ChangeLogTag:Thu Jan 08 17:48:49 1998 <coryan@CHA-CHA>

7 files changed, 32 insertions, 12 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 0f22b9f6776..46f9211389b 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,23 @@
+Thu Jan 08 17:48:49 1998    <coryan@CHA-CHA>
+
+	* Naming_Service/NS_CosNaming.cpp: 
+	* orbsvcs/Naming_Service/CosNaming_i.cpp: 
+	  ACE_NESTED is only needed in the generated code.
+
+	* Scheduling_Service/Scheduling_Service.cpp: 
+	  MSVC++ 5.0 seems to have a bug: if the implementation for the
+	  scheduling service is stored into a RtecScheduler::Scheduler_ptr
+	  then the server crashes; this is OK in other platforms and looks
+	  OK since the pointers are in fact compatible.
+
+	* tests/Event_Latency/Event_Latency.cpp: 
+	  Removed some warnings by using "CORBA::ULong" instead of "int"
+	  in comparisons against sequence<>::length.
+
+	* Dump_Schedule/Dump_Schedule.dsp: 
+	* orbsvcs/orbsvcs_lib.dsp: 
+	  Fixed some names and missing options.
+
 Thu Jan 08 15:55:21 1998  Nanbor Wang  <nw1@cs.wustl.edu>
 
 	* tao/objtable.cpp: 
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsp
index 943d6f62b66..1b18702b6ed 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsp
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.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 /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

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

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

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

 BSC32=bscmake.exe

diff --git a/TAO/orbsvcs/Naming_Service/CosNaming_i.cpp b/TAO/orbsvcs/Naming_Service/CosNaming_i.cpp
index 6c2cef0da75..b928359db9d 100644
--- a/TAO/orbsvcs/Naming_Service/CosNaming_i.cpp
+++ b/TAO/orbsvcs/Naming_Service/CosNaming_i.cpp
@@ -325,7 +325,7 @@ NS_NamingContext::resolve (const CosNaming::Name& n,
 
   // if the name we had to resolve was simple, we just need
   // to return the result.
-  return (ACE_NESTED_CLASS (CORBA,Object)::_duplicate (item));
+  return CORBA::Object::_duplicate (item);
 }
 
 void 
@@ -441,7 +441,7 @@ NS_NamingContext::list (CORBA::ULong how_many,
        ACE_UNUSED_ARG (bind_iter);
 	 
        //  bind_iter->initialize (bi); 
-       ACE_NESTED_CLASS (CosNaming, BindingIterator)::_duplicate (bi);
+	   CosNaming::BindingIterator::_duplicate (bi);
        
        n = how_many;
     }
diff --git a/TAO/orbsvcs/Naming_Service/NS_CosNaming.cpp b/TAO/orbsvcs/Naming_Service/NS_CosNaming.cpp
index ce135b599ac..6cc90cacb95 100644
--- a/TAO/orbsvcs/Naming_Service/NS_CosNaming.cpp
+++ b/TAO/orbsvcs/Naming_Service/NS_CosNaming.cpp
@@ -23,13 +23,13 @@ NS_IntId::NS_IntId (CORBA::Object_ptr obj,
 		    CosNaming::BindingType type)
   : type_ (type)
 {
-  ref_ = ACE_NESTED_CLASS (CORBA,Object)::_duplicate (obj);
+	ref_ = CORBA::Object::_duplicate (obj);
 }
 
 NS_IntId::NS_IntId (const NS_IntId &rhs)
 {
   type_ = rhs.type_;
-  ref_ = ACE_NESTED_CLASS (CORBA,Object)::_duplicate (rhs.ref_);
+  ref_ = CORBA::Object::_duplicate (rhs.ref_);
 }
 
 NS_IntId::~NS_IntId (void)
@@ -47,7 +47,7 @@ NS_IntId::operator= (const NS_IntId &rhs)
   type_ = rhs.type_;
   
   CORBA::release (ref_);
-  ref_ = ACE_NESTED_CLASS (CORBA,Object)::_duplicate (rhs.ref_);
+  ref_ = CORBA::Object::_duplicate (rhs.ref_);
 }
 
 NS_ExtId::NS_ExtId (void)
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 8f6c2917a32..9c10f9894b1 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -34,8 +34,8 @@ int main (int argc, char *argv[])
       TAO_CHECK_ENV;
 
       // Create an Scheduling service servant...
-      RtecScheduler::Scheduler_ptr scheduler = new ACE_Config_Scheduler;
-      // CORBA::Object::_duplicate(scheduler);
+      ACE_Config_Scheduler *scheduler = new ACE_Config_Scheduler;
+      CORBA::Object::_duplicate(scheduler);
       TAO_CHECK_ENV;
 
       CORBA::String str =
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_lib.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs_lib.dsp
index 4d11f05f55b..8ad98366e7e 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_lib.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs_lib.dsp
@@ -56,7 +56,7 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

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

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

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

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
index 6070be74afc..02961f65817 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
@@ -142,7 +142,7 @@ Latency_Consumer::push (const RtecEventComm::EventSet &events,
     }
 #endif /* quantify */
 
-  for (int i = 0; i < events.length (); ++i)
+  for (CORBA::ULong i = 0; i < events.length (); ++i)
     {
       if (events[i].type_ == ACE_ES_EVENT_SHUTDOWN)
 	{
@@ -465,7 +465,7 @@ Latency_Supplier::push (const RtecEventComm::EventSet &events,
 
   // ACE_DEBUG ((LM_DEBUG, "%d event(s)\n", events.length ()));
 
-  for (int i = 0; i < events.length (); ++i)
+  for (CORBA::ULong i = 0; i < events.length (); ++i)
     {
       if (!master_ && events[i].type_ == ACE_ES_EVENT_SHUTDOWN)
 	{