ChangeLogTag:Fri Sep 01 16:15:52 2000 Carlos O'Ryan <coryan@uci.edu>

7 files changed, 118 insertions, 20 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 8fdf5640048..d45add8095f 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,19 @@
+Fri Sep 01 16:15:52 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+	* tao/PortableServer/Collocated_Object.cpp:
+	  Fixed implementation of TAO_Collocated_Object::_is_a(), try
+	  using the hint before testing the servant.
+
+        * TAOACE_Static.dsw:
+	  Include the new static projects into this workspace, update some
+	  dependencies.
+
+        * orbsvcs/tests/ImplRepo/airplane_client.dsp:
+        * orbsvcs/tests/ImplRepo/airplane_server.dsp:
+        * orbsvcs/tests/ImplRepo/nestea_client.dsp:
+        * orbsvcs/tests/ImplRepo/nestea_server.dsp:
+	  Add missing TAO_PortableServer library to these project files
+
 Fri Sep  1 16:01:37 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * TAO_IDL/be/be_visitor_operation/interceptors_result.cpp:
diff --git a/TAO/TAOACE_Static.dsw b/TAO/TAOACE_Static.dsw
index e9228b851b8..c9cec2f1d4e 100644
--- a/TAO/TAOACE_Static.dsw
+++ b/TAO/TAOACE_Static.dsw
@@ -23,6 +23,12 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name gperf

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler Static

+    End Project Dependency

 }}}

 

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

@@ -35,6 +41,12 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name gperf

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler Static

+    End Project Dependency

 }}}

 

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

@@ -47,6 +59,12 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name gperf

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO LIB

+    End Project Dependency

 }}}

 

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

@@ -59,6 +77,12 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name gperf

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO LIB

+    End Project Dependency

 }}}

 

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

@@ -71,6 +95,12 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name gperf

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler Static

+    End Project Dependency

 }}}

 

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

@@ -83,6 +113,12 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name gperf

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO LIB

+    End Project Dependency

 }}}

 

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

@@ -95,6 +131,12 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name gperf

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO LIB

+    End Project Dependency

 }}}

 

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

@@ -107,6 +149,12 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name gperf

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler Static

+    End Project Dependency

 }}}

 

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

@@ -119,6 +167,12 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name gperf

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler Static

+    End Project Dependency

 }}}

 

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

@@ -131,6 +185,12 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name gperf

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler Static

+    End Project Dependency

 }}}

 

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

@@ -143,6 +203,12 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name gperf

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler Static

+    End Project Dependency

 }}}

 

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

@@ -177,6 +243,18 @@ Package=<4>
 

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

 

+Project: "PortableServer_Static"=.\tao\PortableServer\TAO_PortableServer_Static.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

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

 

 Package=<5>

@@ -185,6 +263,9 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler Static

+    End Project Dependency

 }}}

 

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

@@ -233,6 +314,12 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name gperf

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO LIB

+    End Project Dependency

 }}}

 

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

diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp b/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp
index a46211f7459..7760e6aeacb 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp
@@ -17,13 +17,12 @@ CFG=Airplane Client - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Airplane Client - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Airplane Client - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Airplane Client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Airplane Client - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -104,10 +103,6 @@ SOURCE=.\airplane_client_i.cpp
 

 SOURCE=.\AirplaneC.cpp

 # End Source File

-# Begin Source File

-

-SOURCE=.\AirplaneS.cpp

-# End Source File

 # End Group

 # Begin Group "Header Files"

 

diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp
index 1046848fb93..032cb36fe0a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.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 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:"..\..\..\tao" /libpath:"..\..\..\..\ace"

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

 

 !ELSEIF  "$(CFG)" == "Airplane Server - 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 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:"..\..\..\tao" /libpath:"..\..\..\..\ace"

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

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp b/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp
index 3fe446dd698..daed853edeb 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp
@@ -17,13 +17,12 @@ CFG=Nestea Client - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Nestea Client - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Nestea Client - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Nestea Client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Nestea Client - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -104,10 +103,6 @@ SOURCE=.\nestea_client_i.cpp
 

 SOURCE=.\NesteaC.cpp

 # End Source File

-# Begin Source File

-

-SOURCE=.\NesteaS.cpp

-# End Source File

 # End Group

 # Begin Group "Header Files"

 

diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp
index 31544128181..9f964875a76 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.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 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:"..\..\..\tao" /libpath:"..\..\..\..\ace"

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

 

 !ELSEIF  "$(CFG)" == "Nestea Server - 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 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:"..\..\..\tao" /libpath:"..\..\..\..\ace"

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

 

 !ENDIF 

 

diff --git a/TAO/tao/PortableServer/Collocated_Object.cpp b/TAO/tao/PortableServer/Collocated_Object.cpp
index 4e99c390aec..e1b0dbdefcd 100644
--- a/TAO/tao/PortableServer/Collocated_Object.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object.cpp
@@ -46,6 +46,11 @@ TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id,
   if (!this->_is_collocated ())
     return this->CORBA_Object::_is_a (logical_type_id, ACE_TRY_ENV);
 
+  if (this->_stubobj ()->type_id.in () != 0
+      && ACE_OS::strcmp (logical_type_id,
+                         this->_stubobj ()->type_id.in ()) == 0)
+    return 1;
+
   TAO_Stub *stub = this->_stubobj ();
   // Which collocation strategy should we use?
   if (stub != 0 &&