diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-03-25 00:41:59 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-03-25 00:41:59 +0000 |
| commit | 068cbe293f6d0c86ab671df071e7cd8420a92f54 (patch) | |
| tree | 57c49a66aa3ce9427f410add4fc51726bbbe6681 /CIAO | |
| parent | 31e3ff21a25cb74904842253dea49d1b13bf3818 (diff) | |
| download | ATCD-068cbe293f6d0c86ab671df071e7cd8420a92f54.tar.gz | |
Tue Mar 25 00:42:50 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
Fixed compile errors with unicode enabled
Diffstat (limited to 'CIAO')
| -rw-r--r-- | CIAO/ChangeLog | 5 | ||||
| -rw-r--r-- | CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 5fcfd1a1b97..a9ca94fad35 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 25 00:42:50 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> + + * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: + Fixed compile errors with unicode enabled + Sun Mar 23 13:04:16 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/Deployment/Interceptors/Deployment_Interceptors.h: diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp index bf8093254c3..4c4e60d0bce 100644 --- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp +++ b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp @@ -71,7 +71,7 @@ namespace CIAO if (!(reference >>= CORBA::Any::to_object (obj))) { - CIAO_ERROR (1, (LM_WARNING, CLINFO + CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO_StoreReferences_i::post_install - " "Unable to extract instance reference from Any\n")); } @@ -125,11 +125,11 @@ namespace CIAO std::string result; DAnCE::Utility::stringify_exception_from_any (exception_thrown, result); - CIAO_ERROR (3 , (LM_WARNING, CLINFO - ACE_TEXT ("CIAO_StoreReferences_i::post_remove - ") - ACE_TEXT ("Received exception while unregistering ") - ACE_TEXT ("for instance ") - ACE_TEXT ("<%C>:<%C>\n"), + CIAO_ERROR (3 , (LM_ERROR, CLINFO + "CIAO_StoreReferences_i::post_remove - " + "Received exception while unregistering " + "for instance " + "<%C>:<%C>\n", plan.instance[instanceRef].name.in (), result.c_str ())); return; |