Merged revisions 81226,81229,81233 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/TAO

........
  r81226 | sma | 2008-04-03 04:43:45 -0500 (Thu, 03 Apr 2008) | 1 line
  
  ChangeLogTag: Thu Apr  3 09:40:00 UTC 2008  Simon Massey  <simon dot massey at prismtech dot com>
........
  r81229 | sma | 2008-04-03 10:12:37 -0500 (Thu, 03 Apr 2008) | 1 line
  
  ChangeLogTag: Thu Apr  3 15:15:00 UTC 2008  Simon Massey  <simon dot massey at prismtech dot com>
........
  r81233 | sma | 2008-04-04 05:22:09 -0500 (Fri, 04 Apr 2008) | 1 line
  
  ChangeLogTag: Fri Apr  4 10:20:00 UTC 2008  Simon Massey  <simon dot massey at prismtech dot com>
........

4 files changed, 27 insertions, 7 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8db86ffebab..15fe311fb98 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Fri Apr  4 10:20:00 UTC 2008  Simon Massey  <simon dot massey at prismtech dot com>
+
+        * orbsvcs/tests/Bug_1630_Regression/testclient.cpp:
+
+          Another "interface" VC8 MFC conflict.
+
+Thu Apr  3 15:15:00 UTC 2008  Simon Massey  <simon dot massey at prismtech dot com>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp:
+
+          Another "interface" VC8 MFC conflict.
+
+Thu Apr  3 09:40:00 UTC 2008  Simon Massey  <simon dot massey at prismtech dot com>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
+
+          Using "interface" as the descriptive name of a parameter seems to
+          cause VC8 (when building with MFC) to assume you mean a struct type
+          and it raises an incorrect systax error.
+
 Thu Apr  3 01:18:45 UTC 2008  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * tests/DSI_Gateway/client.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
index f3f41ddcd7c..6f978d9d564 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
@@ -257,10 +257,10 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_)
         this->interface_repository_->lookup_id (interface_);
 
       // Narrow the interface
-      CORBA::InterfaceDef_var interface =
+      CORBA::InterfaceDef_var intface =
         CORBA::InterfaceDef::_narrow (contained.in ());
 
-      if (CORBA::is_nil (interface.in () ))
+      if (CORBA::is_nil (intface.in () ))
         {
           if (TAO_debug_level >= 10)
             {
@@ -274,7 +274,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_)
         {
           // Obtain the full interface description
           CORBA::InterfaceDef::FullInterfaceDescription_var fid =
-            interface->describe_interface ();
+            intface->describe_interface ();
 
           // Obtain the base interfaces
           this->base_interfaces_ = fid->base_interfaces;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index be8c2d6d59f..5d07ebec18f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -262,7 +262,7 @@ public:
 
 protected:
   /// Function caches the full interface description from the IFR
-  int cache_interface_description (const char *interface);
+  int cache_interface_description (const char *interface_);
 
   /// Insert a operation/parameter into the IFR cache
   int insert_into_ifr_cache (const char *operation, TAO_CEC_Operation_Params *parameters);
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
index c7443b34692..a4237f7ccda 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
@@ -39,7 +39,7 @@ int main (int argc, char* argv[])
       //
       CORBA::InterfaceDefSeq baseInterfaces(1) ;
       baseInterfaces.length(0) ;
-      CORBA::InterfaceDef_var interface =
+      CORBA::InterfaceDef_var intface =
          ifr->create_interface( "IDL:interface865:1.0",
                                 "interface865",
                                 "1.0",
@@ -108,7 +108,7 @@ int main (int argc, char* argv[])
       //
       ACE_DEBUG((LM_DEBUG, ". create_operation\n"));
       CORBA::OperationDef_var operation =
-         interface->create_operation( "IDL:interface865/f:1.0",
+         intface->create_operation( "IDL:interface865/f:1.0",
                                       "f",
                                       "1.0",
                                       voidPrimitive.in(),
@@ -204,7 +204,7 @@ int main (int argc, char* argv[])
 
       // Finally destroy the interface.
       //
-      interface->destroy() ;
+      intface->destroy() ;
 
       //orb->destroy();