diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-12-10 11:58:11 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-12-10 11:58:11 +0000 |
| commit | 22941223f4a210d37bf61c85906fbd813713743d (patch) | |
| tree | d990a49f6a8f521ca0e4ebf95db769ad6f125a2e | |
| parent | 29f477a7051c9bb709cc40980580f4383fe317fb (diff) | |
| download | ATCD-22941223f4a210d37bf61c85906fbd813713743d.tar.gz | |
Thu Dec 10 11:57:58 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/String_Manager_T.h
* tao/String_Sequence_Element_T.h:
Added private operator != and ==, the string elements
just behave like char*, so != and == on them is illegal
and doesn't check the strings itself. If any user has
done this without realizing this, this change will now
give the user a compile error
* tao/TransportCurrent/Transport_Current.h:
Layout change
| -rw-r--r-- | TAO/ChangeLog | 17 | ||||
| -rw-r--r-- | TAO/tao/String_Manager_T.h | 4 | ||||
| -rw-r--r-- | TAO/tao/String_Sequence_Element_T.h | 4 | ||||
| -rw-r--r-- | TAO/tao/TransportCurrent/Transport_Current.h | 1 |
4 files changed, 23 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 73382afbd88..fbf524ba1b9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,10 +1,23 @@ +Thu Dec 10 11:57:58 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/String_Manager_T.h + * tao/String_Sequence_Element_T.h: + Added private operator != and ==, the string elements + just behave like char*, so != and == on them is illegal + and doesn't check the strings itself. If any user has + done this without realizing this, this change will now + give the user a compile error + + * tao/TransportCurrent/Transport_Current.h: + Layout change + Thu Dec 10 11:42:00 UTC 2009 Martin Corino <mcorino@remedy.nl> * tests/Bug_3672_Regression/ami_test_i.cpp: * tests/Bug_3672_Regression/client.cpp: Test did not work correctly on Windows because of timing issues. Changed to work correctly on Windows also. - + Thu Dec 10 10:32:56 UTC 2009 Denis Budko <denis.budko@remedy.nl> * orbsvcs/tests/Bug_1436_Regression/run_test.pl: @@ -35,7 +48,7 @@ Wed Dec 9 21:16:38 UTC 2009 Yan Dai <dai_y@ociweb.com> * tests/OBV/Indirection/MessengerClient.cpp: Fixed a warning. - + Wed Dec 9 14:24:58 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * TAO_IDL/be/be_visitor_component/servant_svs.cpp: diff --git a/TAO/tao/String_Manager_T.h b/TAO/tao/String_Manager_T.h index 523aa24469f..479638e25c0 100644 --- a/TAO/tao/String_Manager_T.h +++ b/TAO/tao/String_Manager_T.h @@ -129,6 +129,10 @@ public: private: /// The underlying string character_type *ptr_; + + /// Prevent comparison + bool operator != (const String_Manager_T <character_type> &s) const; + bool operator == (const String_Manager_T <character_type> &s) const; }; typedef TAO::String_Manager_T<CORBA::Char> String_Manager; diff --git a/TAO/tao/String_Sequence_Element_T.h b/TAO/tao/String_Sequence_Element_T.h index 8c54f185a46..aedcdf131dc 100644 --- a/TAO/tao/String_Sequence_Element_T.h +++ b/TAO/tao/String_Sequence_Element_T.h @@ -135,6 +135,10 @@ private: // This function is not implemented string_sequence_element(); + /// Prevent comparison + bool operator != (const string_sequence_element &s) const; + bool operator == (const string_sequence_element &s) const; + private: value_type * element_; CORBA::Boolean release_; diff --git a/TAO/tao/TransportCurrent/Transport_Current.h b/TAO/tao/TransportCurrent/Transport_Current.h index 2d776e8d6b6..09809f4ee88 100644 --- a/TAO/tao/TransportCurrent/Transport_Current.h +++ b/TAO/tao/TransportCurrent/Transport_Current.h @@ -1,7 +1,6 @@ // -*- C++ -*- // $Id$ - #include "tao/TransportCurrent/TCC.h" #include "tao/TransportCurrent/Current_Loader.h" |