summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-03-10 18:47:09 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-03-10 18:47:09 +0000
commit9a7711074395f6e53f4a085795145614d372be71 (patch)
tree4c853c357b06850f46bb66113232c9e8bb1fa059
parent0c3cd0a9465ab478ac9cea327f865fef8fa16b54 (diff)
downloadATCD-9a7711074395f6e53f4a085795145614d372be71.tar.gz
Tue Mar 10 18:47:54 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/GIOP_Message_Base.cpp: Fixed unicode compile error
-rw-r--r--TAO/ChangeLog13
-rw-r--r--TAO/tao/GIOP_Message_Base.cpp2
2 files changed, 10 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index cbdf938c275..a1531d15f69 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,15 +1,20 @@
+Tue Mar 10 18:47:54 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/GIOP_Message_Base.cpp:
+ Fixed unicode compile error
+
Tue Mar 10 14:18:19 UTC 2009 Marcel Smit <msmit@remedy.nl>
* tao/GIOP_Message_Base.cpp:
Optimized logging when ZIOP is not enabled.
-
+
* tao/ZIOP/ZIOP.cpp:
* tao/ZIOP/ZIOP_Stub.cpp:
Implemented CompressorIdLevelList policy. On the client
- ZIOP checks which compressor should be used.
- Bug 3619 is added since a ZIOP server has no idea of the
+ ZIOP checks which compressor should be used.
+ Bug 3619 is added since a ZIOP server has no idea of the
client CompressorIdLevelList policy at this moment. A ZIOP
- client should always implement at least one ZIOP server
+ client should always implement at least one ZIOP server
CompressorIdLevelList policy.
Tue Mar 10 10:20:54 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 19b50cb5b75..ad3048a8e46 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -1585,7 +1585,7 @@ TAO_GIOP_Message_Base::dump_msg (const char *label,
ACE_HEX_DUMP ((LM_DEBUG,
(const char *) ptr,
len,
- "GIOP message"));
+ ACE_TEXT ("GIOP message")));
}
int