diff options
| -rw-r--r-- | ChangeLog-97b | 9 | ||||
| -rw-r--r-- | TAO/ChangeLog-98c | 122 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | ace/IOStream.h | 25 | ||||
| -rw-r--r-- | ace/IOStream_T.cpp | 9 |
5 files changed, 87 insertions, 80 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index bbd3f5b4073..10ccd523e88 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,3 +1,8 @@ +Mon Nov 17 02:03:21 1997 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu> + + * ace/IOStream_T.cpp: Added a few more fixes for KCC C++ and its + standard C++ library support. + Mon Nov 17 01:34:34 1997 <nw1@COYOTE> * netsvcs/servers/main.cpp (main): Removed daemon and changed to @@ -5,10 +10,6 @@ Mon Nov 17 01:34:34 1997 <nw1@COYOTE> and Stephen Coy for tracing this down and Irfan for coming out with the fix. -Mon Nov 17 00:59:15 1997 Douglas C. Schmidt <schmidt@cs.wustl.edu> - - * ACE version 4.3.49, released Mon Nov 17 00:59:15 1997. - Sun Nov 16 21:58:51 1997 Darrell Brunsch <brunsch@cs.wustl.edu> * tests/*.dsp, ace/*.dsp: Added Release, Unicode Debug, and diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 22dd253824f..b6b22e9c978 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -34,24 +34,6 @@ Mon Nov 17 01:48:17 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> New version of the generated files, this last version is almost making in it, but still needs hand crafting. -Sun Nov 16 23:30:26 1997 Sergio Flores <sergio@tango.cs.wustl.edu> - - * orbsvcs/tests/Logger/svr.cpp (main): - Changed the code to use the resolve_initial_references () - interface to get the object refrence to the naming service. - - * orbsvcs/tests/Logger/clnt.cpp (main): Now uses the - resolve_initial_references() to get the naming service object - reference, to get the logger factory object reference. - - * orbsvcs/bin/Naming_Service/svr.cpp (main): - * orbsvcs/bin/Naming_Service/svr.h: - Added code to respond to multicast requests for the IOR. - - Added code to respond to multicast requests for the IOR. - -Sun Nov 16 23:14:45 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> - * TAO_IDL/be/be_array.cpp: * TAO_IDL/be/be_sequence.cpp: * TAO_IDL/be/be_typedef.cpp: @@ -59,8 +41,6 @@ Sun Nov 16 23:14:45 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> account the tc_encap_len() for the base type but it should use the full tc_size(). -Sun Nov 16 18:18:50 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> - * tao/encode.cpp: Object references *must* be passed a pointer to Object_ptr in the marshalling code. @@ -71,7 +51,21 @@ Sun Nov 16 18:18:50 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> allocates the Object_ptr in the heap, stores the result there and creates an Any for it. -Sun Nov 16 16:52:47 1997 Sergio Flores <sergio@tango.cs.wustl.edu> +Sun Nov 16 23:30:26 1997 Sergio Flores <sergio@tango.cs.wustl.edu> + + * orbsvcs/tests/Logger/svr.cpp (main): + Changed the code to use the resolve_initial_references () + interface to get the object refrence to the naming service. + + * orbsvcs/tests/Logger/clnt.cpp (main): Now uses the + resolve_initial_references() to get the naming service object + reference, to get the logger factory object reference. + + * orbsvcs/bin/Naming_Service/svr.cpp (main): + * orbsvcs/bin/Naming_Service/svr.h: + Added code to respond to multicast requests for the IOR. + + Added code to respond to multicast requests for the IOR. * tests/Cubit/TAO/IDL_Cubit/clnt.cpp: Fixed some formatting problems dealing with the precision of the output. @@ -92,17 +86,15 @@ Sun Nov 16 12:56:24 1997 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu> generating the ACE_UNUSED_ARG (obj) line of code, we use /* obj */ in the signature. -Sun Nov 16 09:42:05 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> - - * tests/Cubit/TAO/IDL_Cubit/clnt.cpp: - Fixed output for structs and union test. - Sun Nov 16 05:51:38 1997 Douglas C. Schmidt <schmidt@cs.wustl.edu> * TAO version 0.0.31, released Sun Nov 16 05:51:38 1997. Sun Nov 16 00:22:04 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> + * tests/Cubit/TAO/IDL_Cubit/clnt.cpp: + Fixed output for structs and union test. + * tao/iiopobj.cpp: If the user provides no key for an object we generate one, based on the object address. @@ -192,6 +184,32 @@ Sat Nov 15 21:38:48 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> It was initializing nested constants in the client header file, Andy told me how to fix it. + * TAO_IDL/be/be_operation.cpp: + Fixed typo in generated code: + s/_tao_enviroment/_tao_environment/ + + * TAO_IDL/be/be_field.cpp: + Only generate the inline members of the field type if the type + is not imported. + + * TAO_IDL/driver/drv_fork.cpp: + * TAO_IDL/driver/drv_preproc.cpp: + Removed old code to support plain fork (without ACE). + Also removed temporary files *unless* we are on Win32, were + removing the file and keeping it open fails. + + * TAO_IDL/include/idl_global.h: + * TAO_IDL/util/utl_global.cpp: + Added routines to obtain the generated names of any IDL file, + not only the one we are processing. + + * TAO_IDL/be/be_codegen.cpp: + The compiler now generate all the required include directives + when the IDL file contains some. + + * tao/params.cpp: + Initialize name_service_port_ to zero in the constructor. + Sat Nov 15 21:20:01 1997 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu> * TAO_IDL/be/be_string.cpp: The typecode info was getting @@ -206,8 +224,6 @@ Sat Nov 15 21:20:01 1997 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu> Any constructor. This would have caused seg faults when decoding. This is now fixed. -Sat Nov 15 20:17:35 1997 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu> - * TAO_IDL/be: Split be_state.cpp into a number of files based on the IDL types, e.g., be_state_struct.cpp, be_state_union.cpp, ... @@ -232,6 +248,16 @@ Sat Nov 15 20:17:35 1997 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu> strings or obj references, as well as for element types of sequences. + * TAO_IDL/be/be_typedef.cpp: Added code to generate the typecode + structure for typedefs. These use the tk_alias kind field. + + * TAO_IDL/be/{be_union,be_state}.cpp: Improvements to union with + string members. However, this is still incomplete and will be + done by the next couple of commits. + + * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp: Removed the ACE_DEBUG + stmt for printing object keys. + Sat Nov 15 18:03:39 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp (make_cubit): We don't @@ -245,46 +271,6 @@ Sat Nov 15 18:03:39 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> memory by having it return const char * and just return the pointer. This should fix some subtle problems. -Sat Nov 15 17:33:15 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> - - * TAO_IDL/be/be_operation.cpp: - Fixed typo in generated code: - s/_tao_enviroment/_tao_environment/ - - * TAO_IDL/be/be_field.cpp: - Only generate the inline members of the field type if the type - is not imported. - - * TAO_IDL/driver/drv_fork.cpp: - * TAO_IDL/driver/drv_preproc.cpp: - Removed old code to support plain fork (without ACE). - Also removed temporary files *unless* we are on Win32, were - removing the file and keeping it open fails. - - * TAO_IDL/include/idl_global.h: - * TAO_IDL/util/utl_global.cpp: - Added routines to obtain the generated names of any IDL file, - not only the one we are processing. - - * TAO_IDL/be/be_codegen.cpp: - The compiler now generate all the required include directives - when the IDL file contains some. - - * tao/params.cpp: - Initialize name_service_port_ to zero in the constructor. - -Sat Nov 15 12:32:37 1997 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu> - - * TAO_IDL/be/be_typedef.cpp: Added code to generate the typecode - structure for typedefs. These use the tk_alias kind field. - - * TAO_IDL/be/{be_union,be_state}.cpp: Improvements to union with - string members. However, this is still incomplete and will be - done by the next couple of commits. - - * tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp: Removed the ACE_DEBUG - stmt for printing object keys. - Sat Nov 15 12:19:55 1997 Nanbor Wang <nw1@merengue.cs.wustl.edu> * TAO_IDL/be/be_codegen.cpp: Changed two loop counters from type @@ -1,4 +1,4 @@ -This is ACE version 4.3.49, released Mon Nov 17 00:59:15 1997. +This is ACE version 4.3.48, released Mon Nov 17 00:59:15 1997. If you have any problems with ACE, please send email to Douglas C. Schmidt (schmidt@cs.wustl.edu). diff --git a/ace/IOStream.h b/ace/IOStream.h index c47fb18f98a..7e33a5a7959 100644 --- a/ace/IOStream.h +++ b/ace/IOStream.h @@ -284,14 +284,31 @@ protected: virtual ACE_HANDLE get_handle (void); #if defined (ACE_HAS_STANDARD_CPP_LIBRARY) - char *base (void) const { return eback_saved_; } - char *ebuf (void) const { return eback_saved_ + streambuf_size_; } - int blen (void) const { return streambuf_size_; } + char *base (void) const + { + return cur_mode_ == get_mode_ ? eback_saved_ + : cur_mode_ == put_mode_ ? pbase_saved_ + : 0; + } + char *ebuf (void) const + { + return cur_mode_ == 0 ? 0 : base() + streambuf_size_; + } + + int blen (void) const + { + return streambuf_size_; + } + void setb (char* b, char* eb, int a=0) { setbuf (b, (eb - b)); } - int out_waiting (void) { return pptr () - pbase (); } + + int out_waiting (void) + { + return pptr () - pbase (); + } #endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ }; diff --git a/ace/IOStream_T.cpp b/ace/IOStream_T.cpp index 4f52ae60b3a..be58c574282 100644 --- a/ace/IOStream_T.cpp +++ b/ace/IOStream_T.cpp @@ -8,7 +8,7 @@ #if !defined (ACE_LACKS_ACE_IOSTREAM) #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) && defined (__GNUG__) -# if ! defined (ACE_IOSTREAM_T_H) +# 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 // for global constructors and destructors to be tied to. Without it, @@ -116,9 +116,11 @@ ACE_IOStream<STREAM>::operator>> (ACE_IOStream_String &v) if (ipfx0 ()) { char c; - iostream::operator>> (c); + this->get (c); - for (v = c; this->get (c) && !isspace (c); v += c) + for (v = c; + this->get (c) && !isspace (c); + v += c) continue; } @@ -144,6 +146,7 @@ ACE_IOStream<STREAM>::operator<< (ACE_IOStream_String &v) return *this; } + // A more clever put operator for strings that knows how to deal with // quoted strings containing back-quoted quotes. |