summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/DynamicAny/dynamicany_export.h48
-rw-r--r--TAO/tao/IORManipulation/ior_manip_export.h48
-rw-r--r--TAO/tao/IORTable/TAO_IORTable_Static.dsp4
-rw-r--r--TAO/tao/IORTable/iortable_export.h48
-rw-r--r--TAO/tao/PortableServer/TAO_PortableServer_Static.dsp16
-rw-r--r--TAO/tao/PortableServer/portableserver_export.h48
-rw-r--r--TAO/tao/TAO_Export.h48
-rw-r--r--TAO/tao/TAO_Static.dsp32
-rw-r--r--TAO/tao/ior_corbaloc_export.h50
-rw-r--r--TAO/tao/ior_corbaname_export.h50
10 files changed, 216 insertions, 176 deletions
diff --git a/TAO/tao/DynamicAny/dynamicany_export.h b/TAO/tao/DynamicAny/dynamicany_export.h
index 3b466127cbf..83eed065565 100644
--- a/TAO/tao/DynamicAny/dynamicany_export.h
+++ b/TAO/tao/DynamicAny/dynamicany_export.h
@@ -1,40 +1,40 @@
+
// -*- C++ -*-
// $Id$
// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
+// This file is generated automatically by generate_export_file.pl
// ------------------------------
#ifndef TAO_DYNAMICANY_EXPORT_H
#define TAO_DYNAMICANY_EXPORT_H
#include "ace/config-all.h"
-#if !defined (TAO_DYNAMICANY_HAS_DLL)
-#define TAO_DYNAMICANY_HAS_DLL 1
-#endif /* ! TAO_DYNAMICANY_HAS_DLL */
-
-#if defined (TAO_DYNAMICANY_HAS_DLL)
-# if (TAO_DYNAMICANY_HAS_DLL == 1)
-# if defined (TAO_DYNAMICANY_BUILD_DLL)
-# define TAO_DynamicAny_Export ACE_Proper_Export_Flag
-# define TAO_DYNAMICANY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-# define TAO_DYNAMICANY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# else
-# define TAO_DynamicAny_Export ACE_Proper_Import_Flag
-# define TAO_DYNAMICANY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-# define TAO_DYNAMICANY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* TAO_DYNAMICANY_BUILD_DLL */
-# else
-# define TAO_DynamicAny_Export
-# define TAO_DYNAMICANY_SINGLETON_DECLARATION(T)
-# define TAO_DYNAMICANY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* ! TAO_DYNAMICANY_HAS_DLL == 1 */
+#if defined (TAO_AS_STATIC_LIBS)
+# if !defined (TAO_DYNAMICANY_HAS_DLL)
+# define TAO_DYNAMICANY_HAS_DLL 0
+# endif /* ! TAO_DYNAMICANY_HAS_DLL */
#else
+# if !defined (TAO_DYNAMICANY_HAS_DLL)
+# define TAO_DYNAMICANY_HAS_DLL 1
+# endif /* ! TAO_DYNAMICANY_HAS_DLL */
+#endif
+
+#if defined (TAO_DYNAMICANY_HAS_DLL) && (TAO_DYNAMICANY_HAS_DLL == 1)
+# if defined (TAO_DYNAMICANY_BUILD_DLL)
+# define TAO_DynamicAny_Export ACE_Proper_Export_Flag
+# define TAO_DYNAMICANY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+# define TAO_DYNAMICANY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# else /* TAO_DYNAMICANY_BUILD_DLL */
+# define TAO_DynamicAny_Export ACE_Proper_Import_Flag
+# define TAO_DYNAMICANY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+# define TAO_DYNAMICANY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# endif /* TAO_DYNAMICANY_BUILD_DLL */
+#else /* TAO_DYNAMICANY_HAS_DLL == 1 */
# define TAO_DynamicAny_Export
# define TAO_DYNAMICANY_SINGLETON_DECLARATION(T)
# define TAO_DYNAMICANY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_DYNAMICANY_HAS_DLL */
+#endif /* TAO_DYNAMICANY_HAS_DLL == 1 */
-#endif /* TAO_DYNAMICANY_EXPORT_H */
+#endif /* TAO_DYNAMICANY_EXPORT_H */
// End of auto generated file.
diff --git a/TAO/tao/IORManipulation/ior_manip_export.h b/TAO/tao/IORManipulation/ior_manip_export.h
index d07bf7a1c2d..0173c23bb58 100644
--- a/TAO/tao/IORManipulation/ior_manip_export.h
+++ b/TAO/tao/IORManipulation/ior_manip_export.h
@@ -1,40 +1,40 @@
+
// -*- C++ -*-
// $Id$
// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
+// This file is generated automatically by generate_export_file.pl
// ------------------------------
#ifndef TAO_IORMANIP_EXPORT_H
#define TAO_IORMANIP_EXPORT_H
#include "ace/config-all.h"
-#if !defined (TAO_IORMANIP_HAS_DLL)
-#define TAO_IORMANIP_HAS_DLL 1
-#endif /* ! TAO_IORMANIP_HAS_DLL */
-
-#if defined (TAO_IORMANIP_HAS_DLL)
-# if (TAO_IORMANIP_HAS_DLL == 1)
-# if defined (TAO_IORMANIP_BUILD_DLL)
-# define TAO_IORManip_Export ACE_Proper_Export_Flag
-# define TAO_IORMANIP_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-# define TAO_IORMANIP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# else
-# define TAO_IORManip_Export ACE_Proper_Import_Flag
-# define TAO_IORMANIP_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-# define TAO_IORMANIP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* TAO_IORMANIP_BUILD_DLL */
-# else
-# define TAO_IORManip_Export
-# define TAO_IORMANIP_SINGLETON_DECLARATION(T)
-# define TAO_IORMANIP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* ! TAO_IORMANIP_HAS_DLL == 1 */
+#if defined (TAO_AS_STATIC_LIBS)
+# if !defined (TAO_IORMANIP_HAS_DLL)
+# define TAO_IORMANIP_HAS_DLL 0
+# endif /* ! TAO_IORMANIP_HAS_DLL */
#else
+# if !defined (TAO_IORMANIP_HAS_DLL)
+# define TAO_IORMANIP_HAS_DLL 1
+# endif /* ! TAO_IORMANIP_HAS_DLL */
+#endif
+
+#if defined (TAO_IORMANIP_HAS_DLL) && (TAO_IORMANIP_HAS_DLL == 1)
+# if defined (TAO_IORMANIP_BUILD_DLL)
+# define TAO_IORManip_Export ACE_Proper_Export_Flag
+# define TAO_IORMANIP_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+# define TAO_IORMANIP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# else /* TAO_IORMANIP_BUILD_DLL */
+# define TAO_IORManip_Export ACE_Proper_Import_Flag
+# define TAO_IORMANIP_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+# define TAO_IORMANIP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# endif /* TAO_IORMANIP_BUILD_DLL */
+#else /* TAO_IORMANIP_HAS_DLL == 1 */
# define TAO_IORManip_Export
# define TAO_IORMANIP_SINGLETON_DECLARATION(T)
# define TAO_IORMANIP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_IORMANIP_HAS_DLL */
+#endif /* TAO_IORMANIP_HAS_DLL == 1 */
-#endif /* TAO_IORMANIP_EXPORT_H */
+#endif /* TAO_IORMANIP_EXPORT_H */
// End of auto generated file.
diff --git a/TAO/tao/IORTable/TAO_IORTable_Static.dsp b/TAO/tao/IORTable/TAO_IORTable_Static.dsp
index 5e97ae7ccd4..f679979e095 100644
--- a/TAO/tao/IORTable/TAO_IORTable_Static.dsp
+++ b/TAO/tao/IORTable/TAO_IORTable_Static.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "LIB\Release\IORTable"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D TAO_IORTABLE_HAS_DLL=0 /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D ACE_OS_HAS_DLL=0 /D "_MBCS" /D "_LIB" /D "TAO_AS_STATIC_LIBS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "LIB\Debug\IORTable"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D TAO_IORTABLE_HAS_DLL=0 /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_MBCS" /D "_LIB" /D "TAO_AS_STATIC_LIBS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/tao/IORTable/iortable_export.h b/TAO/tao/IORTable/iortable_export.h
index 633e8f4f84e..ba6833bea98 100644
--- a/TAO/tao/IORTable/iortable_export.h
+++ b/TAO/tao/IORTable/iortable_export.h
@@ -1,40 +1,40 @@
+
// -*- C++ -*-
// $Id$
// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
+// This file is generated automatically by generate_export_file.pl
// ------------------------------
#ifndef TAO_IORTABLE_EXPORT_H
#define TAO_IORTABLE_EXPORT_H
#include "ace/config-all.h"
-#if !defined (TAO_IORTABLE_HAS_DLL)
-#define TAO_IORTABLE_HAS_DLL 1
-#endif /* ! TAO_IORTABLE_HAS_DLL */
-
-#if defined (TAO_IORTABLE_HAS_DLL)
-# if (TAO_IORTABLE_HAS_DLL == 1)
-# if defined (TAO_IORTABLE_BUILD_DLL)
-# define TAO_IORTable_Export ACE_Proper_Export_Flag
-# define TAO_IORTABLE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-# define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# else
-# define TAO_IORTable_Export ACE_Proper_Import_Flag
-# define TAO_IORTABLE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-# define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* TAO_IORTABLE_BUILD_DLL */
-# else
-# define TAO_IORTable_Export
-# define TAO_IORTABLE_SINGLETON_DECLARATION(T)
-# define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* ! TAO_IORTABLE_HAS_DLL == 1 */
+#if defined (TAO_AS_STATIC_LIBS)
+# if !defined (TAO_IORTABLE_HAS_DLL)
+# define TAO_IORTABLE_HAS_DLL 0
+# endif /* ! TAO_IORTABLE_HAS_DLL */
#else
+# if !defined (TAO_IORTABLE_HAS_DLL)
+# define TAO_IORTABLE_HAS_DLL 1
+# endif /* ! TAO_IORTABLE_HAS_DLL */
+#endif
+
+#if defined (TAO_IORTABLE_HAS_DLL) && (TAO_IORTABLE_HAS_DLL == 1)
+# if defined (TAO_IORTABLE_BUILD_DLL)
+# define TAO_IORTable_Export ACE_Proper_Export_Flag
+# define TAO_IORTABLE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+# define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# else /* TAO_IORTABLE_BUILD_DLL */
+# define TAO_IORTable_Export ACE_Proper_Import_Flag
+# define TAO_IORTABLE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+# define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# endif /* TAO_IORTABLE_BUILD_DLL */
+#else /* TAO_IORTABLE_HAS_DLL == 1 */
# define TAO_IORTable_Export
# define TAO_IORTABLE_SINGLETON_DECLARATION(T)
# define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_IORTABLE_HAS_DLL */
+#endif /* TAO_IORTABLE_HAS_DLL == 1 */
-#endif /* TAO_IORTABLE_EXPORT_H */
+#endif /* TAO_IORTABLE_EXPORT_H */
// End of auto generated file.
diff --git a/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp b/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp
index 69d2da04f9c..eb3ca7045ed 100644
--- a/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp
+++ b/TAO/tao/PortableServer/TAO_PortableServer_Static.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "LIB\Release\PortableServer"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D TAO_PORTABLESERVER_HAS_DLL=0 /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D ACE_OS_HAS_DLL=0 /D "_LIB" /D "_MBCS" /D "TAO_AS_STATIC_LIBS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "LIB\Debug\PortableServer"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D TAO_PORTABLESERVER_HAS_DLL=0 /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_LIB" /D "_MBCS" /D "TAO_AS_STATIC_LIBS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -153,6 +153,10 @@ SOURCE=.\PortableServerC.i
# End Source File
# Begin Source File
+SOURCE=.\RTPortableServerC.i
+# End Source File
+# Begin Source File
+
SOURCE=.\Servant_Base.i
# End Source File
# End Group
@@ -249,6 +253,10 @@ SOURCE=.\PortableServerC.h
# End Source File
# Begin Source File
+SOURCE=.\RTPortableServerC.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Servant_Base.h
# End Source File
# Begin Source File
@@ -337,6 +345,10 @@ SOURCE=.\PortableServerC.cpp
# End Source File
# Begin Source File
+SOURCE=.\RTPortableServerC.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Servant_Base.cpp
# End Source File
# Begin Source File
diff --git a/TAO/tao/PortableServer/portableserver_export.h b/TAO/tao/PortableServer/portableserver_export.h
index 5a102f0c2c3..81c9200c157 100644
--- a/TAO/tao/PortableServer/portableserver_export.h
+++ b/TAO/tao/PortableServer/portableserver_export.h
@@ -1,40 +1,40 @@
+
// -*- C++ -*-
// $Id$
// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
+// This file is generated automatically by generate_export_file.pl
// ------------------------------
#ifndef TAO_PORTABLESERVER_EXPORT_H
#define TAO_PORTABLESERVER_EXPORT_H
#include "ace/config-all.h"
-#if !defined (TAO_PORTABLESERVER_HAS_DLL)
-#define TAO_PORTABLESERVER_HAS_DLL 1
-#endif /* ! TAO_PORTABLESERVER_HAS_DLL */
-
-#if defined (TAO_PORTABLESERVER_HAS_DLL)
-# if (TAO_PORTABLESERVER_HAS_DLL == 1)
-# if defined (TAO_PORTABLESERVER_BUILD_DLL)
-# define TAO_PortableServer_Export ACE_Proper_Export_Flag
-# define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-# define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# else
-# define TAO_PortableServer_Export ACE_Proper_Import_Flag
-# define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-# define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* TAO_PORTABLESERVER_BUILD_DLL */
-# else
-# define TAO_PortableServer_Export
-# define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T)
-# define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* ! TAO_PORTABLESERVER_HAS_DLL == 1 */
+#if defined (TAO_AS_STATIC_LIBS)
+# if !defined (TAO_PORTABLESERVER_HAS_DLL)
+# define TAO_PORTABLESERVER_HAS_DLL 0
+# endif /* ! TAO_PORTABLESERVER_HAS_DLL */
#else
+# if !defined (TAO_PORTABLESERVER_HAS_DLL)
+# define TAO_PORTABLESERVER_HAS_DLL 1
+# endif /* ! TAO_PORTABLESERVER_HAS_DLL */
+#endif
+
+#if defined (TAO_PORTABLESERVER_HAS_DLL) && (TAO_PORTABLESERVER_HAS_DLL == 1)
+# if defined (TAO_PORTABLESERVER_BUILD_DLL)
+# define TAO_PortableServer_Export ACE_Proper_Export_Flag
+# define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+# define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# else /* TAO_PORTABLESERVER_BUILD_DLL */
+# define TAO_PortableServer_Export ACE_Proper_Import_Flag
+# define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+# define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# endif /* TAO_PORTABLESERVER_BUILD_DLL */
+#else /* TAO_PORTABLESERVER_HAS_DLL == 1 */
# define TAO_PortableServer_Export
# define TAO_PORTABLESERVER_SINGLETON_DECLARATION(T)
# define TAO_PORTABLESERVER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_PORTABLESERVER_HAS_DLL */
+#endif /* TAO_PORTABLESERVER_HAS_DLL == 1 */
-#endif /* TAO_PORTABLESERVER_EXPORT_H */
+#endif /* TAO_PORTABLESERVER_EXPORT_H */
// End of auto generated file.
diff --git a/TAO/tao/TAO_Export.h b/TAO/tao/TAO_Export.h
index 51fd5c981e2..fc49ecbc163 100644
--- a/TAO/tao/TAO_Export.h
+++ b/TAO/tao/TAO_Export.h
@@ -1,40 +1,40 @@
+
// -*- C++ -*-
// $Id$
// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
+// This file is generated automatically by generate_export_file.pl
// ------------------------------
#ifndef TAO_EXPORT_H
#define TAO_EXPORT_H
#include "ace/config-all.h"
-#if !defined (TAO_HAS_DLL)
-#define TAO_HAS_DLL 1
-#endif /* ! TAO_HAS_DLL */
-
-#if defined (TAO_HAS_DLL)
-# if (TAO_HAS_DLL == 1)
-# if defined (TAO_BUILD_DLL)
-# define TAO_Export ACE_Proper_Export_Flag
-# define TAO_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-# define TAO_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# else
-# define TAO_Export ACE_Proper_Import_Flag
-# define TAO_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-# define TAO_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* TAO_BUILD_DLL */
-# else
-# define TAO_Export
-# define TAO_SINGLETON_DECLARATION(T)
-# define TAO_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* ! TAO_HAS_DLL == 1 */
+#if defined (TAO_AS_STATIC_LIBS)
+# if !defined (TAO_HAS_DLL)
+# define TAO_HAS_DLL 0
+# endif /* ! TAO_HAS_DLL */
#else
+# if !defined (TAO_HAS_DLL)
+# define TAO_HAS_DLL 1
+# endif /* ! TAO_HAS_DLL */
+#endif
+
+#if defined (TAO_HAS_DLL) && (TAO_HAS_DLL == 1)
+# if defined (TAO_BUILD_DLL)
+# define TAO_Export ACE_Proper_Export_Flag
+# define TAO_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+# define TAO_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# else /* TAO_BUILD_DLL */
+# define TAO_Export ACE_Proper_Import_Flag
+# define TAO_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+# define TAO_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# endif /* TAO_BUILD_DLL */
+#else /* TAO_HAS_DLL == 1 */
# define TAO_Export
# define TAO_SINGLETON_DECLARATION(T)
# define TAO_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_HAS_DLL */
+#endif /* TAO_HAS_DLL == 1 */
-#endif /* TAO_EXPORT_H */
+#endif /* TAO_EXPORT_H */
// End of auto generated file.
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index a4550897a36..dcadb99f8d6 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "LIB\Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /I "../" /D ACE_OS_HAS_DLL=0 /D "TAO_AS_STATIC_LIB" /D "_WINDOWS" /D "_CONSOLE" /D "_DEBUG" /D "TAO_AS_STATIC_LIBS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "LIB\Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../" /I "../" /D TAO_HAS_DLL=0 /D "_WINDOWS" /D "_DEBUG" /D "WIN32" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../" /I "../" /D "TAO_AS_STATIC_LIBS" /D "_WINDOWS" /D "_CONSOLE" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
@@ -335,6 +335,10 @@ SOURCE=.\ior_corbaloc_export.h
# End Source File
# Begin Source File
+SOURCE=.\IOR_Parser.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Leader_Follower.h
# End Source File
# Begin Source File
@@ -423,6 +427,10 @@ SOURCE=.\ORB_Strategies_T.h
# End Source File
# Begin Source File
+SOURCE=.\ORB_Table.h
+# End Source File
+# Begin Source File
+
SOURCE=.\orbconf.h
# End Source File
# Begin Source File
@@ -947,6 +955,10 @@ SOURCE=.\IOPS.i
# End Source File
# Begin Source File
+SOURCE=.\IOR_Parser.i
+# End Source File
+# Begin Source File
+
SOURCE=.\Leader_Follower.i
# End Source File
# Begin Source File
@@ -1011,6 +1023,10 @@ SOURCE=.\ORB_Strategies_T.i
# End Source File
# Begin Source File
+SOURCE=.\ORB_Table.inl
+# End Source File
+# Begin Source File
+
SOURCE=.\params.i
# End Source File
# Begin Source File
@@ -1491,6 +1507,10 @@ SOURCE=.\IOPS.cpp
# End Source File
# Begin Source File
+SOURCE=.\IOR_Parser.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Leader_Follower.cpp
# End Source File
# Begin Source File
@@ -1567,6 +1587,10 @@ SOURCE=.\ORB_Core.cpp
# End Source File
# Begin Source File
+SOURCE=.\ORB_Table.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\params.cpp
# End Source File
# Begin Source File
@@ -1615,6 +1639,10 @@ SOURCE=.\PortableInterceptor.cpp
# End Source File
# Begin Source File
+SOURCE=.\PortableInterceptorC.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Principal.cpp
# End Source File
# Begin Source File
diff --git a/TAO/tao/ior_corbaloc_export.h b/TAO/tao/ior_corbaloc_export.h
index 501e2e53530..20ed4609b0c 100644
--- a/TAO/tao/ior_corbaloc_export.h
+++ b/TAO/tao/ior_corbaloc_export.h
@@ -1,40 +1,40 @@
+
// -*- C++ -*-
// $Id$
// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
+// This file is generated automatically by generate_export_file.pl
// ------------------------------
-#if !defined (TAO_IOR_CORBALOC_EXPORT_H)
+#ifndef TAO_IOR_CORBALOC_EXPORT_H
#define TAO_IOR_CORBALOC_EXPORT_H
#include "ace/config-all.h"
-#if !defined (TAO_IOR_CORBALOC_HAS_DLL)
-#define TAO_IOR_CORBALOC_HAS_DLL 1
-#endif /* ! TAO_IOR_CORBALOC_HAS_DLL */
-
-#if defined (TAO_IOR_CORBALOC_HAS_DLL)
-# if (TAO_IOR_CORBALOC_HAS_DLL == 1)
-# if defined (TAO_IOR_CORBALOC_BUILD_DLL)
-# define TAO_IOR_CORBALOC_Export ACE_Proper_Export_Flag
-# define TAO_IOR_CORBALOC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-# define TAO_IOR_CORBALOC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# else
-# define TAO_IOR_CORBALOC_Export ACE_Proper_Import_Flag
-# define TAO_IOR_CORBALOC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-# define TAO_IOR_CORBALOC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* TAO_IOR_CORBALOC_BUILD_DLL */
-# else
-# define TAO_IOR_CORBALOC_Export
-# define TAO_IOR_CORBALOC_SINGLETON_DECLARATION(T)
-# define TAO_IOR_CORBALOC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* ! TAO_IOR_CORBALOC_HAS_DLL == 1 */
+#if defined (TAO_AS_STATIC_LIBS)
+# if !defined (TAO_IOR_CORBALOC_HAS_DLL)
+# define TAO_IOR_CORBALOC_HAS_DLL 0
+# endif /* ! TAO_IOR_CORBALOC_HAS_DLL */
#else
+# if !defined (TAO_IOR_CORBALOC_HAS_DLL)
+# define TAO_IOR_CORBALOC_HAS_DLL 1
+# endif /* ! TAO_IOR_CORBALOC_HAS_DLL */
+#endif
+
+#if defined (TAO_IOR_CORBALOC_HAS_DLL) && (TAO_IOR_CORBALOC_HAS_DLL == 1)
+# if defined (TAO_IOR_CORBALOC_BUILD_DLL)
+# define TAO_IOR_CORBALOC_Export ACE_Proper_Export_Flag
+# define TAO_IOR_CORBALOC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+# define TAO_IOR_CORBALOC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# else /* TAO_IOR_CORBALOC_BUILD_DLL */
+# define TAO_IOR_CORBALOC_Export ACE_Proper_Import_Flag
+# define TAO_IOR_CORBALOC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+# define TAO_IOR_CORBALOC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# endif /* TAO_IOR_CORBALOC_BUILD_DLL */
+#else /* TAO_IOR_CORBALOC_HAS_DLL == 1 */
# define TAO_IOR_CORBALOC_Export
# define TAO_IOR_CORBALOC_SINGLETON_DECLARATION(T)
# define TAO_IOR_CORBALOC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_IOR_CORBALOC_HAS_DLL */
+#endif /* TAO_IOR_CORBALOC_HAS_DLL == 1 */
-#endif /* TAO_IOR_CORBALOC_EXPORT_H */
+#endif /* TAO_IOR_CORBALOC_EXPORT_H */
// End of auto generated file.
diff --git a/TAO/tao/ior_corbaname_export.h b/TAO/tao/ior_corbaname_export.h
index ce34717dbb2..76e4f94c795 100644
--- a/TAO/tao/ior_corbaname_export.h
+++ b/TAO/tao/ior_corbaname_export.h
@@ -1,40 +1,40 @@
+
// -*- C++ -*-
// $Id$
// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
+// This file is generated automatically by generate_export_file.pl
// ------------------------------
-#if !defined (TAO_IOR_CORBANAME_EXPORT_H)
+#ifndef TAO_IOR_CORBANAME_EXPORT_H
#define TAO_IOR_CORBANAME_EXPORT_H
#include "ace/config-all.h"
-#if !defined (TAO_IOR_CORBANAME_HAS_DLL)
-#define TAO_IOR_CORBANAME_HAS_DLL 1
-#endif /* ! TAO_IOR_CORBANAME_HAS_DLL */
-
-#if defined (TAO_IOR_CORBANAME_HAS_DLL)
-# if (TAO_IOR_CORBANAME_HAS_DLL == 1)
-# if defined (TAO_IOR_CORBANAME_BUILD_DLL)
-# define TAO_IOR_CORBANAME_Export ACE_Proper_Export_Flag
-# define TAO_IOR_CORBANAME_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-# define TAO_IOR_CORBANAME_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# else
-# define TAO_IOR_CORBANAME_Export ACE_Proper_Import_Flag
-# define TAO_IOR_CORBANAME_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-# define TAO_IOR_CORBANAME_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* TAO_IOR_CORBANAME_BUILD_DLL */
-# else
-# define TAO_IOR_CORBANAME_Export
-# define TAO_IOR_CORBANAME_SINGLETON_DECLARATION(T)
-# define TAO_IOR_CORBANAME_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-# endif /* ! TAO_IOR_CORBANAME_HAS_DLL == 1 */
+#if defined (TAO_AS_STATIC_LIBS)
+# if !defined (TAO_IOR_CORBANAME_HAS_DLL)
+# define TAO_IOR_CORBANAME_HAS_DLL 0
+# endif /* ! TAO_IOR_CORBANAME_HAS_DLL */
#else
+# if !defined (TAO_IOR_CORBANAME_HAS_DLL)
+# define TAO_IOR_CORBANAME_HAS_DLL 1
+# endif /* ! TAO_IOR_CORBANAME_HAS_DLL */
+#endif
+
+#if defined (TAO_IOR_CORBANAME_HAS_DLL) && (TAO_IOR_CORBANAME_HAS_DLL == 1)
+# if defined (TAO_IOR_CORBANAME_BUILD_DLL)
+# define TAO_IOR_CORBANAME_Export ACE_Proper_Export_Flag
+# define TAO_IOR_CORBANAME_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+# define TAO_IOR_CORBANAME_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# else /* TAO_IOR_CORBANAME_BUILD_DLL */
+# define TAO_IOR_CORBANAME_Export ACE_Proper_Import_Flag
+# define TAO_IOR_CORBANAME_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+# define TAO_IOR_CORBANAME_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# endif /* TAO_IOR_CORBANAME_BUILD_DLL */
+#else /* TAO_IOR_CORBANAME_HAS_DLL == 1 */
# define TAO_IOR_CORBANAME_Export
# define TAO_IOR_CORBANAME_SINGLETON_DECLARATION(T)
# define TAO_IOR_CORBANAME_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_IOR_CORBANAME_HAS_DLL */
+#endif /* TAO_IOR_CORBANAME_HAS_DLL == 1 */
-#endif /* TAO_IOR_CORBANAME_EXPORT_H */
+#endif /* TAO_IOR_CORBANAME_EXPORT_H */
// End of auto generated file.
View Lorry Controller Status