diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-12-10 13:04:10 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-12-10 13:04:10 +0000 |
| commit | 87d3be5f09cc365f1808a594164252db1d6be527 (patch) | |
| tree | 073559f1ddb0ff446bafcf2602b9a334ea885b30 | |
| parent | 942f7b79bb9db897ad4ce1fc12684ba11573910a (diff) | |
| download | ATCD-87d3be5f09cc365f1808a594164252db1d6be527.tar.gz | |
Thu Dec 10 13:03:58 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
Reverted change below, causes correct code to break
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
| -rw-r--r-- | TAO/ChangeLog | 14 | ||||
| -rw-r--r-- | TAO/tao/String_Manager_T.h | 4 | ||||
| -rw-r--r-- | TAO/tao/String_Sequence_Element_T.h | 4 |
3 files changed, 14 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e712ad33912..b79660b2c50 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Thu Dec 10 13:03:58 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + Reverted change below, causes correct code to break + + 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 + Thu Dec 10 12:42:00 UTC 2009 Martin Corino <mcorino@remedy.nl> * tests/BiDirectional_DelayedUpcall/client.cpp: diff --git a/TAO/tao/String_Manager_T.h b/TAO/tao/String_Manager_T.h index 479638e25c0..523aa24469f 100644 --- a/TAO/tao/String_Manager_T.h +++ b/TAO/tao/String_Manager_T.h @@ -129,10 +129,6 @@ 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 aedcdf131dc..8c54f185a46 100644 --- a/TAO/tao/String_Sequence_Element_T.h +++ b/TAO/tao/String_Sequence_Element_T.h @@ -135,10 +135,6 @@ 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_; |