summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/ChangeLog-98c21
-rw-r--r--TAO/tests/POA/Default_Servant/server.cpp4
-rw-r--r--TAO/tests/POA/Explicit_Activation/server.cpp8
-rw-r--r--TAO/tests/POA/Generic_Servant/client.cpp6
-rw-r--r--TAO/tests/POA/Generic_Servant/client.dsp5
-rw-r--r--TAO/tests/POA/Generic_Servant/server.dsp13
-rw-r--r--TAO/tests/POA/NewPOA/NewPOA.cpp12
-rw-r--r--TAO/tests/POA/RootPOA/RootPOA.cpp6
8 files changed, 53 insertions, 22 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index e364d26b420..9f38663571b 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,24 @@
+Wed Jun 10 13:03:03 1998 Irfan Pyarali <irfan@cs.wustl.edu>
+
+ * tests/POA/Explicit_Activation/server.cpp,
+ tests/POA/Generic_Servant/client.cpp,
+ tests/POA/NewPOA/NewPOA.cpp, and tests/POA/RootPOA/RootPOA.cpp:
+ Use ACE_DEBUG instead of cout.
+
+ * tao/Server_Request.cpp (dsi_marshal): Only marshal if the params
+ are valid.
+
+ * tao/ORB_Core.h: Changed the lock used by
+ ACE_Cached_Connect_Strategy from a rw_mutex to a regular mutex.
+
+ * tao/ORB.cpp: Changed CORBA::B_TRUE and CORBA::B_FALSE from enums
+ to CORBA::Boolean.
+
+ * tao/{Connect.cpp, ORB.cpp}: Fixed the template instantiations in
+ lieu of the changes to Hash_Addr.
+
+ * tao/Any.h: Added ACE_Export to nested structs.
+
Wed Jun 10 10:28:31 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
* orbsvcs/orbsvcs/Event/Event_Channel.h:
diff --git a/TAO/tests/POA/Default_Servant/server.cpp b/TAO/tests/POA/Default_Servant/server.cpp
index 87f80689d52..7dcc447df3b 100644
--- a/TAO/tests/POA/Default_Servant/server.cpp
+++ b/TAO/tests/POA/Default_Servant/server.cpp
@@ -153,8 +153,8 @@ main (int argc, char **argv)
return -1;
}
- ACE_DEBUG((LM_DEBUG,"%s\n",
- file_system_ior.in ()));
+ ACE_DEBUG ((LM_DEBUG,"%s\n",
+ file_system_ior.in ()));
// set the state of the poa_manager to active i.e ready to process requests
poa_manager->activate (env);
diff --git a/TAO/tests/POA/Explicit_Activation/server.cpp b/TAO/tests/POA/Explicit_Activation/server.cpp
index 432f077ac67..1bb7c8be715 100644
--- a/TAO/tests/POA/Explicit_Activation/server.cpp
+++ b/TAO/tests/POA/Explicit_Activation/server.cpp
@@ -227,9 +227,11 @@ main (int argc, char **argv)
return -1;
}
- cout << first_ior.in () << endl;
- cout << second_ior.in () << endl;
- cout << third_ior.in () << endl;
+ ACE_DEBUG ((LM_DEBUG,
+ "%s\n%s\n%s\n",
+ first_ior.in (),
+ second_ior.in (),
+ third_ior.in ()));
// Activate thirdPOA using its ObjectID.
MyFooServant third_foo_impl (second_poa.in (), 29);
diff --git a/TAO/tests/POA/Generic_Servant/client.cpp b/TAO/tests/POA/Generic_Servant/client.cpp
index 18b75d1e86f..a985e2c0ddc 100644
--- a/TAO/tests/POA/Generic_Servant/client.cpp
+++ b/TAO/tests/POA/Generic_Servant/client.cpp
@@ -150,7 +150,9 @@ main (int argc, char **argv)
}
// Print the result of doit () method of the foo reference.
- cout << result << endl;
-
+ ACE_DEBUG ((LM_DEBUG,
+ "%d\n",
+ result));
+
return 0;
}
diff --git a/TAO/tests/POA/Generic_Servant/client.dsp b/TAO/tests/POA/Generic_Servant/client.dsp
index 4ee9d087ee9..226cde58559 100644
--- a/TAO/tests/POA/Generic_Servant/client.dsp
+++ b/TAO/tests/POA/Generic_Servant/client.dsp
@@ -99,7 +99,7 @@ InputName=Foo
BuildCmds= \
..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
+ -Wb,export_include=generic_servant_export.h $(InputName).idl
"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -122,13 +122,14 @@ BuildCmds= \
!ELSEIF "$(CFG)" == "client - Win32 Debug"
+USERDEP__FOO_I="..\..\..\tao_idl\tao_idl.exe"
# Begin Custom Build
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
+ -Wb,export_include=generic_servant_export.h $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/POA/Generic_Servant/server.dsp b/TAO/tests/POA/Generic_Servant/server.dsp
index abb9706bd3b..75bf578e9f8 100644
--- a/TAO/tests/POA/Generic_Servant/server.dsp
+++ b/TAO/tests/POA/Generic_Servant/server.dsp
@@ -57,9 +57,9 @@ LINK32=link.exe
# Begin Special Build Tool
SOURCE=$(InputPath)
PostBuild_Desc=Copying DLL to ..\Explicit_Activation and\
- ..\On_Demand_Activation
+ ..\On_Demand_Activation
PostBuild_Cmds=copy server.dll ..\Explicit_Activation copy server.dll\
- ..\On_Demand_Activation
+ ..\On_Demand_Activation
# End Special Build Tool
!ELSEIF "$(CFG)" == "server - Win32 Debug"
@@ -91,9 +91,9 @@ LINK32=link.exe
# Begin Special Build Tool
SOURCE=$(InputPath)
PostBuild_Desc=Copying DLL to ..\Explicit_Activation and\
- ..\On_Demand_Activation
+ ..\On_Demand_Activation
PostBuild_Cmds=copy server.dll ..\Explicit_Activation copy server.dll\
- ..\On_Demand_Activation
+ ..\On_Demand_Activation
# End Special Build Tool
!ENDIF
@@ -114,7 +114,7 @@ InputName=Foo
BuildCmds= \
..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
+ -Wb,export_include=generic_servant_export.h $(InputName).idl
"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -137,13 +137,14 @@ BuildCmds= \
!ELSEIF "$(CFG)" == "server - Win32 Debug"
+USERDEP__FOO_I="..\..\..\tao_idl\tao_idl.exe"
# Begin Custom Build
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
+ -Wb,export_include=generic_servant_export.h $(InputName).idl
"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/POA/NewPOA/NewPOA.cpp b/TAO/tests/POA/NewPOA/NewPOA.cpp
index a79381d0005..9d06f61532c 100644
--- a/TAO/tests/POA/NewPOA/NewPOA.cpp
+++ b/TAO/tests/POA/NewPOA/NewPOA.cpp
@@ -170,11 +170,13 @@ main (int argc, char **argv)
return -1;
}
- cout << root_poa_name.in () << endl;
- cout << first_poa_name.in () << endl;
- cout << second_poa_name.in () << endl;
- cout << fifth_poa_name.in () << endl;
-
+ ACE_DEBUG ((LM_DEBUG,
+ "%s\n%s\n%s\n%s\n",
+ root_poa_name.in (),
+ first_poa_name.in (),
+ second_poa_name.in (),
+ fifth_poa_name.in ()));
+
// This should destroy all its children
root_poa->destroy (CORBA::B_TRUE,
CORBA::B_TRUE,
diff --git a/TAO/tests/POA/RootPOA/RootPOA.cpp b/TAO/tests/POA/RootPOA/RootPOA.cpp
index d28918a8c84..7c1d7c83e46 100644
--- a/TAO/tests/POA/RootPOA/RootPOA.cpp
+++ b/TAO/tests/POA/RootPOA/RootPOA.cpp
@@ -62,8 +62,10 @@ main (int argc, char **argv)
return -1;
}
- cout << "The RootPOA is : " << poa_name.in () << endl;
-
+ ACE_DEBUG ((LM_DEBUG,
+ "The RootPOA is : %s\n",
+ poa_name.in ()));
+
// Destroy the POA object,also destroys the child POAs if any.
root_poa->destroy (CORBA::B_TRUE,
CORBA::B_TRUE,
View Lorry Controller Status