Some changes to get a little bit further in compilation

5 files changed, 82 insertions, 8 deletions

diff --git a/flat/CIAO/ciao/Containers/Swapping/Dynamic_Component_Activator.h b/flat/CIAO/ciao/Containers/Swapping/Dynamic_Component_Activator.h
index 577be605910..c328771bdfa 100644
--- a/flat/CIAO/ciao/Containers/Swapping/Dynamic_Component_Activator.h
+++ b/flat/CIAO/ciao/Containers/Swapping/Dynamic_Component_Activator.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ciao/CIAO_Server_Export.h"
+#include "ciao/Containers/Swapping/Swapping_Container_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,7 +46,7 @@ namespace CIAO
    * consumer servants.
    *
    */
-  class CIAO_SERVER_Export Dynamic_Component_Activator
+  class CIAO_Swapping_Container_Export Dynamic_Component_Activator
     : public virtual PortableServer::ServantActivator,
       public virtual TAO_Local_RefCounted_Object
   {
diff --git a/flat/CIAO/ciao/Containers/Swapping/Swapping_Container.cpp b/flat/CIAO/ciao/Containers/Swapping/Swapping_Container.cpp
index 7e48f167f0e..5b5802b24d4 100644
--- a/flat/CIAO/ciao/Containers/Swapping/Swapping_Container.cpp
+++ b/flat/CIAO/ciao/Containers/Swapping/Swapping_Container.cpp
@@ -17,7 +17,7 @@ namespace CIAO
   Swapping_Container::serial_number_ (0);
 
   Swapping_Container::Swapping_Container (CORBA::ORB_ptr o,
-                                          Container_Impl *container_impl)
+                                          Deployment::CIAO_Container_i *container_impl)
   : Session_Container (o, container_impl),
     number_ (0)
   {
diff --git a/flat/CIAO/ciao/Containers/Swapping/Swapping_Container.h b/flat/CIAO/ciao/Containers/Swapping/Swapping_Container.h
index 784de1a6e3c..170fc1f9138 100644
--- a/flat/CIAO/ciao/Containers/Swapping/Swapping_Container.h
+++ b/flat/CIAO/ciao/Containers/Swapping/Swapping_Container.h
@@ -18,23 +18,23 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ciao/CIAO_Server_Export.h"
+#include "ciao/Containers/Swapping/Swapping_Container_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ciao/Session_Container.h"
+#include "ciao/Containers/Session/Session_Container.h"
 
 namespace CIAO
 {
   class Dynamic_Component_Servant_Base;
   class Dynamic_Component_Activator;
 
-  class CIAO_SERVER_Export Swapping_Container : public Session_Container
+  class CIAO_Swapping_Container_Export Swapping_Container : public Session_Container
   {
   public:
-    Swapping_Container (CORBA::ORB_ptr o, Container_Impl *container_impl);
+    Swapping_Container (CORBA::ORB_ptr o, Deployment::CIAO_Container_i *container_impl);
 
     virtual ~Swapping_Container (void);
 
@@ -71,7 +71,7 @@ namespace CIAO
                                   PortableServer::POA_ptr root);
 
     void create_connections_POA (PortableServer::POA_ptr root);
-    
+
   protected:
     unsigned long number_;
 
diff --git a/flat/CIAO/ciao/Containers/Swapping/Swapping_Container.mpc b/flat/CIAO/ciao/Containers/Swapping/Swapping_Container.mpc
new file mode 100644
index 00000000000..30891e90e7a
--- /dev/null
+++ b/flat/CIAO/ciao/Containers/Swapping/Swapping_Container.mpc
@@ -0,0 +1,16 @@
+// $Id$
+
+project(CIAO_Swapping_Container) : ciao_lib, ciao_container_base, utils, \
+                                  ccm_componentserver_stub, ciao_servant_activator {
+  dynamicflags = SWAPPING_CONTAINER_BUILD_DLL
+
+  Source_Files {
+    Swapping_Container.cpp
+  }
+  Inline_Files {
+    Swapping_Container.inl
+  }
+  Header_Files {
+    Swapping_Container.h
+  }
+}
diff --git a/flat/CIAO/ciao/Containers/Swapping/Swapping_Container_export.h b/flat/CIAO/ciao/Containers/Swapping/Swapping_Container_export.h
new file mode 100644
index 00000000000..e0e25ac317d
--- /dev/null
+++ b/flat/CIAO/ciao/Containers/Swapping/Swapping_Container_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl Swapping_Container
+// ------------------------------
+#ifndef SWAPPING_CONTAINER_EXPORT_H
+#define SWAPPING_CONTAINER_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (SWAPPING_CONTAINER_HAS_DLL)
+#  define SWAPPING_CONTAINER_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && SWAPPING_CONTAINER_HAS_DLL */
+
+#if !defined (SWAPPING_CONTAINER_HAS_DLL)
+#  define SWAPPING_CONTAINER_HAS_DLL 1
+#endif /* ! SWAPPING_CONTAINER_HAS_DLL */
+
+#if defined (SWAPPING_CONTAINER_HAS_DLL) && (SWAPPING_CONTAINER_HAS_DLL == 1)
+#  if defined (SWAPPING_CONTAINER_BUILD_DLL)
+#    define CIAO_Swapping_Container_Export ACE_Proper_Export_Flag
+#    define SWAPPING_CONTAINER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define SWAPPING_CONTAINER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* SWAPPING_CONTAINER_BUILD_DLL */
+#    define CIAO_Swapping_Container_Export ACE_Proper_Import_Flag
+#    define SWAPPING_CONTAINER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define SWAPPING_CONTAINER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* SWAPPING_CONTAINER_BUILD_DLL */
+#else /* SWAPPING_CONTAINER_HAS_DLL == 1 */
+#  define CIAO_Swapping_Container_Export
+#  define SWAPPING_CONTAINER_SINGLETON_DECLARATION(T)
+#  define SWAPPING_CONTAINER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* SWAPPING_CONTAINER_HAS_DLL == 1 */
+
+// Set SWAPPING_CONTAINER_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (SWAPPING_CONTAINER_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define SWAPPING_CONTAINER_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define SWAPPING_CONTAINER_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !SWAPPING_CONTAINER_NTRACE */
+
+#if (SWAPPING_CONTAINER_NTRACE == 1)
+#  define SWAPPING_CONTAINER_TRACE(X)
+#else /* (SWAPPING_CONTAINER_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define SWAPPING_CONTAINER_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (SWAPPING_CONTAINER_NTRACE == 1) */
+
+#endif /* SWAPPING_CONTAINER_EXPORT_H */
+
+// End of auto generated file.