*** empty log message ***

7 files changed, 30 insertions, 9 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 6928893505f..1d7e6d8424b 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,17 @@
+Mon Apr 07 21:20:37 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ciao/ServerActivator_Impl.cpp: Fixed a couple of compilation
+	  warnings with gcc.
+
+	* ciao/CIAO_Client.dsp:
+	* ciao/CIAO_Container.dsp:
+	* ciao/CIAO_Server.dsp: Turned on RTTI to sync up with the new Any
+	  implementation.
+
+	* ciao/CIAO_common.h:
+	* ciao/Cookies.cpp: Fixed the use of old CORBA_* types.  They are
+	  no longer available in the newer version of ACE/TAO.
+
 Sun Apr 06 20:36:39 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* examples/handcrafted/Display/CIAO_Installation_Data.ini:
diff --git a/TAO/CIAO/ciao/CIAO_Client.dsp b/TAO/CIAO/ciao/CIAO_Client.dsp
index 8aaff03848e..a8a7b55236b 100644
--- a/TAO/CIAO/ciao/CIAO_Client.dsp
+++ b/TAO/CIAO/ciao/CIAO_Client.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_CLIENT_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\..\.." /I "..\.." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_CLIENT_BUILD_DLL" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "..\..\.." /I "..\.." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_CLIENT_BUILD_DLL" /YX /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_CLIENT_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "..\..\.." /I "..\.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_CLIENT_BUILD_DLL" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I ".." /I "..\..\.." /I "..\.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_CLIENT_BUILD_DLL" /YX /FD /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

diff --git a/TAO/CIAO/ciao/CIAO_Container.dsp b/TAO/CIAO/ciao/CIAO_Container.dsp
index 02da8299b43..4883db98f84 100644
--- a/TAO/CIAO/ciao/CIAO_Container.dsp
+++ b/TAO/CIAO/ciao/CIAO_Container.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_CONTAINER_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\..\.." /I "..\.." /I "..\..\orbsvcs\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_CONTAINER_BUILD_DLL" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "..\..\.." /I "..\.." /I "..\..\orbsvcs\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_CONTAINER_BUILD_DLL" /YX /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_CONTAINER_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "..\..\.." /I "..\.." /I "..\..\orbsvcs\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_CONTAINER_BUILD_DLL" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I ".." /I "..\..\.." /I "..\.." /I "..\..\orbsvcs\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_CONTAINER_BUILD_DLL" /YX /FD /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

diff --git a/TAO/CIAO/ciao/CIAO_Server.dsp b/TAO/CIAO/ciao/CIAO_Server.dsp
index 6b59216575c..6c066031260 100644
--- a/TAO/CIAO/ciao/CIAO_Server.dsp
+++ b/TAO/CIAO/ciao/CIAO_Server.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_SERVER_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\..\.." /I "..\.." /I "..\..\orbsvcs\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_SERVER_BUILD_DLL" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "..\..\.." /I "..\.." /I "..\..\orbsvcs\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_SERVER_BUILD_DLL" /YX /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_SERVER_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "..\..\.." /I "..\.." /I "..\..\orbsvcs\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_SERVER_BUILD_DLL" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I ".." /I "..\..\.." /I "..\.." /I "..\..\orbsvcs\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CIAO_SERVER_BUILD_DLL" /YX /FD /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

diff --git a/TAO/CIAO/ciao/CIAO_common.h b/TAO/CIAO/ciao/CIAO_common.h
index 57f70b9faa9..9a187410d1c 100644
--- a/TAO/CIAO/ciao/CIAO_common.h
+++ b/TAO/CIAO/ciao/CIAO_common.h
@@ -19,8 +19,8 @@
 #endif /* ! ACE_LACKS_PRAGMA_ONCE */
 
 #define CIAO_REGISTER_VALUE_FACTORY(ORB,FACTORY,VALUETYPE)       {\
-        CORBA_ValueFactory factory = new FACTORY; \
-        CORBA_ValueFactory prev_factory = \
+        CORBA::ValueFactory factory = new FACTORY; \
+        CORBA::ValueFactory prev_factory = \
           ORB->register_value_factory \
           (VALUETYPE::_tao_obv_static_repository_id (), \
            factory); \
diff --git a/TAO/CIAO/ciao/Cookies.cpp b/TAO/CIAO/ciao/Cookies.cpp
index 92a5b0dfdcf..2673151b5cc 100644
--- a/TAO/CIAO/ciao/Cookies.cpp
+++ b/TAO/CIAO/ciao/Cookies.cpp
@@ -48,7 +48,7 @@ CIAO::Map_Key_Cookie::extract (::Components::Cookie *ck,
 CORBA::ValueBase *
 CIAO::Map_Key_Cookie_init::create_for_unmarshal (void)
 {
-  CORBA_ValueBase *ret_val = 0;
+  CORBA::ValueBase *ret_val = 0;
   ACE_NEW_RETURN (
       ret_val,
       CIAO::Map_Key_Cookie,
diff --git a/TAO/CIAO/ciao/ServerActivator_Impl.cpp b/TAO/CIAO/ciao/ServerActivator_Impl.cpp
index 883b5949ea7..f1ff497b4db 100644
--- a/TAO/CIAO/ciao/ServerActivator_Impl.cpp
+++ b/TAO/CIAO/ciao/ServerActivator_Impl.cpp
@@ -51,6 +51,11 @@ CIAO::ServerActivator_Impl::init (const char *server_location,
                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_UNUSED_ARG (spawn_delay); // @@ We need to use this argumetn
+                                // later to determine is a
+                                // ComponentServer has been spawned
+                                // successfully.
+
   if (server_location == 0)
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), -1);
 
@@ -105,6 +110,8 @@ CIAO::ServerActivator_Impl::create_component_server (const Components::ConfigVal
                    Components::CreateFailure,
                    Components::InvalidConfiguration))
 {
+  ACE_UNUSED_ARG (config);      // This will be used later.
+
   ACE_DEBUG ((LM_DEBUG, "CIAO::ServerActivator_Impl::create_component_server\n"));
 
   ::Components::Deployment::ComponentServer_var retval;