*** empty log message ***

14 files changed, 42 insertions, 270 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 1d6433f8152..a9512d1e216 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,23 @@
+Sat Mar 15 11:43:34 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ciao/Makefile:
+	* ciao/Makefile.client:
+	* ciao/Makefile.container:
+	* ciao/Makefile.server: Removed Makefiles.  I depend on MPC files
+	  exclusively at the moment.
+
+	* ciao/Assembly_Impl.cpp:
+	* ciao/Assembly_Impl.h:
+	* ciao/CCM_Core.mpc:
+	* ciao/Container_Base.cpp:
+	* ciao/Container_Base.h:
+	* ciao/Container_Impl.h:
+	* ciao/Daemon_Impl.h:
+	* ciao/Object_Set_T.cpp:
+	* ciao/ServerActivator_Impl.h: Fixed Linux build errors.  Some
+	  warnings are not fixed due to incomplete implementations and I
+	  want to make sure they got addressed in some future point. 
+
 Fri Mar 14 23:19:52 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ciao/CCM_Core.mpc: Updated the core MPC file to reflect recent
diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index 888a8082c91..d139a67fafc 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -1,10 +1,9 @@
-project (CAIO_Client) : taolib_with_idl {
+project (CIAO_Client) : taolib_with_idl {
   depends += IFR_Client
   sharedname  = CIAO_Client
   libs       += TAO TAO_IFR_Client
   idlflags  += -I $(TAO_ROOT) -Wb,stub_export_include=CIAO_Client_Export.h -Wb,skel_export_include=CIAO_Container_Export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
   dllflags    = CIAO_CLIENT_BUILD_DLL
-  include_dir = CIAO
 
   IDL_Files {
     CCM_Base.idl
@@ -22,13 +21,13 @@ project (CAIO_Client) : taolib_with_idl {
   }
 }
 
-project (CAIO_Container) : taolib_with_idl {
+project (CIAO_Container) : taolib_with_idl {
   depends += CIAO_Client PortableServer Security
   sharedname  = CIAO_Container
   libs       += TAO TAO_PortableServer TAO_IFR_Client TAO_Security CIAO_Client
   idlflags  += -I $(TAO_ROOT) -I$ $(TAO_ROOT)/orbsvcs/orbsvcs -Wb,export_include=CIAO_Container_Export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
   dllflags    = CIAO_CONTAINER_BUILD_DLL
-  include_dir = CIAO orbsvcs/orbsvcs
+  includes += $(TAO_ROOT)/orbsvcs/orbsvcs
 
   IDL_Files {
     CCM_Transaction.idl
@@ -49,14 +48,14 @@ project (CAIO_Container) : taolib_with_idl {
   }
 }
 
-project (CAIO_Server) :taolib_with_idl {
+project (CIAO_Server) :taolib_with_idl {
   depends += CIAO_Container CosNaming
   sharedname  = CIAO_Server
   libs       += TAO TAO_PortableServer TAO_IFR_Client TAO_Security TAO_CosNaming
   idlflags  += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs/orbsvcs -Wb,export_include=CIAO_Server_Export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
 
   dllflags    = CIAO_SERVER_BUILD_DLL
-  include_dir = CIAO orbsvcs/orbsvcs
+  includes += $(TAO_ROOT)/orbsvcs/orbsvcs
 
   IDL_Files {
     CCM_Deployment.idl
@@ -66,21 +65,21 @@ project (CAIO_Server) :taolib_with_idl {
   }
 
   Source_Files {
-    Assembly_Impl.cpp
     CCM_DeploymentC.cpp
     CCM_DeploymentS.cpp
     CIAO_ServersC.cpp
     CIAO_ServersS.cpp
+    DaemonC.cpp
+    DaemonS.cpp
+    HomeRegistrarC.cpp
+    HomeRegistrarS.cpp
+    Assembly_Impl.cpp
     ComponentInstallation_Impl.cpp
     ComponentServer_Impl.cpp
     Container_Base.cpp
     Container_Impl.cpp
     Daemon_Impl.cpp
-    DaemonC.cpp
-    DaemonS.cpp
     HomeRegistrar_i.cpp
-    HomeRegistrarC.cpp
-    HomeRegistrarS.cpp
     Server_init.cpp
     ServerActivator_Impl.cpp
   }
diff --git a/TAO/CIAO/ciao/Container_Base.cpp b/TAO/CIAO/ciao/Container_Base.cpp
index da9ee5c4d70..5f26da8d305 100644
--- a/TAO/CIAO/ciao/Container_Base.cpp
+++ b/TAO/CIAO/ciao/Container_Base.cpp
@@ -4,7 +4,7 @@
 #include "ace/DLL.h"
 
 #if !defined (__ACE_INLINE__)
-# include "ciao/Container_Base.inl"
+# include "Container_Base.inl"
 #endif /* __ACE_INLINE__ */
 
 ////////////////////////////////////////////////////////////////
diff --git a/TAO/CIAO/ciao/Container_Base.h b/TAO/CIAO/ciao/Container_Base.h
index 9ef9ff3749c..23be45bf84d 100644
--- a/TAO/CIAO/ciao/Container_Base.h
+++ b/TAO/CIAO/ciao/Container_Base.h
@@ -149,7 +149,7 @@ namespace CIAO
 }
 
 #if defined (__ACE_INLINE__)
-# include "ciao/Container_Base.inl"
+# include "Container_Base.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/TAO/CIAO/ciao/Container_Impl.h b/TAO/CIAO/ciao/Container_Impl.h
index 2194bd73a03..3d984be2836 100644
--- a/TAO/CIAO/ciao/Container_Impl.h
+++ b/TAO/CIAO/ciao/Container_Impl.h
@@ -131,7 +131,7 @@ protected:
     PortableServer::POA_var poa_;
 
     /// Internal container implementation.
-    Container *container_;
+    CIAO::Container *container_;
 
     /// Cached ConfigValues.
     Components::ConfigValues_var config_;
@@ -149,7 +149,7 @@ protected:
     TAO_SYNCH_MUTEX lock_;
 
     /// Keep a list of managed CCMHome.
-    Object_Set<::Components::CCMHome, ::Components::CCMHome_var> home_set_;
+    Object_Set<Components::CCMHome, Components::CCMHome_var> home_set_;
   };
 }
 
diff --git a/TAO/CIAO/ciao/Makefile b/TAO/CIAO/ciao/Makefile
deleted file mode 100644
index 7929c4da116..00000000000
--- a/TAO/CIAO/ciao/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-MAKEFILE = Makefile
-
-#----------------------------------------------------------------------------
-#       Include macros
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-MKLIST = \
-	Makefile.client \
-	Makefile.container \
-	Makefile.server
-
-all debug profile optimize install deinstall clean realclean clobber depend idl_stubs:
-ifeq (Windows,$(findstring Windows,$(OS)))
-	@cmd /c "FOR /D %m IN ($(MKLIST)) DO $(MAKE) -f %m MAKEFILE=$$m $(@:.nested=)"
-else  # ! Windows
-	@for m in $(MKLIST); do \
-	echo $$m; \
-        $(MAKE) -f $$m MAKEFILE=$$m $(@:.nested=); \
-        done
-endif # ! Windows
diff --git a/TAO/CIAO/ciao/Makefile.client b/TAO/CIAO/ciao/Makefile.client
deleted file mode 100644
index a54d7e58535..00000000000
--- a/TAO/CIAO/ciao/Makefile.client
+++ /dev/null
@@ -1,69 +0,0 @@
-#-------------- -*- Makefile -*- --------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-ifndef CIAO_ROOT
-  CIAO_ROOT = $(ACE_ROOT)/TAO/CIAO
-endif # ! CIAO_ROOT
-
-MAKEFILE = Makefile.client
-LIBNAME = libCIAO_Client
-LIB = $(LIBNAME).a
-SHLIB = $(LIBNAME).$(SOEXT)
-VPATH=.
-
-ACE_SHLIBS = -lTAO -lACE
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-override TAO_IDLFLAGS += -Ge 1 -Sc -I$(TAO_ROOT) \
-        -Wb,stub_export_include=CIAO_Client_Export.h \
-        -Wb,skel_export_include=CIAO_Container_Export.h \
-        -Wb,pre_include="ace/pre.h" \
-        -Wb,post_include="ace/post.h"
-
-IDL_FILES = CCM_Base CCM_Event CCM_Component
-IDL_SRC = CCM_BaseC CCM_EventC CCM_ComponentC
-
-SHLIB_SRC = $(IDL_SRC) Client_init
-
-LSRC = $(addsuffix .cpp,$(SHLIB_SRC))
-LOBJ = $(addsuffix .o,$(SHLIB_SRC))
-PSRC = $(addsuffix .cpp,$(BIN))
-
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#       Local targets (and local hacks)
-#----------------------------------------------------------------------------
-INCLDIRS += -I$(TAO_ROOT)/CIAO
-
-.PRECIOUS: CCM_BaseC.h CCM_BaseC.i CCM_BaseC.cpp CCM_EventC.h CCM_EventC.i CCM_EventC.cpp CCM_ComponentC.h CCM_ComponentC.i CCM_ComponentC.cpp CCM_BaseS.h CCM_BaseS.i CCM_BaseS.cpp CCM_EventS.h CCM_EventS.i CCM_EventS.cpp CCM_ComponentS.h CCM_ComponentS.i CCM_ComponentS.cpp
-
-realclean: clean
-	-$(RM) CCM_BaseC.* CCM_BaseS.* CCM_EventC.* CCM_EventS.* CCM_ComponentC.* CCM_ComponentS.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/CIAO/ciao/Makefile.container b/TAO/CIAO/ciao/Makefile.container
deleted file mode 100644
index e654aa941a5..00000000000
--- a/TAO/CIAO/ciao/Makefile.container
+++ /dev/null
@@ -1,72 +0,0 @@
-#-------------- -*- Makefile -*- --------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-ifndef CIAO_ROOT
-  CIAO_ROOT = $(ACE_ROOT)/TAO/CIAO
-endif # ! CIAO_ROOT
-
-MAKEFILE = Makefile.container
-LIBNAME  = libCIAO_Container
-LIB = $(LIBNAME).a
-SHLIB = $(LIBNAME).$(SOEXT)
-VPATH=.
-
-ACE_SHLIBS = -lTAO -lACE
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-override TAO_IDLFLAGS += -Ge 1 -Sc -I$(TAO_ROOT) \
-	-I$(TAO_ROOT)/orbsvcs/orbsvcs \
-        -Wb,export_include=CIAO_Container_Export.h \
-        -Wb,pre_include="ace/pre.h" \
-        -Wb,post_include="ace/post.h"
-
-IDL_FILES = CCM_Transaction CosPersistentState CCM_Container CCM_Container_Ex
-IDL_SRC = CCM_TransactionC CosPersistentStateC CCM_ContainerC CCM_Container_ExC
-
-SHLIB_SRC = $(IDL_SRC) CCM_BaseS CCM_EventS CCM_ComponentS Cookies
-
-LSRC = $(addsuffix .cpp,$(SHLIB_SRC))
-LOBJ = $(addsuffix .o,$(SHLIB_SRC))
-PSRC = $(addsuffix .cpp,$(BIN))
-
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#       Local targets (and local hacks)
-#----------------------------------------------------------------------------
-INCLDIRS += -I$(CIAO_ROOT) -I$(TAO_ROOT)/orbsvcs/orbsvcs
-
-.PRECIOUS: CCM_ContainerC.h CCM_ContainerC.i CCM_ContainerC.cpp
-.PRECIOUS: CCM_Container_ExC.h CCM_Container_ExC.i CCM_Container_ExC.cpp
-.PRECIOUS: CCM_TransactionC.h CCM_TransactionC.i CCM_TransactionC.cpp
-.PRECIOUS: CosPersistentStateC.h CosPersistentStateC.i CosPersistentStateC.cpp
-
-realclean: clean
-	-$(RM) CCM_ContainerC.* CCM_ContainerS.* CCM_Container_ExC.* CCM_Container_ExS.* CCM_TransactionC.* CCM_TransactionS.* CosPersistentStateC.* CosPersistentStateS.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/CIAO/ciao/Makefile.server b/TAO/CIAO/ciao/Makefile.server
deleted file mode 100644
index f09225672ec..00000000000
--- a/TAO/CIAO/ciao/Makefile.server
+++ /dev/null
@@ -1,75 +0,0 @@
-#-------------- -*- Makefile -*- --------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-ifndef CIAO_ROOT
-  CIAO_ROOT = $(ACE_ROOT)/TAO/CIAO
-endif # ! CIAO_ROOT
-
-MAKEFILE = Makefile.server
-LIBNAME = libCIAO_Server
-LIB = $(LIBNAME).a
-SHLIB = $(LIBNAME).$(SOEXT)
-VPATH=.
-
-ACE_SHLIBS = -lTAO -lACE
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-override TAO_IDLFLAGS += -Ge 1 -Sc -I$(TAO_ROOT) \
-	-I$(TAO_ROOT)/orbsvcs/orbsvcs \
-	-Wb,export_include=CIAO_Server_Export.h \
-	-Wb,pre_include="ace/pre.h" \
-	-Wb,post_include="ace/post.h"
-
-IDL_FILES = CCM_Deployment HomeRegistrar
-IDL_SRC = \
-        $(addsuffix S, $(IDL_FILES)) \
-        $(addsuffix C, $(IDL_FILES))
-
-SHLIB_SRC = $(IDL_SRC) Container_Base HomeRegistrar_i Server_init
-
-LSRC = $(addsuffix .cpp,$(SHLIB_SRC))
-LOBJ = $(addsuffix .o,$(SHLIB_SRC))
-PSRC = $(addsuffix .cpp,$(BIN))
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#       Local targets (and local hacks)
-#----------------------------------------------------------------------------
-INCLDIRS += -I$(CIAO_ROOT) -I$(TAO_ROOT)/orbsvcs/orbsvcs
-
-.PRECIOUS: CCM_DeploymentC.h CCM_DeploymentC.i CCM_DeploymentC.cpp
-
-realclean: clean
-	-$(RM) CCM_DeploymentC.* CCM_DeploymentS.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/CIAO/ciao/Object_Set_T.cpp b/TAO/CIAO/ciao/Object_Set_T.cpp
index 976da95bfa0..043f2f0e9f0 100644
--- a/TAO/CIAO/ciao/Object_Set_T.cpp
+++ b/TAO/CIAO/ciao/Object_Set_T.cpp
@@ -61,7 +61,7 @@ CIAO::Object_Set<T, T_var>::remove (T *objref)
   CORBA::ULong i = 0;
 
   for (; i < this->size_; ++i)
-    if (objref->_is_equivalent (this->buffer_[i])) // _is_equivalent could be unreliable?
+    if (objref->_is_equivalent (this->buffer_[i].in ())) // _is_equivalent could be unreliable?
       {
         --this->size_;
         if (i != this->size_)
@@ -115,7 +115,7 @@ CIAO::Object_Set<T, T_var>::object_in_set (T *objref)
   CORBA::ULong i = 0;
 
   for (; i < this->size_; ++i)
-    if (objref->_is_equivalent (this->buffer_[i])) // _is_equivalent could be unreliable?
+    if (objref->_is_equivalent (this->buffer_[i].in ())) // _is_equivalent could be unreliable?
       return -1;
 
   return 0;
diff --git a/TAO/CIAO/ciao/ServerActivator_Impl.h b/TAO/CIAO/ciao/ServerActivator_Impl.h
index 2292afd44ba..cdc2abc5ffe 100644
--- a/TAO/CIAO/ciao/ServerActivator_Impl.h
+++ b/TAO/CIAO/ciao/ServerActivator_Impl.h
@@ -170,7 +170,7 @@ namespace CIAO
     TAO_SYNCH_MUTEX lock_;
 
     /// Keep a list of managed ComponentServer objects.
-    Object_Set<::Components::Deployment::ComponentServer, ::Components::Deployment::ComponentServer_var> cs_set_;
+    Object_Set<Components::Deployment::ComponentServer, Components::Deployment::ComponentServer_var> cs_set_;
   };
 }
 
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
index d5726c36345..e09564cd4b5 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
@@ -40,6 +40,8 @@ CIAO::AssemblyFactory_Impl::create_assembly (const char * assembly_loc
                    Components::Deployment::InvalidLocation,
                    Components::CreateFailure))
 {
+  ACE_UNUSED_ARG (assembly_loc);
+
   CIAO::Assembly_Impl *servant = 0;
   ACE_NEW_RETURN (servant,
                   CIAO::Assembly_Impl (this->orb_.in (),
@@ -64,7 +66,7 @@ CIAO::AssemblyFactory_Impl::create_assembly (const char * assembly_loc
   ACE_CHECK_RETURN (0);
 
   ::Components::Deployment::Assembly_var assembly =
-      ::Components::Deployment::Assembly::_narrow (objref
+      ::Components::Deployment::Assembly::_narrow (objref.in ()
                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h
index 4fd9780d7ff..b26a3a424bc 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h
@@ -86,7 +86,7 @@ namespace CIAO
     PortableServer::POA_var poa_;
 
     /// Keep a list of managed Assembly objects.
-    ACE_Active_Map_Manager<::Components::Deployment::Assembly_var> assembly_map_;
+    ACE_Active_Map_Manager<Components::Deployment::Assembly_var> assembly_map_;
   };
 
   /**
diff --git a/TAO/CIAO/tools/Daemon/Daemon_Impl.h b/TAO/CIAO/tools/Daemon/Daemon_Impl.h
index 862d89790aa..4ec597f6359 100644
--- a/TAO/CIAO/tools/Daemon/Daemon_Impl.h
+++ b/TAO/CIAO/tools/Daemon/Daemon_Impl.h
@@ -18,7 +18,7 @@
 #define CIAO_DAEMON_IMPL_H
 #include "ace/pre.h"
 
-#include "daemonS.h"
+#include "DaemonS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once