diff options
-rw-r--r-- | ace/IOStream.cpp | 2 | ||||
-rw-r--r-- | ace/IOStream_T.cpp | 24 | ||||
-rw-r--r-- | ace/IOStream_T.h | 22 | ||||
-rw-r--r-- | examples/IOStream/client/iostream_client.cpp | 6 | ||||
-rw-r--r-- | examples/IOStream/server/iostream_server.cpp | 8 | ||||
-rw-r--r-- | tests/IOStream_Test.cpp | 6 |
6 files changed, 34 insertions, 34 deletions
diff --git a/ace/IOStream.cpp b/ace/IOStream.cpp index f9d96970129..e45ff844d68 100644 --- a/ace/IOStream.cpp +++ b/ace/IOStream.cpp @@ -42,7 +42,7 @@ // invokes iostream::operator>> (int&) then iostream::operator>> (String&) // // What has happened is that the first >> is invoked on the base class and returns - // a reference to iostream. The second >> has no idea of the ACE_IOStream_T and + // a reference to iostream. The second >> has no idea of the ACE_IOStream and // gets invoked on iostream. Probably NOT what you wanted! diff --git a/ace/IOStream_T.cpp b/ace/IOStream_T.cpp index 7ab8c71b5fb..d2abced600f 100644 --- a/ace/IOStream_T.cpp +++ b/ace/IOStream_T.cpp @@ -14,7 +14,7 @@ // file. That name contains a ".", so it's not a legal C variable name. // The root of all this trouble is a static instance (of Iostream_init) // declared in the iostream.h header file. - int ACE_IOStream_T_global_of_builtin_type_to_avoid_munch_problems = 0; + 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__) */ @@ -26,7 +26,7 @@ #endif /* !__ACE_INLINE__ */ // We will be given a STREAM by the iostream object which creates us. -// See the ACE_IOStream_T template for how that works. Like other +// See the ACE_IOStream template for how that works. Like other // streambuf objects, we can be input-only, output-only or both. template <class STREAM> @@ -58,7 +58,7 @@ ACE_Streambuf_T<STREAM>::ACE_Streambuf_T (STREAM *peer, // STREAM. template <class STREAM> -ACE_IOStream_T<STREAM>::ACE_IOStream_T (STREAM &stream, +ACE_IOStream<STREAM>::ACE_IOStream (STREAM &stream, u_int streambuf_size) : iostream (streambuf_ = new ACE_Streambuf_T<STREAM> ((STREAM *) this, streambuf_size)), STREAM (stream) @@ -67,7 +67,7 @@ ACE_IOStream_T<STREAM>::ACE_IOStream_T (STREAM &stream, } template <class STREAM> -ACE_IOStream_T<STREAM>::ACE_IOStream_T (u_int streambuf_size) +ACE_IOStream<STREAM>::ACE_IOStream (u_int streambuf_size) : iostream (streambuf_ = new ACE_Streambuf_T<STREAM> ((STREAM *) this, streambuf_size)) { iostream::init (this->streambuf_); @@ -77,7 +77,7 @@ ACE_IOStream_T<STREAM>::ACE_IOStream_T (u_int streambuf_size) // iostream () template <class STREAM> -ACE_IOStream_T<STREAM>::~ACE_IOStream_T (void) +ACE_IOStream<STREAM>::~ACE_IOStream (void) { delete this->streambuf_; } @@ -86,13 +86,13 @@ ACE_IOStream_T<STREAM>::~ACE_IOStream_T (void) // function. template <class STREAM> int -ACE_IOStream_T<STREAM>::close (void) +ACE_IOStream<STREAM>::close (void) { return STREAM::close (); } -template <class STREAM> ACE_IOStream_T<STREAM> & -ACE_IOStream_T<STREAM>::operator>> (ACE_Time_Value *&tv) +template <class STREAM> ACE_IOStream<STREAM> & +ACE_IOStream<STREAM>::operator>> (ACE_Time_Value *&tv) { ACE_Time_Value *old_tv = this->streambuf_->recv_timeout (tv); tv = old_tv; @@ -105,8 +105,8 @@ ACE_IOStream_T<STREAM>::operator>> (ACE_Time_Value *&tv) // that isn't always the best thing for a String. If we don't provide // our own here, we may not get what we want. -template <class STREAM> ACE_IOStream_T<STREAM> & -ACE_IOStream_T<STREAM>::operator>> (ACE_IOStream_String &v) +template <class STREAM> ACE_IOStream<STREAM> & +ACE_IOStream<STREAM>::operator>> (ACE_IOStream_String &v) { if (ipfx0 ()) { @@ -122,8 +122,8 @@ ACE_IOStream_T<STREAM>::operator>> (ACE_IOStream_String &v) return *this; } -template <class STREAM> ACE_IOStream_T<STREAM> & -ACE_IOStream_T<STREAM>::operator<< (ACE_IOStream_String &v) +template <class STREAM> ACE_IOStream<STREAM> & +ACE_IOStream<STREAM>::operator<< (ACE_IOStream_String &v) { if (opfx ()) { diff --git a/ace/IOStream_T.h b/ace/IOStream_T.h index 1950a08a3ba..797162ef113 100644 --- a/ace/IOStream_T.h +++ b/ace/IOStream_T.h @@ -38,7 +38,7 @@ public: u_int streambuf_size = ACE_STREAMBUF_SIZE, int io_mode = ios::in | ios::out); // We will be given a STREAM by the iostream object which creates - // us. See the ACE_IOStream_T template for how that works. Like + // us. See the ACE_IOStream template for how that works. Like // other streambuf objects, we can be input-only, output-only or // both. @@ -66,7 +66,7 @@ protected: }; template <class STREAM> -class ACE_IOStream_T : public iostream, public STREAM +class ACE_IOStream : public iostream, public STREAM // = TITLE // A template adapter for creating an iostream-like object using // an ACE IPC Stream for the actual I/O. Iostreams use an @@ -90,8 +90,8 @@ class ACE_IOStream_T : public iostream, public STREAM // // Because the operators in the iostream class are not virtual, // you cannot easily provide overloads in your custom - // ACE_IOStream_T classes. To make these things work correctly, - // you need to overload ALL operators of the ACE_IOStream_T you + // ACE_IOStream classes. To make these things work correctly, + // you need to overload ALL operators of the ACE_IOStream you // create. I've attempted to do that here to make things easier // for you but there are no guarantees. // @@ -100,14 +100,14 @@ class ACE_IOStream_T : public iostream, public STREAM // customize only one or two. { public: - ACE_IOStream_T (STREAM &stream, + ACE_IOStream (STREAM &stream, u_int streambuf_size = ACE_STREAMBUF_SIZE); - ACE_IOStream_T (u_int streambuf_size = ACE_STREAMBUF_SIZE); + ACE_IOStream (u_int streambuf_size = ACE_STREAMBUF_SIZE); // The default constructor. This will initiailze your STREAM and // then setup the iostream baseclass to use a custom streambuf based // on STREAM. - virtual ~ACE_IOStream_T (void); + virtual ~ACE_IOStream (void); // We have to get rid of the streambuf_ ourselves since we gave it // to iostream(); @@ -116,18 +116,18 @@ public: // function. #if defined (ACE_HAS_STRING_CLASS) - virtual ACE_IOStream_T<STREAM> &operator>> (ACE_IOStream_String &v); + virtual ACE_IOStream<STREAM> &operator>> (ACE_IOStream_String &v); // A simple string operator. The base iostream has 'em for char* // but that isn't always the best thing for a String. If we don't // provide our own here, we may not get what we want. - virtual ACE_IOStream_T<STREAM> &operator<< (ACE_IOStream_String &v); + virtual ACE_IOStream<STREAM> &operator<< (ACE_IOStream_String &v); // The converse of the String put operator. #endif /* ACE_HAS_STRING_CLASS */ // = Using the macros to provide get/set operators. - GETPUT_FUNC_SET (ACE_IOStream_T<STREAM>) + GETPUT_FUNC_SET (ACE_IOStream<STREAM>) #if defined (ACE_LACKS_IOSTREAM_FX) virtual int ipfx (int /* need */ = 0) { return good(); } @@ -150,7 +150,7 @@ public: virtual void osfx (void) { iostream::osfx(); return; } #endif /* ACE_LACKS_IOSTREAM_FX */ - ACE_IOStream_T<STREAM> & operator>>(ACE_Time_Value *&tv); + ACE_IOStream<STREAM> & operator>>(ACE_Time_Value *&tv); // Allow the programmer to provide a timeout for read operations. // Give it a pointer to NULL to block forever. diff --git a/examples/IOStream/client/iostream_client.cpp b/examples/IOStream/client/iostream_client.cpp index 0227f96d20c..cb54c9016a8 100644 --- a/examples/IOStream/client/iostream_client.cpp +++ b/examples/IOStream/client/iostream_client.cpp @@ -7,7 +7,7 @@ int main (int argc, char *argv[]) const char *server_host = argc > 1 ? argv[1] : ACE_DEFAULT_SERVER_HOST; u_short server_port = argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_SERVER_PORT; - ACE_IOStream_T<ACE_SOCK_Stream> server; + ACE_IOStream<ACE_SOCK_Stream> server; ACE_SOCK_Connector connector; ACE_INET_Addr addr (server_port, server_host); @@ -49,10 +49,10 @@ int main (int argc, char *argv[]) #if !defined (ACE_LACKS_ACE_IOSTREAM) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_IOStream_T <ACE_SOCK_Stream>; +template class ACE_IOStream <ACE_SOCK_Stream>; template class ACE_Streambuf_T <ACE_SOCK_Stream>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_IOStream_T <ACE_SOCK_Stream> +#pragma instantiate ACE_IOStream <ACE_SOCK_Stream> #pragma instantiate ACE_Streambuf_T <ACE_SOCK_Stream> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/examples/IOStream/server/iostream_server.cpp b/examples/IOStream/server/iostream_server.cpp index 88d5ea1e4f5..1c0a61d9637 100644 --- a/examples/IOStream/server/iostream_server.cpp +++ b/examples/IOStream/server/iostream_server.cpp @@ -1,4 +1,4 @@ -// This is a simple example of using the ACE_IOStream_T and +// This is a simple example of using the ACE_IOStream and // ACE_Streambuf_T templates to create an object based on ACE_*_Stream // classes which mimic a C++ iostream. @@ -13,7 +13,7 @@ // like an iostream. The new type (ACE_SOCK_IOStream) can be used // anywhere an ACE_SOCK_Stream is used. -typedef ACE_IOStream_T<ACE_SOCK_Stream> ACE_SOCK_IOStream ; +typedef ACE_IOStream<ACE_SOCK_Stream> ACE_SOCK_IOStream ; // Create a service handler object based on our new // iostream/SOCK_Stream hybrid. @@ -149,12 +149,12 @@ main (int argc, char *argv []) #if !defined (ACE_LACKS_ACE_IOSTREAM) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Acceptor <Handler, ACE_SOCK_ACCEPTOR>; -template class ACE_IOStream_T <ACE_SOCK_Stream>; +template class ACE_IOStream <ACE_SOCK_Stream>; template class ACE_Streambuf_T <ACE_SOCK_Stream>; template class ACE_Svc_Handler <ACE_SOCK_IOStream, ACE_INET_Addr, ACE_NULL_SYNCH>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Acceptor <Handler, ACE_SOCK_ACCEPTOR> -#pragma instantiate ACE_IOStream_T <ACE_SOCK_Stream> +#pragma instantiate ACE_IOStream <ACE_SOCK_Stream> #pragma instantiate ACE_Streambuf_T <ACE_SOCK_Stream> #pragma instantiate ACE_Svc_Handler <ACE_SOCK_IOStream, ACE_INET_Addr, ACE_NULL_SYNCH> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp index 5cd3af5f17a..73bea0ab44e 100644 --- a/tests/IOStream_Test.cpp +++ b/tests/IOStream_Test.cpp @@ -26,7 +26,7 @@ #if !defined (ACE_LACKS_ACE_IOSTREAM) -typedef ACE_IOStream_T<ACE_SOCK_Stream> ACE_SOCK_IOStream; +typedef ACE_IOStream<ACE_SOCK_Stream> ACE_SOCK_IOStream; /* The biggest drawback to an iostream is that it generally eats up whitespace when performing a get (>>) operation. @@ -416,10 +416,10 @@ main (int, char *[]) #if !defined (ACE_LACKS_ACE_IOSTREAM) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_IOStream_T<ACE_SOCK_Stream>; +template class ACE_IOStream<ACE_SOCK_Stream>; template class ACE_Streambuf_T<ACE_SOCK_Stream>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_IOStream_T<ACE_SOCK_Stream> +#pragma instantiate ACE_IOStream<ACE_SOCK_Stream> #pragma instantiate ACE_Streambuf_T<ACE_SOCK_Stream> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |