Tue Nov 3 13:06:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp:
          Small code fix

        * ciao/Containers/CIAO_Servant_Activator.mpc:
          Cleanup of this file and no need to generate C.inl file

        * ciao/Containers/Container_Base.h:
          Updated the export macro

        * ciao/Containers/Containers.mpc:
          Use a seperate project for the idl file which also generates the export
          file

        * ciao/Containers/Container_Base_export.h:
          Removed from the archive, generated by TAO_IDL

6 files changed, 35 insertions, 67 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 08632df8b4f..0b73ca2a0dc 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,21 @@
+Tue Nov  3 13:06:31 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp:
+          Small code fix
+
+        * ciao/Containers/CIAO_Servant_Activator.mpc:
+          Cleanup of this file and no need to generate C.inl file
+
+        * ciao/Containers/Container_Base.h:
+          Updated the export macro
+
+        * ciao/Containers/Containers.mpc:
+          Use a seperate project for the idl file which also generates the export
+          file
+
+        * ciao/Containers/Container_Base_export.h:
+          Removed from the archive, generated by TAO_IDL
+
 Sun Nov  1 09:50:31 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/docs/DDS for CCM FTF 30Oct09.doc
diff --git a/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp b/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp
index b4eeb734c2c..133171dec2d 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp
+++ b/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp
@@ -455,7 +455,7 @@ namespace CIAO
             }
         }
 
-      if (info == 0)
+      if (!info)
         {
           CIAO_ERROR ((LM_ERROR, CLINFO
                        "CIAO_ServerActivator_i::remove_component_server - "
diff --git a/CIAO/ciao/Containers/CIAO_Servant_Activator.mpc b/CIAO/ciao/Containers/CIAO_Servant_Activator.mpc
index a425cda3595..7b0067ab282 100644
--- a/CIAO/ciao/Containers/CIAO_Servant_Activator.mpc
+++ b/CIAO/ciao/Containers/CIAO_Servant_Activator.mpc
@@ -2,9 +2,9 @@
 
 project(CIAO_Servant_Activator_stub) : ciao_lib, portableserver, ciaoidldefaults, ciao_port_activator_stub, avoids_minimum_corba {
   dynamicflags = CIAO_SERVANT_ACTIVATOR_BUILD_DLL
-  idlflags  += -Wb,stub_export_include=CIAO_Servant_Activator_export.h
-  idlflags  += -Wb,stub_export_macro=CIAO_Servant_Activator_Export
-  idlflags  += -SS
+  idlflags  += -Wb,stub_export_include=CIAO_Servant_Activator_export.h \
+               -Wb,stub_export_macro=CIAO_Servant_Activator_Export \
+               -SS -Sci
 
   IDL_Files {
     CIAO_Servant_Activator.idl
diff --git a/CIAO/ciao/Containers/Container_Base.h b/CIAO/ciao/Containers/Container_Base.h
index 63de3d2b448..c8c602e8e21 100644
--- a/CIAO/ciao/Containers/Container_Base.h
+++ b/CIAO/ciao/Containers/Container_Base.h
@@ -57,7 +57,7 @@ namespace CIAO
    * Perhaps we can use local interface to define these interfaces as
    * we will also get reference counting automatically.
    */
-  class CIAO_Container_Base_Export Container_i :
+  class CIAO_CONTAINER_BASE_Export Container_i :
     public virtual Container,
     public virtual ::CORBA::LocalObject
   {
diff --git a/CIAO/ciao/Containers/Container_Base_export.h b/CIAO/ciao/Containers/Container_Base_export.h
deleted file mode 100644
index 75279891cb6..00000000000
--- a/CIAO/ciao/Containers/Container_Base_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CIAO_Container_Base
-// ------------------------------
-#ifndef CIAO_CONTAINER_BASE_EXPORT_H
-#define CIAO_CONTAINER_BASE_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAO_CONTAINER_BASE_HAS_DLL)
-#  define CIAO_CONTAINER_BASE_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAO_CONTAINER_BASE_HAS_DLL */
-
-#if !defined (CIAO_CONTAINER_BASE_HAS_DLL)
-#  define CIAO_CONTAINER_BASE_HAS_DLL 1
-#endif /* ! CIAO_CONTAINER_BASE_HAS_DLL */
-
-#if defined (CIAO_CONTAINER_BASE_HAS_DLL) && (CIAO_CONTAINER_BASE_HAS_DLL == 1)
-#  if defined (CIAO_CONTAINER_BASE_BUILD_DLL)
-#    define CIAO_Container_Base_Export ACE_Proper_Export_Flag
-#    define CIAO_CONTAINER_BASE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_CONTAINER_BASE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CIAO_CONTAINER_BASE_BUILD_DLL */
-#    define CIAO_Container_Base_Export ACE_Proper_Import_Flag
-#    define CIAO_CONTAINER_BASE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_CONTAINER_BASE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CIAO_CONTAINER_BASE_BUILD_DLL */
-#else /* CIAO_CONTAINER_BASE_HAS_DLL == 1 */
-#  define CIAO_Container_Base_Export
-#  define CIAO_CONTAINER_BASE_SINGLETON_DECLARATION(T)
-#  define CIAO_CONTAINER_BASE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CIAO_CONTAINER_BASE_HAS_DLL == 1 */
-
-// Set CIAO_CONTAINER_BASE_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CIAO_CONTAINER_BASE_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CIAO_CONTAINER_BASE_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CIAO_CONTAINER_BASE_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CIAO_CONTAINER_BASE_NTRACE */
-
-#if (CIAO_CONTAINER_BASE_NTRACE == 1)
-#  define CIAO_CONTAINER_BASE_TRACE(X)
-#else /* (CIAO_CONTAINER_BASE_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CIAO_CONTAINER_BASE_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CIAO_CONTAINER_BASE_NTRACE == 1) */
-
-#endif /* CIAO_CONTAINER_BASE_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/ciao/Containers/Containers.mpc b/CIAO/ciao/Containers/Containers.mpc
index 732c9437c4c..3e17afdb9fd 100644
--- a/CIAO/ciao/Containers/Containers.mpc
+++ b/CIAO/ciao/Containers/Containers.mpc
@@ -1,17 +1,25 @@
 // $Id$
 
+project(CIAO_Container_Base_idl) : taoidldefaults {
+  custom_only = 1
+
+  idlflags  += -Wb,export_include=Container_Base_export.h \
+               -Wb,export_macro=CIAO_CONTAINER_BASE_Export \
+               -SS -Sci -Gxhst
+
+  IDL_Files {
+    Container_Base.idl
+  }
+}
 project(CIAO_Container_Base) : ciao_lib, ccm_svnt, ciao_servant_activator, ciao_port_activator_stub  {
+  after += CIAO_Container_Base_idl
   dynamicflags += CIAO_CONTAINER_BASE_BUILD_DLL
-  idlflags  += -Wb,export_include=Container_Base_export.h
-  idlflags  += -Wb,export_macro=CIAO_Container_Base_Export
 
   IDL_Files {
-    Container_Base.idl
   }
   Source_Files {
     Container_Base.cpp
     Container_BaseC.cpp
-    Container_BaseS.cpp
   }
   Inline_Files {
     Container_Base.inl