diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-12-04 12:34:54 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-12-04 12:34:54 +0000 |
| commit | 9acaf176a0019401c833a42fdc9a5cb27d01f60c (patch) | |
| tree | 3217b2216b825b3e018203b353e25f2a6b6d6ed7 | |
| parent | 5ef879d29b98620cf27b3439e8f094001f577e0d (diff) | |
| download | ATCD-9acaf176a0019401c833a42fdc9a5cb27d01f60c.tar.gz | |
*** empty log message ***
98 files changed, 1034 insertions, 809 deletions
diff --git a/ASNMP/asnmp/Makefile b/ASNMP/asnmp/Makefile index a9adbcfd586..cdf97cfc908 100644 --- a/ASNMP/asnmp/Makefile +++ b/ASNMP/asnmp/Makefile @@ -64,7 +64,7 @@ CCFLAGS += -I$(ACE_ROOT)/ASNMP/ address.o: address.cpp /home/cs/guest/mrm/ASNMP/asnmp/address.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -79,7 +79,7 @@ address.o: address.cpp /home/cs/guest/mrm/ASNMP/asnmp/address.h \ asn1.o: asn1.cpp /home/cs/guest/mrm/ASNMP/asnmp/asn1.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -153,7 +153,7 @@ counter.o: counter.cpp /home/cs/guest/mrm/ASNMP/asnmp/counter.h \ /home/cs/guest/mrm/ASNMP/asnmp/smi.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -168,7 +168,7 @@ ctr64.o: ctr64.cpp /home/cs/guest/mrm/ASNMP/asnmp/ctr64.h \ /home/cs/guest/mrm/ASNMP/asnmp/smi.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -183,7 +183,7 @@ gauge.o: gauge.cpp /home/cs/guest/mrm/ASNMP/asnmp/gauge.h \ /home/cs/guest/mrm/ASNMP/asnmp/smi.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -197,7 +197,7 @@ integer.o: integer.cpp /home/cs/guest/mrm/ASNMP/asnmp/integer.h \ /home/cs/guest/mrm/ASNMP/asnmp/smi.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -209,7 +209,7 @@ integer.o: integer.cpp /home/cs/guest/mrm/ASNMP/asnmp/integer.h \ octet.o: octet.cpp \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -224,7 +224,7 @@ octet.o: octet.cpp \ oid.o: oid.cpp /home/cs/guest/mrm/ASNMP/asnmp/oid.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -241,7 +241,7 @@ pdu.o: pdu.cpp /home/cs/guest/mrm/ASNMP/asnmp/snmp.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -312,7 +312,7 @@ snmp.o: snmp.cpp /home/cs/guest/mrm/ASNMP/asnmp/snmp.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -386,7 +386,7 @@ target.o: target.cpp /home/cs/guest/mrm/ASNMP/asnmp/target.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -408,7 +408,7 @@ timetick.o: timetick.cpp /home/cs/guest/mrm/ASNMP/asnmp/timetick.h \ /home/cs/guest/mrm/ASNMP/asnmp/smi.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -423,7 +423,7 @@ transaction.o: transaction.cpp \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -495,7 +495,7 @@ transaction.o: transaction.cpp \ vb.o: vb.cpp /home/cs/guest/mrm/ASNMP/asnmp/oid.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -518,7 +518,7 @@ vb.o: vb.cpp /home/cs/guest/mrm/ASNMP/asnmp/oid.h \ wpdu.o: wpdu.cpp /home/cs/guest/mrm/ASNMP/asnmp/wpdu.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ diff --git a/ASNMP/tests/Makefile b/ASNMP/tests/Makefile index bb262771b08..cb45092ebec 100644 --- a/ASNMP/tests/Makefile +++ b/ASNMP/tests/Makefile @@ -51,7 +51,7 @@ Address_Test.o: Address_Test.cpp \ /home/cs/guest/mrm/ASNMP/asnmp/address.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -68,7 +68,7 @@ Address_Test.o: Address_Test.cpp \ Counter64_Test.o: Counter64_Test.cpp \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -85,7 +85,7 @@ Counter64_Test.o: Counter64_Test.cpp \ Counter_Test.o: Counter_Test.cpp \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -103,7 +103,7 @@ Counter_Test.o: Counter_Test.cpp \ Gauge_Test.o: Gauge_Test.cpp \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -121,7 +121,7 @@ Gauge_Test.o: Gauge_Test.cpp \ Integer_Test.o: Integer_Test.cpp \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -138,7 +138,7 @@ Integer_Test.o: Integer_Test.cpp \ Octet_Test.o: Octet_Test.cpp \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -155,7 +155,7 @@ Octet_Test.o: Octet_Test.cpp \ Oid_Test.o: Oid_Test.cpp \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -172,7 +172,7 @@ Oid_Test.o: Oid_Test.cpp \ Target_Test.o: Target_Test.cpp \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ @@ -196,7 +196,7 @@ Target_Test.o: Target_Test.cpp \ Varbind_Test.o: Varbind_Test.cpp \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \ - /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \ + /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/streams.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \ diff --git a/ChangeLog-98a b/ChangeLog-98a index 29e9cb6c4bb..62e97f18874 100644 --- a/ChangeLog-98a +++ b/ChangeLog-98a @@ -1,26 +1,118 @@ Thu Dec 04 03:46:04 1997 <irfan@TWOSTEP> + * ace/Makefile (Svc_Conf_l.cpp): Changed the sed macros to produce + OS.h include instead of stdcpp.h. + + * ace/Svc_Conf_l.cpp: Updated after code was regenerated using the + new sed changes in the Makefiles. Currently there are two + inclusions of OS.h in this file and an extra stdlib.h. Maybe + someone more experienced in sed can take these out by updating + the Makefile. + + * ace/IOStream_T.h (stdcpp.h): Removed inclusion of stdcpp.h. It + is redundant because IOStream.h includes it. + + * ace/streams.h: New file. This files tries to reduce the + differences between the old and new stream libraries for the + user. This is done by automatically selecting the correct + includes depending on the ACE_HAS_STANDARD_CPP_LIBRARY variable. + This file also helps out by making commonly used classes (e.g., + ios, ostream, iostream, cin, cout, etc) available in the global + name space when used with the Standard C++ Library. Use this + file where you would usually include <iostream.h> or <iostream>. + + * ace/iosfwd.h: New file. This files deals with forward + declaration for the stream classes. Remember that since the new + Standard C++ Library uses templates for the implementation of + the streams, simple forward declaration will not work. Classes + forward declared by this class include: + + ios + streambuf + istream + ostream + iostream + filebuf + ifstream + ofstream + fstream + + Use this file where you would usually forward declare the + classes listed above. + + * ace/stdcpp.h: Removed this file from the repository. This file + was trying to do too much. All the inclusion of the C Library + headers were unnecessary. This is because the new C++ standard + preserves the old C library include files. The functions from + those files will still be in the global namescape. The new + header files (e.g., cstdio), provides the same prototypes as the + old files (e.g., stdio.h), except that all prototypes are in the + std namespace. Since we want the old behavior and global + prototypes (for backward compatibility), inclusion of the new + header files was incorrect. + + stdcpp.h was included by OS.h. This caused almost all files to + force the inclusion of the stream header files. This was + changed so that OS.h only includes the ace/iosfwd.h file. This + means that if your code was using stream classes and you were + depending on OS.h to provide you the stream header files, you + will have to change your code to either include iostream.h or + iostream, or more portably ace/streams.h. + * ace/OS.h: Removed stdcpp.h. Moved the standard C library includes from stdcpp.h to OS.h. Also added ace/iosfwd.h to give forward declaration for the stream classes. + * ACE: Added explicit inclusion of ace/streams.h to the following + files: + + ace/IOStream.cpp + ace/Log_Record.cpp + ace/OS.cpp + ace/SString.cpp + ace/Log_Msg.cpp + tests/test_config.h + examples/Log_Msg/test_log_msg.cpp + examples/Reactor/Misc/test_time_value.cpp + examples/Threads/task_three.cpp + netsvcs/lib/Logging_Strategy.cpp + examples/Logger/Acceptor-server/server_loggerd.cpp + examples/ASX/UPIPE_Event_Server/event_server.cpp + examples/Reactor/Ntalker/ntalker.cpp + examples/Shared_Malloc/test_persistence.cpp + examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp + examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp + examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp + examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp + + * Updated makefile dependencies throughout ACE to reflect the + removal of stdcpp.h and the addition of streams.h. + + * examples/Threads/barrier2.cpp: Removed inclusion of stdcpp.h. + * ace/IOStream_T.cpp: Reorganized include files so that inclusion of config.h is not necessary. - * ace/IOStream_T.h (stdcpp.h): Removed inclusion of stdcpp.h. It - is redundant because IOStream.h includes it. - * ace/IOStream.cpp: Changed inclusion of config.h to OS.h. - * ace/Makefile (Svc_Conf_l.cpp): Changed the sed macros to produce - OS.h include instead of stdcpp.h. + * ace: Removed config.h from the following files. It was + redundant. - * ACE: Added explicit inclusion of ace/streams.h to the following - files: + Timer_Hash.cpp + Timer_Heap.cpp + Timer_List.cpp + Timer_Queue.cpp + Timer_Wheel.cpp + + * ace: Added code to protect against multiple inclusions of + config.h. Following files were effected: - IOStream.cpp - Log_Record.cpp - OS.cpp + Trace.cpp + Log_Msg.cpp + + * ace/config-win32-common.h: Removed redundant definitions of + ACE_HAS_TYPENAME_KEYWORD and ACE_HAS_SIG_ATOMIC_T. Thanks to + Matthias Kerkhoff <make@cs.tu-berlin.de> for pointing this out. Thu Dec 4 00:26:46 1997 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu> diff --git a/TAO/Benchmark/benchmark/Makefile b/TAO/Benchmark/benchmark/Makefile index fadaf340108..afb9deff599 100644 --- a/TAO/Benchmark/benchmark/Makefile +++ b/TAO/Benchmark/benchmark/Makefile @@ -57,7 +57,7 @@ CPPFLAGS += -I$(TAO_ROOT)/Benchmark/ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/ACE.i \ @@ -67,7 +67,7 @@ CPPFLAGS += -I$(TAO_ROOT)/Benchmark/ $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_options.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -85,7 +85,7 @@ CPPFLAGS += -I$(TAO_ROOT)/Benchmark/ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -103,7 +103,7 @@ CPPFLAGS += -I$(TAO_ROOT)/Benchmark/ $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_options.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/IIOP/test/Orbix/base_server/Makefile b/TAO/IIOP/test/Orbix/base_server/Makefile index dc3604d3f35..898cfc9e433 100644 --- a/TAO/IIOP/test/Orbix/base_server/Makefile +++ b/TAO/IIOP/test/Orbix/base_server/Makefile @@ -63,7 +63,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -76,7 +76,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/IIOP/test/Orbix/client/Makefile b/TAO/IIOP/test/Orbix/client/Makefile index 70b3257447d..c003c0a707c 100644 --- a/TAO/IIOP/test/Orbix/client/Makefile +++ b/TAO/IIOP/test/Orbix/client/Makefile @@ -62,7 +62,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -74,7 +74,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS)) .obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/IIOP/test/Orbix/factory_client/Makefile b/TAO/IIOP/test/Orbix/factory_client/Makefile index de2877537b6..755bc8f8ab0 100644 --- a/TAO/IIOP/test/Orbix/factory_client/Makefile +++ b/TAO/IIOP/test/Orbix/factory_client/Makefile @@ -62,7 +62,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS)) .obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/IIOP/test/Orbix/tpool/Makefile b/TAO/IIOP/test/Orbix/tpool/Makefile index d4cbaacb6bd..f72024e35f0 100644 --- a/TAO/IIOP/test/Orbix/tpool/Makefile +++ b/TAO/IIOP/test/Orbix/tpool/Makefile @@ -63,7 +63,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -76,7 +76,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/IIOP/test/Orbix/tpr/Makefile b/TAO/IIOP/test/Orbix/tpr/Makefile index cf6149643d3..5c8191124c7 100644 --- a/TAO/IIOP/test/Orbix/tpr/Makefile +++ b/TAO/IIOP/test/Orbix/tpr/Makefile @@ -63,7 +63,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -76,7 +76,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/IIOP/test/Orbix/tps/Makefile b/TAO/IIOP/test/Orbix/tps/Makefile index f7e949578c2..0ea9b2e1e71 100644 --- a/TAO/IIOP/test/Orbix/tps/Makefile +++ b/TAO/IIOP/test/Orbix/tps/Makefile @@ -68,7 +68,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -163,7 +163,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -258,7 +258,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/Makefile b/TAO/IIOP/tests/Cubit/Orbix/base_server/Makefile index dc3604d3f35..898cfc9e433 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/base_server/Makefile +++ b/TAO/IIOP/tests/Cubit/Orbix/base_server/Makefile @@ -63,7 +63,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -76,7 +76,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/Makefile b/TAO/IIOP/tests/Cubit/Orbix/client/Makefile index 70b3257447d..c003c0a707c 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/client/Makefile +++ b/TAO/IIOP/tests/Cubit/Orbix/client/Makefile @@ -62,7 +62,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -74,7 +74,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS)) .obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/Makefile b/TAO/IIOP/tests/Cubit/Orbix/factory_client/Makefile index de2877537b6..755bc8f8ab0 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/Makefile +++ b/TAO/IIOP/tests/Cubit/Orbix/factory_client/Makefile @@ -62,7 +62,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS)) .obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/Makefile b/TAO/IIOP/tests/Cubit/Orbix/tpool/Makefile index d4cbaacb6bd..f72024e35f0 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/tpool/Makefile +++ b/TAO/IIOP/tests/Cubit/Orbix/tpool/Makefile @@ -63,7 +63,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -76,7 +76,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/Makefile b/TAO/IIOP/tests/Cubit/Orbix/tpr/Makefile index cf6149643d3..5c8191124c7 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/tpr/Makefile +++ b/TAO/IIOP/tests/Cubit/Orbix/tpr/Makefile @@ -63,7 +63,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -76,7 +76,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/Makefile b/TAO/IIOP/tests/Cubit/Orbix/tps/Makefile index f7e949578c2..0ea9b2e1e71 100644 --- a/TAO/IIOP/tests/Cubit/Orbix/tps/Makefile +++ b/TAO/IIOP/tests/Cubit/Orbix/tps/Makefile @@ -68,7 +68,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -163,7 +163,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -258,7 +258,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/TAO_IDL/be/Makefile b/TAO/TAO_IDL/be/Makefile index 4290d86b58e..65ce55f0649 100644 --- a/TAO/TAO_IDL/be/Makefile +++ b/TAO/TAO_IDL/be/Makefile @@ -103,7 +103,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -172,7 +172,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -241,7 +241,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -310,7 +310,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -379,7 +379,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -448,7 +448,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -517,7 +517,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -586,7 +586,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -655,7 +655,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -724,7 +724,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -793,7 +793,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -862,7 +862,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -931,7 +931,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1000,7 +1000,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1069,7 +1069,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1138,7 +1138,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1207,7 +1207,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1276,7 +1276,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1345,7 +1345,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1414,7 +1414,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1483,7 +1483,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1552,7 +1552,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1621,7 +1621,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1690,7 +1690,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1759,7 +1759,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1828,7 +1828,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1897,7 +1897,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1966,7 +1966,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2035,7 +2035,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2104,7 +2104,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2173,7 +2173,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2242,7 +2242,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2311,7 +2311,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2380,7 +2380,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2449,7 +2449,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2518,7 +2518,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2587,7 +2587,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2656,7 +2656,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2725,7 +2725,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2795,7 +2795,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2865,7 +2865,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2934,7 +2934,7 @@ CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index ca89291620e..e4a00b6544b 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -1,10 +1,12 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /home/daffy/u0/vern/flex/flex-2.4.7/RCS/flex.skl,v 1.2 94/08/03 11:13:24 vern Exp $ + * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ */ #define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 #include /**/ <stdio.h> @@ -30,7 +32,7 @@ #else /* ! __cplusplus */ -#ifdef __STDC__ +#if __STDC__ #define YY_USE_PROTOS #define YY_USE_CONST @@ -38,16 +40,19 @@ #endif /* __STDC__ */ #endif /* ! __cplusplus */ - #ifdef __TURBOC__ + #pragma warn -rch + #pragma warn -use +#include /**/ <io.h> +#include /**/ <stdlib.h> #define YY_USE_CONST +#define YY_USE_PROTOS #endif - -#ifndef YY_USE_CONST -#ifndef const -#define const -#endif +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst #endif @@ -74,16 +79,16 @@ #define BEGIN yy_start = 1 + 2 * /* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. + * to BEGIN to return to the state. The YYSTATE alias is for lex + * compatibility. */ #define YY_START ((yy_start - 1) / 2) +#define YYSTATE YY_START /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) -/* Special action meaning "start processing a new file". Now included - * only for backward compatibility with previous versions of flex. - */ +/* Special action meaning "start processing a new file". */ #define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 @@ -96,14 +101,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; extern int yyleng; extern FILE *yyin, *yyout; -#ifdef __cplusplus -extern "C" { -#endif - extern int yywrap YY_PROTO(( void )); -#ifdef __cplusplus - } -#endif - #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 @@ -129,6 +126,7 @@ extern "C" { { \ /* Undo effects of setting up yytext. */ \ *yy_cp = yy_hold_char; \ + YY_RESTORE_YY_MORE_OFFSET \ yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ @@ -136,6 +134,12 @@ extern "C" { #define unput(c) yyunput( c, yytext_ptr ) +/* The following is because we cannot portably get our hands on size_t + * (without autoconf's help, which isn't available because we want + * flex-generated scanners to compile on their own). + */ +typedef unsigned int yy_size_t; + struct yy_buffer_state { @@ -147,13 +151,19 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - int yy_buf_size; + yy_size_t yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ int yy_n_chars; + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + /* Whether this is an "interactive" input source; if so, and * if we're using stdio for input, then we want to use getc() * instead of fread(), to make sure we stop fetching input after @@ -161,6 +171,12 @@ struct yy_buffer_state */ int yy_is_interactive; + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -209,55 +225,59 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -static void yyunput YY_PROTO(( int c, char *buf_ptr )); void yyrestart YY_PROTO(( FILE *input_file )); + void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); void yy_load_buffer_state YY_PROTO(( void )); YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); +void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); +#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) -static int yy_start_stack_ptr = 0; -static int yy_start_stack_depth = 0; -static int *yy_start_stack = 0; -static void yy_push_state YY_PROTO(( int new_state )); -static void yy_pop_state YY_PROTO(( void )); -static int yy_top_state YY_PROTO(( void )); +YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); +YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); +YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); -static void *yy_flex_alloc YY_PROTO(( unsigned int )); -static void *yy_flex_realloc YY_PROTO(( void *, unsigned int )); +static void *yy_flex_alloc YY_PROTO(( yy_size_t )); +static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); static void yy_flex_free YY_PROTO(( void * )); #define yy_new_buffer yy_create_buffer -#define INITIAL 0 +#define yy_set_interactive(is_interactive) \ + { \ + if ( ! yy_current_buffer ) \ + yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_current_buffer->yy_is_interactive = is_interactive; \ + } + +#define yy_set_bol(at_bol) \ + { \ + if ( ! yy_current_buffer ) \ + yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_current_buffer->yy_at_bol = at_bol; \ + } + +#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) + typedef unsigned char YY_CHAR; -typedef int yy_state_type; FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +typedef int yy_state_type; extern char yytext[]; -#ifndef yytext_ptr -static void yy_flex_strncpy YY_PROTO(( char *, const char *, int )); -#endif - -#ifdef __cplusplus -static int yyinput YY_PROTO(( void )); -#else -static int input YY_PROTO(( void )); -#endif - static yy_state_type yy_get_previous_state YY_PROTO(( void )); static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); static int yy_get_next_buffer YY_PROTO(( void )); -static void yy_fatal_error YY_PROTO(( const char msg[] )); +static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ yytext_ptr = yy_bp; \ - yyleng = yy_cp - yy_bp; \ + yyleng = (int) (yy_cp - yy_bp); \ yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ if ( yyleng >= YYLMAX ) \ @@ -265,8 +285,9 @@ static void yy_fatal_error YY_PROTO(( const char msg[] )); yy_flex_strncpy( yytext, yytext_ptr, yyleng + 1 ); \ yy_c_buf_p = yy_cp; +#define YY_NUM_RULES 60 #define YY_END_OF_BUFFER 61 -static const short int yy_accept[278] = +static yyconst short int yy_accept[278] = { 0, 57, 57, 61, 59, 57, 58, 59, 59, 59, 59, 44, 42, 59, 59, 59, 39, 39, 39, 39, 39, @@ -300,7 +321,7 @@ static const short int yy_accept[278] = 6, 8, 14, 52, 0, 49, 0 } ; -static const int yy_ec[256] = +static yyconst int yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -332,7 +353,7 @@ static const int yy_ec[256] = 1, 1, 1, 1, 1 } ; -static const int yy_meta[55] = +static yyconst int yy_meta[55] = { 0, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 3, 3, @@ -342,7 +363,7 @@ static const int yy_meta[55] = 4, 4, 4, 4 } ; -static const short int yy_base[288] = +static yyconst short int yy_base[288] = { 0, 0, 439, 444, 446, 53, 446, 438, 412, 45, 53, 53, 58, 425, 423, 421, 0, 419, 412, 13, 392, @@ -377,7 +398,7 @@ static const short int yy_base[288] = 276, 280, 75, 284, 288, 292, 296 } ; -static const short int yy_def[288] = +static yyconst short int yy_def[288] = { 0, 277, 1, 277, 277, 277, 277, 278, 279, 277, 277, 277, 277, 277, 277, 277, 280, 280, 280, 280, 280, @@ -412,7 +433,7 @@ static const short int yy_def[288] = 277, 277, 277, 277, 277, 277, 277 } ; -static const short int yy_nxt[501] = +static yyconst short int yy_nxt[501] = { 0, 4, 5, 6, 5, 7, 4, 8, 4, 4, 9, 4, 10, 11, 12, 12, 13, 14, 15, 16, 16, @@ -471,7 +492,7 @@ static const short int yy_nxt[501] = } ; -static const short int yy_chk[501] = +static yyconst short int yy_chk[501] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -539,14 +560,16 @@ static char *yy_last_accepting_cpos; #define REJECT reject_used_but_not_detected #define yymore() yymore_used_but_not_detected #define YY_MORE_ADJ 0 +#define YY_RESTORE_YY_MORE_OFFSET #ifndef YYLMAX #define YYLMAX 8192 #endif char yytext[YYLMAX]; char *yytext_ptr; -# line 1 "idl.ll" -# line 3 "idl.ll" +#line 1 "idl.ll" +#define INITIAL 0 +#line 3 "idl.ll" /* COPYRIGHT @@ -645,6 +668,54 @@ inline char *__yytext() * section 1. */ +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int yywrap YY_PROTO(( void )); +#else +extern int yywrap YY_PROTO(( void )); +#endif +#endif + +#ifndef YY_NO_UNPUT +static void yyunput YY_PROTO(( int c, char *buf_ptr )); +#endif + +#ifndef yytext_ptr +static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen YY_PROTO(( yyconst char * )); +#endif + +#ifndef YY_NO_INPUT +#ifdef __cplusplus +static int yyinput YY_PROTO(( void )); +#else +static int input YY_PROTO(( void )); +#endif +#endif + +#if YY_STACK_USED +static int yy_start_stack_ptr = 0; +static int yy_start_stack_depth = 0; +static int *yy_start_stack = 0; +#ifndef YY_NO_PUSH_STATE +static void yy_push_state YY_PROTO(( int new_state )); +#endif +#ifndef YY_NO_POP_STATE +static void yy_pop_state YY_PROTO(( void )); +#endif +#ifndef YY_NO_TOP_STATE +static int yy_top_state YY_PROTO(( void )); +#endif + +#else +#define YY_NO_PUSH_STATE 1 +#define YY_NO_POP_STATE 1 +#define YY_NO_TOP_STATE 1 +#endif + #ifdef YY_MALLOC_DECL YY_MALLOC_DECL #else @@ -681,9 +752,15 @@ YY_MALLOC_DECL #define YY_INPUT(buf,result,max_size) \ if ( yy_current_buffer->yy_is_interactive ) \ { \ - int c = getc( yyin ); \ - result = c == EOF ? 0 : 1; \ - buf[0] = (char) c; \ + int c = '*', n; \ + for ( n = 0; n < max_size && \ + (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ + if ( c == '\n' ) \ + buf[n++] = (char) c; \ + if ( c == EOF && ferror( yyin ) ) \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + result = n; \ } \ else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \ && ferror( yyin ) ) \ @@ -727,18 +804,26 @@ YY_MALLOC_DECL #define YY_BREAK break; #endif +#define YY_RULE_SETUP \ + if ( yyleng > 0 ) \ + yy_current_buffer->yy_at_bol = \ + (yytext[yyleng - 1] == '\n'); \ + YY_USER_ACTION + YY_DECL { register yy_state_type yy_current_state; register char *yy_cp, *yy_bp; register int yy_act; -# line 100 "idl.ll" +#line 100 "idl.ll" if ( yy_init ) { + yy_init = 0; + #ifdef YY_USER_INIT YY_USER_INIT; #endif @@ -752,15 +837,11 @@ YY_DECL if ( ! yyout ) yyout = stdout; - if ( yy_current_buffer ) - yy_init_buffer( yy_current_buffer, yyin ); - else + if ( ! yy_current_buffer ) yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); yy_load_buffer_state(); - - yy_init = 0; } while ( 1 ) /* loops until end-of-file is reached */ @@ -776,8 +857,7 @@ YY_DECL yy_bp = yy_cp; yy_current_state = yy_start; - if ( yy_bp[-1] == '\n' ) - ++yy_current_state; + yy_current_state += YY_AT_BOL(); yy_match: do { @@ -800,6 +880,12 @@ yy_match: yy_find_action: yy_act = yy_accept[yy_current_state]; + if ( yy_act == 0 ) + { /* have to back up */ + yy_cp = yy_last_accepting_cpos; + yy_current_state = yy_last_accepting_state; + yy_act = yy_accept[yy_current_state]; + } YY_DO_BEFORE_ACTION; @@ -817,201 +903,201 @@ do_action: /* This label is used only to access EOF actions. */ goto yy_find_action; case 1: -YY_USER_ACTION -# line 102 "idl.ll" +YY_RULE_SETUP +#line 102 "idl.ll" return IDL_ANY; YY_BREAK case 2: -YY_USER_ACTION -# line 103 "idl.ll" +YY_RULE_SETUP +#line 103 "idl.ll" return IDL_MODULE; YY_BREAK case 3: -YY_USER_ACTION -# line 104 "idl.ll" +YY_RULE_SETUP +#line 104 "idl.ll" return IDL_RAISES; YY_BREAK case 4: -YY_USER_ACTION -# line 105 "idl.ll" +YY_RULE_SETUP +#line 105 "idl.ll" return IDL_READONLY; YY_BREAK case 5: -YY_USER_ACTION -# line 106 "idl.ll" +YY_RULE_SETUP +#line 106 "idl.ll" return IDL_ATTRIBUTE; YY_BREAK case 6: -YY_USER_ACTION -# line 107 "idl.ll" +YY_RULE_SETUP +#line 107 "idl.ll" return IDL_EXCEPTION; YY_BREAK case 7: -YY_USER_ACTION -# line 108 "idl.ll" +YY_RULE_SETUP +#line 108 "idl.ll" return IDL_CONTEXT; YY_BREAK case 8: -YY_USER_ACTION -# line 109 "idl.ll" +YY_RULE_SETUP +#line 109 "idl.ll" return IDL_INTERFACE; YY_BREAK case 9: -YY_USER_ACTION -# line 110 "idl.ll" +YY_RULE_SETUP +#line 110 "idl.ll" return IDL_CONST; YY_BREAK case 10: -YY_USER_ACTION -# line 111 "idl.ll" +YY_RULE_SETUP +#line 111 "idl.ll" return IDL_TYPEDEF; YY_BREAK case 11: -YY_USER_ACTION -# line 112 "idl.ll" +YY_RULE_SETUP +#line 112 "idl.ll" return IDL_STRUCT; YY_BREAK case 12: -YY_USER_ACTION -# line 113 "idl.ll" +YY_RULE_SETUP +#line 113 "idl.ll" return IDL_ENUM; YY_BREAK case 13: -YY_USER_ACTION -# line 114 "idl.ll" +YY_RULE_SETUP +#line 114 "idl.ll" return IDL_STRING; YY_BREAK case 14: -YY_USER_ACTION -# line 115 "idl.ll" +YY_RULE_SETUP +#line 115 "idl.ll" return IDL_WSTRING; YY_BREAK case 15: -YY_USER_ACTION -# line 116 "idl.ll" +YY_RULE_SETUP +#line 116 "idl.ll" return IDL_SEQUENCE; YY_BREAK case 16: -YY_USER_ACTION -# line 117 "idl.ll" +YY_RULE_SETUP +#line 117 "idl.ll" return IDL_UNION; YY_BREAK case 17: -YY_USER_ACTION -# line 118 "idl.ll" +YY_RULE_SETUP +#line 118 "idl.ll" return IDL_SWITCH; YY_BREAK case 18: -YY_USER_ACTION -# line 119 "idl.ll" +YY_RULE_SETUP +#line 119 "idl.ll" return IDL_CASE; YY_BREAK case 19: -YY_USER_ACTION -# line 120 "idl.ll" +YY_RULE_SETUP +#line 120 "idl.ll" return IDL_DEFAULT; YY_BREAK case 20: -YY_USER_ACTION -# line 121 "idl.ll" +YY_RULE_SETUP +#line 121 "idl.ll" return IDL_FLOAT; YY_BREAK case 21: -YY_USER_ACTION -# line 122 "idl.ll" +YY_RULE_SETUP +#line 122 "idl.ll" return IDL_DOUBLE; YY_BREAK case 22: -YY_USER_ACTION -# line 123 "idl.ll" +YY_RULE_SETUP +#line 123 "idl.ll" return IDL_LONG; YY_BREAK case 23: -YY_USER_ACTION -# line 124 "idl.ll" +YY_RULE_SETUP +#line 124 "idl.ll" return IDL_SHORT; YY_BREAK case 24: -YY_USER_ACTION -# line 125 "idl.ll" +YY_RULE_SETUP +#line 125 "idl.ll" return IDL_UNSIGNED; YY_BREAK case 25: -YY_USER_ACTION -# line 126 "idl.ll" +YY_RULE_SETUP +#line 126 "idl.ll" return IDL_CHAR; YY_BREAK case 26: -YY_USER_ACTION -# line 127 "idl.ll" +YY_RULE_SETUP +#line 127 "idl.ll" return IDL_WCHAR; YY_BREAK case 27: -YY_USER_ACTION -# line 128 "idl.ll" +YY_RULE_SETUP +#line 128 "idl.ll" return IDL_BOOLEAN; YY_BREAK case 28: -YY_USER_ACTION -# line 129 "idl.ll" +YY_RULE_SETUP +#line 129 "idl.ll" return IDL_OCTET; YY_BREAK case 29: -YY_USER_ACTION -# line 130 "idl.ll" +YY_RULE_SETUP +#line 130 "idl.ll" return IDL_VOID; YY_BREAK case 30: -YY_USER_ACTION -# line 132 "idl.ll" +YY_RULE_SETUP +#line 132 "idl.ll" return IDL_TRUETOK; YY_BREAK case 31: -YY_USER_ACTION -# line 133 "idl.ll" +YY_RULE_SETUP +#line 133 "idl.ll" return IDL_FALSETOK; YY_BREAK case 32: -YY_USER_ACTION -# line 135 "idl.ll" +YY_RULE_SETUP +#line 135 "idl.ll" return IDL_INOUT; YY_BREAK case 33: -YY_USER_ACTION -# line 136 "idl.ll" +YY_RULE_SETUP +#line 136 "idl.ll" return IDL_IN; YY_BREAK case 34: -YY_USER_ACTION -# line 137 "idl.ll" +YY_RULE_SETUP +#line 137 "idl.ll" return IDL_OUT; YY_BREAK case 35: -YY_USER_ACTION -# line 138 "idl.ll" +YY_RULE_SETUP +#line 138 "idl.ll" return IDL_ONEWAY; YY_BREAK case 36: -YY_USER_ACTION -# line 140 "idl.ll" +YY_RULE_SETUP +#line 140 "idl.ll" return IDL_LEFT_SHIFT; YY_BREAK case 37: -YY_USER_ACTION -# line 141 "idl.ll" +YY_RULE_SETUP +#line 141 "idl.ll" return IDL_RIGHT_SHIFT; YY_BREAK case 38: -YY_USER_ACTION -# line 142 "idl.ll" +YY_RULE_SETUP +#line 142 "idl.ll" { yylval.strval = "::"; return IDL_SCOPE_DELIMITOR; } YY_BREAK case 39: -YY_USER_ACTION -# line 147 "idl.ll" +YY_RULE_SETUP +#line 147 "idl.ll" { char *z = (char *) malloc(strlen(ace_yytext) + 1); strcpy(z, ace_yytext); @@ -1020,48 +1106,48 @@ YY_USER_ACTION } YY_BREAK case 40: -YY_USER_ACTION -# line 154 "idl.ll" +YY_RULE_SETUP +#line 154 "idl.ll" { yylval.dval = idl_atof(ace_yytext); return IDL_FLOATING_PT_LITERAL; } YY_BREAK case 41: -YY_USER_ACTION -# line 158 "idl.ll" +YY_RULE_SETUP +#line 158 "idl.ll" { yylval.dval = idl_atof(ace_yytext); return IDL_FLOATING_PT_LITERAL; } YY_BREAK case 42: -YY_USER_ACTION -# line 163 "idl.ll" +YY_RULE_SETUP +#line 163 "idl.ll" { yylval.ival = idl_atoi(ace_yytext, 10); return IDL_INTEGER_LITERAL; } YY_BREAK case 43: -YY_USER_ACTION -# line 167 "idl.ll" +YY_RULE_SETUP +#line 167 "idl.ll" { yylval.ival = idl_atoi(ace_yytext, 16); return IDL_INTEGER_LITERAL; } YY_BREAK case 44: -YY_USER_ACTION -# line 171 "idl.ll" +YY_RULE_SETUP +#line 171 "idl.ll" { yylval.ival = idl_atoi(ace_yytext, 8); return IDL_INTEGER_LITERAL; } YY_BREAK case 45: -YY_USER_ACTION -# line 176 "idl.ll" +YY_RULE_SETUP +#line 176 "idl.ll" { /* Skip the quotes */ char *tmp = ace_yytext; @@ -1071,16 +1157,16 @@ YY_USER_ACTION } YY_BREAK case 46: -YY_USER_ACTION -# line 183 "idl.ll" +YY_RULE_SETUP +#line 183 "idl.ll" { yylval.cval = ace_yytext [1]; return IDL_CHARACTER_LITERAL; } YY_BREAK case 47: -YY_USER_ACTION -# line 187 "idl.ll" +YY_RULE_SETUP +#line 187 "idl.ll" { // octal character constant yylval.cval = idl_escape_reader(ace_yytext + 1); @@ -1088,68 +1174,68 @@ YY_USER_ACTION } YY_BREAK case 48: -YY_USER_ACTION -# line 192 "idl.ll" +YY_RULE_SETUP +#line 192 "idl.ll" { yylval.cval = idl_escape_reader(ace_yytext + 1); return IDL_CHARACTER_LITERAL; } YY_BREAK case 49: -YY_USER_ACTION -# line 196 "idl.ll" +YY_RULE_SETUP +#line 196 "idl.ll" {/* remember pragma */ idl_global->set_lineno(idl_global->lineno() + 1); idl_store_pragma(ace_yytext); } YY_BREAK case 50: -YY_USER_ACTION -# line 200 "idl.ll" +YY_RULE_SETUP +#line 200 "idl.ll" { idl_parse_line_and_file(ace_yytext); } YY_BREAK case 51: -YY_USER_ACTION -# line 203 "idl.ll" +YY_RULE_SETUP +#line 203 "idl.ll" { idl_parse_line_and_file(ace_yytext); } YY_BREAK case 52: -YY_USER_ACTION -# line 206 "idl.ll" +YY_RULE_SETUP +#line 206 "idl.ll" { idl_parse_line_and_file(ace_yytext); } YY_BREAK case 53: -YY_USER_ACTION -# line 209 "idl.ll" +YY_RULE_SETUP +#line 209 "idl.ll" { idl_parse_line_and_file(ace_yytext); } YY_BREAK case 54: -YY_USER_ACTION -# line 212 "idl.ll" +YY_RULE_SETUP +#line 212 "idl.ll" { /* ignore cpp ident */ idl_global->set_lineno(idl_global->lineno() + 1); } YY_BREAK case 55: -YY_USER_ACTION -# line 216 "idl.ll" +YY_RULE_SETUP +#line 216 "idl.ll" { /* ignore comments */ idl_global->set_lineno(idl_global->lineno() + 1); } YY_BREAK case 56: -YY_USER_ACTION -# line 220 "idl.ll" +YY_RULE_SETUP +#line 220 "idl.ll" { for(;;) { char c = yyinput(); @@ -1166,25 +1252,25 @@ YY_USER_ACTION } YY_BREAK case 57: -YY_USER_ACTION -# line 234 "idl.ll" +YY_RULE_SETUP +#line 234 "idl.ll" ; YY_BREAK case 58: -YY_USER_ACTION -# line 235 "idl.ll" +YY_RULE_SETUP +#line 235 "idl.ll" { idl_global->set_lineno(idl_global->lineno() + 1); } YY_BREAK case 59: -YY_USER_ACTION -# line 238 "idl.ll" +YY_RULE_SETUP +#line 238 "idl.ll" return ace_yytext [0]; YY_BREAK case 60: -YY_USER_ACTION -# line 240 "idl.ll" +YY_RULE_SETUP +#line 240 "idl.ll" TAO_ECHO; YY_BREAK case YY_STATE_EOF(INITIAL): @@ -1193,10 +1279,11 @@ case YY_STATE_EOF(INITIAL): case YY_END_OF_BUFFER: { /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = yy_cp - yytext_ptr - 1; + int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; /* Undo the effects of YY_DO_BEFORE_ACTION. */ *yy_cp = yy_hold_char; + YY_RESTORE_YY_MORE_OFFSET if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) { @@ -1252,7 +1339,7 @@ case YY_STATE_EOF(INITIAL): else { - yy_cp = yy_c_buf_p; + yy_cp = yy_c_buf_p; goto yy_find_action; } } @@ -1330,7 +1417,7 @@ case YY_STATE_EOF(INITIAL): static int yy_get_next_buffer() { register char *dest = yy_current_buffer->yy_ch_buf; - register char *source = yytext_ptr - 1; /* copy prev. char, too */ + register char *source = yytext_ptr; register int number_to_move, i; int ret_val; @@ -1342,7 +1429,7 @@ static int yy_get_next_buffer() { /* Don't try to fill the buffer, so this is an EOF. */ if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) { - /* We matched a singled characater, the EOB, so + /* We matched a single character, the EOB, so * treat this as a final EOF. */ return EOB_ACT_END_OF_FILE; @@ -1360,7 +1447,7 @@ static int yy_get_next_buffer() /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = yy_c_buf_p - yytext_ptr; + number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1369,7 +1456,7 @@ static int yy_get_next_buffer() /* don't do the read, it's not guaranteed to return an EOF, * just force an EOF */ - yy_n_chars = 0; + yy_current_buffer->yy_n_chars = yy_n_chars = 0; else { @@ -1386,12 +1473,26 @@ static int yy_get_next_buffer() /* just a shorter name for the current buffer */ YY_BUFFER_STATE b = yy_current_buffer; - int yy_c_buf_p_offset = yy_c_buf_p - b->yy_ch_buf; + int yy_c_buf_p_offset = + (int) (yy_c_buf_p - b->yy_ch_buf); + + if ( b->yy_is_our_buffer ) + { + int new_size = b->yy_buf_size * 2; + + if ( new_size <= 0 ) + b->yy_buf_size += b->yy_buf_size / 8; + else + b->yy_buf_size *= 2; - b->yy_buf_size *= 2; - b->yy_ch_buf = (char *) - yy_flex_realloc( (void *) b->yy_ch_buf, - b->yy_buf_size ); + b->yy_ch_buf = (char *) + /* Include room in for 2 EOB chars. */ + yy_flex_realloc( (void *) b->yy_ch_buf, + b->yy_buf_size + 2 ); + } + else + /* Can't grow it, we don't own it. */ + b->yy_ch_buf = 0; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -1410,11 +1511,13 @@ static int yy_get_next_buffer() /* Read in more data. */ YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), yy_n_chars, num_to_read ); + + yy_current_buffer->yy_n_chars = yy_n_chars; } if ( yy_n_chars == 0 ) { - if ( number_to_move - YY_MORE_ADJ == 1 ) + if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; yyrestart( yyin ); @@ -1435,13 +1538,7 @@ static int yy_get_next_buffer() yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; - /* yytext begins at the second character in yy_ch_buf; the first - * character is the one which preceded it before reading in the latest - * buffer; it needs to be kept around in case it's a newline, so - * yy_get_previous_state() will have with '^' rules active. - */ - - yytext_ptr = &yy_current_buffer->yy_ch_buf[1]; + yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; return ret_val; } @@ -1454,11 +1551,8 @@ static yy_state_type yy_get_previous_state() register yy_state_type yy_current_state; register char *yy_cp; - register char *yy_bp = yytext_ptr; - yy_current_state = yy_start; - if ( yy_bp[-1] == '\n' ) - ++yy_current_state; + yy_current_state += YY_AT_BOL(); for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) { @@ -1516,6 +1610,7 @@ yy_state_type yy_current_state; } +#ifndef YY_NO_UNPUT #ifdef YY_USE_PROTOS static void yyunput( int c, register char *yy_bp ) #else @@ -1541,25 +1636,23 @@ register char *yy_bp; while ( source > yy_current_buffer->yy_ch_buf ) *--dest = *--source; - yy_cp += dest - source; - yy_bp += dest - source; - yy_n_chars = yy_current_buffer->yy_buf_size; + yy_cp += (int) (dest - source); + yy_bp += (int) (dest - source); + yy_current_buffer->yy_n_chars = + yy_n_chars = yy_current_buffer->yy_buf_size; if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); } - if ( yy_cp > yy_bp && yy_cp[-1] == '\n' ) - yy_cp[-2] = '\n'; - *--yy_cp = (char) c; - /* Note: the formal parameter *must* be called "yy_bp" for this - * macro to now work correctly. - */ - YY_DO_BEFORE_ACTION; /* set up yytext again */ + yytext_ptr = yy_bp; + yy_hold_char = *yy_cp; + yy_c_buf_p = yy_cp; } +#endif /* ifndef YY_NO_UNPUT */ #ifdef __cplusplus @@ -1584,21 +1677,34 @@ static int input() else { /* need more input */ - yytext_ptr = yy_c_buf_p; + int offset = yy_c_buf_p - yytext_ptr; ++yy_c_buf_p; switch ( yy_get_next_buffer() ) { + case EOB_ACT_LAST_MATCH: + /* This happens because yy_g_n_b() + * sees that we've accumulated a + * token and flags that we need to + * try matching the token before + * proceeding. But for input(), + * there's no matching to consider. + * So convert the EOB_ACT_LAST_MATCH + * to EOB_ACT_END_OF_FILE. + */ + + /* Reset buffer status. */ + yyrestart( yyin ); + + /* fall through */ + case EOB_ACT_END_OF_FILE: { if ( yywrap() ) - { - yy_c_buf_p = - yytext_ptr + YY_MORE_ADJ; return EOF; - } - YY_NEW_FILE; + if ( ! yy_did_buffer_switch_on_eof ) + YY_NEW_FILE; #ifdef __cplusplus return yyinput(); #else @@ -1607,17 +1713,8 @@ static int input() } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; + yy_c_buf_p = yytext_ptr + offset; break; - - case EOB_ACT_LAST_MATCH: -#ifdef __cplusplus - YY_FATAL_ERROR( - "unexpected last match in yyinput()" ); -#else - YY_FATAL_ERROR( - "unexpected last match in input()" ); -#endif } } } @@ -1626,6 +1723,8 @@ static int input() *yy_c_buf_p = '\0'; /* preserve yytext */ yy_hold_char = *++yy_c_buf_p; + yy_current_buffer->yy_at_bol = (c == '\n'); + return c; } @@ -1699,7 +1798,6 @@ int size; YY_BUFFER_STATE b; b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); - if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1709,10 +1807,11 @@ int size; * we need to put in 2 end-of-buffer characters. */ b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); - if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + b->yy_is_our_buffer = 1; + yy_init_buffer( b, file ); return b; @@ -1726,14 +1825,25 @@ void yy_delete_buffer( b ) YY_BUFFER_STATE b; #endif { + if ( ! b ) + return; + if ( b == yy_current_buffer ) yy_current_buffer = (YY_BUFFER_STATE) 0; - yy_flex_free( (void *) b->yy_ch_buf ); + if ( b->yy_is_our_buffer ) + yy_flex_free( (void *) b->yy_ch_buf ); + yy_flex_free( (void *) b ); } +#ifndef YY_ALWAYS_INTERACTIVE +#ifndef YY_NEVER_INTERACTIVE +extern int isatty YY_PROTO(( int )); +#endif +#endif + #ifdef YY_USE_PROTOS void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) #else @@ -1741,33 +1851,151 @@ void yy_init_buffer( b, file ) YY_BUFFER_STATE b; FILE *file; #endif + + { + yy_flush_buffer( b ); + b->yy_input_file = file; + b->yy_fill_buffer = 1; - /* We put in the '\n' and start reading from [1] so that an - * initial match-at-newline will be true. - */ +#if YY_ALWAYS_INTERACTIVE + b->yy_is_interactive = 1; +#else +#if YY_NEVER_INTERACTIVE + b->yy_is_interactive = 0; +#else + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; +#endif +#endif + } + + +#ifdef YY_USE_PROTOS +void yy_flush_buffer( YY_BUFFER_STATE b ) +#else +void yy_flush_buffer( b ) +YY_BUFFER_STATE b; +#endif + + { + if ( ! b ) + return; - b->yy_ch_buf[0] = '\n'; - b->yy_n_chars = 1; + b->yy_n_chars = 0; /* We always need two end-of-buffer characters. The first causes * a transition to the end-of-buffer state. The second causes * a jam in that state. */ + b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[2] = YY_END_OF_BUFFER_CHAR; - b->yy_buf_pos = &b->yy_ch_buf[1]; + b->yy_buf_pos = &b->yy_ch_buf[0]; - b->yy_is_interactive = file ? isatty( fileno(file) ) : 0; + b->yy_at_bol = 1; + b->yy_buffer_status = YY_BUFFER_NEW; - b->yy_fill_buffer = 1; + if ( b == yy_current_buffer ) + yy_load_buffer_state(); + } + +#ifndef YY_NO_SCAN_BUFFER +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) +#else +YY_BUFFER_STATE yy_scan_buffer( base, size ) +char *base; +yy_size_t size; +#endif + { + YY_BUFFER_STATE b; + + if ( size < 2 || + base[size-2] != YY_END_OF_BUFFER_CHAR || + base[size-1] != YY_END_OF_BUFFER_CHAR ) + /* They forgot to leave room for the EOB's. */ + return 0; + + b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); + + b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_pos = b->yy_ch_buf = base; + b->yy_is_our_buffer = 0; + b->yy_input_file = 0; + b->yy_n_chars = b->yy_buf_size; + b->yy_is_interactive = 0; + b->yy_at_bol = 1; + b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; + + yy_switch_to_buffer( b ); + + return b; + } +#endif + + +#ifndef YY_NO_SCAN_STRING +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) +#else +YY_BUFFER_STATE yy_scan_string( yy_str ) +yyconst char *yy_str; +#endif + { + int len; + for ( len = 0; yy_str[len]; ++len ) + ; + + return yy_scan_bytes( yy_str, len ); + } +#endif + + +#ifndef YY_NO_SCAN_BYTES +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) +#else +YY_BUFFER_STATE yy_scan_bytes( bytes, len ) +yyconst char *bytes; +int len; +#endif + { + YY_BUFFER_STATE b; + char *buf; + yy_size_t n; + int i; + + /* Get memory for full buffer, including space for trailing EOB's. */ + n = len + 2; + buf = (char *) yy_flex_alloc( n ); + if ( ! buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); + + for ( i = 0; i < len; ++i ) + buf[i] = bytes[i]; + + buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; + + b = yy_scan_buffer( buf, n ); + if ( ! b ) + YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); + + /* It's okay to grow etc. this buffer, and we should throw it + * away when we're done. + */ + b->yy_is_our_buffer = 1; + + return b; } +#endif +#ifndef YY_NO_PUSH_STATE #ifdef YY_USE_PROTOS static void yy_push_state( int new_state ) #else @@ -1777,7 +2005,7 @@ int new_state; { if ( yy_start_stack_ptr >= yy_start_stack_depth ) { - int new_size; + yy_size_t new_size; yy_start_stack_depth += YY_START_STACK_INCR; new_size = yy_start_stack_depth * sizeof( int ); @@ -1798,8 +2026,10 @@ int new_state; BEGIN(new_state); } +#endif +#ifndef YY_NO_POP_STATE static void yy_pop_state() { if ( --yy_start_stack_ptr < 0 ) @@ -1807,23 +2037,29 @@ static void yy_pop_state() BEGIN(yy_start_stack[yy_start_stack_ptr]); } +#endif +#ifndef YY_NO_TOP_STATE static int yy_top_state() { return yy_start_stack[yy_start_stack_ptr - 1]; } +#endif +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 +#endif #ifdef YY_USE_PROTOS -static void yy_fatal_error( const char msg[] ) +static void yy_fatal_error( yyconst char msg[] ) #else static void yy_fatal_error( msg ) char msg[]; #endif { (void) fprintf( stderr, "%s\n", msg ); - exit( 1 ); + exit( YY_EXIT_FAILURE ); } @@ -1836,7 +2072,7 @@ char msg[]; { \ /* Undo effects of setting up yytext. */ \ yytext[yyleng] = yy_hold_char; \ - yy_c_buf_p = yytext + n - YY_MORE_ADJ; \ + yy_c_buf_p = yytext + n; \ yy_hold_char = *yy_c_buf_p; \ *yy_c_buf_p = '\0'; \ yyleng = n; \ @@ -1848,11 +2084,11 @@ char msg[]; #ifndef yytext_ptr #ifdef YY_USE_PROTOS -static void yy_flex_strncpy( char *s1, const char *s2, int n ) +static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) #else static void yy_flex_strncpy( s1, s2, n ) char *s1; -const char *s2; +yyconst char *s2; int n; #endif { @@ -1862,26 +2098,49 @@ int n; } #endif +#ifdef YY_NEED_STRLEN +#ifdef YY_USE_PROTOS +static int yy_flex_strlen( yyconst char *s ) +#else +static int yy_flex_strlen( s ) +yyconst char *s; +#endif + { + register int n; + for ( n = 0; s[n]; ++n ) + ; + + return n; + } +#endif + #ifdef YY_USE_PROTOS -static void *yy_flex_alloc( unsigned int size ) +static void *yy_flex_alloc( yy_size_t size ) #else static void *yy_flex_alloc( size ) -unsigned int size; +yy_size_t size; #endif { return (void *) malloc( size ); } #ifdef YY_USE_PROTOS -static void *yy_flex_realloc( void *ptr, unsigned int size ) +static void *yy_flex_realloc( void *ptr, yy_size_t size ) #else static void *yy_flex_realloc( ptr, size ) void *ptr; -unsigned int size; +yy_size_t size; #endif { - return (void *) realloc( ptr, size ); + /* The cast to (char *) in the following accommodates both + * implementations that use char* generic pointers, and those + * that use void* generic pointers. It works with the latter + * because both ANSI C and C++ allow castless assignment from + * any pointer type to void*, and deal with argument conversions + * as though doing an assignment. + */ + return (void *) realloc( (char *) ptr, size ); } #ifdef YY_USE_PROTOS @@ -1893,7 +2152,15 @@ void *ptr; { free( ptr ); } -# line 240 "idl.ll" + +#if YY_MAIN +int main() + { + yylex(); + return 0; + } +#endif +#line 240 "idl.ll" /* subroutines */ diff --git a/TAO/local/bin/Event_Service/Makefile b/TAO/local/bin/Event_Service/Makefile index f73ab072e15..c824a6b903e 100644 --- a/TAO/local/bin/Event_Service/Makefile +++ b/TAO/local/bin/Event_Service/Makefile @@ -61,7 +61,7 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -258,7 +258,7 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) .obj/BCU.o .shobj/BCU.: BCU.cpp BCU.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -272,7 +272,7 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -436,7 +436,7 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -507,7 +507,7 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -593,7 +593,7 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -639,7 +639,7 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -704,7 +704,7 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -900,7 +900,7 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/local/bin/Scheduling_Service/Makefile b/TAO/local/bin/Scheduling_Service/Makefile index cb31ad2deab..d5f61ab1eb4 100644 --- a/TAO/local/bin/Scheduling_Service/Makefile +++ b/TAO/local/bin/Scheduling_Service/Makefile @@ -63,7 +63,7 @@ dump_schedule: $(addprefix $(VDIR),$(DUMP_OBJS)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -234,7 +234,7 @@ dump_schedule: $(addprefix $(VDIR),$(DUMP_OBJS)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -403,7 +403,7 @@ dump_schedule: $(addprefix $(VDIR),$(DUMP_OBJS)) $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -575,7 +575,7 @@ dump_schedule: $(addprefix $(VDIR),$(DUMP_OBJS)) $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/local/tests/Makefile b/TAO/local/tests/Makefile index dc0bdba09a9..7997cf23477 100644 --- a/TAO/local/tests/Makefile +++ b/TAO/local/tests/Makefile @@ -81,7 +81,7 @@ Utilization: $(addprefix $(VDIR),$(UTILIZATION_OBJS) $(UTILIZATION_CONFIG_OBJS)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/orbsvcs/bin/Naming_Service/Makefile b/TAO/orbsvcs/bin/Naming_Service/Makefile index c8b53530a75..e764ca2c4e4 100644 --- a/TAO/orbsvcs/bin/Naming_Service/Makefile +++ b/TAO/orbsvcs/bin/Naming_Service/Makefile @@ -53,7 +53,7 @@ svr: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -219,7 +219,7 @@ svr: $(addprefix $(VDIR),$(SVR_OBJS)) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -386,7 +386,7 @@ svr: $(addprefix $(VDIR),$(SVR_OBJS)) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/orbsvcs/lib/Makefile b/TAO/orbsvcs/lib/Makefile index 7709e57a973..6437d7eafd3 100644 --- a/TAO/orbsvcs/lib/Makefile +++ b/TAO/orbsvcs/lib/Makefile @@ -83,7 +83,7 @@ realclean: clean $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -247,7 +247,7 @@ realclean: clean $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -411,7 +411,7 @@ realclean: clean $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -575,7 +575,7 @@ realclean: clean $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -739,7 +739,7 @@ realclean: clean $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -903,7 +903,7 @@ realclean: clean $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1068,7 +1068,7 @@ realclean: clean $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1234,7 +1234,7 @@ realclean: clean $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1401,7 +1401,7 @@ realclean: clean $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1719,7 +1719,7 @@ realclean: clean .obj/Runtime_Scheduler.o .shobj/Runtime_Scheduler.so: Runtime_Scheduler.cpp Runtime_Scheduler.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2037,7 +2037,7 @@ realclean: clean .obj/Timeprobe.o .shobj/Timeprobe.so: Timeprobe.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile index 02bbe8e5569..b22d35a0b0b 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Makefile +++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile @@ -47,7 +47,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/lib -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(T $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index 37f90f94fa6..68b8627429f 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -137,7 +137,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -301,7 +301,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -465,7 +465,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -629,7 +629,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -793,7 +793,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -958,7 +958,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1122,7 +1122,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1285,7 +1285,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1449,7 +1449,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1613,7 +1613,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1781,7 +1781,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1945,7 +1945,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2109,7 +2109,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2273,7 +2273,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2437,7 +2437,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2601,7 +2601,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2765,7 +2765,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -2929,7 +2929,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -3093,7 +3093,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -3257,7 +3257,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -3421,7 +3421,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -3585,7 +3585,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -3749,7 +3749,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -3913,7 +3913,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -4077,7 +4077,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -4241,7 +4241,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -4405,7 +4405,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -4569,7 +4569,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -4733,7 +4733,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -4897,7 +4897,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -5069,7 +5069,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -5233,7 +5233,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -5397,7 +5397,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -5561,7 +5561,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -5725,7 +5725,7 @@ copy: $(INSTALL) $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/tests/Cubit/COOL/Makefile b/TAO/tests/Cubit/COOL/Makefile index e836d36fb7f..7cd9396fedf 100644 --- a/TAO/tests/Cubit/COOL/Makefile +++ b/TAO/tests/Cubit/COOL/Makefile @@ -68,7 +68,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS)) .obj/server.o .shobj/server.so: server.cpp cubit.H cubit.C cubit_impl.h sk_cubit.H \ sk_cubit.C $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -84,7 +84,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -156,7 +156,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/tests/Cubit/Orbix/base_server/Makefile b/TAO/tests/Cubit/Orbix/base_server/Makefile index dc3604d3f35..898cfc9e433 100644 --- a/TAO/tests/Cubit/Orbix/base_server/Makefile +++ b/TAO/tests/Cubit/Orbix/base_server/Makefile @@ -63,7 +63,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -76,7 +76,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/tests/Cubit/Orbix/client/Makefile b/TAO/tests/Cubit/Orbix/client/Makefile index 70b3257447d..c003c0a707c 100644 --- a/TAO/tests/Cubit/Orbix/client/Makefile +++ b/TAO/tests/Cubit/Orbix/client/Makefile @@ -62,7 +62,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -74,7 +74,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS)) .obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/tests/Cubit/Orbix/factory_client/Makefile b/TAO/tests/Cubit/Orbix/factory_client/Makefile index de2877537b6..755bc8f8ab0 100644 --- a/TAO/tests/Cubit/Orbix/factory_client/Makefile +++ b/TAO/tests/Cubit/Orbix/factory_client/Makefile @@ -62,7 +62,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS)) .obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/tests/Cubit/Orbix/tpool/Makefile b/TAO/tests/Cubit/Orbix/tpool/Makefile index d4cbaacb6bd..f72024e35f0 100644 --- a/TAO/tests/Cubit/Orbix/tpool/Makefile +++ b/TAO/tests/Cubit/Orbix/tpool/Makefile @@ -63,7 +63,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -76,7 +76,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/tests/Cubit/Orbix/tpr/Makefile b/TAO/tests/Cubit/Orbix/tpr/Makefile index cf6149643d3..5c8191124c7 100644 --- a/TAO/tests/Cubit/Orbix/tpr/Makefile +++ b/TAO/tests/Cubit/Orbix/tpr/Makefile @@ -63,7 +63,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -76,7 +76,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/tests/Cubit/Orbix/tps/Makefile b/TAO/tests/Cubit/Orbix/tps/Makefile index f7e949578c2..0ea9b2e1e71 100644 --- a/TAO/tests/Cubit/Orbix/tps/Makefile +++ b/TAO/tests/Cubit/Orbix/tps/Makefile @@ -68,7 +68,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -163,7 +163,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -258,7 +258,7 @@ server: $(addprefix $(VDIR),$(SVR_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/tests/Cubit/TAO/DII_Cubit/Makefile index 114256ddd39..d8868023a64 100644 --- a/TAO/tests/Cubit/TAO/DII_Cubit/Makefile +++ b/TAO/tests/Cubit/TAO/DII_Cubit/Makefile @@ -133,7 +133,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -319,7 +319,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -503,7 +503,7 @@ endif .obj/cubit.o .shobj/cubit.: cubit.cpp cubit.h $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -688,7 +688,7 @@ endif .obj/test1.o .shobj/test1.: test1.cpp test1.h $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/TAO/tests/Demux_Test/CodeGen/Makefile b/TAO/tests/Demux_Test/CodeGen/Makefile index 32ea3aaf73b..8892815b4f4 100644 --- a/TAO/tests/Demux_Test/CodeGen/Makefile +++ b/TAO/tests/Demux_Test/CodeGen/Makefile @@ -61,7 +61,7 @@ CPPFLAGS += -DDEBUG $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/streams.h \ $(WRAPPER_ROOT)/ace/OS.i \ $(WRAPPER_ROOT)/ace/Trace.h \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ @@ -93,7 +93,7 @@ CPPFLAGS += -DDEBUG $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/streams.h \ $(WRAPPER_ROOT)/ace/OS.i \ $(WRAPPER_ROOT)/ace/Trace.h \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ @@ -125,7 +125,7 @@ CPPFLAGS += -DDEBUG $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/streams.h \ $(WRAPPER_ROOT)/ace/OS.i \ $(WRAPPER_ROOT)/ace/Trace.h \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ @@ -157,7 +157,7 @@ CPPFLAGS += -DDEBUG $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/streams.h \ $(WRAPPER_ROOT)/ace/OS.i \ $(WRAPPER_ROOT)/ace/Trace.h \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ @@ -189,7 +189,7 @@ CPPFLAGS += -DDEBUG $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/streams.h \ $(WRAPPER_ROOT)/ace/OS.i \ $(WRAPPER_ROOT)/ace/Trace.h \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ @@ -221,7 +221,7 @@ CPPFLAGS += -DDEBUG $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/streams.h \ $(WRAPPER_ROOT)/ace/OS.i \ $(WRAPPER_ROOT)/ace/Trace.h \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ @@ -253,7 +253,7 @@ CPPFLAGS += -DDEBUG $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/streams.h \ $(WRAPPER_ROOT)/ace/OS.i \ $(WRAPPER_ROOT)/ace/Trace.h \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ @@ -285,7 +285,7 @@ CPPFLAGS += -DDEBUG $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ - $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/streams.h \ $(WRAPPER_ROOT)/ace/OS.i \ $(WRAPPER_ROOT)/ace/Trace.h \ $(WRAPPER_ROOT)/ace/Log_Msg.h \ diff --git a/ace/stdcpp.h b/ace/stdcpp.h deleted file mode 100644 index 4a1b226c894..00000000000 --- a/ace/stdcpp.h +++ /dev/null @@ -1,140 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// stdcpp.h -// -// = AUTHOR -// Irfan and Tim and Darrell -// -// = DESCRIPTION -// This file contains the portability ugliness for the Standard C++ -// Library. As implementations of the "standard" emerge, this file -// will need to be updated. -// -// ============================================================================ - -#if !defined (ACE_STDCPP_H) -#define ACE_STDCPP_H - -#if !defined (ACE_USER_CONFIG_H) -#define ACE_USER_CONFIG_H -#include "ace/config.h" -#endif /* ACE_USER_CONFIG_H */ - -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) - -# if defined (_MSC_VER) -# pragma warning(disable: 4018 4114 4146 4245) -# pragma warning(disable: 4663 4664 4665 4511 4512) -# endif /* _MSC_VER */ - - // For some reason, The Standard C++ Library has decided to save space - // and ommit the file extensions. -# include /**/ <iomanip> -# include /**/ <ios> -# include /**/ <iostream> -# include /**/ <istream> -# include /**/ <ostream> -# include /**/ <fstream> -# include /**/ <streambuf> - - -/* As more compilers conform to Draft 2, ACE should be modified to use the - namespace instead of promoting names to the global namespace. For those - compilers that don't support it yet, there could be a global struct that - looks like: - - struct std - { - typedef ostream ::ostream; - - // ... - } -*/ - -// In case iostream.h is not #included before this header . . . -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ - (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) - using std::istream; - using std::ostream; - using std::ofstream; - using std::endl; - using std::flush; - using std::iostream; - using std::cerr; - using std::cout; - using std::cin; - using std::streambuf; - using std::ios; -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -# if defined (_MSC_VER) -# pragma warning(4: 4018 4114 4146 4245) -# pragma warning(4: 4663 4664 4665 4512 4511) -# endif /* _MSC_VER */ - -# else /* ACE_HAS_STANDARD_CPP_LIBRARY */ -# include /**/ <fstream.h> -# include /**/ <iostream.h> - -# if defined (ACE_WIN32) -# if defined(_MSC_VER) // VSB -# include /**/ <ios.h> -# include /**/ <streamb.h> -# include /**/ <istream.h> -# include /**/ <ostream.h> -# include /**/ <iomanip.h> -# endif /* _MSC_VER */ -# include /**/ <strstrea.h> // VSB -# endif /* ACE_WIN32 */ - -# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ - -// Now include the new standard headers (like cstdio) if using the -// new standard. - -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) -# if defined (_MSC_VER) -# pragma warning(disable: 4018 4114 4146 4245) -# pragma warning(disable: 4663 4664 4665 4511 4512) -# endif /* _MSC_VER */ - -# include /**/ <cassert> -# include /**/ <climits> -# include /**/ <cstdio> -# include /**/ <new> -# include /**/ <cctype> -# include /**/ <csignal> -# include /**/ <cstring> -# include /**/ <cstdarg> -# include /**/ <cerrno> -# include /**/ <cstdlib> - -# if defined (_MSC_VER) -# pragma warning(4: 4018 4114 4146 4245) -# pragma warning(4: 4663 4664 4665 4512 4511) -# endif /* _MSC_VER */ - -#else /* ACE_HAS_STANDARD_CPP_LIBRARY && ACE_HAS_STANDARD_CPP_LIBRARY */ - -# include /**/ <assert.h> -# include /**/ <limits.h> -// NOTE: stdarg.h must be #included before stdio.h on LynxOS. -# include /**/ <stdarg.h> -# include /**/ <stdio.h> -# include /**/ <new.h> -# include /**/ <ctype.h> -# include /**/ <signal.h> -# include /**/ <string.h> -# include /**/ <errno.h> -# include /**/ <stdlib.h> - -#endif /* ACE_HAS_STANDARD_CPP_LIBRARY && ACE_HAS_STANDARD_CPP_LIBRARY */ - -#endif /* ACE_STDCPP_H */ diff --git a/apps/Gateway/Gateway/Makefile b/apps/Gateway/Gateway/Makefile index c43671fee25..6aa31b36b1b 100644 --- a/apps/Gateway/Gateway/Makefile +++ b/apps/Gateway/Gateway/Makefile @@ -64,7 +64,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -191,7 +191,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Config_Files.o .shobj/Config_Files.so: Config_Files.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -205,7 +205,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/File_Parser.o .shobj/File_Parser.so: File_Parser.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -221,7 +221,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -358,7 +358,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -487,7 +487,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -560,7 +560,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -693,7 +693,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -825,7 +825,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/apps/Gateway/Peer/Makefile b/apps/Gateway/Peer/Makefile index e192bf34c67..28179f13812 100644 --- a/apps/Gateway/Peer/Makefile +++ b/apps/Gateway/Peer/Makefile @@ -55,7 +55,7 @@ INCLDIRS += -I../Gateway $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/apps/JAWS/clients/Blobby/Makefile b/apps/JAWS/clients/Blobby/Makefile index 303400cb776..7cc9133e51a 100644 --- a/apps/JAWS/clients/Blobby/Makefile +++ b/apps/JAWS/clients/Blobby/Makefile @@ -45,7 +45,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Blob.o .shobj/Blob.so: Blob.cpp Blob.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -169,7 +169,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Blob_Handler.o .shobj/Blob_Handler.so: Blob_Handler.cpp Blob_Handler.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -283,7 +283,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Options.o .shobj/Options.so: Options.cpp Blob.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/apps/JAWS/clients/Caching/Makefile b/apps/JAWS/clients/Caching/Makefile index 2a17014c235..f5d185a1105 100644 --- a/apps/JAWS/clients/Caching/Makefile +++ b/apps/JAWS/clients/Caching/Makefile @@ -50,7 +50,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/apps/JAWS/server/Makefile b/apps/JAWS/server/Makefile index 696a810171d..a8182b3af26 100644 --- a/apps/JAWS/server/Makefile +++ b/apps/JAWS/server/Makefile @@ -58,7 +58,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -196,7 +196,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/HTTP_Config.o .shobj/HTTP_Config.so: HTTP_Config.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -212,7 +212,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -287,7 +287,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -314,7 +314,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -365,7 +365,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Process.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -398,7 +398,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Parse_Headers.o .shobj/Parse_Headers.so: Parse_Headers.cpp Parse_Headers.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -412,7 +412,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/ASX/CCM_App/Makefile b/examples/ASX/CCM_App/Makefile index 568e10ec7fa..3bbc4182071 100644 --- a/examples/ASX/CCM_App/Makefile +++ b/examples/ASX/CCM_App/Makefile @@ -49,7 +49,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/ASX/Event_Server/Event_Server/Makefile b/examples/ASX/Event_Server/Event_Server/Makefile index 726340354f0..1f2a86a4348 100644 --- a/examples/ASX/Event_Server/Event_Server/Makefile +++ b/examples/ASX/Event_Server/Event_Server/Makefile @@ -50,7 +50,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -86,7 +86,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -214,7 +214,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Event_Analyzer.o .shobj/Event_Analyzer.so: Event_Analyzer.cpp Options.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -322,7 +322,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -468,7 +468,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/ASX/UPIPE_Event_Server/Makefile b/examples/ASX/UPIPE_Event_Server/Makefile index 00006fd70eb..f71a9ed1355 100644 --- a/examples/ASX/UPIPE_Event_Server/Makefile +++ b/examples/ASX/UPIPE_Event_Server/Makefile @@ -50,7 +50,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -84,7 +84,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Supplier_Router.o .shobj/Supplier_Router.so: Supplier_Router.cpp Options.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -225,7 +225,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -324,7 +324,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -463,7 +463,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/ASX/UPIPE_Event_Server/event_server.cpp b/examples/ASX/UPIPE_Event_Server/event_server.cpp index 4e6dc23af95..d7d788939d5 100644 --- a/examples/ASX/UPIPE_Event_Server/event_server.cpp +++ b/examples/ASX/UPIPE_Event_Server/event_server.cpp @@ -9,6 +9,7 @@ #include "Supplier_Router.h" #include "ace/UPIPE_Acceptor.h" #include "ace/UPIPE_Connector.h" +#include "ace/streams.h" #if defined (ACE_HAS_THREADS) diff --git a/examples/Connection/misc/Makefile b/examples/Connection/misc/Makefile index 4922e88936d..05dd8e6c027 100644 --- a/examples/Connection/misc/Makefile +++ b/examples/Connection/misc/Makefile @@ -46,7 +46,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -181,7 +181,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Connection/non_blocking/Makefile b/examples/Connection/non_blocking/Makefile index 09909b57197..c02b6da1d88 100644 --- a/examples/Connection/non_blocking/Makefile +++ b/examples/Connection/non_blocking/Makefile @@ -62,7 +62,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -171,7 +171,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -279,7 +279,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -404,7 +404,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -527,7 +527,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -660,7 +660,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -789,7 +789,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -910,7 +910,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1031,7 +1031,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1155,7 +1155,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/IOStream/client/Makefile b/examples/IOStream/client/Makefile index 3143ff0954a..b45811ffb24 100644 --- a/examples/IOStream/client/Makefile +++ b/examples/IOStream/client/Makefile @@ -46,7 +46,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/IOStream/server/Makefile b/examples/IOStream/server/Makefile index 4366a104f26..bf0b9a574b6 100644 --- a/examples/IOStream/server/Makefile +++ b/examples/IOStream/server/Makefile @@ -46,7 +46,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/IPC_SAP/DEV_SAP/reader/Makefile b/examples/IPC_SAP/DEV_SAP/reader/Makefile index 2beb6b6ef61..c864e21aa1b 100644 --- a/examples/IPC_SAP/DEV_SAP/reader/Makefile +++ b/examples/IPC_SAP/DEV_SAP/reader/Makefile @@ -46,7 +46,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/reader.o .shobj/reader.: reader.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/IPC_SAP/DEV_SAP/writer/Makefile b/examples/IPC_SAP/DEV_SAP/writer/Makefile index 83ed5a27d31..4d078e1f1db 100644 --- a/examples/IPC_SAP/DEV_SAP/writer/Makefile +++ b/examples/IPC_SAP/DEV_SAP/writer/Makefile @@ -51,7 +51,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/IPC_SAP/FIFO_SAP/Makefile b/examples/IPC_SAP/FIFO_SAP/Makefile index ada569a4c8d..1d0ecfe06bb 100644 --- a/examples/IPC_SAP/FIFO_SAP/Makefile +++ b/examples/IPC_SAP/FIFO_SAP/Makefile @@ -50,7 +50,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -71,7 +71,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -91,7 +91,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -110,7 +110,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -129,7 +129,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/IPC_SAP/FILE_SAP/Makefile b/examples/IPC_SAP/FILE_SAP/Makefile index 73334fd73ea..79d0de00275 100644 --- a/examples/IPC_SAP/FILE_SAP/Makefile +++ b/examples/IPC_SAP/FILE_SAP/Makefile @@ -40,7 +40,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/client.o .shobj/client.: client.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/IPC_SAP/SOCK_SAP/Makefile b/examples/IPC_SAP/SOCK_SAP/Makefile index 7fd5fef5f54..f7185f0d06e 100644 --- a/examples/IPC_SAP/SOCK_SAP/Makefile +++ b/examples/IPC_SAP/SOCK_SAP/Makefile @@ -56,7 +56,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -85,7 +85,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -120,7 +120,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -150,7 +150,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -179,7 +179,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -215,7 +215,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -251,7 +251,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -281,7 +281,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/C-inclient.o .shobj/C-inclient.: C-inclient.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -294,7 +294,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/C-inserver.o .shobj/C-inserver.: C-inserver.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/IPC_SAP/SPIPE_SAP/Makefile b/examples/IPC_SAP/SPIPE_SAP/Makefile index d8816e4bc33..2cb9f03c6dc 100644 --- a/examples/IPC_SAP/SPIPE_SAP/Makefile +++ b/examples/IPC_SAP/SPIPE_SAP/Makefile @@ -50,7 +50,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -78,7 +78,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -105,7 +105,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -132,7 +132,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -159,7 +159,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -187,7 +187,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -215,7 +215,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -242,7 +242,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/IPC_SAP/TLI_SAP/Makefile b/examples/IPC_SAP/TLI_SAP/Makefile index 3d95e37a221..241452c5ca9 100644 --- a/examples/IPC_SAP/TLI_SAP/Makefile +++ b/examples/IPC_SAP/TLI_SAP/Makefile @@ -55,7 +55,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -78,7 +78,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -144,7 +144,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -168,7 +168,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -233,7 +233,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -257,7 +257,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/IPC_SAP/UPIPE_SAP/Makefile b/examples/IPC_SAP/UPIPE_SAP/Makefile index 1f31bf5c103..270cca5b14e 100644 --- a/examples/IPC_SAP/UPIPE_SAP/Makefile +++ b/examples/IPC_SAP/UPIPE_SAP/Makefile @@ -44,7 +44,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -164,7 +164,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -283,7 +283,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Log_Msg/Makefile b/examples/Log_Msg/Makefile index 131b3953180..a3eed939ff1 100644 --- a/examples/Log_Msg/Makefile +++ b/examples/Log_Msg/Makefile @@ -43,7 +43,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/test_log_msg.o .shobj/test_log_msg.: test_log_msg.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp index ea6e27b20d6..e6629bc4eae 100644 --- a/examples/Logger/Acceptor-server/server_loggerd.cpp +++ b/examples/Logger/Acceptor-server/server_loggerd.cpp @@ -11,6 +11,7 @@ #include "ace/SOCK_Acceptor.h" #include "ace/Synch.h" #include "ace/Singleton.h" +#include "ace/streams.h" // ---------------------------------------- diff --git a/examples/Logger/client/Makefile b/examples/Logger/client/Makefile index 0f489326abc..fccd6577ce6 100644 --- a/examples/Logger/client/Makefile +++ b/examples/Logger/client/Makefile @@ -46,7 +46,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Logger/simple-server/Makefile b/examples/Logger/simple-server/Makefile index 0d8e3266e2b..423e9738481 100644 --- a/examples/Logger/simple-server/Makefile +++ b/examples/Logger/simple-server/Makefile @@ -51,7 +51,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -150,7 +150,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Map_Manager/Makefile b/examples/Map_Manager/Makefile index 20289b35789..954558db0aa 100644 --- a/examples/Map_Manager/Makefile +++ b/examples/Map_Manager/Makefile @@ -44,7 +44,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Mem_Map/IO-tests/Makefile b/examples/Mem_Map/IO-tests/Makefile index c1552ceaeaf..5317b5123e6 100644 --- a/examples/Mem_Map/IO-tests/Makefile +++ b/examples/Mem_Map/IO-tests/Makefile @@ -45,7 +45,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/IO_Test.o .shobj/IO_Test.so: IO_Test.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Mem_Map/file-reverse/Makefile b/examples/Mem_Map/file-reverse/Makefile index 27c5c430e5d..5e9422085a5 100644 --- a/examples/Mem_Map/file-reverse/Makefile +++ b/examples/Mem_Map/file-reverse/Makefile @@ -47,7 +47,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Misc/Makefile b/examples/Misc/Makefile index 6ca4bc457a7..5c6a2f2f9f5 100644 --- a/examples/Misc/Makefile +++ b/examples/Misc/Makefile @@ -56,7 +56,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -85,7 +85,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -100,7 +100,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -120,7 +120,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -185,7 +185,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -234,7 +234,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -249,7 +249,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Reactor/Dgram/Makefile b/examples/Reactor/Dgram/Makefile index 71e399686ce..71aa90b6d72 100644 --- a/examples/Reactor/Dgram/Makefile +++ b/examples/Reactor/Dgram/Makefile @@ -47,7 +47,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -117,7 +117,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Reactor/FIFO/Makefile b/examples/Reactor/FIFO/Makefile index a426b957239..8fade8229d9 100644 --- a/examples/Reactor/FIFO/Makefile +++ b/examples/Reactor/FIFO/Makefile @@ -47,7 +47,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -67,7 +67,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Reactor/Misc/Makefile b/examples/Reactor/Misc/Makefile index f0b5e1a1b4e..d3c785a4826 100644 --- a/examples/Reactor/Misc/Makefile +++ b/examples/Reactor/Misc/Makefile @@ -50,7 +50,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -112,7 +112,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -179,7 +179,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -272,7 +272,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -288,7 +288,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -383,7 +383,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -447,7 +447,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -534,7 +534,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -550,7 +550,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Reactor/Multicast/Makefile b/examples/Reactor/Multicast/Makefile index e6ee3901da2..8ee58288aa1 100644 --- a/examples/Reactor/Multicast/Makefile +++ b/examples/Reactor/Multicast/Makefile @@ -47,7 +47,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Reactor/Ntalker/Makefile b/examples/Reactor/Ntalker/Makefile index 1e4329b6414..79be282fef8 100644 --- a/examples/Reactor/Ntalker/Makefile +++ b/examples/Reactor/Ntalker/Makefile @@ -45,7 +45,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Reactor/Ntalker/ntalker.cpp b/examples/Reactor/Ntalker/ntalker.cpp index afd5188fb35..24e88628f96 100644 --- a/examples/Reactor/Ntalker/ntalker.cpp +++ b/examples/Reactor/Ntalker/ntalker.cpp @@ -11,6 +11,7 @@ #include "ace/Get_Opt.h" #include "ace/Thread_Manager.h" #include "ace/Service_Config.h" +#include "ace/streams.h" #if defined (ACE_HAS_IP_MULTICAST) // network interface to subscribe to diff --git a/examples/Service_Configurator/IPC-tests/client/Makefile b/examples/Service_Configurator/IPC-tests/client/Makefile index b674e3acdc2..bf9cfe4ab41 100644 --- a/examples/Service_Configurator/IPC-tests/client/Makefile +++ b/examples/Service_Configurator/IPC-tests/client/Makefile @@ -57,7 +57,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -94,7 +94,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -132,7 +132,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -166,7 +166,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -200,7 +200,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -229,7 +229,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -256,7 +256,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -281,7 +281,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -308,7 +308,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -342,7 +342,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Service_Configurator/IPC-tests/server/Makefile b/examples/Service_Configurator/IPC-tests/server/Makefile index e5419c36419..96db3644bb4 100644 --- a/examples/Service_Configurator/IPC-tests/server/Makefile +++ b/examples/Service_Configurator/IPC-tests/server/Makefile @@ -62,7 +62,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -146,7 +146,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -232,7 +232,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -310,7 +310,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -403,7 +403,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -496,7 +496,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -576,7 +576,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -677,7 +677,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -747,7 +747,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -827,7 +827,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -908,7 +908,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1032,7 +1032,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Service_Configurator/Misc/Makefile b/examples/Service_Configurator/Misc/Makefile index 1f037f077c8..c32f445e0ed 100644 --- a/examples/Service_Configurator/Misc/Makefile +++ b/examples/Service_Configurator/Misc/Makefile @@ -48,7 +48,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Shared_Malloc/Makefile b/examples/Shared_Malloc/Makefile index 45a1a2dc0fa..c065392ce30 100644 --- a/examples/Shared_Malloc/Makefile +++ b/examples/Shared_Malloc/Makefile @@ -51,7 +51,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Malloc.o .shobj/Malloc.so: Malloc.cpp Options.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -103,7 +103,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Shared_Malloc/test_persistence.cpp b/examples/Shared_Malloc/test_persistence.cpp index 4c70e161412..a90a3a0743a 100644 --- a/examples/Shared_Malloc/test_persistence.cpp +++ b/examples/Shared_Malloc/test_persistence.cpp @@ -3,6 +3,7 @@ // Test the persistence capabilities of the ACE shared memory manager. #include "ace/Malloc.h" +#include "ace/streams.h" typedef ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> MALLOC; typedef ACE_Malloc_Iterator <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> MALLOC_ITERATOR; diff --git a/examples/Shared_Memory/Makefile b/examples/Shared_Memory/Makefile index e0add9960a5..a7cbc1b9043 100644 --- a/examples/Shared_Memory/Makefile +++ b/examples/Shared_Memory/Makefile @@ -50,7 +50,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -68,7 +68,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp b/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp index 123e1cfc910..9dc9b3ac315 100644 --- a/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp +++ b/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp @@ -2,6 +2,7 @@ // $Id$ #include "test.h" +#include "ace/streams.h" int main (int, char *[]) diff --git a/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp b/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp index 839e85a2832..cce52d10bcd 100644 --- a/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp +++ b/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp @@ -2,6 +2,7 @@ #include "ace/Signal.h" #include "ace/SV_Message_Queue.h" +#include "ace/streams.h" #include "test.h" // Must be global for signal Message... diff --git a/examples/System_V_IPC/SV_Message_Queues/Makefile b/examples/System_V_IPC/SV_Message_Queues/Makefile index 5ba40c28afd..680c5d38cfc 100644 --- a/examples/System_V_IPC/SV_Message_Queues/Makefile +++ b/examples/System_V_IPC/SV_Message_Queues/Makefile @@ -49,7 +49,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -102,7 +102,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -121,7 +121,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -181,7 +181,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp b/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp index 254e42300ca..7144d7fd5ca 100644 --- a/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp +++ b/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp @@ -1,8 +1,8 @@ #include "ace/Typed_SV_Message_Queue.h" // $Id$ - #include "test.h" +#include "ace/streams.h" int main (int, char *[]) diff --git a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp index d6de4b7ba23..6588c27cf3a 100644 --- a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp +++ b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp @@ -4,6 +4,7 @@ #include "ace/Typed_SV_Message_Queue.h" #include "test.h" +#include "ace/streams.h" // Must be global for signal Message... static ACE_Typed_SV_Message_Queue<Message_Data> msgque diff --git a/examples/System_V_IPC/SV_Semaphores/Makefile b/examples/System_V_IPC/SV_Semaphores/Makefile index 9f0b310fb93..dae3df37d6c 100644 --- a/examples/System_V_IPC/SV_Semaphores/Makefile +++ b/examples/System_V_IPC/SV_Semaphores/Makefile @@ -44,7 +44,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -95,7 +95,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/System_V_IPC/SV_Shared_Memory/Makefile b/examples/System_V_IPC/SV_Shared_Memory/Makefile index ae273a6c7f3..5475256d187 100644 --- a/examples/System_V_IPC/SV_Shared_Memory/Makefile +++ b/examples/System_V_IPC/SV_Shared_Memory/Makefile @@ -47,7 +47,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Threads/Makefile b/examples/Threads/Makefile index d4b34e4f037..b794d1b6992 100644 --- a/examples/Threads/Makefile +++ b/examples/Threads/Makefile @@ -71,7 +71,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -139,7 +139,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -202,7 +202,7 @@ endif $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h .obj/barrier2.o .shobj/barrier2.: barrier2.cpp \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/config.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -299,7 +299,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -400,7 +400,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -504,7 +504,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -571,7 +571,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -642,7 +642,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -691,7 +691,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -740,7 +740,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -795,7 +795,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -864,7 +864,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -958,7 +958,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1051,7 +1051,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1146,7 +1146,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1240,7 +1240,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1307,7 +1307,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1401,7 +1401,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1468,7 +1468,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1561,7 +1561,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1599,7 +1599,7 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/examples/Threads/barrier2.cpp b/examples/Threads/barrier2.cpp index 00d7229856c..940988cf208 100644 --- a/examples/Threads/barrier2.cpp +++ b/examples/Threads/barrier2.cpp @@ -13,7 +13,6 @@ // BARRIER_TYPE is supposed to enable/disable barrier sync on each svc // a worker has done. -#include "ace/stdcpp.h" #include "ace/Task.h" #include "ace/Service_Config.h" diff --git a/examples/Timer_Queue/Makefile b/examples/Timer_Queue/Makefile index 6cba76cb532..2861a084d1b 100644 --- a/examples/Timer_Queue/Makefile +++ b/examples/Timer_Queue/Makefile @@ -58,7 +58,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -162,7 +162,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -275,7 +275,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -376,7 +376,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -480,7 +480,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -585,7 +585,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -690,7 +690,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/netsvcs/clients/Logger/Makefile b/netsvcs/clients/Logger/Makefile index 1c2f903a1f6..6569827d024 100644 --- a/netsvcs/clients/Logger/Makefile +++ b/netsvcs/clients/Logger/Makefile @@ -47,7 +47,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -70,7 +70,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/indirect_logging.o .shobj/indirect_logging.: indirect_logging.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/netsvcs/clients/Naming/Client/Makefile b/netsvcs/clients/Naming/Client/Makefile index 8e01314d1e9..01b4fff97a5 100644 --- a/netsvcs/clients/Naming/Client/Makefile +++ b/netsvcs/clients/Naming/Client/Makefile @@ -56,7 +56,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -152,7 +152,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile b/netsvcs/clients/Naming/Dump_Restore/Makefile index 1e43bc8fe2c..f2af2fb7221 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Makefile +++ b/netsvcs/clients/Naming/Dump_Restore/Makefile @@ -56,7 +56,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -148,7 +148,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/netsvcs/clients/Tokens/collection/Makefile b/netsvcs/clients/Tokens/collection/Makefile index f8de9a3b77f..049a2f10957 100644 --- a/netsvcs/clients/Tokens/collection/Makefile +++ b/netsvcs/clients/Tokens/collection/Makefile @@ -45,7 +45,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/collection.o .shobj/collection.so: collection.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/netsvcs/clients/Tokens/deadlock/Makefile b/netsvcs/clients/Tokens/deadlock/Makefile index fd156c42139..b8f231662a7 100644 --- a/netsvcs/clients/Tokens/deadlock/Makefile +++ b/netsvcs/clients/Tokens/deadlock/Makefile @@ -45,7 +45,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/deadlock_detection_test.o .shobj/deadlock_detection_test.so: deadlock_detection_test.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/netsvcs/clients/Tokens/invariant/Makefile b/netsvcs/clients/Tokens/invariant/Makefile index c1d913a56d5..91dc546f250 100644 --- a/netsvcs/clients/Tokens/invariant/Makefile +++ b/netsvcs/clients/Tokens/invariant/Makefile @@ -45,7 +45,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/invariant.o .shobj/invariant.so: invariant.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/netsvcs/clients/Tokens/mutex/Makefile b/netsvcs/clients/Tokens/mutex/Makefile index 6413d6f47e5..f854cb50f88 100644 --- a/netsvcs/clients/Tokens/mutex/Makefile +++ b/netsvcs/clients/Tokens/mutex/Makefile @@ -45,7 +45,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/test_mutex.o .shobj/test_mutex.so: test_mutex.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/netsvcs/clients/Tokens/rw_lock/Makefile b/netsvcs/clients/Tokens/rw_lock/Makefile index e68e3cabccc..aafb4bbe080 100644 --- a/netsvcs/clients/Tokens/rw_lock/Makefile +++ b/netsvcs/clients/Tokens/rw_lock/Makefile @@ -45,7 +45,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/rw_locks.o .shobj/rw_locks.so: rw_locks.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/netsvcs/lib/Makefile b/netsvcs/lib/Makefile index 8ab2a7d4612..27b1bbbc612 100644 --- a/netsvcs/lib/Makefile +++ b/netsvcs/lib/Makefile @@ -56,7 +56,7 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -182,7 +182,7 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -311,7 +311,7 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -445,7 +445,7 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -576,7 +576,7 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -708,7 +708,7 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -736,7 +736,7 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -869,7 +869,7 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1003,7 +1003,7 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/netsvcs/servers/Makefile b/netsvcs/servers/Makefile index a194a1e19ea..cf49db80ac9 100644 --- a/netsvcs/servers/Makefile +++ b/netsvcs/servers/Makefile @@ -47,7 +47,7 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/performance-tests/Misc/Makefile b/performance-tests/Misc/Makefile index c61da0fad39..08cbe29999a 100644 --- a/performance-tests/Misc/Makefile +++ b/performance-tests/Misc/Makefile @@ -59,7 +59,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -74,7 +74,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/childbirth_time.o .shobj/childbirth_time.so: childbirth_time.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -97,7 +97,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -200,7 +200,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -297,7 +297,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Version.h \ @@ -314,7 +314,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -354,7 +354,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/performance-tests/Synch-Benchmarks/Makefile b/performance-tests/Synch-Benchmarks/Makefile index 42ad307d1fa..bbec54d229d 100644 --- a/performance-tests/Synch-Benchmarks/Makefile +++ b/performance-tests/Synch-Benchmarks/Makefile @@ -67,7 +67,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -146,7 +146,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -225,7 +225,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -304,7 +304,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -383,7 +383,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -462,7 +462,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -541,7 +541,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -620,7 +620,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -699,7 +699,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -778,7 +778,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -858,7 +858,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -934,7 +934,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/pipe_proc_test.o .shobj/pipe_proc_test.so: pipe_proc_test.cpp Options.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1012,7 +1012,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU .obj/Options.o .shobj/Options.so: Options.cpp Options.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1075,7 +1075,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1142,7 +1142,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/stdcpp.h \ + $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ |