diff options
author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-21 08:39:29 +0000 |
---|---|---|
committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-21 08:39:29 +0000 |
commit | 1852c36e69c3803d4a1a6fbe813d8d7885161c4d (patch) | |
tree | c30071013592532d84896a919bc13af6a086c3f5 | |
parent | a15640bdd4c3576a179ef604f759e9a6a0f8b773 (diff) | |
download | ATCD-1852c36e69c3803d4a1a6fbe813d8d7885161c4d.tar.gz |
ChangeLogTag:Sat Aug 21 03:32:52 1999 Nanbor Wang <nanbor@cs.wustl.edu>
-rw-r--r-- | TAO/examples/Simple/time-date/Time_Date.cpp | 1 | ||||
-rw-r--r-- | TAO/examples/Simple/time-date/Time_Date.dsp | 4 | ||||
-rw-r--r-- | TAO/examples/Simple/time-date/client.dsp | 4 | ||||
-rw-r--r-- | TAO/examples/Simple/time-date/server.dsp | 4 | ||||
-rw-r--r-- | TAO/tao/ORB.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/default_resource.h | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp index 2688a9bda68..d969cb85d97 100644 --- a/TAO/examples/Simple/time-date/Time_Date.cpp +++ b/TAO/examples/Simple/time-date/Time_Date.cpp @@ -1,6 +1,7 @@ // $Id$ #define ACE_BUILD_SVC_DLL +#define Alt_Resource_Factory_BUILD_DLL #include "ace/Get_Opt.h" #include "ace/Dynamic_Service.h" #include "Time_Date.h" diff --git a/TAO/examples/Simple/time-date/Time_Date.dsp b/TAO/examples/Simple/time-date/Time_Date.dsp index 2fd73c06a80..8aca99634a9 100644 --- a/TAO/examples/Simple/time-date/Time_Date.dsp +++ b/TAO/examples/Simple/time-date/Time_Date.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # 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 "TIME_DATE_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TIME_DATE_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\.." /I "..\..\..\orbsvcs" /D "_WINDOWS" /D "_USRDLL" /D "TIME_DATE_EXPORTS" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D Alt_Resource_Factory_HAS_DLL=1 /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe # 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 "TIME_DATE_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_USRDLL" /D "TIME_DATE_EXPORTS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\.." /D "_USRDLL" /D "TIME_DATE_EXPORTS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D Alt_Resource_Factory_HAS_DLL=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
diff --git a/TAO/examples/Simple/time-date/client.dsp b/TAO/examples/Simple/time-date/client.dsp index 32fb99dbb90..b32b7d1ade6 100644 --- a/TAO/examples/Simple/time-date/client.dsp +++ b/TAO/examples/Simple/time-date/client.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\orbsvcs" /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\orbsvcs" /I "..\..\..\.." /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D Alt_Resource_Factory_HAS_DLL=1 /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# 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 "..\..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D Alt_Resource_Factory_HAS_DLL=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/examples/Simple/time-date/server.dsp b/TAO/examples/Simple/time-date/server.dsp index e4de7943d91..01c220e0206 100644 --- a/TAO/examples/Simple/time-date/server.dsp +++ b/TAO/examples/Simple/time-date/server.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\.." /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\.." /I "..\..\..\orbsvcs" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D Alt_Resource_Factory_HAS_DLL=1 /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# 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 "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D Alt_Resource_Factory_HAS_DLL=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 8265db8ac0e..f25fd6b816f 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -208,8 +208,6 @@ CORBA_ORB::open (void) if (this->open_called_ == 1) return 1; - this->open_called_ = 1; - TAO_Acceptor_Registry *ar = this->orb_core_->acceptor_registry (); // get a reference to the acceptor_registry! @@ -220,6 +218,8 @@ CORBA_ORB::open (void) // Need to return an error somehow!! Maybe set do_exit? return -1; + this->open_called_ = 1; + return 0; } diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index 55765140b71..297de51fea1 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -29,7 +29,7 @@ class TAO_Object_Adapter; -class TAO_Default_Resource_Factory : public TAO_Resource_Factory +class TAO_Export TAO_Default_Resource_Factory : public TAO_Resource_Factory { // = TITLE // TAO's default resource factory |