diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-12-13 13:36:09 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-12-13 13:36:09 +0000 |
| commit | 18b893805bf8e413c2233b45b5322bc9cf354fd2 (patch) | |
| tree | 3d3df4ef4b1c604b305e23356c2df91614f291af | |
| parent | 545cb45be7123b9461d3fdc5ec37ea42bbe363df (diff) | |
| download | ATCD-18b893805bf8e413c2233b45b5322bc9cf354fd2.tar.gz | |
ChangeLogTag: Tue Dec 13 13:35:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6290cf9f46d..c771c880f61 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 13 13:35:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Sequence_Unit_Tests/string_traits_base.hpp: + Removed static from the declaration of empty to fix VxWorks warnings + Tue Dec 13 12:55:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/tests/Notify/Discarding/notify.conf: diff --git a/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp b/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp index 69c2b259633..508d116b3c6 100644 --- a/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp +++ b/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp @@ -60,7 +60,7 @@ struct string_traits_base<CORBA::WChar> return CORBA::wstring_dup(L""); #else #warning "platform not configured with native wchar_t support" - static CORBA::WChar empty[] = { 0 }; + CORBA::WChar empty[] = { 0 }; return CORBA::wstring_dup(empty); #endif /* 0 */ } |