summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/ChangeLog-98c13
-rw-r--r--TAO/TAO_IDL/tao_idl.dsp16
-rw-r--r--TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp6
-rw-r--r--TAO/orbsvcs/Event_Service/Event_Service.cpp8
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.cpp4
-rw-r--r--TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp8
-rw-r--r--TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp8
-rw-r--r--TAO/tao/TAO.dsp48
8 files changed, 94 insertions, 17 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 91cb37a2b5f..ed472c2fb7b 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,16 @@
+Sat Jan 24 21:01:00 1998 <coryan@MILONGA>
+
+ * orbsvcs/Dump_Schedule/Dump_Schedule.cpp:
+ * orbsvcs/Event_Service/Event_Service.cpp:
+ * orbsvcs/Naming_Service/Naming_Service.cpp:
+ * orbsvcs/Scheduling_Service/Scheduling_Service.cpp:
+ * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
+ Fixed several minor error and sources of non-complaince.
+
+ * TAO_IDL/tao_idl.dsp:
+ * tao/TAO.dsp:
+ CVS does not merge binary files properly.
+
Sat Jan 24 15:51:41 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
* tao/objtable.cpp:
diff --git a/TAO/TAO_IDL/tao_idl.dsp b/TAO/TAO_IDL/tao_idl.dsp
index 565284b6119..95a76d6f55e 100644
--- a/TAO/TAO_IDL/tao_idl.dsp
+++ b/TAO/TAO_IDL/tao_idl.dsp
@@ -392,6 +392,14 @@ SOURCE=.\be\be_visitor.cpp
# End Source File
# Begin Source File
+SOURCE=.\be\be_visitor_args.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\be\be_visitor_interface.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\be\be_visitor_root.cpp
# End Source File
# Begin Source File
@@ -784,6 +792,14 @@ SOURCE=.\be_include\be_visitor.h
# End Source File
# Begin Source File
+SOURCE=.\be_include\be_visitor_args.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\be_include\be_visitor_interface.h
+# End Source File
+# Begin Source File
+
SOURCE=.\be_include\be_visitor_root.h
# End Source File
# Begin Source File
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
index fc8372e0691..9c92c64dd92 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
@@ -24,7 +24,7 @@ int main (int argc, char *argv[])
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA");
- if (poa_object == 0)
+ if (CORBA::is_nil(poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the POA.\n"),
1);
@@ -39,13 +39,13 @@ int main (int argc, char *argv[])
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService");
- if (naming_obj == 0)
+ if (CORBA::is_nil(naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the POA.\n"),
1);
CosNaming::NamingContext_var naming_context =
- CosNaming::NamingContext::_narrow (naming_obj, TAO_TRY_ENV);
+ CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
TAO_CHECK_ENV;
ACE_Scheduler_Factory::use_config (naming_context.in ());
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 6e40b7b46b4..cb68e602ef0 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -23,13 +23,13 @@ int main (int argc, char *argv[])
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA");
- if (poa_object == 0)
+ if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the POA.\n"),
1);
PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (poa_object, TAO_TRY_ENV);
+ PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
TAO_CHECK_ENV;
PortableServer::POAManager_var poa_manager =
@@ -38,13 +38,13 @@ int main (int argc, char *argv[])
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService");
- if (naming_obj == 0)
+ if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the POA.\n"),
1);
CosNaming::NamingContext_var naming_context =
- CosNaming::NamingContext::_narrow (naming_obj, TAO_TRY_ENV);
+ CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
TAO_CHECK_ENV;
ACE_Scheduler_Factory::use_config (naming_context.in ());
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 36152b29adb..99be942d8a2 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -105,13 +105,13 @@ main (int argc, char ** argv)
// Initialize the Object Adapter
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA");
- if (poa_object == 0)
+ if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the POA.\n"),
1);
PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (poa_object, TAO_TRY_ENV);
+ PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
TAO_CHECK_ENV;
PortableServer::POAManager_var poa_manager =
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index b5ec3320990..9fe96da8a78 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -18,13 +18,13 @@ int main (int argc, char *argv[])
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA");
- if (poa_object == 0)
+ if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the POA.\n"),
1);
PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (poa_object, TAO_TRY_ENV);
+ PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
TAO_CHECK_ENV;
PortableServer::POAManager_var poa_manager =
@@ -33,13 +33,13 @@ int main (int argc, char *argv[])
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService");
- if (naming_obj == 0)
+ if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the POA.\n"),
1);
CosNaming::NamingContext_var naming_context =
- CosNaming::NamingContext::_narrow (naming_obj, TAO_TRY_ENV);
+ CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
TAO_CHECK_ENV;
// Create an Scheduling service servant...
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
index b71694d7458..6c85e2d592e 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
@@ -783,13 +783,13 @@ main (int argc, char *argv [])
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA");
- if (poa_object == 0)
+ if (CORBA::is_nil (poa_object.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the POA.\n"),
1);
PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (poa_object, TAO_TRY_ENV);
+ PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
TAO_CHECK_ENV;
PortableServer::POAManager_var poa_manager =
@@ -798,13 +798,13 @@ main (int argc, char *argv [])
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService");
- if (naming_obj == 0)
+ if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the POA.\n"),
1);
CosNaming::NamingContext_var naming_context =
- CosNaming::NamingContext::_narrow (naming_obj, TAO_TRY_ENV);
+ CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
TAO_CHECK_ENV;
ACE_Scheduler_Factory::use_config (naming_context.in ());
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 5666053ab3f..299930915cc 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -180,6 +180,10 @@ SOURCE=.\object.cpp
# End Source File
# Begin Source File
+SOURCE=.\objkeyC.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\objtable.cpp
# End Source File
# Begin Source File
@@ -204,6 +208,14 @@ SOURCE=.\poa.cpp
# End Source File
# Begin Source File
+SOURCE=.\poaC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\poaS.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\principa.cpp
# End Source File
# Begin Source File
@@ -216,6 +228,10 @@ SOURCE=.\sequence.cpp
# End Source File
# Begin Source File
+SOURCE=.\servant_base.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\server_factory.cpp
# End Source File
# Begin Source File
@@ -316,6 +332,10 @@ SOURCE=.\object.h
# End Source File
# Begin Source File
+SOURCE=.\objkeyC.h
+# End Source File
+# Begin Source File
+
SOURCE=.\objtable.h
# End Source File
# Begin Source File
@@ -348,6 +368,18 @@ SOURCE=.\poa.h
# End Source File
# Begin Source File
+SOURCE=.\poa_T.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\poaC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\poaS.h
+# End Source File
+# Begin Source File
+
SOURCE=.\principa.h
# End Source File
# Begin Source File
@@ -360,6 +392,10 @@ SOURCE=.\sequence.h
# End Source File
# Begin Source File
+SOURCE=.\servant_base.h
+# End Source File
+# Begin Source File
+
SOURCE=.\server_factory.h
# End Source File
# Begin Source File
@@ -444,6 +480,10 @@ SOURCE=.\object.i
# End Source File
# Begin Source File
+SOURCE=.\objkeyC.i
+# End Source File
+# Begin Source File
+
SOURCE=.\orb_core.i
# End Source File
# Begin Source File
@@ -460,6 +500,14 @@ SOURCE=.\poa.i
# End Source File
# Begin Source File
+SOURCE=.\poaC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\poaS.i
+# End Source File
+# Begin Source File
+
SOURCE=.\sequence.i
# End Source File
# Begin Source File
View Lorry Controller Status