diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-06-08 09:44:07 +0200 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-06-08 09:44:07 +0200 |
commit | a3c268906c8890975eb405c421050b92b16aaf0d (patch) | |
tree | 8c1fb1316789da044630769fa136514bb577243c /ACE | |
parent | 6e9f7718c9e564e9a0ac1efbe34adfc3f74ed06c (diff) | |
download | ATCD-a3c268906c8890975eb405c421050b92b16aaf0d.tar.gz |
Remove cleanup of ACE_HAS_STRING_CLASS
* ACE/ace/IOStream.h:
* ACE/ace/README:
* ACE/ace/config-hpux-11.00.h:
* ACE/ace/config-lynxos.h:
* ACE/ace/config-netbsd.h:
* ACE/ace/config-openbsd.h:
* ACE/ace/config-openvms.h:
* ACE/ace/config-qnx.h:
* ACE/ace/config-rtems.h:
* ACE/ace/config-suncc-common.h:
* ACE/ace/config-sunos5.4-g++.h:
* ACE/ace/config-sunos5.5.h:
* ACE/ace/config-sunos5.6.h:
* ACE/ace/config-win32-borland.h:
* ACE/examples/IOStream/client/iostream_client.cpp:
* ACE/examples/IOStream/server/iostream_server.cpp:
Diffstat (limited to 'ACE')
-rw-r--r-- | ACE/ace/IOStream.h | 1 | ||||
-rw-r--r-- | ACE/ace/README | 3 | ||||
-rw-r--r-- | ACE/ace/config-hpux-11.00.h | 2 | ||||
-rw-r--r-- | ACE/ace/config-lynxos.h | 1 | ||||
-rw-r--r-- | ACE/ace/config-netbsd.h | 1 | ||||
-rw-r--r-- | ACE/ace/config-openbsd.h | 1 | ||||
-rw-r--r-- | ACE/ace/config-openvms.h | 1 | ||||
-rw-r--r-- | ACE/ace/config-qnx.h | 1 | ||||
-rw-r--r-- | ACE/ace/config-rtems.h | 3 | ||||
-rw-r--r-- | ACE/ace/config-suncc-common.h | 1 | ||||
-rw-r--r-- | ACE/ace/config-sunos5.4-g++.h | 4 | ||||
-rw-r--r-- | ACE/ace/config-sunos5.5.h | 4 | ||||
-rw-r--r-- | ACE/ace/config-sunos5.6.h | 3 | ||||
-rw-r--r-- | ACE/ace/config-win32-borland.h | 1 | ||||
-rw-r--r-- | ACE/examples/IOStream/client/iostream_client.cpp | 8 | ||||
-rw-r--r-- | ACE/examples/IOStream/server/iostream_server.cpp | 12 |
16 files changed, 0 insertions, 47 deletions
diff --git a/ACE/ace/IOStream.h b/ACE/ace/IOStream.h index a79b9b5c2f8..51f94101ae0 100644 --- a/ACE/ace/IOStream.h +++ b/ACE/ace/IOStream.h @@ -393,7 +393,6 @@ typedef ostream& (*__omanip_)(ostream&); #define PUT_PROT(MT,DT,CODE) PUT_SIG(MT,DT) CODE #define PUT_FUNC(MT,DT) PUT_PROT(MT,DT,PUT_CODE) - // These are necessary in case somebody wants to derive from us and // override one of these with a custom approach. diff --git a/ACE/ace/README b/ACE/ace/README index fbd2c53c2ab..8a87dc09fc8 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -541,9 +541,6 @@ ACE_HAS_STRNLEN Platform supports strnlen(3). ACE_HAS_STREAMS Platform supports STREAMS ACE_HAS_STREAM_PIPES Platform supports STREAM pipes ACE_HAS_STRICT Use the STRICT compilation mode on Win32. -ACE_HAS_STRING_CLASS Platform/Compiler supports a - String class (e.g., GNU or - Win32). ACE_HAS_STRUCT_NETDB_DATA Compiler/platform has strange hostent API for socket *_r() calls diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index cdbdf691523..9fe9e0d79e1 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -10,9 +10,7 @@ #define ACE_LACKS_SYS_SELECT_H #if defined (__GNUG__) - # include "ace/config-g++-common.h" - #else // aC++... diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h index b45bc08388d..6f4b8068e51 100644 --- a/ACE/ace/config-lynxos.h +++ b/ACE/ace/config-lynxos.h @@ -84,7 +84,6 @@ #define ACE_HAS_SSIZE_T #define ACE_HAS_STREAMS #define ACE_HAS_STRINGS -#define ACE_HAS_STRING_CLASS #define ACE_HAS_SYSCTL #define ACE_HAS_SYS_FILIO_H #define ACE_HAS_SYS_SOCKIO_H diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h index c65a19491d5..046ddbdbba4 100644 --- a/ACE/ace/config-netbsd.h +++ b/ACE/ace/config-netbsd.h @@ -65,7 +65,6 @@ #define ACE_HAS_SOCKLEN_T 1 #define ACE_HAS_SSIZE_T 1 #define ACE_HAS_STRINGS 1 -#define ACE_HAS_STRING_CLASS 1 #define ACE_HAS_SVR4_DYNAMIC_LINKING 1 #define ACE_HAS_SYSV_IPC #define ACE_HAS_SYS_FILIO_H 1 diff --git a/ACE/ace/config-openbsd.h b/ACE/ace/config-openbsd.h index 43a9364314a..2fa6dbc321d 100644 --- a/ACE/ace/config-openbsd.h +++ b/ACE/ace/config-openbsd.h @@ -68,7 +68,6 @@ #define ACE_HAS_SOCKLEN_T #define ACE_HAS_SSIZE_T #define ACE_HAS_STRINGS -#define ACE_HAS_STRING_CLASS #define ACE_HAS_SVR4_DYNAMIC_LINKING #define ACE_HAS_SVR4_SIGNAL_T #define ACE_HAS_SYSCTL diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h index e6b38678af2..e4e5071c80d 100644 --- a/ACE/ace/config-openvms.h +++ b/ACE/ace/config-openvms.h @@ -164,7 +164,6 @@ #define ACE_HAS_POSIX_NONBLOCK 1 #define ACE_HAS_POSIX_TIME 1 #define ACE_HAS_BROKEN_POSIX_TIME 1 -#define ACE_HAS_STRING_CLASS 1 #define ACE_HAS_SVR4_DYNAMIC_LINKING 1 #define ACE_LACKS_NAMED_POSIX_SEM 1 diff --git a/ACE/ace/config-qnx.h b/ACE/ace/config-qnx.h index 8530976d068..436cdc4bd69 100644 --- a/ACE/ace/config-qnx.h +++ b/ACE/ace/config-qnx.h @@ -104,7 +104,6 @@ #define ACE_HAS_SOCKADDR_MSG_NAME 1 #define ACE_HAS_SIG_C_FUNC 1 #define ACE_HAS_SOCKADDR_IN6_SIN6_LEN 1 -#define ACE_HAS_STRING_CLASS 1 #define ACE_HAS_STRSIGNAL #define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1 #define ACE_HAS_POSIX_NONBLOCK 1 diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h index 6c4c2995dfb..e74a3faa463 100644 --- a/ACE/ace/config-rtems.h +++ b/ACE/ace/config-rtems.h @@ -21,9 +21,6 @@ // Then the compiler specific parts #if defined (__GNUG__) - // config-g-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. -# define ACE_HAS_STRING_CLASS # include "ace/config-g++-common.h" #else /* ! __GNUG__ */ # ifdef __cplusplus /* Let it slide for C compilers. */ diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h index 737d7723514..517e743d1d8 100644 --- a/ACE/ace/config-suncc-common.h +++ b/ACE/ace/config-suncc-common.h @@ -3,7 +3,6 @@ #define ACE_SUNCC_COMMON_H #include /**/ "ace/pre.h" -# define ACE_HAS_STRING_CLASS # define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS # define ACE_HAS_THR_C_DEST 1 # define ACE_LACKS_SWAB diff --git a/ACE/ace/config-sunos5.4-g++.h b/ACE/ace/config-sunos5.4-g++.h index 514fb4a8768..74be0d51147 100644 --- a/ACE/ace/config-sunos5.4-g++.h +++ b/ACE/ace/config-sunos5.4-g++.h @@ -10,10 +10,6 @@ # define __ACE_INLINE__ #endif /* ! __ACE_INLINE__ */ -// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so -// this must appear before its #include. -#define ACE_HAS_STRING_CLASS - #include "ace/config-g++-common.h" #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h index 2e4c2d28451..cc2ba11caff 100644 --- a/ACE/ace/config-sunos5.5.h +++ b/ACE/ace/config-sunos5.5.h @@ -81,10 +81,6 @@ # endif /* __SUNPRO_CC > 0x540 (> Sun C++ 5.4) */ #elif defined (__GNUG__) - // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so - // this must appear before its #include. -# define ACE_HAS_STRING_CLASS - # include "ace/config-g++-common.h" # define ACE_HAS_HI_RES_TIMER diff --git a/ACE/ace/config-sunos5.6.h b/ACE/ace/config-sunos5.6.h index dcac3f6bdbe..2e2ef3b9d03 100644 --- a/ACE/ace/config-sunos5.6.h +++ b/ACE/ace/config-sunos5.6.h @@ -49,9 +49,6 @@ #ifndef ACE_HAS_SIG_C_FUNC #define ACE_HAS_SIG_C_FUNC 1 #endif /* ACE_HAS_SIG_C_FUNC */ -#ifndef ACE_HAS_STRING_CLASS -#define ACE_HAS_STRING_CLASS 1 -#endif /* ACE_HAS_STRING_CLASS */ #ifndef ACE_LACKS_IOSTREAM_FX #define ACE_LACKS_IOSTREAM_FX 1 #endif /* ACE_LACKS_IOSTREAM_FX */ diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 69923890d2b..0c1f4184147 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -117,7 +117,6 @@ #define ACE_HAS_NONCONST_SELECT_TIMEVAL #define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_STRING_CLASS 1 #define ACE_HAS_USER_MODE_MASKS 1 #define ACE_LACKS_ACE_IOSTREAM 1 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 diff --git a/ACE/examples/IOStream/client/iostream_client.cpp b/ACE/examples/IOStream/client/iostream_client.cpp index e454440ed0b..3d71a72bde5 100644 --- a/ACE/examples/IOStream/client/iostream_client.cpp +++ b/ACE/examples/IOStream/client/iostream_client.cpp @@ -32,7 +32,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) int i; float f; -#if defined (ACE_HAS_STRING_CLASS) ACE_IOStream_String s1; ACE_IOStream_String s2; server >> s1 >> i >> f >> s2; @@ -42,13 +41,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) cerr << i << " "; cerr << f << " "; cerr << s2 << endl; -#else - server >> i >> f; - - cerr << "(" << ACE_OS::getpid () << ") Server sent:\n\t"; - cerr << "(" << i << ") "; - cerr << "(" << f << ")" << endl; -#endif /* ACE_HAS_STRING_CLASS */ if (server.close () == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/ACE/examples/IOStream/server/iostream_server.cpp b/ACE/examples/IOStream/server/iostream_server.cpp index 4ef4a6d3026..f658f703bad 100644 --- a/ACE/examples/IOStream/server/iostream_server.cpp +++ b/ACE/examples/IOStream/server/iostream_server.cpp @@ -45,7 +45,6 @@ Handler::handle_input (ACE_HANDLE) if (this->peer ().eof ()) ACE_ERROR_RETURN ((LM_ERROR, "(%P) connection closed\n"), -1); -#if defined (ACE_HAS_STRING_CLASS) ACE_IOStream_String s; if (!(this->peer () >> i >> f >> s)) @@ -57,17 +56,6 @@ Handler::handle_input (ACE_HANDLE) if (!(this->peer () << "Received: " << i << " " << f << " " << s << endl)) ACE_ERROR_RETURN ((LM_ERROR, "(%P) %p\n", "error sending data"), -1); -#else - if (!(this->peer () >> i >> f)) - ACE_ERROR_RETURN ((LM_ERROR, "(%P) %p\n", "error getting data"), -1); - - cerr << "(" << ACE_OS::getpid () << ") Client sent:\n\t"; - cerr << "(" << i << ") (" << f << ")" << endl; - - if (!(this->peer () << i << " " << f << endl)) - ACE_ERROR_RETURN ((LM_ERROR, "(%P) %p\n", "error sending data"), -1); -#endif /* ACE_HAS_STRING_CLASS */ - // In order to flush the output to the peer, we have to use the sync // () function. Some iostreams implementations let us use a 'flush' // function much like the 'endl' function. |