diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2002-08-21 06:09:53 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2002-08-21 06:09:53 +0000 |
| commit | b9836654489f2b5d9f4249b943204bf7daae620e (patch) | |
| tree | 9a50766be760cae09bac7f515713a8984affca01 | |
| parent | c2e3a45c40229f0ab3352b5e6e7b3cfc38ced0af (diff) | |
| download | ATCD-b9836654489f2b5d9f4249b943204bf7daae620e.tar.gz | |
ChangeLogTag: Wed Aug 21 07:52:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
55 files changed, 309 insertions, 60 deletions
diff --git a/ChangeLog b/ChangeLog index de3c81594be..58a42a3e03c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,51 @@ +Wed Aug 21 07:43:12 2002 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ATM_Addr.{h,i}: + Made the signature definition and implementation of set_selector() + and get_selector() the same. + + * ace/CDR_Stream.cpp: + Made the read_string() signature the same as in the definition + + * ace/config-doxygen.h: + Added ACE_HAS_XTI_ATM to the list of defines that must be set + when generating the doxygen documentation + + * ace/config-win32-mingw.h: + Added extern "C" around the win32api methods ace uses but which + are not defined in the mingw win32api. + + * ace/Lib_Find.cpp: + Made signature of ldfind method the same as in the definition + + * ace/Log_Record.cpp: + Made signature of print method the same as in the definition + + * ace/Multiplexor.i: + Added #ifdef 0/#endif around the contents of this file, because the + header and cpp file also do this. Doxygen parses now this .i file + and gives a lot of warnings about this file because it cannot find + the definition of the methods in this file. + + * ace/Configuration.h: + * ace/Containers_T.cpp: + * ace/Lib_Find.h: + * ace/OS.h: + * ace/RMCast/RMCast_Reliable_Factory.h: + * ace/RMCast/RMCast_UDP_Proxy.h: + Small improvements for doxygen documentation. + + * include/makeinclude/ace_flags.bor: + Added cflags and lib for TAO PSDL library + + * include/makeinclude/platform_mingw32.GNU: + MingW doesn't support the adding of the version number after + the .dll, so set SONAME and SOVERSION to empty. + + * examples/Connection/non_blocking/test_lsock_acceptor.cpp: + * examples/Connection/non_blocking/test_lsock_connector.cpp: + Added include of Log_Msg to fix compile errors with MingW + Tue Aug 20 14:19:55 2002 Jaiganesh@doc <bugzilla@cs.wustl.edu> * ACE version 5.2.4 released. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index de3c81594be..58a42a3e03c 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,51 @@ +Wed Aug 21 07:43:12 2002 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ATM_Addr.{h,i}: + Made the signature definition and implementation of set_selector() + and get_selector() the same. + + * ace/CDR_Stream.cpp: + Made the read_string() signature the same as in the definition + + * ace/config-doxygen.h: + Added ACE_HAS_XTI_ATM to the list of defines that must be set + when generating the doxygen documentation + + * ace/config-win32-mingw.h: + Added extern "C" around the win32api methods ace uses but which + are not defined in the mingw win32api. + + * ace/Lib_Find.cpp: + Made signature of ldfind method the same as in the definition + + * ace/Log_Record.cpp: + Made signature of print method the same as in the definition + + * ace/Multiplexor.i: + Added #ifdef 0/#endif around the contents of this file, because the + header and cpp file also do this. Doxygen parses now this .i file + and gives a lot of warnings about this file because it cannot find + the definition of the methods in this file. + + * ace/Configuration.h: + * ace/Containers_T.cpp: + * ace/Lib_Find.h: + * ace/OS.h: + * ace/RMCast/RMCast_Reliable_Factory.h: + * ace/RMCast/RMCast_UDP_Proxy.h: + Small improvements for doxygen documentation. + + * include/makeinclude/ace_flags.bor: + Added cflags and lib for TAO PSDL library + + * include/makeinclude/platform_mingw32.GNU: + MingW doesn't support the adding of the version number after + the .dll, so set SONAME and SOVERSION to empty. + + * examples/Connection/non_blocking/test_lsock_acceptor.cpp: + * examples/Connection/non_blocking/test_lsock_connector.cpp: + Added include of Log_Msg to fix compile errors with MingW + Tue Aug 20 14:19:55 2002 Jaiganesh@doc <bugzilla@cs.wustl.edu> * ACE version 5.2.4 released. diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f9693aacbdc..89f7bf3b691 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,22 @@ +Wed Aug 21 08:01:12 2002 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/PSS/PSDL.bor: + Added new BCB makefile + + * orbsvcs/Makefile.bor: + Added PSS directory + + * orbsvcs/tests/AVStreams/Component_Switching/*.bor: + * orbsvcs/tests/AVStreams/Full_Profile/server.bor: + * orbsvcs/tests/AVStreams/Multicast/*.bor: + * orbsvcs/tests/AVStreams/Multicast_Full_Profile/*.bor: + * orbsvcs/tests/AVStreams/Pluggable/*.bor: + * orbsvcs/tests/EC_Custom_Marshal/*.bor: + * orbsvcs/tests/EC_Mcast/Makefile.bor: + * orbsvcs/tests/EC_Throughput/*.bor: + * orbsvcs/tests/Event/Basic/*.bor: + Added missing libraries + Tue Aug 20 14:20:40 2002 Jaiganesh@doc <bugzilla@cs.wustl.edu> * TAO version 1.2.4 released. diff --git a/TAO/orbsvcs/Makefile.bor b/TAO/orbsvcs/Makefile.bor index 0fc481c4f3b..34417117cf9 100644 --- a/TAO/orbsvcs/Makefile.bor +++ b/TAO/orbsvcs/Makefile.bor @@ -4,6 +4,7 @@ DIRS = \ orbsvcs \ + PSS \ CosEvent_Service \ Event_Service \ IFR_Service \ diff --git a/TAO/orbsvcs/PSS/PSDL.bor b/TAO/orbsvcs/PSS/PSDL.bor new file mode 100644 index 00000000000..cc8b67ce304 --- /dev/null +++ b/TAO/orbsvcs/PSS/PSDL.bor @@ -0,0 +1,50 @@ +# +# Makefile for building the TAO PSDL library +# + +NAME = TAO_PSDL + +OBJFILES = \ + $(OBJDIR)\PSDL_Enum_Type_Visitor.obj \ + $(OBJDIR)\PSDL_Exception_Scope.obj \ + $(OBJDIR)\PSDL_Exception_Visitor.obj \ + $(OBJDIR)\PSDL_Extern.obj \ + $(OBJDIR)\PSDL_Interface_Scope.obj \ + $(OBJDIR)\PSDL_Interface_Visitor.obj \ + $(OBJDIR)\PSDL_Interpreter.obj \ + $(OBJDIR)\PSDL_l.obj \ + $(OBJDIR)\PSDL_Module_Scope.obj \ + $(OBJDIR)\PSDL_Module_Visitor.obj \ + $(OBJDIR)\PSDL_Node.obj \ + $(OBJDIR)\PSDL_Node_Visitor.obj \ + $(OBJDIR)\PSDL_Op_Dcl_Scope.obj \ + $(OBJDIR)\PSDL_Root_Scope.obj \ + $(OBJDIR)\PSDL_Scope.obj \ + $(OBJDIR)\PSDL_Scope_Visitor.obj \ + $(OBJDIR)\PSDL_Simple_Scope.obj \ + $(OBJDIR)\PSDL_Stream.obj \ + $(OBJDIR)\PSDL_Struct_Scope.obj \ + $(OBJDIR)\PSDL_Struct_Visitor.obj \ + $(OBJDIR)\PSDL_Type_Dcl_Visitor.obj \ + $(OBJDIR)\PSDL_Typecode_Defn.obj \ + $(OBJDIR)\PSDL_Visitor_Factory.obj \ + $(OBJDIR)\PSDL_y.obj + +CFLAGS = \ + $(ACE_CFLAGS) \ + $(TAO_CFLAGS) \ + $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_SVC_UTILS_CFLAGS) \ + $(TAO_PSDL_CFLAGS) \ + -DTAO_PSDL_BUILD_DLL + +CPPDIR = . + +LIBFILES = \ + $(ACE_LIB) \ + $(TAO_LIB) \ + $(TAO_PORTABLESERVER_LIB) \ + $(TAO_SVC_UTILS_LIB) \ + +!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor> + diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.bor b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.bor index 2d82974212b..77f77b761eb 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.bor +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.bor @@ -16,6 +16,7 @@ CFLAGS = \ $(TAO_PORTABLESERVER_CFLAGS) \ $(TAO_NAMING_CFLAGS) \ $(TAO_PROPERTY_CFLAGS) \ + $(TAO_IORTABLE_CFLAGS) \ $(TAO_AV_CFLAGS) LIBFILES = \ @@ -26,6 +27,7 @@ LIBFILES = \ $(TAO_PORTABLESERVER_LIB) \ $(TAO_NAMING_LIB) \ $(TAO_PROPERTY_LIB) \ + $(TAO_IORTABLE_LIB) \ $(TAO_AV_LIB) CPPDIR = .;.. diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.bor b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.bor index 4c3c1c8ad02..e4eb5633a3f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.bor +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.bor @@ -17,6 +17,7 @@ CFLAGS = \ $(TAO_PORTABLESERVER_CFLAGS) \ $(TAO_NAMING_CFLAGS) \ $(TAO_PROPERTY_CFLAGS) \ + $(TAO_IORTABLE_CFLAGS) \ $(TAO_AV_CFLAGS) LIBFILES = \ @@ -27,6 +28,7 @@ LIBFILES = \ $(TAO_PORTABLESERVER_LIB) \ $(TAO_NAMING_LIB) \ $(TAO_PROPERTY_LIB) \ + $(TAO_IORTABLE_LIB) \ $(TAO_AV_LIB) CPPDIR = .;.. diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.bor b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.bor index dccd8ebdbd8..9dfe14148ba 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.bor +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.bor @@ -1,3 +1,4 @@ + # # Makefile for building the avstreams component_switching test # @@ -16,6 +17,7 @@ CFLAGS = \ $(TAO_PORTABLESERVER_CFLAGS) \ $(TAO_NAMING_CFLAGS) \ $(TAO_PROPERTY_CFLAGS) \ + $(TAO_IORTABLE_CFLAGS) \ $(TAO_AV_CFLAGS) LIBFILES = \ @@ -26,6 +28,7 @@ LIBFILES = \ $(TAO_PORTABLESERVER_LIB) \ $(TAO_NAMING_LIB) \ $(TAO_PROPERTY_LIB) \ + $(TAO_IORTABLE_LIB) \ $(TAO_AV_LIB) CPPDIR = .;.. diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.bor b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.bor index e1651544038..ef4168c7d9d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.bor +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.bor @@ -14,6 +14,7 @@ CFLAGS = \ $(TAO_PORTABLESERVER_CFLAGS) \ $(TAO_NAMING_CFLAGS) \ $(TAO_PROPERTY_CFLAGS) \ + $(TAO_IORTABLE_CFLAGS) \ $(TAO_AV_CFLAGS) LIBFILES = \ @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_PORTABLESERVER_LIB) \ $(TAO_NAMING_LIB) \ $(TAO_PROPERTY_LIB) \ + $(TAO_IORTABLE_LIB) \ $(TAO_AV_LIB) CPPDIR = .;.. diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.bor b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.bor index 78db25aacdc..d41eea33d59 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.bor +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.bor @@ -15,6 +15,7 @@ CFLAGS = \ $(TAO_STRATEGIES_CFLAGS) \ $(TAO_NAMING_CFLAGS) \ $(TAO_PROPERTY_CFLAGS) \ + $(TAO_IORTABLE_CFLAGS) \ $(TAO_AV_CFLAGS) LIBFILES = \ @@ -25,6 +26,7 @@ LIBFILES = \ $(TAO_STRATEGIES_LIB) \ $(TAO_NAMING_LIB) \ $(TAO_PROPERTY_LIB) \ + $(TAO_IORTABLE_LIB) \ $(TAO_AV_LIB) CPPDIR = .;.. diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.bor b/TAO/orbsvcs/tests/AVStreams/Multicast/server.bor index 852b09c5956..122e5c05aad 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.bor +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.bor @@ -15,6 +15,7 @@ CFLAGS = \ $(TAO_STRATEGIES_CFLAGS) \ $(TAO_NAMING_CFLAGS) \ $(TAO_PROPERTY_CFLAGS) \ + $(TAO_IORTABLE_CFLAGS) \ $(TAO_AV_CFLAGS) LIBFILES = \ @@ -25,6 +26,7 @@ LIBFILES = \ $(TAO_STRATEGIES_LIB) \ $(TAO_NAMING_LIB) \ $(TAO_PROPERTY_LIB) \ + $(TAO_IORTABLE_LIB) \ $(TAO_AV_LIB) CPPDIR = .;.. diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.bor b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.bor index 895badb3e97..177fe6c578d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.bor +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.bor @@ -14,15 +14,17 @@ CFLAGS = \ $(TAO_PORTABLESERVER_CFLAGS) \ $(TAO_NAMING_CFLAGS) \ $(TAO_PROPERTY_CFLAGS) \ + $(TAO_IORTABLE_CFLAGS) \ $(TAO_AV_CFLAGS) LIBFILES = \ $(ACE_LIB) \ - $(ACE_QOS_CFLAGS) \ + $(ACE_QOS_LIB) \ $(TAO_LIB) \ $(TAO_PORTABLESERVER_LIB) \ $(TAO_NAMING_LIB) \ $(TAO_PROPERTY_LIB) \ + $(TAO_IORTABLE_LIB) \ $(TAO_AV_LIB) CPPDIR = .;.. diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.bor b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.bor index 2ee623f5904..eea4519c553 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.bor +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.bor @@ -14,6 +14,7 @@ CFLAGS = \ $(TAO_PORTABLESERVER_CFLAGS) \ $(TAO_NAMING_CFLAGS) \ $(TAO_PROPERTY_CFLAGS) \ + $(TAO_IORTABLE_CFLAGS) \ $(TAO_AV_CFLAGS) LIBFILES = \ @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_PORTABLESERVER_LIB) \ $(TAO_NAMING_LIB) \ $(TAO_PROPERTY_LIB) \ + $(TAO_IORTABLE_LIB) \ $(TAO_AV_LIB) CPPDIR = .;.. diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.bor b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.bor index 94b8366b741..70cf24106e4 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.bor +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.bor @@ -10,18 +10,22 @@ OBJFILES = \ CFLAGS = \ $(ACE_CFLAGS) \ + $(ACE_QOS_CFLAGS) \ $(TAO_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ $(TAO_NAMING_CFLAGS) \ $(TAO_PROPERTY_CFLAGS) \ + $(TAO_IORTABLE_CFLAGS) \ $(TAO_AV_CFLAGS) LIBFILES = \ $(ACE_LIB) \ + $(ACE_QOS_LIB) \ $(TAO_LIB) \ $(TAO_PORTABLESERVER_LIB) \ $(TAO_NAMING_LIB) \ $(TAO_PROPERTY_LIB) \ + $(TAO_IORTABLE_LIB) \ $(TAO_AV_LIB) CPPDIR = .;.. diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.bor b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.bor index 7960db16eec..f87251fb045 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.bor +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.bor @@ -9,18 +9,22 @@ OBJFILES = \ CFLAGS = \ $(ACE_CFLAGS) \ + $(ACE_QOS_CFLAGS) \ $(TAO_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ $(TAO_NAMING_CFLAGS) \ $(TAO_PROPERTY_CFLAGS) \ + $(TAO_IORTABLE_CFLAGS) \ $(TAO_AV_CFLAGS) LIBFILES = \ $(ACE_LIB) \ + $(ACE_QOS_LIB) \ $(TAO_LIB) \ $(TAO_PORTABLESERVER_LIB) \ $(TAO_NAMING_LIB) \ $(TAO_PROPERTY_LIB) \ + $(TAO_IORTABLE_LIB) \ $(TAO_AV_LIB) CPPDIR = .;.. diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.bor b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.bor index 7d0fd596c61..2d1715bffb5 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.bor +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.bor @@ -18,6 +18,7 @@ CFLAGS = \ $(TAO_NAMING_CFLAGS) \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -28,6 +29,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.bor b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.bor index abf3a0731fa..6cd2e48b161 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.bor +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.bor @@ -18,6 +18,7 @@ CFLAGS = \ $(TAO_NAMING_CFLAGS) \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -28,6 +29,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.bor b/TAO/orbsvcs/tests/EC_Mcast/Makefile.bor index 8e513473aac..d2b7cbf495a 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.bor +++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -22,6 +23,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.bor b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.bor index dfabcdabce9..d520daa653c 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.bor +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.bor @@ -16,6 +16,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -26,6 +27,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.bor b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.bor index 09adffe2e1f..0e96b0dc7c7 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.bor +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.bor @@ -16,6 +16,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -26,6 +27,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.bor b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.bor index 76ddfe551b7..03e2c891732 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.bor +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.bor @@ -18,6 +18,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -29,6 +30,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.bor b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.bor index 04ca51d6d52..086d4d7f638 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.bor +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.bor b/TAO/orbsvcs/tests/Event/Basic/BCast.bor index 3370153de12..4d7dd5f70e1 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.bor +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.bor b/TAO/orbsvcs/tests/Event/Basic/Bitmask.bor index b09f1fe0132..d2937c735c7 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.bor +++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.bor b/TAO/orbsvcs/tests/Event/Basic/Complex.bor index 4b9dc2459a1..1e751550824 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Complex.bor +++ b/TAO/orbsvcs/tests/Event/Basic/Complex.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.bor b/TAO/orbsvcs/tests/Event/Basic/Control.bor index 4dc8a09bad6..69856c072b8 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.bor +++ b/TAO/orbsvcs/tests/Event/Basic/Control.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.bor b/TAO/orbsvcs/tests/Event/Basic/Disconnect.bor index 1e232cb4af3..513efa8717b 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.bor +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.bor b/TAO/orbsvcs/tests/Event/Basic/Gateway.bor index 4a58df38e2a..940ff043d3b 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.bor +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.bor b/TAO/orbsvcs/tests/Event/Basic/Negation.bor index 4f2daaba1c9..8cc3ce7ab82 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.bor +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.bor b/TAO/orbsvcs/tests/Event/Basic/Observer.bor index 04e997e4676..fe685126fc5 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.bor +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.bor b/TAO/orbsvcs/tests/Event/Basic/Random.bor index 7de852e31a3..52f627225fc 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.bor +++ b/TAO/orbsvcs/tests/Event/Basic/Random.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.bor b/TAO/orbsvcs/tests/Event/Basic/Reconnect.bor index 62f3ada134f..847ab11b19e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.bor +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.bor b/TAO/orbsvcs/tests/Event/Basic/Shutdown.bor index e988773f3fe..0ff8c07f9ba 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.bor +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.bor b/TAO/orbsvcs/tests/Event/Basic/Timeout.bor index 04a3de620c0..e54e0111f63 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Timeout.bor +++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.bor b/TAO/orbsvcs/tests/Event/Basic/Wildcard.bor index 5b205a58c2c..1a2b82b7141 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.bor +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.bor @@ -13,6 +13,7 @@ CFLAGS = \ $(TAO_SVC_UTILS_CFLAGS) \ $(TAO_IORTABLE_CFLAGS) \ $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ $(TAO_CFLAGS) \ $(ACE_CFLAGS) @@ -23,6 +24,7 @@ LIBFILES = \ $(TAO_SVC_UTILS_LIB) \ $(TAO_IORTABLE_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_MESSAGING_LIB) \ $(TAO_LIB) \ $(ACE_LIB) diff --git a/ace/ATM_Addr.h b/ace/ATM_Addr.h index 47711e2e767..df658bc1d28 100644 --- a/ace/ATM_Addr.h +++ b/ace/ATM_Addr.h @@ -149,7 +149,7 @@ public: u_char get_selector (void) const; /// Set the selector for the network address. - void set_selector (u_char); + void set_selector (u_char selector); /** * Compare two addresses for equality. The addresses are considered diff --git a/ace/ATM_Addr.i b/ace/ATM_Addr.i index 4b588c8faa7..41bb6c27193 100644 --- a/ace/ATM_Addr.i +++ b/ace/ATM_Addr.i @@ -17,7 +17,7 @@ ACE_ATM_Addr::get_addr (void) const return (void *) &this->atm_addr_; } -ACE_INLINE unsigned char +ACE_INLINE u_char ACE_ATM_Addr::get_selector (void) const { ACE_TRACE ("ACE_ATM_Addr::get_selector"); @@ -33,7 +33,7 @@ ACE_ATM_Addr::get_selector (void) const } ACE_INLINE void -ACE_ATM_Addr::set_selector (unsigned char selector) +ACE_ATM_Addr::set_selector (u_char selector) { ACE_TRACE ("ACE_ATM_Addr::set_selector"); #if defined (ACE_HAS_FORE_ATM_XTI) diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp index 5c6ecbcfcb6..ead194c1881 100644 --- a/ace/CDR_Stream.cpp +++ b/ace/CDR_Stream.cpp @@ -834,7 +834,7 @@ ACE_InputCDR::read_wchar (ACE_CDR::WChar& x) } ACE_CDR::Boolean -ACE_InputCDR::read_string (char *&x) +ACE_InputCDR::read_string (ACE_CDR::Char *&x) { // @@ This is a slight violation of "Optimize for the common case", // i.e. normally the translator will be 0, but OTOH the code is diff --git a/ace/Configuration.h b/ace/Configuration.h index bd2ab7d8342..6f86b70e55b 100644 --- a/ace/Configuration.h +++ b/ace/Configuration.h @@ -469,12 +469,12 @@ public: int recursive); virtual int enumerate_values (const ACE_Configuration_Section_Key& key, - int Index, + int index, ACE_TString& name, VALUETYPE& type); virtual int enumerate_sections (const ACE_Configuration_Section_Key& key, - int Index, + int index, ACE_TString& name); virtual int set_string_value (const ACE_Configuration_Section_Key& key, @@ -792,12 +792,12 @@ public: int recursive); virtual int enumerate_values (const ACE_Configuration_Section_Key& key, - int Index, + int index, ACE_TString& name, VALUETYPE& type); virtual int enumerate_sections (const ACE_Configuration_Section_Key& key, - int Index, + int index, ACE_TString& name); virtual int set_string_value (const ACE_Configuration_Section_Key& key, @@ -847,7 +847,7 @@ private: /// Helper for the <open> method. int create_index (void); - /// Helper for <create_index> method: places hash table into an + /// Helper for create_index() method: places hash table into an /// allocated space. int create_index_helper (void *buffer); diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp index 471e8cb2356..78a0f3666b2 100644 --- a/ace/Containers_T.cpp +++ b/ace/Containers_T.cpp @@ -99,7 +99,7 @@ ACE_Fixed_Stack<T, ACE_SIZE>::ACE_Fixed_Stack (void) template<class T, size_t ACE_SIZE> ACE_Fixed_Stack<T, ACE_SIZE>::ACE_Fixed_Stack (const ACE_Fixed_Stack<T, ACE_SIZE> &s) : size_ (s.size_), - top_ (s.top_) + top_ (s.top_) { ACE_TRACE ("ACE_Fixed_Stack<T, ACE_SIZE>::ACE_Fixed_Stack"); for (size_t i = 0; i < this->top_; i++) @@ -1519,12 +1519,12 @@ ACE_Ordered_MultiSet<T>::insert (const T &item) } template <class T> int -ACE_Ordered_MultiSet<T>::insert (const T &item, +ACE_Ordered_MultiSet<T>::insert (const T &new_item, ACE_Ordered_MultiSet_Iterator<T> &iter) { // ACE_TRACE ("ACE_Ordered_MultiSet<T>::insert using iterator"); - return this->insert_from (item, iter.current_, &iter.current_); + return this->insert_from (new_item, iter.current_, &iter.current_); } template <class T> int diff --git a/ace/Lib_Find.cpp b/ace/Lib_Find.cpp index f92f343ee12..86b95ba2a94 100644 --- a/ace/Lib_Find.cpp +++ b/ace/Lib_Find.cpp @@ -8,7 +8,7 @@ ACE_RCSID(ace, Lib_Find, "$Id$") #if ! defined (ACE_PSOS_DIAB_MIPS) int -ACE_Lib_Find::ldfind (const ACE_TCHAR filename[], +ACE_Lib_Find::ldfind (const ACE_TCHAR* filename, ACE_TCHAR pathname[], size_t maxpathnamelen) { diff --git a/ace/Lib_Find.h b/ace/Lib_Find.h index adb8dffb9e4..3b5370ef252 100644 --- a/ace/Lib_Find.h +++ b/ace/Lib_Find.h @@ -36,9 +36,9 @@ class ACE_Export ACE_Lib_Find * prefix (e.g., "lib" on UNIX and "" on Win32) if the <filename> * doesn't match directly. */ - static int ldfind (const ACE_TCHAR *filename, - ACE_TCHAR *pathname, - size_t maxlen); + static int ldfind (const ACE_TCHAR* filename, + ACE_TCHAR pathname[], + size_t maxpathnamelen); /** * Uses <ldfind> to locate and open the appropriate <filename> and diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp index 53c7cd273a7..a5017e01f1f 100644 --- a/ace/Log_Record.cpp +++ b/ace/Log_Record.cpp @@ -159,7 +159,7 @@ ACE_Log_Record::ACE_Log_Record (void) } int -ACE_Log_Record::format_msg (const ACE_TCHAR *host_name, +ACE_Log_Record::format_msg (const ACE_TCHAR host_name[], u_long verbose_flag, ACE_TCHAR *verbose_msg) { @@ -225,7 +225,7 @@ ACE_Log_Record::format_msg (const ACE_TCHAR *host_name, } int -ACE_Log_Record::print (const ACE_TCHAR *host_name, +ACE_Log_Record::print (const ACE_TCHAR host_name[], u_long verbose_flag, FILE *fp) { @@ -255,7 +255,7 @@ ACE_Log_Record::print (const ACE_TCHAR *host_name, #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) int -ACE_Log_Record::print (const ACE_TCHAR *host_name, +ACE_Log_Record::print (const ACE_TCHAR host_name[], u_long verbose_flag, ostream &s) { diff --git a/ace/Multiplexor.i b/ace/Multiplexor.i index 1763c13ab4c..18e022ac911 100644 --- a/ace/Multiplexor.i +++ b/ace/Multiplexor.i @@ -2,8 +2,9 @@ // $Id$ // Multiplexor.i +#if 0 -int +int Driver::link_from_below (ACE_Module *stream_head) { ACE_TRACE ("Driver::link_from_below"); @@ -19,7 +20,7 @@ Driver::link_from_below (ACE_Module *stream_head) return 0; } -int +int Driver::unlink_from_below (ACE_Module *) { ACE_TRACE ("Driver::unlink_from_below"); @@ -36,21 +37,21 @@ ACE_Multiplexor::~ACE_Multiplexor (void) ACE_TRACE ("ACE_Multiplexor::~ACE_Multiplexor"); } -int +int ACE_Multiplexor::link_from_above (Driver &ld) { ACE_TRACE ("ACE_Multiplexor::link_from_above"); return ld.link_from_below (this->alloc_lower_module (this)); } -int +int ACE_Multiplexor::link_from_above (ACE_Multiplexor &lm) { ACE_TRACE ("ACE_Multiplexor::link_from_above"); return lm.link_from_below (this->alloc_lower_module (this)); } -int +int ACE_Multiplexor::link_from_below (ACE_Module *stream_head) { ACE_TRACE ("ACE_Multiplexor::link_from_below"); @@ -66,23 +67,25 @@ ACE_Multiplexor::link_from_below (ACE_Module *stream_head) return 0; } -int +int ACE_Multiplexor::unlink_from_above (Driver &) { ACE_TRACE ("ACE_Multiplexor::unlink_from_above"); return -1; } -int +int ACE_Multiplexor::unlink_from_above (ACE_Multiplexor &) { ACE_TRACE ("ACE_Multiplexor::unlink_from_above"); return -1; } -int +int ACE_Multiplexor::unlink_from_below (ACE_Module *) { ACE_TRACE ("ACE_Multiplexor::unlink_from_below"); return -1; } + +#endif /* 0 */ @@ -4785,13 +4785,6 @@ public: static void abort (void); static pid_t fork (void); - //@{ - /// Forks and exec's a process in a manner that works on Solaris and - /// NT. argv[0] must be the full path name to the executable. - static pid_t fork (const ACE_TCHAR *program_name); - static pid_t fork_exec (ACE_TCHAR *argv[]); - //@} - static int getpagesize (void); static int allocation_granularity (void); @@ -4809,6 +4802,13 @@ public: static int system (const ACE_TCHAR *s); //@} + //@{ + /// Forks and exec's a process in a manner that works on Solaris and + /// NT. argv[0] must be the full path name to the executable. + static pid_t fork (const ACE_TCHAR *program_name); + static pid_t fork_exec (ACE_TCHAR *argv[]); + //@} + /** * Calls <::waitpid> on UNIX/POSIX platforms and <::await> on * Chorus. Does not work on Vxworks, or pSoS. diff --git a/ace/RMCast/RMCast_Reliable_Factory.h b/ace/RMCast/RMCast_Reliable_Factory.h index e41c7fd9e74..ee18b03f44a 100644 --- a/ace/RMCast/RMCast_Reliable_Factory.h +++ b/ace/RMCast/RMCast_Reliable_Factory.h @@ -36,14 +36,14 @@ class ACE_RMCast_Export ACE_RMCast_Reliable_Factory : public ACE_RMCast_Module_F { public: /// Constructor - /** - * The create() method will return always \param reliable. - */ ACE_RMCast_Reliable_Factory (ACE_RMCast_Module_Factory *factory); //! Destructor virtual ~ACE_RMCast_Reliable_Factory (void); + /** + * The create() method will return always \param reliable. + */ virtual ACE_RMCast_Module *create (void); virtual void destroy (ACE_RMCast_Module *); diff --git a/ace/RMCast/RMCast_UDP_Proxy.h b/ace/RMCast/RMCast_UDP_Proxy.h index f1a7f77a25a..29e9816168d 100644 --- a/ace/RMCast/RMCast_UDP_Proxy.h +++ b/ace/RMCast/RMCast_UDP_Proxy.h @@ -60,7 +60,7 @@ public: //@{ /** * Implement the ACE_RMCast_Proxy methods, in this case we use the - * \param io_udp_ object to send the data, using the address of our + * @var io_udp_ object to send the data, using the address of our * remote peer. */ virtual int reply_data (ACE_RMCast::Data &); diff --git a/ace/config-doxygen.h b/ace/config-doxygen.h index edbe5581877..b79df2325d6 100644 --- a/ace/config-doxygen.h +++ b/ace/config-doxygen.h @@ -88,4 +88,7 @@ /// Generate ACE ATM classes documentation #define ACE_HAS_ATM +/// Generate ACE XTI ATM class documentation +#define ACE_HAS_XTI_ATM + #endif /* ACE_CONFIG_DOXYGEN_H */ diff --git a/ace/config-win32-mingw.h b/ace/config-win32-mingw.h index db5d8cee478..af590f6003b 100644 --- a/ace/config-win32-mingw.h +++ b/ace/config-win32-mingw.h @@ -66,26 +66,30 @@ // The MingW32 w32api version 1.50 and lower don't define these types and methods // but we need it in the Win32_Asynch_IO.cpp -typedef void *PVOID,*LPVOID; +extern "C" { -/* FIXME for __WIN64 */ -#ifndef __ptr64 -#define __ptr64 -#endif -typedef void* __ptr64 PVOID64; + typedef void *PVOID,*LPVOID; + + /* FIXME for __WIN64 */ + #ifndef __ptr64 + #define __ptr64 + #endif + typedef void* __ptr64 PVOID64; + + // + // Define segement buffer structure for scatter/gather read/write. + // + typedef union _FILE_SEGMENT_ELEMENT { + PVOID64 Buffer; + ULONGLONG Alignment; + }FILE_SEGMENT_ELEMENT, *PFILE_SEGMENT_ELEMENT; -// -// Define segement buffer structure for scatter/gather read/write. -// -typedef union _FILE_SEGMENT_ELEMENT { - PVOID64 Buffer; - ULONGLONG Alignment; -}FILE_SEGMENT_ELEMENT, *PFILE_SEGMENT_ELEMENT; + BOOL WINAPI ReadFileScatter(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED); -BOOL WINAPI ReadFileScatter(HANDLE,FILE_SEGMENT_ELEMENT[],DWORD,LPDWORD,LPOVERLAPPED); + BOOL WINAPI WriteFileGather(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED); +} -BOOL WINAPI WriteFileGather(HANDLE,FILE_SEGMENT_ELEMENT[],DWORD,LPDWORD,LPOVERLAPPED); #endif #include "ace/post.h" diff --git a/examples/Connection/non_blocking/test_lsock_acceptor.cpp b/examples/Connection/non_blocking/test_lsock_acceptor.cpp index ddf0de2a823..916f3930b96 100644 --- a/examples/Connection/non_blocking/test_lsock_acceptor.cpp +++ b/examples/Connection/non_blocking/test_lsock_acceptor.cpp @@ -3,6 +3,7 @@ // ACE_LSOCK Server. #include "ace/LSOCK_Acceptor.h" +#include "ace/Log_Msg.h" #if defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) int diff --git a/examples/Connection/non_blocking/test_lsock_connector.cpp b/examples/Connection/non_blocking/test_lsock_connector.cpp index a65867fb701..e38f7bf86ea 100644 --- a/examples/Connection/non_blocking/test_lsock_connector.cpp +++ b/examples/Connection/non_blocking/test_lsock_connector.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/LSOCK_Connector.h" +#include "ace/Log_Msg.h" #if defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) int diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor index 13b82b65967..46e76d8c78c 100644 --- a/include/makeinclude/ace_flags.bor +++ b/include/makeinclude/ace_flags.bor @@ -69,6 +69,7 @@ TAO_TRADING_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_TRADING_HAS_DLL=$(DLL_FLAG) TAO_PORTABLEGROUP_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_PORTABLEGROUP_HAS_DLL=$(DLL_FLAG) TAO_ETCL_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_ETCL_HAS_DLL=$(DLL_FLAG) TAO_IFRSERVICE_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_IFRSERVICE_HAS_DLL=$(DLL_FLAG) +TAO_PSDL_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_PSDL_HAS_DLL=$(DLL_FLAG) # # Libraries @@ -123,6 +124,7 @@ TAO_TRADING_LIB = $(CORE_BINDIR)\TAO_CosTrading$(LIB_DECORATOR).lib TAO_PORTABLEGROUP_LIB = $(CORE_BINDIR)\TAO_PortableGroup$(LIB_DECORATOR).lib TAO_ETCL_LIB = $(CORE_BINDIR)\TAO_ETCL$(LIB_DECORATOR).lib TAO_IFRSERVICE_LIB = $(CORE_BINDIR)\TAO_IFRService$(LIB_DECORATOR).lib +TAO_PSDL_LIB = $(CORE_BINDIR)\TAO_PSDL$(LIB_DECORATOR).lib # # Compiler flags tests diff --git a/include/makeinclude/platform_mingw32.GNU b/include/makeinclude/platform_mingw32.GNU index 800877565f8..8ab17f325d1 100644 --- a/include/makeinclude/platform_mingw32.GNU +++ b/include/makeinclude/platform_mingw32.GNU @@ -1,7 +1,7 @@ # $Id$ # This file should allow to build ACE for mingw32 with mingw tools. -# Edit to change TCPU and M32_BASE below. +# Edit to change TCPU and MINGW_BASE below. # # Don't forget to define the ACE_ROOT environment variable! @@ -50,6 +50,10 @@ ifndef MINGW_BASE MINGW_BASE = c:/live/local/mingw32 endif -mingw32 = 1 +# MingW doesn't allow to add the version number of ACE to the dll name +# because fe ace.dll.5.2.3 isn't a valid dll name +SONAME= +SOVERSION= +mingw32 = 1 include $(ACE_ROOT)/include/makeinclude/platform_gnuwin32_common.GNU diff --git a/protocols/ace/RMCast/RMCast_Reliable_Factory.h b/protocols/ace/RMCast/RMCast_Reliable_Factory.h index e41c7fd9e74..ee18b03f44a 100644 --- a/protocols/ace/RMCast/RMCast_Reliable_Factory.h +++ b/protocols/ace/RMCast/RMCast_Reliable_Factory.h @@ -36,14 +36,14 @@ class ACE_RMCast_Export ACE_RMCast_Reliable_Factory : public ACE_RMCast_Module_F { public: /// Constructor - /** - * The create() method will return always \param reliable. - */ ACE_RMCast_Reliable_Factory (ACE_RMCast_Module_Factory *factory); //! Destructor virtual ~ACE_RMCast_Reliable_Factory (void); + /** + * The create() method will return always \param reliable. + */ virtual ACE_RMCast_Module *create (void); virtual void destroy (ACE_RMCast_Module *); diff --git a/protocols/ace/RMCast/RMCast_UDP_Proxy.h b/protocols/ace/RMCast/RMCast_UDP_Proxy.h index f1a7f77a25a..29e9816168d 100644 --- a/protocols/ace/RMCast/RMCast_UDP_Proxy.h +++ b/protocols/ace/RMCast/RMCast_UDP_Proxy.h @@ -60,7 +60,7 @@ public: //@{ /** * Implement the ACE_RMCast_Proxy methods, in this case we use the - * \param io_udp_ object to send the data, using the address of our + * @var io_udp_ object to send the data, using the address of our * remote peer. */ virtual int reply_data (ACE_RMCast::Data &); |