summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2010-09-14 12:08:05 +0000
committerSteve Huston <shuston@riverace.com>2010-09-14 12:08:05 +0000
commitff2cb88bc8bb2628abd3b75361fc98b81440f1f1 (patch)
tree638970dbaa2cc307f55b08b355703d14e5dfc53c /ACE
parentb777769df1e2afa9ca19fc0c4e6f7d1347adb406 (diff)
downloadATCD-ff2cb88bc8bb2628abd3b75361fc98b81440f1f1.tar.gz
ChangeLogTag:Tue Sep 14 12:05:19 UTC 2010 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ACE')
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/examples/APG/Logging/Callback-3.h8
2 files changed, 9 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 2f56d0ecb06..de223b3e767 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 14 12:05:19 UTC 2010 Steve Huston <shuston@riverace.com>
+
+ * examples/APG/Logging/Callback-3.h: Replaced use of deprecated
+ ACE_Log_Record::encode() with CDR converter.
+
Tue Sep 14 12:01:01 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/FlReactor/ace_flreactor.mpc:
diff --git a/ACE/examples/APG/Logging/Callback-3.h b/ACE/examples/APG/Logging/Callback-3.h
index 27f136a3a00..0d468547d2e 100644
--- a/ACE/examples/APG/Logging/Callback-3.h
+++ b/ACE/examples/APG/Logging/Callback-3.h
@@ -4,6 +4,7 @@
#define APG_CALLBACK3_H
#include "ace/streams.h"
+#include "ace/CDR_Stream.h"
#include "ace/Log_Msg.h"
#include "ace/Log_Msg_Callback.h"
#include "ace/Log_Record.h"
@@ -50,10 +51,9 @@ public:
return;
}
- size_t len = log_record.length();
- log_record.encode ();
-
- if (this->logger_->send_n ((char *) &log_record, len) == -1)
+ ACE_OutputCDR cdr;
+ cdr << log_record;
+ if (this->logger_->send_n (cdr.begin ()) == -1)
{
delete this->logger_;
this->logger_ = 0;