diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2011-11-03 08:53:22 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2011-11-03 08:53:22 +0000 |
| commit | d9cbedfb4ece96bb988e80b22af601c79ca102dc (patch) | |
| tree | 2544275482f587f8d833f622da22e9dfe5506083 | |
| parent | c07d4d35b7e92867984f014222c918dd3167dfe6 (diff) | |
| download | ATCD-d9cbedfb4ece96bb988e80b22af601c79ca102dc.tar.gz | |
Thu Nov 03 08:52:13 UTC 2011 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | CIAO/ChangeLog | 5 | ||||
| -rw-r--r-- | CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 03fd3ba05ae..9535e5a18b3 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 03 08:52:13 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: + Fixed WCHAR compile problem. + Wed Nov 02 12:09:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> * tests/Collocation/Receiver/Receiver_exec.cpp: Cancel timer and delete generators diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp index 149a96d2327..4234ccbdbb0 100644 --- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp +++ b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp @@ -171,16 +171,16 @@ namespace CIAO catch (const CORBA::INV_OBJREF&) { CIAO_ERROR (6, (LM_INFO, CLINFO - ACE_TEXT("CIAO_ReferenceLookup_i::pre_connect - ") - ACE_TEXT("Unable to resolve external reference for connection %C\n"), + "CIAO_ReferenceLookup_i::pre_connect - " + "Unable to resolve external reference for connection %C\n", plan.connection[connRef].name.in ())); } catch (CORBA::Exception &ex) { CIAO_ERROR (1, (LM_ERROR, CLINFO - ACE_TEXT("CIAO_ReferenceLookup_i::pre_connect - ") - ACE_TEXT("Caught CORBA Exception while resolving external") - ACE_TEXT ("reference for connection %C: %C\n"), + "CIAO_ReferenceLookup_i::pre_connect - " + "Caught CORBA Exception while resolving external" + "reference for connection %C: %C\n", plan.connection[connRef].name.in (), ex._info ().c_str ())); throw; @@ -188,9 +188,9 @@ namespace CIAO catch (...) { CIAO_ERROR (1, (LM_ERROR, CLINFO - ACE_TEXT("CIAO_ReferenceLookup_i::pre_connect - ") - ACE_TEXT("Caught C Exception while resolving external reference") - ACE_TEXT("for connection %C\n"), + "CIAO_ReferenceLookup_i::pre_connect - " + "Caught C Exception while resolving external reference" + "for connection %C\n", plan.connection[connRef].name.in ())); throw; } |