summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2009-07-17 12:11:31 +0000
committermsmit <msmit@remedy.nl>2009-07-17 12:11:31 +0000
commit08521cba3847fadaf10575dd6055718369b26cc8 (patch)
tree9d5726d808c4f02b1d19b773b9135f80b90ec964
parentd89ad168d35ba3ddf5170cc239b45b2eee1c4cd9 (diff)
downloadATCD-08521cba3847fadaf10575dd6055718369b26cc8.tar.gz
Fri Jul 17 12:09:55 UTC 2009 Marcel Smit <msmit@remedy.nl>
* tools/Config_Handlers/XMI.cpp: Resolved UNICODE compiler errors.
-rw-r--r--CIAO/ChangeLog5
-rw-r--r--CIAO/tools/Config_Handlers/XMI.cpp21
2 files changed, 18 insertions, 8 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 9572f54d667..cefecce7022 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 17 12:09:55 UTC 2009 Marcel Smit <msmit@remedy.nl>
+
+ * tools/Config_Handlers/XMI.cpp:
+ Resolved UNICODE compiler errors.
+
Fri Jul 17 11:50:08 UTC 2009 Marcel Smit <msmit@remedy.nl>
* ciao/Containers/Session/Session_Container.cpp:
diff --git a/CIAO/tools/Config_Handlers/XMI.cpp b/CIAO/tools/Config_Handlers/XMI.cpp
index 4827375f774..cc3dbc56aa7 100644
--- a/CIAO/tools/Config_Handlers/XMI.cpp
+++ b/CIAO/tools/Config_Handlers/XMI.cpp
@@ -761,7 +761,8 @@ namespace XMI
void Extension::
id (Type const& o)
{
- ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "http://www.omg.org/XMI", "", top_ ());
+ ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT("id"), ACE_TEXT("http://www.omg.org/XMI"),
+ ACE_TEXT(""), top_ ());
attr_ (&a);
Traversal::Extension::id (o);
attr_ (0);
@@ -770,7 +771,8 @@ namespace XMI
void Extension::
label (Type const& o)
{
- ::XSCRT::XML::Attribute< ACE_TCHAR > a ("label", "http://www.omg.org/XMI", "", top_ ());
+ ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT("label"), ACE_TEXT("http://www.omg.org/XMI"),
+ ACE_TEXT(""), top_ ());
attr_ (&a);
Traversal::Extension::label (o);
attr_ (0);
@@ -779,7 +781,8 @@ namespace XMI
void Extension::
uuid (Type const& o)
{
- ::XSCRT::XML::Attribute< ACE_TCHAR > a ("uuid", "http://www.omg.org/XMI", "", top_ ());
+ ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT("uuid"), ACE_TEXT("http://www.omg.org/XMI"),
+ ACE_TEXT(""), top_ ());
attr_ (&a);
Traversal::Extension::uuid (o);
attr_ (0);
@@ -788,7 +791,7 @@ namespace XMI
void Extension::
href (Type const& o)
{
- ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ());
+ ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT("href"), ACE_TEXT(""), top_ ());
attr_ (&a);
Traversal::Extension::href (o);
attr_ (0);
@@ -797,7 +800,8 @@ namespace XMI
void Extension::
idref (Type const& o)
{
- ::XSCRT::XML::Attribute< ACE_TCHAR > a ("idref", "http://www.omg.org/XMI", "", top_ ());
+ ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT("idref"), ACE_TEXT("http://www.omg.org/XMI"),
+ ACE_TEXT(""), top_ ());
attr_ (&a);
Traversal::Extension::idref (o);
attr_ (0);
@@ -806,7 +810,8 @@ namespace XMI
void Extension::
version (Type const& o)
{
- ::XSCRT::XML::Attribute< ACE_TCHAR > a ("version", "http://www.omg.org/XMI", "", top_ ());
+ ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT("version"), ACE_TEXT("http://www.omg.org/XMI"),
+ ACE_TEXT(""), top_ ());
attr_ (&a);
Traversal::Extension::version (o);
attr_ (0);
@@ -815,7 +820,7 @@ namespace XMI
void Extension::
extender (Type const& o)
{
- ::XSCRT::XML::Attribute< ACE_TCHAR > a ("extender", "", top_ ());
+ ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT("extender"), ACE_TEXT(""), top_ ());
attr_ (&a);
Traversal::Extension::extender (o);
attr_ (0);
@@ -824,7 +829,7 @@ namespace XMI
void Extension::
extenderID (Type const& o)
{
- ::XSCRT::XML::Attribute< ACE_TCHAR > a ("extenderID", "", top_ ());
+ ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT("extenderID"), ACE_TEXT(""), top_ ());
attr_ (&a);
Traversal::Extension::extenderID (o);
attr_ (0);