ChangeLogTag:Sun Aug 27 22:11:43 2000 Carlos O'Ryan <coryan@uci.edu>

19 files changed, 556 insertions, 21 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 0c08dc45fd9..022826fc2ef 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,33 @@
+Sun Aug 27 22:11:43 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * TAOACE.dsw:
+        * tao/DynamicAny/TAO_DynamicAny.dsp:
+        * tao/DynamicAny/TAO_DynamicAny_Static.dsp:
+          Add new project files for the dynamic any library.
+
+        * tao/TAO.dsw:
+        * orbsvcs/Trading_Service/Trading_Service.dsp:
+        * orbsvcs/orbsvcs/CosTrading.dsp:
+        * orbsvcs/tests/Trading/Trading.dsw:
+        * orbsvcs/tests/Trading/Colocated_Test.dsp:
+        * orbsvcs/tests/Trading/Export_Test.dsp:
+        * orbsvcs/tests/Trading/Import_Test.dsp:
+        * tests/DynAny_Test/basic_test.dsp:
+          Add the TAO_DynamicAny library to the projects that needed it
+
+        * tao/DynamicAny/DynAny_i.cpp:
+        * tao/DynamicAny/DynArray_i.cpp:
+        * tao/DynamicAny/DynArray_i.h:
+        * tao/DynamicAny/DynEnum_i.cpp:
+        * tao/DynamicAny/DynSequence_i.cpp:
+        * tao/DynamicAny/DynStruct_i.cpp:
+        * tao/DynamicAny/DynUnion_i.cpp:
+          Workaround MSVC bug with nested type names using the
+          ACE_NESTED_CLASS trick.
+
+        * TAO_IDL/be/be_global.cpp:
+          Add missing ,
+
 Sun Aug 27 17:50:04 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * tao/TAO.dsp:
diff --git a/TAO/TAOACE.dsw b/TAO/TAOACE.dsw
index 7bfe113cdb5..5201ec6af24 100644
--- a/TAO/TAOACE.dsw
+++ b/TAO/TAOACE.dsw
@@ -279,6 +279,21 @@ Package=<4>
 

 ###############################################################################

 

+Project: "DynamicAny"=.\tao\DynamicAny\TAO_DynamicAny.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

 Project: "Event_Service"=.\orbsvcs\Event_Service\Event_Service.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 769f07a7c78..fc94692a679 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -68,7 +68,7 @@ BE_GlobalData::BE_GlobalData (void)
       ami_call_back_ (I_FALSE),
       gen_tie_classes_ (I_TRUE),
 #if (TAO_HAS_SMART_PROXIES == 1)
-      gen_smart_proxies_ (I_TRUE)
+      gen_smart_proxies_ (I_TRUE),
 #else
       gen_smart_proxies_ (I_FALSE),
 #endif /* TAO_HAS_SMART_PROXIES == 1 */
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.dsp b/TAO/orbsvcs/Trading_Service/Trading_Service.dsp
index 567c1a661f2..ebec743c367 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.dsp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO.lib ace.lib TAO_CosNaming.lib TAO_CosTrading.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAO_DynamicAny.lib TAO.lib ace.lib TAO_CosNaming.lib TAO_CosTrading.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao\DynamicAny" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Trading_Service - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOd.lib aced.lib TAO_CosNamingd.lib TAO_CosTradingd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAO_DynamicAnyd.lib TAOd.lib aced.lib TAO_CosNamingd.lib TAO_CosTradingd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao\DynamicAny" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp b/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp
index 9860115e72f..1236123b312 100644
--- a/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp
+++ b/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TradingLib.lib TAO_CosTrading.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 ace.lib TAO.lib TAO_DynamicAny.lib TradingLib.lib TAO_CosTrading.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 

 !ELSEIF  "$(CFG)" == "Colocated_Test - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TradingLibd.lib TAO_CosTradingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 aced.lib TAOd.lib TAO_DynamicAnyd.lib TradingLibd.lib TAO_CosTradingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/tests/Trading/Export_Test.dsp b/TAO/orbsvcs/tests/Trading/Export_Test.dsp
index a5fec007ccc..6cd695c3e0a 100644
--- a/TAO/orbsvcs/tests/Trading/Export_Test.dsp
+++ b/TAO/orbsvcs/tests/Trading/Export_Test.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TradingLib.lib TAO_CosTrading.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 ace.lib TAO.lib TAO_DynamicAny.lib TradingLib.lib TAO_CosTrading.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 

 !ELSEIF  "$(CFG)" == "Export_Test - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TradingLibd.lib TAO_CosTradingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 aced.lib TAOd.lib TAO_DynamicAnyd.lib TradingLibd.lib TAO_CosTradingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/tests/Trading/Import_Test.dsp b/TAO/orbsvcs/tests/Trading/Import_Test.dsp
index 50a40999633..c816b193049 100644
--- a/TAO/orbsvcs/tests/Trading/Import_Test.dsp
+++ b/TAO/orbsvcs/tests/Trading/Import_Test.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TradingLib.lib TAO_CosTrading.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 ace.lib TAO.lib TAO_DynamicAny.lib TradingLib.lib TAO_CosTrading.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 

 !ELSEIF  "$(CFG)" == "Import_Test - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TradingLibd.lib TAO_CosTradingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 aced.lib TAOd.lib TAO_DynamicAnyd.lib TradingLibd.lib TAO_CosTradingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/tests/Trading/Trading.dsw b/TAO/orbsvcs/tests/Trading/Trading.dsw
index 1f52da1bd31..f6dc42c12d7 100644
--- a/TAO/orbsvcs/tests/Trading/Trading.dsw
+++ b/TAO/orbsvcs/tests/Trading/Trading.dsw
@@ -14,6 +14,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name TradingLib

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name Trading Test Library

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -29,6 +32,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name TradingLib

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name Trading Test Library

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -44,11 +50,14 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name TradingLib

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name Trading Test Library

+    End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "TradingLib"=.\TradingLib.dsp - Package Owner=<4>

+Project: "Trading Test Library"=.\TradingLib.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index 7a7e2c032c6..95938283666 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -111,7 +111,7 @@ TAO_DynAny_i::_tao_QueryInterface (ptr_arith_t type)
       this->_add_ref ();
       return this;
     }
-  return this->DynamicAny::DynAny::_tao_QueryInterface (type);
+  return this->ACE_NESTED_CLASS (DynamicAny, DynAny::_tao_QueryInterface) (type);
 }
 
 // ****************************************************************
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index 2dc5df673b1..24534c1320c 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -191,7 +191,7 @@ TAO_DynArray_i::_tao_QueryInterface (ptr_arith_t type)
       this->_add_ref ();
       return this;
     }
-  return this->DynamicAny::DynAny::_tao_QueryInterface (type);
+  return this->ACE_NESTED_CLASS (DynamicAny, DynAny::_tao_QueryInterface) (type);
 }
 
 // ****************************************************************
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
index 1bb6ae59362..8ed67b8fdd1 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -26,7 +26,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_Export TAO_DynArray_i : public virtual DynamicAny::DynArray, public virtual TAO_Local_RefCounted_Object
+class TAO_DynamicAny_Export TAO_DynArray_i : public virtual DynamicAny::DynArray, public virtual TAO_Local_RefCounted_Object
 {
   // = TITLE
   //    TAO_DynArray_i
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index 1396fcf1dcd..721406749f4 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -96,7 +96,7 @@ TAO_DynEnum_i::_tao_QueryInterface (ptr_arith_t type)
       this->_add_ref ();
       return this;
     }
-  return this->DynamicAny::DynAny::_tao_QueryInterface (type);
+  return this->ACE_NESTED_CLASS (DynamicAny, DynAny::_tao_QueryInterface) (type);
 }
 
 // ****************************************************************
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 724e8c41eed..53c35ea648d 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -152,7 +152,7 @@ TAO_DynSequence_i::_tao_QueryInterface (ptr_arith_t type)
       this->_add_ref ();
       return this;
     }
-  return this->DynamicAny::DynAny::_tao_QueryInterface (type);
+  return this->ACE_NESTED_CLASS (DynamicAny, DynAny::_tao_QueryInterface) (type);
 }
 
 // ****************************************************************
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index b9ea7431d4e..9854e6c2b2b 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -145,7 +145,7 @@ TAO_DynStruct_i::_tao_QueryInterface (ptr_arith_t type)
       this->_add_ref ();
       return this;
     }
-  return this->DynamicAny::DynAny::_tao_QueryInterface (type);
+  return this->ACE_NESTED_CLASS (DynamicAny, DynAny::_tao_QueryInterface) (type);
 }
 
 // ****************************************************************
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index cf3407c45cc..731c638d70d 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -120,7 +120,7 @@ TAO_DynUnion_i::_tao_QueryInterface (ptr_arith_t type)
       this->_add_ref ();
       return this;
     }
-  return this->DynamicAny::DynAny::_tao_QueryInterface (type);
+  return this->ACE_NESTED_CLASS (DynamicAny, DynAny::_tao_QueryInterface) (type);
 }
 
 // Private functions
diff --git a/TAO/tao/DynamicAny/TAO_DynamicAny.dsp b/TAO/tao/DynamicAny/TAO_DynamicAny.dsp
new file mode 100644
index 00000000000..b7aff19fd3c
--- /dev/null
+++ b/TAO/tao/DynamicAny/TAO_DynamicAny.dsp
@@ -0,0 +1,260 @@
+# Microsoft Developer Studio Project File - Name="DynamicAny" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=DynamicAny - Win32 MFC Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "TAO_DynamicAny.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "TAO_DynamicAny.mak" CFG="DynamicAny - Win32 MFC Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "DynamicAny - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "DynamicAny - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "DynamicAny - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "DynamicAny - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "DynamicAny - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "DLL\Release\DynamicAny"

+# 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 "DynamicAny_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_DYNAMICANY_BUILD_DLL" /FD /c

+# SUBTRACT CPP /YX

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

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

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

+# ADD LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_DynamicAny.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "DynamicAny - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "DLL\Debug\DynamicAny"

+# 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 "DynamicAny_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_DYNAMICANY_BUILD_DLL" /FD /c

+# SUBTRACT CPP /YX

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

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

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_DynamicAnyd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "DynamicAny - Win32 MFC Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "DynamicAny___Win32_MFC_Debug"

+# PROP BASE Intermediate_Dir "DynamicAny___Win32_MFC_Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "DLL\Debug\DynamicAnyMFC"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENT_BUILD_DLL" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D ACE_HAS_MFC=1 /D "WIN32" /D "_WINDOWS" /D "TAO_DYNAMICANY_BUILD_DLL" /FD /c

+# SUBTRACT CPP /YX

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

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

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 TAOd.lib aced.lib TAO_Svc_Utilsd.lib TAO_RTEventd.lib TAO_RTSchedd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_DynamicAnyd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAOmfcd.lib acemfcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_DynamicAnymfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "DynamicAny - Win32 MFC Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "DynamicAny___Win32_MFC_Release"

+# PROP BASE Intermediate_Dir "DynamicAny___Win32_MFC_Release"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "DLL\Release\DynamicAnyMFC"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENT_BUILD_DLL" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "TAO_DYNAMICANY_BUILD_DLL" /D ACE_HAS_MFC=1 /D "WIN32" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

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

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

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 ace.lib TAO.lib TAO_Svc_Utils.lib TAO_RTEvent.lib TAO_RTSched.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_DynamicAny.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_DynamicAnymfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "DynamicAny - Win32 Release"

+# Name "DynamicAny - Win32 Debug"

+# Name "DynamicAny - Win32 MFC Debug"

+# Name "DynamicAny - Win32 MFC Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=.\DynamicAny.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynamicAnyC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynAny_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynAnyFactory.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynArray_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynEnum_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynSequence_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynStruct_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynUnion_i.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\DynamicAny.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\dynamicany_export.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynamicAnyC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynAny_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynAnyFactory.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynArray_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynEnum_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynSequence_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynStruct_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynUnion_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynUnion_i_T.h

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter ".i"

+# Begin Source File

+

+SOURCE=.\DynamicAnyC.i

+# End Source File

+# End Group

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\DynUnion_i_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/tao/DynamicAny/TAO_DynamicAny_Static.dsp b/TAO/tao/DynamicAny/TAO_DynamicAny_Static.dsp
new file mode 100644
index 00000000000..630efaa28ab
--- /dev/null
+++ b/TAO/tao/DynamicAny/TAO_DynamicAny_Static.dsp
@@ -0,0 +1,191 @@
+# Microsoft Developer Studio Project File - Name="DynamicAny_Static" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

+

+CFG=DynamicAny_Static - Win32 Static Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "TAO_DynamicAny_Static.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "TAO_DynamicAny_Static.mak" CFG="DynamicAny_Static - Win32 Static Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "DynamicAny_Static - Win32 Static Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "DynamicAny_Static - Win32 Static Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "DynamicAny_Static - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "LIB\Release\DynamicAny"

+# 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 TAO_DYNAMICANY_HAS_DLL=0 /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c

+# SUBTRACT CPP /YX

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo /out:"TAO_DynamicAnys.lib"

+

+!ELSEIF  "$(CFG)" == "DynamicAny_Static - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "LIB\Debug\DynamicAny"

+# 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 TAO_DYNAMICANY_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c

+# SUBTRACT CPP /YX

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo /out:"TAO_DynamicAnysd.lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "DynamicAny_Static - Win32 Static Release"

+# Name "DynamicAny_Static - Win32 Static Debug"

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\DynUnion_i_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter "i"

+# Begin Source File

+

+SOURCE=.\DynamicAnyC.i

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h"

+# Begin Source File

+

+SOURCE=.\DynamicAny.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\dynamicany_export.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynamicAnyC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynAny_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynAnyFactory.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynArray_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynEnum_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynSequence_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynStruct_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynUnion_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynUnion_i_T.h

+# End Source File

+# End Group

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp"

+# Begin Source File

+

+SOURCE=.\DynamicAny.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynamicAnyC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynAny_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynAnyFactory.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynArray_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynEnum_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynSequence_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynStruct_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DynUnion_i.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/tao/TAO.dsw b/TAO/tao/TAO.dsw
index 50ef1a477e4..b6309e0748e 100644
--- a/TAO/tao/TAO.dsw
+++ b/TAO/tao/TAO.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "TAO"=.\TAO.dsp - Package Owner=<4>

+Project: "DynamicAny"=.\DynamicAny\TAO_DynamicAny.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -11,11 +11,41 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "TAO_Static"=.\TAO_Static.dsp - Package Owner=<4>

+Project: "DynamicAny_Static"=.\DynamicAny\TAO_DynamicAny_Static.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO LIB

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "TAO DLL"=.\TAO.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "TAO LIB"=.\TAO_Static.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/tests/DynAny_Test/basic_test.dsp b/TAO/tests/DynAny_Test/basic_test.dsp
index 1a8470fef4d..ccffff4c6a0 100644
--- a/TAO/tests/DynAny_Test/basic_test.dsp
+++ b/TAO/tests/DynAny_Test/basic_test.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD LINK32 ace.lib TAO.lib TAO_DynamicAny.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\DynamicAny"

 

 !ELSEIF  "$(CFG)" == "DynAny Basics - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD LINK32 aced.lib TAOd.lib TAO_DynamicAnyd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\\" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\DynamicAny"

 

 !ENDIF