diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-21 08:16:40 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-21 08:16:40 +0000 |
| commit | 1f7f05650369ec46e2dfff79dab01e4c164344e3 (patch) | |
| tree | 347caac9e75c3dfa241034ceecbdc4d99dd8e23a | |
| parent | cdd26dd0f034c131c0924fc47429c326464db20c (diff) | |
| download | ATCD-1f7f05650369ec46e2dfff79dab01e4c164344e3.tar.gz | |
ChangeLogTag: Fri Apr 21 08:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/String_Traits_Base_T.h | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 15305eb2978..9ca599d0af8 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Apr 21 08:13:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * CIDLC/ServantSourceGenerator.cpp: + Removed usage of ACE_NESTED_CLASS + + * DAnCE/RepositoryManager/PC_Updater.cpp: + Fixed compile errors + Thu Apr 20 13:14:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * tools/Config_Handlers/DnC_Dump.cpp: diff --git a/TAO/tao/String_Traits_Base_T.h b/TAO/tao/String_Traits_Base_T.h index 6b2ae6eb051..fc5197b01ea 100644 --- a/TAO/tao/String_Traits_Base_T.h +++ b/TAO/tao/String_Traits_Base_T.h @@ -76,8 +76,9 @@ struct string_traits_base<CORBA::WChar> #if defined(ACE_HAS_WCHAR) || defined(ACE_HAS_XPG4_MULTIBYTE_CHAR) return CORBA::wstring_dup(L""); #else -#warning "platform not configured with native wchar_t support" - static CORBA::WChar empty[] = { 0 }; +//#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 */ } |