diff options
author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-12-03 07:13:38 +0000 |
---|---|---|
committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-12-03 07:13:38 +0000 |
commit | c5c5462fbb178b65ab3a2a2a2b3e2a99d5458c9e (patch) | |
tree | 4749af403b3bf68a246a903fad2838e6ae8caae4 | |
parent | e85a5a82dc29f29b31baefa561263965d1d505c1 (diff) | |
download | ATCD-c5c5462fbb178b65ab3a2a2a2b3e2a99d5458c9e.tar.gz |
*** empty log message ***
-rw-r--r-- | ChangeLog-98a | 15 | ||||
-rw-r--r-- | ace/IOStream_T.cpp | 4 | ||||
-rw-r--r-- | ace/config-vxworks5.x-g++.h | 10 | ||||
-rw-r--r-- | ace/stdcpp.h | 27 | ||||
-rw-r--r-- | examples/Threads/task_three.cpp | 16 | ||||
-rw-r--r-- | netsvcs/lib/Logging_Strategy.cpp | 16 | ||||
-rw-r--r-- | tests/test_config.h | 16 |
7 files changed, 17 insertions, 87 deletions
diff --git a/ChangeLog-98a b/ChangeLog-98a index 22260600346..c28fb251a02 100644 --- a/ChangeLog-98a +++ b/ChangeLog-98a @@ -1,5 +1,20 @@ Wed Dec 03 00:17:50 1997 <irfan@TWOSTEP> + * tests/test_config.h: Removed code for + ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION, as this option is no longer + necessary. + + * ace/stdcpp.h: Removed code for + ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION, as this option is no longer + necessary. + + * ace/config-vxworks5.x-g++.h: Removed + ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION. This flag is no longer + required. + + * ace/IOStream_T.cpp: Removed ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION + from #if defined. + * ACE: Removed the explicit iostream.h inclusion from these: examples/ASX/UPIPE_Event_Server/event_server.cpp diff --git a/ace/IOStream_T.cpp b/ace/IOStream_T.cpp index be58c574282..c18285f4331 100644 --- a/ace/IOStream_T.cpp +++ b/ace/IOStream_T.cpp @@ -7,7 +7,7 @@ #include "ace/config.h" #if !defined (ACE_LACKS_ACE_IOSTREAM) -#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) && defined (__GNUG__) +#if defined (__GNUG__) # if !defined (ACE_IOSTREAM_T_H) // _Only_ define this when compiling this .cpp file standalone, not // when instantiating templates. Its purpose is to provide something @@ -19,7 +19,7 @@ // declared in the iostream.h header file. int ACE_IOStream_global_of_builtin_type_to_avoid_munch_problems = 0; # endif /* ! ACE_IOSTREAM_T_H */ -#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION && defined (__GNUG__) */ +#endif /* __GNUG__ */ #define ACE_BUILD_DLL #include "ace/IOStream_T.h" diff --git a/ace/config-vxworks5.x-g++.h b/ace/config-vxworks5.x-g++.h index 42147a071e7..50b7bab57a7 100644 --- a/ace/config-vxworks5.x-g++.h +++ b/ace/config-vxworks5.x-g++.h @@ -28,16 +28,6 @@ // that it doesn't. It causes undefined symbols for math functions. // #define ACE_HAS_LONGLONG_T -// On g++/VxWorks, iostream.h defines a static instance (yes, instance) -// of the Iostream_init class. That causes all files that #include it -// to put in the global constructor/destructor hooks. For files that -// don't have any static instances of non-class (built-in) types, the -// hooks refer to the file name, e.g., "foo.cpp". That file name gets -// embedded in a variable name by munch. The output from munch won't -// compile, though, because of the period! So, let g++/VxWorks users -// include iostream.h only where they need it. -#define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION - #define ACE_HAS_MSG #define ACE_HAS_MT_SAFE_SOCKETS #define ACE_HAS_NONSTATIC_OBJECT_MANAGER diff --git a/ace/stdcpp.h b/ace/stdcpp.h index 794b90bf5c4..4a1b226c894 100644 --- a/ace/stdcpp.h +++ b/ace/stdcpp.h @@ -27,7 +27,6 @@ #include "ace/config.h" #endif /* ACE_USER_CONFIG_H */ -#if !defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) # if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) # if defined (_MSC_VER) @@ -96,32 +95,6 @@ # endif /* ACE_WIN32 */ # endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ -#else /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ - -# 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 /**/ <iostream> - -# if defined (_MSC_VER) -# pragma warning(4: 4018 4114 4146 4245) -# pragma warning(4: 4663 4664 4665 4512 4511) -# endif /* _MSC_VER */ - -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ - (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) - using std::ostream; - using std::endl; - using std::cerr; -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ -# else /* ACE_HAS_STANDARD_CPP_LIBRARY */ -# include /**/ <iostream.h> -# endif - -#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ // Now include the new standard headers (like cstdio) if using the // new standard. diff --git a/examples/Threads/task_three.cpp b/examples/Threads/task_three.cpp index 4ca4668023d..c0d7ca3c516 100644 --- a/examples/Threads/task_three.cpp +++ b/examples/Threads/task_three.cpp @@ -17,22 +17,6 @@ #include "ace/Task.h" #include "ace/stdcpp.h" -// Make sure we have fstream -#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) -# include /**/ <fstream> - -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ - (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) - using std::ofstream; - using std::ios; -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -# else /* ACE_HAS_STANDARD_CPP_LIBRARY */ -# include /**/ <fstream.h> -# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ -#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ - #if defined (ACE_HAS_THREADS) static ofstream *out_stream = 0; diff --git a/netsvcs/lib/Logging_Strategy.cpp b/netsvcs/lib/Logging_Strategy.cpp index d8b11450159..f0170c244ac 100644 --- a/netsvcs/lib/Logging_Strategy.cpp +++ b/netsvcs/lib/Logging_Strategy.cpp @@ -5,22 +5,6 @@ #include "ace/Get_Opt.h" #include "Logging_Strategy.h" -// Make sure we have fstream -#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) -# include /**/ <fstream> - -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ - (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) - using std::ofstream; - using std::ios; -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -# else /* ACE_HAS_STANDARD_CPP_LIBRARY */ -# include /**/ <fstream.h> -# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ -#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ - // Parse the string containing all the flags and set the flags accordingly void ACE_Logging_Strategy::tokenize (char *flag_string) diff --git a/tests/test_config.h b/tests/test_config.h index 85f8917b8d9..d9ad2ec0570 100644 --- a/tests/test_config.h +++ b/tests/test_config.h @@ -23,22 +23,6 @@ #include "ace/stdcpp.h" -// Make sure we have fstream -#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) -# include /**/ <fstream> - -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ - (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) - using std::ofstream; - using std::ios; -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -# else /* ACE_HAS_STANDARD_CPP_LIBRARY */ -# include /**/ <fstream.h> -# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ -#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ - #if !defined (ACE_HAS_TEMPLATE_SPECIALIZATION) class KEY // ============================================================================ |