Changeset 5485

Timestamp:

Jul 30, 2009, 3:07:54 PM (15 years ago)

Author:

Christoph Mayer

Message:

static initialization workaround

Location:

source/ariba/communication

Files:

• BaseCommunication.cpp (modified) (3 diffs)
• BaseCommunication.h (modified) (4 diffs)

source/ariba/communication/BaseCommunication.cpp

@@ -55 +55 @@
 
 use_logging_cpp(BaseCommunication);
-const BaseCommunication::LinkDescriptor
-        BaseCommunication::LinkDescriptor::UNSPECIFIED;
 
 BaseCommunication::BaseCommunication() {
@@ -501 +499 @@
         for (int i=0; i<linkSet.size();i++)
                 if (linkSet[i]->localLink == link) return (LinkDescriptor&)*linkSet[i];
-        return (LinkDescriptor&)LinkDescriptor::UNSPECIFIED;
+
+        LinkDescriptor ret;
+        ret.unspecified = true;
+        return ret;
 }
 
@@ -508 +509 @@
         for (int i=0; i<linkSet.size();i++)
                 if (linkSet[i]->remoteLink == link) return (LinkDescriptor&)*linkSet[i];
-        return (LinkDescriptor&)LinkDescriptor::UNSPECIFIED;
+
+        LinkDescriptor ret;
+        ret.unspecified = true;
+        return ret;
 }
 

source/ariba/communication/BaseCommunication.h

@@ -229 +229 @@
         class LinkDescriptor {
         public:
-                static const LinkDescriptor UNSPECIFIED;
 
                 /// default constructor
@@ -235 +234 @@
                         localLink(LinkID::UNSPECIFIED), localLocator(NULL),
                         remoteLink(LinkID::UNSPECIFIED), remoteLocator(NULL),
-                        remoteEndpoint(EndpointDescriptor::UNSPECIFIED), up(false) {
+                        remoteEndpoint(EndpointDescriptor::UNSPECIFIED), up(false), unspecified(false) {
                 }
 
@@ -243 +242 @@
                 }
 
-                /// returns true if this is the UNSPECIFIED object
                 bool isUnspecified() const {
-                        return this == &UNSPECIFIED;
+                        return unspecified;
                 }
+
+                bool unspecified;
 
                 /// link identifiers
@@ -288 +288 @@
         NetworkChangeDetection networkMonitor;
 #endif
+
         /// event listener
         typedef set<CommunicationEvents*> EventListenerSet;