diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-09-23 17:50:26 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-09-23 17:50:26 +0000 |
| commit | 9283b8ab48ca65730ee151f9f145bb48accfd0d9 (patch) | |
| tree | c0e69ee59aea1b867b7c8a0cfece69b2ee2731d0 | |
| parent | 0797d0f44e5839cbeb27c6958e0dd9cc51fcb188 (diff) | |
| download | ATCD-9283b8ab48ca65730ee151f9f145bb48accfd0d9.tar.gz | |
ChangeLogTag:Thu Sep 23 17:48:50 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp | 7 | ||||
| -rw-r--r-- | TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1ea0bbf7ccc..42a3607ed3f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Sep 23 17:48:50 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tests/Sequence_Unit_Tests/string_sequence_element.hpp: + * tests/Sequence_Unit_Tests/string_traits_base.hpp: + + Left a couple of coments for Carlos. + Wed Sep 22 21:39:48 2004 Carlos O'Ryan <coryan@atdesk.com> * tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp: diff --git a/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp b/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp index 793ca5df9e4..61c506b5b3f 100644 --- a/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp +++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp @@ -26,6 +26,9 @@ public: typedef charT * value_type; typedef charT const * const_value_type; typedef details::string_traits<charT,true> string_traits; + // @@ Carlos, VC6 cannot handle the following typedefs. It simply + // says that "string_var" (or string_mgr) is not a member of + // "string_traits". I seem to understand this code better than VC6! typedef typename string_traits::string_var string_var; typedef typename string_traits::string_mgr string_mgr; @@ -35,7 +38,7 @@ public: , release_(release) { } - + string_sequence_element( string_sequence_element const & rhs) : element_(rhs.element_) @@ -100,7 +103,7 @@ public: { return release_; } - + private: // This function is not implemented string_sequence_element(); diff --git a/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp b/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp index 7d1a14dbb29..2be2011b2fa 100644 --- a/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp +++ b/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp @@ -43,6 +43,8 @@ struct string_traits_base<char> inline static void release(char_type * s) { + // @@ Carlos, MSVC6 doesn't like to see a "return statement" in + // here, since its declared a void. return CORBA::string_free(s); } }; @@ -66,6 +68,8 @@ struct string_traits_base<CORBA::WChar> inline static void release(char_type * s) { + // @@ Carlos, MSVC6 doesn't like to see a "return statement" in + // here, since its declared a void. return CORBA::wstring_free(s); } }; |