Fixed an error because of macro name clash on Lynx. Thanks to David Levine

for reporting the error.

4 files changed, 30 insertions, 22 deletions

diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 69659214519..5668be63315 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -2283,7 +2283,7 @@ TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (void)
   :sfp_ (0),
    address_ (0),
    format_ (0),
-   direction_ (INVALID)
+   direction_ (TAO_AV_INVALID)
 {
 }
 
@@ -2320,13 +2320,13 @@ int
 TAO_Forward_FlowSpec_Entry::parse (char *flowSpec_entry)
 {
   TAO_Tokenizer tokenizer (flowSpec_entry,'\\');
-  if (this->parse_flow_protocol_string (tokenizer [FLOW_PROTOCOL]) < 0)
+  if (this->parse_flow_protocol_string (tokenizer [TAO_AV_FLOW_PROTOCOL]) < 0)
     return -1;
-  this->set_direction (tokenizer [DIRECTION]);
-  if (this->parse_address (tokenizer [ADDRESS]) < 0)
+  this->set_direction (tokenizer [TAO_AV_DIRECTION]);
+  if (this->parse_address (tokenizer [TAO_AV_ADDRESS]) < 0)
     return -1;
-  this->format_ = tokenizer [FORMAT];
-  this->flowname_ = tokenizer [FLOWNAME];
+  this->format_ = tokenizer [TAO_AV_FORMAT];
+  this->flowname_ = tokenizer [TAO_AV_FLOWNAME];
   return 0;
 }
 
@@ -2334,11 +2334,11 @@ int
 TAO_FlowSpec_Entry::set_direction (char *direction)
 {
   if (ACE_OS::strcasecmp (direction,"in") == 0)
-    this->direction_ = DIR_IN;
+    this->direction_ = TAO_AV_DIR_IN;
   else if (ACE_OS::strcasecmp (direction,"out") == 0)
-    this->direction_ = DIR_OUT;
+    this->direction_ = TAO_AV_DIR_OUT;
   else if (ACE_OS::strcasecmp (direction,"inout") == 0)
-    this->direction_ = DIR_INOUT;
+    this->direction_ = TAO_AV_DIR_INOUT;
   return 0;
 }
 
@@ -2378,13 +2378,13 @@ int
 TAO_Reverse_FlowSpec_Entry::parse (char *flowSpec_entry)
 {
   TAO_Tokenizer tokenizer (flowSpec_entry,'\\');
-  if (this->parse_flow_protocol_string (tokenizer [FLOW_PROTOCOL]) < 0)
+  if (this->parse_flow_protocol_string (tokenizer [TAO_AV_FLOW_PROTOCOL]) < 0)
     return -1;
-  this->set_direction (tokenizer [DIRECTION]);
-  if (this->parse_address (tokenizer [ADDRESS]) < 0)
+  this->set_direction (tokenizer [TAO_AV_DIRECTION]);
+  if (this->parse_address (tokenizer [TAO_AV_ADDRESS]) < 0)
     return -1;
-  this->format_ = tokenizer [FORMAT];
-  this->flowname_ = tokenizer [FLOWNAME];
+  this->format_ = tokenizer [TAO_AV_FORMAT];
+  this->flowname_ = tokenizer [TAO_AV_FLOWNAME];
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index baf1df83499..abcf1e9568a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -1001,10 +1001,10 @@ public:
   //     An helper entry class in the flow spec sequence passed to bind_devs.
   enum Direction
   {
-    INVALID = -1, 
-    DIR_IN = 0, 
-    DIR_OUT = 1, 
-    DIR_INOUT = 2};
+    TAO_AV_INVALID = -1, 
+    TAO_AV_DIR_IN = 0, 
+    TAO_AV_DIR_OUT = 1, 
+    TAO_AV_DIR_INOUT = 2};
 
   TAO_FlowSpec_Entry (void);
   // constructor.
@@ -1059,7 +1059,11 @@ class TAO_ORBSVCS_Export TAO_Forward_FlowSpec_Entry
   :public TAO_FlowSpec_Entry
 {
 public:
-  enum Position {FLOWNAME=0,DIRECTION,FORMAT,FLOW_PROTOCOL,ADDRESS};
+  enum Position {TAO_AV_FLOWNAME = 0,
+                 TAO_AV_DIRECTION = 1,
+                 TAO_AV_FORMAT = 2,
+                 TAO_AV_FLOW_PROTOCOL = 3,
+                 TAO_AV_ADDRESS = 4};
 
   virtual int parse (char* flowSpec_entry);
   // construct the entry from a string specified by the flowSpec grammar.
@@ -1069,7 +1073,11 @@ class TAO_ORBSVCS_Export TAO_Reverse_FlowSpec_Entry
   :public TAO_FlowSpec_Entry
 {
 public:
-  enum Position {FLOWNAME=0,ADDRESS,FLOW_PROTOCOL,DIRECTION,FORMAT};
+  enum Position {TAO_AV_FLOWNAME = 0,
+                 TAO_AV_ADDRESS = 1,
+                 TAO_AV_FLOW_PROTOCOL = 2,
+                 TAO_AV_DIRECTION = 3,
+                 TAO_AV_FORMAT = 4};
 
   virtual int parse (char* flowSpec_entry);
   // construct the entry from a string specified by the flowSpec grammar.
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index d0554829cbf..616552b1f05 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#include "orbsvcs/AV/Endpoint_Strategy.h"
+#include "Endpoint_Strategy.h"
 
 ACE_RCSID(AV, Endpoint_Strategy, "$Id$")
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index 8757bcbcf2a..4f014c5c53d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -19,7 +19,7 @@
 #ifndef TAO_AV_ENDPOINT_STRATEGY_H
 #define TAO_AV_ENDPOINT_STRATEGY_H
 
-#include "orbsvcs/AV/AVStreams_i.h"
+#include "AVStreams_i.h"
 #include "tao/TAO.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.