Changeset 9693 for source

Timestamp:

Mar 23, 2011, 10:02:19 AM (14 years ago)

Author:

Christoph Mayer

Message:

-visual rename

File:

• source/ariba/overlay/BaseOverlay.cpp (modified) (9 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -62 +62 @@
 namespace overlay {
 
-#define visual                          ariba::utility::DddVis::instance()
+#define visualInstance          ariba::utility::DddVis::instance()
 #define visualIdOverlay         ariba::utility::ServerVis::NETWORK_ID_BASE_OVERLAY
 #define visualIdBase            ariba::utility::ServerVis::NETWORK_ID_BASE_COMMUNICATION
@@ -900 +900 @@
         //ovl.visShutdown( ovlId, nodeId, string("") );
 
-        visual.visShutdown(visualIdOverlay, nodeId, "");
-        visual.visShutdown(visualIdBase, nodeId, "");
+        visualInstance.visShutdown(visualIdOverlay, nodeId, "");
+        visualInstance.visShutdown(visualIdBase, nodeId, "");
 
         // inform all registered services of the event
@@ -933 +933 @@
         }
 
-        visual.visCreate(visualIdBase, nodeId, "", "");
-        visual.visCreate(visualIdOverlay, nodeId, "", "");
+        visualInstance.visCreate(visualIdBase, nodeId, "", "");
+        visualInstance.visCreate(visualIdOverlay, nodeId, "", "");
 }
 
@@ -1983 +1983 @@
 
                 if(pre != NodeID::UNSPECIFIED){
-                        visual.visDisconnect(visualIdOverlay, this->nodeId, pre, "");
+                        visualInstance.visDisconnect(visualIdOverlay, this->nodeId, pre, "");
                         pre = NodeID::UNSPECIFIED;
                 }
                 if(suc != NodeID::UNSPECIFIED){
-                        visual.visDisconnect(visualIdOverlay, this->nodeId, suc, "");
+                        visualInstance.visDisconnect(visualIdOverlay, this->nodeId, suc, "");
                         suc = NodeID::UNSPECIFIED;
                 }
@@ -2001 +2001 @@
                         pre = nodes.at(0);
                         if(pre != NodeID::UNSPECIFIED)
-                                visual.visConnect(visualIdOverlay, this->nodeId, pre, "");
+                                visualInstance.visConnect(visualIdOverlay, this->nodeId, pre, "");
                 }
         }
@@ -2010 +2010 @@
                 if(nodes.at(0) != pre){
                         if(pre != NodeID::UNSPECIFIED)
-                                visual.visDisconnect(visualIdOverlay, this->nodeId, pre, "");
+                                visualInstance.visDisconnect(visualIdOverlay, this->nodeId, pre, "");
                         pre = NodeID::UNSPECIFIED;
                 }
                 if(nodes.at(1) != suc){
                         if(suc != NodeID::UNSPECIFIED)
-                                visual.visDisconnect(visualIdOverlay, this->nodeId, suc, "");
+                                visualInstance.visDisconnect(visualIdOverlay, this->nodeId, suc, "");
                         suc = NodeID::UNSPECIFIED;
                 }
@@ -2023 +2023 @@
                         pre = nodes.at(0);
                         if(pre != NodeID::UNSPECIFIED)
-                                visual.visConnect(visualIdOverlay, this->nodeId, pre, "");
+                                visualInstance.visConnect(visualIdOverlay, this->nodeId, pre, "");
                 }
                 if(suc == NodeID::UNSPECIFIED){
                         suc = nodes.at(1);
                         if(suc != NodeID::UNSPECIFIED)
-                                visual.visConnect(visualIdOverlay, this->nodeId, suc, "");
+                                visualInstance.visConnect(visualIdOverlay, this->nodeId, suc, "");
                 }
 
@@ -2086 +2086 @@
                 BOOST_FOREACH(NodeID n, linkset){
                         if(remotenodes.find(n) == remotenodes.end()){
-                                visual.visDisconnect(visualIdBase, this->nodeId, n, "");
+                                visualInstance.visDisconnect(visualIdBase, this->nodeId, n, "");
                                 linkset.erase(n);
                                 changed = true;
@@ -2099 +2099 @@
                 BOOST_FOREACH(NodeID n, remotenodes){
                         if(linkset.find(n) == linkset.end()){
-                                visual.visConnect(visualIdBase, this->nodeId, n, "");
+                                visualInstance.visConnect(visualIdBase, this->nodeId, n, "");
                                 linkset.insert(n);
                                 changed = true;