Tue Apr 5 08:11:57 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * TAO_IDL/be/be_codegen.cpp:
        * TAO_IDL/be/be_global.cpp:
        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
        * TAO_IDL/be_include/be_global.h:
          Don't use NONE as enum value, this is a macro on VxWorks

5 files changed, 15 insertions, 7 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 41253286bf7..9528fc38035 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Tue Apr  5 08:11:57 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+        * TAO_IDL/be_include/be_global.h:
+          Don't use NONE as enum value, this is a macro on VxWorks
+
 Fri Apr  1 15:10:04 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * orbsvcs/Naming_Service/Naming_Service.h:
@@ -9,9 +17,9 @@ Fri Apr  1 15:10:04 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
           adds a -n <numthreads> command line option. Threading is
           achieved by using an ACE_Task to call ORB::run() on multiple
           threads. Default is single threaded behavior.
-        
+
         * orbsvcs/Notify_Service/Notify_Service.cpp:
-        
+
           Added a try/catch to the naming service resolving function. It
           is possible that and execption is thrown while trying to
           connect, and that was causing the service to crash abrupty
@@ -19,7 +27,7 @@ Fri Apr  1 15:10:04 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
           and shutdown happens gracefully.
 
         * orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp:
-        
+
           Silenced some compiler warnings that complained about an
           infinite loop. The test added to break will never pass, so the
           behavior is unchanged, but pedantic gcc compilers are now
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 62de8966661..065da4d99b1 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -3400,7 +3400,7 @@ TAO_CodeGen::gen_conn_hdr_includes (void)
             this->gen_conn_ts_includes (
               idl_global->ciao_oci_ts_file_names ());
             break;
-          case BE_GlobalData::NONE:
+          case BE_GlobalData::DDS_NONE:
             break;
         }
     }
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 669bfe92515..21dc77f2bd8 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -113,7 +113,7 @@ BE_GlobalData::BE_GlobalData (void)
     gen_orb_h_include_ (true),
     gen_empty_anyop_header_ (false),
     lookup_strategy_ (TAO_PERFECT_HASH),
-    dds_impl_ (NONE),
+    dds_impl_ (DDS_NONE),
     opendds_sequence_suffix_ ("Seq"),
     void_type_ (0),
     ccmobject_ (0),
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
index b7a8cf66f40..8daa4c9d908 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
@@ -282,7 +282,7 @@ be_visitor_connector_dds_exh::gen_dds_traits (AST_Decl *datatype)
   UTL_ScopedName *dt_name = datatype->name ();
   BE_GlobalData::DDS_IMPL the_dds_impl = be_global->dds_impl ();
 
-  if (the_dds_impl != BE_GlobalData::NONE)
+  if (the_dds_impl != BE_GlobalData::DDS_NONE)
     {
       os_ << be_nl
           << "struct " << datatype->flat_name () << "_DDS_Traits" << be_nl
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index 4be31d1bf88..5ca843c1c5c 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -51,7 +51,7 @@ public:
   /// connectors.
   enum DDS_IMPL
   {
-    NONE,
+    DDS_NONE,
     NDDS,
     OPENSPLICE,
     OPENDDS