ChangeLogTag: Thu Apr 10 08:15:00 UTC 2008 Simon Massey <simon dot massey at prismtech dot com>

9 files changed, 47 insertions, 12 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 892a382f088..202e5c68504 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,22 @@
+Thu Apr 10 08:15:00 UTC 2008  Simon Massey  <simon dot massey at prismtech dot com>
+
+        * orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp:
+
+          Another "interface" VC8 MFC conflict.
+
+        * tests/DII_AMI_Forward/DII_AMI_Forward.mpc:
+
+          VC8 multi-build conflict (both server + client) over the test.idl
+
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp:
+
+          Place this specialised UUID class into it's own TAO_FtRt namespace.
+
 Wed Apr  9 18:01:34 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Default_Thread_Lane_Resources_Manager.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
index 4dc2d3e3ff5..91763997d4d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
@@ -43,7 +43,7 @@ namespace FTRTEC {
         --argc; ++argv;
         if (argv[0][0] == '-') continue;
         else if (argv[0][0] != '$') {
-          UUID uuid(argv[0]);
+          TAO_FtRt::UUID uuid(argv[0]);
           if (!uuid.is_valid())
             ACE_ERROR_RETURN((LM_ERROR, "Invalid Object_ID\n"), -1);
           object_id_.length(16);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index 6c63a849077..edea0f058e6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -45,8 +45,8 @@ Request_Context_Repository::init(CORBA::ORB_ptr the_orb)
 void Request_Context_Repository::generate_object_id(
   FtRtecEventChannelAdmin::ObjectId& oid)
 {
-  oid.length(sizeof(UUID));
-  UUID::create(oid.get_buffer());
+  oid.length(sizeof(TAO_FtRt::UUID));
+  TAO_FtRt::UUID::create(oid.get_buffer());
   set_object_id(oid);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index c64a9891525..0fbc19919d8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -192,7 +192,7 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa)
 
   FtRtecEventComm::ObjectId oid;
   oid.length(16);
-  UUID::create(oid.get_buffer());
+  TAO_FtRt::UUID::create(oid.get_buffer());
 
   RtecEventChannelAdmin::EventChannel_var gateway;
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
index cc29c3345c5..4a1632fa931 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
@@ -9,6 +9,8 @@ ACE_RCSID (Utils,
 #endif /* __ACE_INLINE__ */
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+namespace TAO_FtRt
+{
 
 static union
 {
@@ -163,5 +165,5 @@ UUID::create (unsigned char *buffer)
 
   ACE_OS::memcpy(buffer + 10, &node, 6);
 }
-
+}
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
index 19b81c44354..298a14e20c2 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
@@ -31,6 +31,8 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+namespace TAO_FtRt
+{
 /**
  * This is an implementation of Global Unique Identifier
  * which follows the document draft-leach-uuids-guids-01.txt. The
@@ -112,7 +114,7 @@ class TAO_FtRtEvent_Export  UUID
       unsigned char uuid[BINRARY_LENGTH];
     } rep_;
 };
-
+}
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
index a94affd5dd5..0a7a87bc9b9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
@@ -3,6 +3,8 @@
 // $Id$
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+namespace TAO_FtRt
+{
 
 ACE_INLINE
 UUID::UUID()
@@ -54,5 +56,5 @@ void UUID::to_string(ACE_CString& string) const
   string.resize(STRING_LENGTH-1);
   this->to_string(&string[0]);
 }
-
+}
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
index 0fb7d2c70bf..1f754d71b06 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
@@ -19,16 +19,16 @@ template<class Interface> typename RIR_Narrow<Interface>::Interface_ptr
 RIR_Narrow<Interface>::resolve (CORBA::ORB_ptr orb,
                                 const char *object_id)
 {
-  Interface_var interface;
+  Interface_var intface;
 
   try
     {
       CORBA::Object_var object =
         orb->resolve_initial_references (object_id);
 
-      interface = Interface::_narrow (object.in ());
+      intface = Interface::_narrow (object.in ());
 
-      if (CORBA::is_nil (interface.in ()))
+      if (CORBA::is_nil (intface.in ()))
         {
           ACE_ERROR ((LM_ERROR,
                       "Panic - error while narrowing <%s>\n",
@@ -38,7 +38,7 @@ RIR_Narrow<Interface>::resolve (CORBA::ORB_ptr orb,
     } catch (const CORBA::Exception& ex) {
       ex._tao_print_exception ("Caught an exception \n");
     }
-  return interface._retn ();
+  return intface._retn ();
 }
 
 #endif /* TAO_PERF_RTEC_RIR_NARROW_CPP */
diff --git a/TAO/tests/DII_AMI_Forward/DII_AMI_Forward.mpc b/TAO/tests/DII_AMI_Forward/DII_AMI_Forward.mpc
index f134a899929..7841eb4a9ed 100644
--- a/TAO/tests/DII_AMI_Forward/DII_AMI_Forward.mpc
+++ b/TAO/tests/DII_AMI_Forward/DII_AMI_Forward.mpc
@@ -2,17 +2,27 @@
 // $Id$
 //
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1;
+}
 
 project (*Client): taoclient, dynamicinterface {
+  after += *idl
   Source_Files {
     client.cpp
     DII_ReplyHandler.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project (*Server): messaging, pi_server, taoserver, avoids_minimum_corba {
+  after += *idl
   IDL_Files {
-    test.idl
   }
 
   Source_Files {