diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-07-26 13:40:39 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-07-26 13:40:39 +0000 |
| commit | a3481e4a590529b225fc9d7684de1761e871c719 (patch) | |
| tree | beb9d1e709055c1f72786214d2016a3dbf3c5878 | |
| parent | 24dfa35ac50f72f3b19d4ee1df48268eafdf0521 (diff) | |
| download | ATCD-a3481e4a590529b225fc9d7684de1761e871c719.tar.gz | |
Mon Jul 26 13:40:13 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* tools/XML/XercesString.h:
* tools/XML/XercesString.cpp:
Tweak a preprocessor check for MSVC and unicode.
| -rw-r--r-- | CIAO/ChangeLog | 11 | ||||
| -rw-r--r-- | CIAO/tools/XML/XercesString.cpp | 2 | ||||
| -rw-r--r-- | CIAO/tools/XML/XercesString.h | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index dc703699a86..93513602712 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Jul 26 13:40:13 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> + + * tools/XML/XercesString.h: + * tools/XML/XercesString.cpp: + + Tweak a preprocessor check for MSVC and unicode. + Mon Jul 26 13:01:16 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> * DAnCE/DAnCE/DAnCE_Properties.idl: @@ -5,9 +12,9 @@ Mon Jul 26 13:01:16 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> Added property for CPU Affinity. * DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp: - + Bugfix. - + * DAnCE/tests/LocalityManager/CPUAffinity: * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity.idl: * DAnCE/tests/LocalityManager/CPUAffinity/CPUAffinity.mpc: diff --git a/CIAO/tools/XML/XercesString.cpp b/CIAO/tools/XML/XercesString.cpp index 829088f1c47..4caa86ff46b 100644 --- a/CIAO/tools/XML/XercesString.cpp +++ b/CIAO/tools/XML/XercesString.cpp @@ -14,7 +14,7 @@ namespace CIAO namespace XML { // On unicode windows, ACE_TCHAR == XMLCh -#if !defined (_MSC_VER) && !defined (ACE_USES_WCHAR) +#if !defined (_MSC_VER) || !defined (ACE_USES_WCHAR) XStr::XStr (const ACE_TCHAR* str) : _wstr(0) { diff --git a/CIAO/tools/XML/XercesString.h b/CIAO/tools/XML/XercesString.h index 5e70d5ac83a..325b73561ef 100644 --- a/CIAO/tools/XML/XercesString.h +++ b/CIAO/tools/XML/XercesString.h @@ -31,7 +31,7 @@ namespace CIAO XStr() : _wstr(0L) { }; // On unicode windows, ACE_TCHAR == XMLCh -#if !defined (_MSC_VER) && !defined (ACE_USES_WCHAR) +#if !defined (_MSC_VER) || !defined (ACE_USES_WCHAR) XStr (const ACE_TCHAR* str); #endif |