ChangeLogTag:Wed Jun 21 20:01:37 2000 Carlos O'Ryan <coryan@uci.edu>

9 files changed, 439 insertions, 44 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index c846b6b0f25..fccdf75450e 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,19 @@
+Wed Jun 21 20:01:37 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tao/TAO.dsp:
+        * tao/TAO.dsw:
+        * tao/TAO_Static.dsp:
+        * tao/ior_dll/ior_dll.dsp:
+        * tests/Object_Loader/Test_DLL.dsp:
+        * tests/Object_Loader/driver.dsp:
+          Fixed the project files.
+
+        * tests/Object_Loader/Test_i.h:
+          Fixed memory leaks in the test, use RefCountServantBase.
+
+        * tests/Object_Loader/driver.cpp:
+          Fixed memory leaks in the test, destroy the POA and ORBs.
+
 Wed Jun 21 15:40:37 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
 
         * tao/IOR_Parser.h:
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 8ac2f10a1a8..a8b0b5c9aa1 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -1525,6 +1525,25 @@ SOURCE=.\IOR_LookupTable.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\IOR_Parser.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

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

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=.\IORC.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

@@ -1867,7 +1886,7 @@ SOURCE=.\Object_KeyC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Loader.cpp

+SOURCE=.\ObjectIDList.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

 

@@ -1886,7 +1905,7 @@ SOURCE=.\Object_Loader.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.cpp

+SOURCE=.\operation_details.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

 

@@ -1905,7 +1924,7 @@ SOURCE=.\ObjectIDList.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\operation_details.cpp

+SOURCE=.\Operation_Table.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

 

@@ -1924,7 +1943,7 @@ SOURCE=.\operation_details.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Operation_Table.cpp

+SOURCE=.\ORB.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

 

@@ -1943,7 +1962,7 @@ SOURCE=.\Operation_Table.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\ORB.cpp

+SOURCE=.\ORB_Core.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

 

@@ -1962,7 +1981,7 @@ SOURCE=.\ORB.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\ORB_Core.cpp

+SOURCE=.\params.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

 

@@ -1981,7 +2000,7 @@ SOURCE=.\ORB_Core.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\params.cpp

+SOURCE=.\Parser_Registry.cpp

 

 !IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

 

@@ -3650,6 +3669,10 @@ SOURCE=.\IOR_LookupTable.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\IOR_Parser.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\IORC.h

 # End Source File

 # Begin Source File

@@ -3718,10 +3741,6 @@ SOURCE=.\Object_KeyC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Loader.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\ObjectIDList.h

 # End Source File

 # Begin Source File

@@ -3750,6 +3769,10 @@ SOURCE=.\params.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Parser_Registry.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Pluggable.h

 # End Source File

 # Begin Source File

@@ -4202,6 +4225,10 @@ SOURCE=.\IOPS.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\IOR_Parser.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\IORC.i

 # End Source File

 # Begin Source File

@@ -4250,10 +4277,6 @@ SOURCE=.\Object_KeyC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Loader.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\ObjectIDList.i

 # End Source File

 # Begin Source File

@@ -4274,6 +4297,10 @@ SOURCE=.\params.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Parser_Registry.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\poaC.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/TAO.dsw b/TAO/tao/TAO.dsw
index 50ef1a477e4..4998d950334 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: "TAO DLL"=.\TAO.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -15,7 +15,22 @@ Package=<4>
 

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

 

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

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

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+}}}

+

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

+

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

 

 Package=<5>

 {{{

diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index 82a3187076b..9e26f57478a 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -359,6 +359,10 @@ SOURCE=.\IOR_LookupTable.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\IOR_Parser.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\IORC.cpp

 # End Source File

 # Begin Source File

@@ -431,10 +435,6 @@ SOURCE=.\Object_KeyC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Loader.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\ObjectIDList.cpp

 # End Source File

 # Begin Source File

@@ -459,6 +459,10 @@ SOURCE=.\params.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Parser_Registry.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Pluggable.cpp

 # End Source File

 # Begin Source File

@@ -1003,6 +1007,10 @@ SOURCE=.\IOR_LookupTable.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\IOR_Parser.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\IORC.h

 # End Source File

 # Begin Source File

@@ -1071,10 +1079,6 @@ SOURCE=.\Object_KeyC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Loader.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\ObjectIDList.h

 # End Source File

 # Begin Source File

@@ -1103,6 +1107,10 @@ SOURCE=.\params.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Parser_Registry.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Pluggable.h

 # End Source File

 # Begin Source File

@@ -1539,6 +1547,10 @@ SOURCE=.\IOPS.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\IOR_Parser.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\IORC.i

 # End Source File

 # Begin Source File

@@ -1587,10 +1599,6 @@ SOURCE=.\Object_KeyC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Loader.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\ObjectIDList.i

 # End Source File

 # Begin Source File

@@ -1611,6 +1619,10 @@ SOURCE=.\params.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Parser_Registry.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\poaC.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/ior_dll/ior_dll.dsp b/TAO/tao/ior_dll/ior_dll.dsp
new file mode 100644
index 00000000000..ddd00ba9764
--- /dev/null
+++ b/TAO/tao/ior_dll/ior_dll.dsp
@@ -0,0 +1,302 @@
+# Microsoft Developer Studio Project File - Name="TAO IOR DLL DLL" - Package Owner=<4>

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

+# ** DO NOT EDIT **

+

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

+# TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602

+

+CFG=TAO IOR DLL DLL - Win32 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 "ior_dll.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 "ior_dll.mak" CFG="TAO IOR DLL DLL - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "TAO IOR DLL DLL - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE "TAO IOR DLL DLL - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

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

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

+!MESSAGE "TAO IOR DLL DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "TAO IOR DLL DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "Desktop"

+

+!IF  "$(CFG)" == "TAO IOR DLL DLL - Win32 Alpha Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ""

+# PROP BASE Intermediate_Dir "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 "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /Gt0 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD nologo MT Gt0 W3 GX O2 I "../../" /c

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

+MTL=midl.exe

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

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

+RSC=rc.exe

+# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:ALPHA /out:"..\..\bin\TAO_IOR_DLL.dll" /libpath:"..\..\ace"

+# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:ALPHA /out:"..\..\bin\TAO_IOR_DLL.dll" /libpath:"..\..\ace"

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ""

+# PROP BASE Intermediate_Dir "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 "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /Gt0 /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "../../" /c

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

+MTL=midl.exe

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

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

+RSC=rc.exe

+# 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 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"..\..\bin\TAO_IOR_DLLd.dll" /libpath:"..\..\ace"

+# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"..\..\bin\TAO_IOR_DLLd.dll" /libpath:"..\..\ace"

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - Win32 MFC Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "TAO_DLL___Win32_MFC_Release"

+# PROP BASE Intermediate_Dir "TAO_DLL___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\MFC_Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

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

+# SUBTRACT BASE CPP /YX

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

+# SUBTRACT CPP /YX

+MTL=midl.exe

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

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

+RSC=rc.exe

+# 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 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\bin\TAO_IOR_DLL.dll" /libpath:"..\..\ace"

+# SUBTRACT BASE LINK32 /incremental:yes

+# ADD LINK32 acemfc.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\bin\TAO_IOR_DLLmfc.dll" /libpath:"..\..\ace"

+# SUBTRACT LINK32 /incremental:yes

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - Win32 MFC Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "TAO_DLL___Win32_MFC_Debug"

+# PROP BASE Intermediate_Dir "TAO_DLL___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\MFC_Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

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

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../../" /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /FD /c

+# SUBTRACT CPP /YX

+MTL=midl.exe

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

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

+RSC=rc.exe

+# 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 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\bin\TAO_IOR_DLLd.dll" /libpath:"..\..\ace"

+# ADD LINK32 acemfcd.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\bin\TAO_IOR_DLLmfcd.dll" /libpath:"..\..\ace"

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - 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"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c

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

+# SUBTRACT CPP /YX

+MTL=midl.exe

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

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

+RSC=rc.exe

+# 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 /subsystem:windows /dll /machine:I386

+# ADD LINK32 TAO.lib ace.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\bin\TAO_IOR_DLL.dll" /libpath:"..\..\..\ace" /libpath:".."

+# SUBTRACT LINK32 /incremental:yes

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - 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"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c

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

+# SUBTRACT CPP /YX

+MTL=midl.exe

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

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

+RSC=rc.exe

+# 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 /subsystem:windows /dll /debug /machine:I386

+# ADD LINK32 TAOd.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_IOR_DLLd.dll" /libpath:"..\..\..\ace" /libpath:".."

+

+!ENDIF 

+

+# Begin Target

+

+# Name "TAO IOR DLL DLL - Win32 Alpha Release"

+# Name "TAO IOR DLL DLL - Win32 Alpha Debug"

+# Name "TAO IOR DLL DLL - Win32 MFC Release"

+# Name "TAO IOR DLL DLL - Win32 MFC Debug"

+# Name "TAO IOR DLL DLL - Win32 Release"

+# Name "TAO IOR DLL DLL - Win32 Debug"

+# Begin Group "Source Files"

+

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

+# Begin Source File

+

+SOURCE=.\DLL_Parser.cpp

+

+!IF  "$(CFG)" == "TAO IOR DLL DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - Win32 Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Object_Loader.cpp

+

+!IF  "$(CFG)" == "TAO IOR DLL DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO IOR DLL DLL - Win32 Debug"

+

+!ENDIF 

+

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

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

+# Begin Source File

+

+SOURCE=.\DLL_Parser.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ior_dll_export.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Object_Loader.h

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter "i"

+# Begin Source File

+

+SOURCE=.\DLL_Parser.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\Object_Loader.i

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/tests/Object_Loader/Test_DLL.dsp b/TAO/tests/Object_Loader/Test_DLL.dsp
index 99ad9a82d5c..d949143a351 100644
--- a/TAO/tests/Object_Loader/Test_DLL.dsp
+++ b/TAO/tests/Object_Loader/Test_DLL.dsp
@@ -80,7 +80,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:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOd.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\bin\Test_DLLd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

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

 

 !ENDIF 

 

diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h
index 8144ff18c87..1081689864d 100644
--- a/TAO/tests/Object_Loader/Test_i.h
+++ b/TAO/tests/Object_Loader/Test_i.h
@@ -19,7 +19,14 @@
 #include "TestS.h"
 #include "OLT_Export.h"
 
-class OLT_Export Test_i : public POA_Test
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+class OLT_Export Test_i : public POA_Test, public PortableServer::RefCountServantBase
 {
   // = TITLE
   //   Implement the Test interface
@@ -50,4 +57,8 @@ private:
 #include "Test_i.i"
 #endif /* __ACE_INLINE__ */
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* TAO_OBJECT_LOADER_TEST_I_H */
diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp
index d6d6e562137..64f52621c48 100644
--- a/TAO/tests/Object_Loader/driver.cpp
+++ b/TAO/tests/Object_Loader/driver.cpp
@@ -7,7 +7,7 @@
 int
 main (int, char *[])
 {
-  int niterations = 1000;
+  int niterations = 10;
   int norbs = 10;
 
   ACE_TRY_NEW_ENV
@@ -49,16 +49,28 @@ main (int, char *[])
             }
         }
 
-      for (int j = 0; j != 10; ++j)
+      for (int j = 0; j != norbs; ++j)
         {
           char buf[16];
-          ACE_OS::sprintf (buf, "%4.4d", j);
+          ACE_OS::sprintf (buf, "ORB_%4.4d", j);
 
           int argc = 0;
           CORBA::ORB_var orb =
             CORBA::ORB_init (argc, 0, buf, ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
+          CORBA::Object_var obj =
+            orb->resolve_initial_references ("RootPOA",
+                                             ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          PortableServer::POA_var poa =
+            PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          poa->destroy (1, 1, ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
           orb->destroy (ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
diff --git a/TAO/tests/Object_Loader/driver.dsp b/TAO/tests/Object_Loader/driver.dsp
index 26b6be15fdb..ab4417df61c 100644
--- a/TAO/tests/Object_Loader/driver.dsp
+++ b/TAO/tests/Object_Loader/driver.dsp
@@ -65,7 +65,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D OLT_HAS_DLL=0 /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -158,31 +158,31 @@ InputName=Test
 BuildCmds= \

 	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

-"$(InputName)Cli.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)Cli.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)Ccli.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)Ser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)Ser.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)Ser.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)Ser_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)Ser_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)Ser_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build