diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
| commit | 23961d0dce22e234e62f116469f04bb62d8986a7 (patch) | |
| tree | ab271f0a3fffa8f21f9ac7fd669f457beb9eb356 /dep/acelite/ace/Service_Object.cpp | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Service_Object.cpp')
| -rw-r--r-- | dep/acelite/ace/Service_Object.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dep/acelite/ace/Service_Object.cpp b/dep/acelite/ace/Service_Object.cpp index 912fa39532c..4a9ace4029e 100644 --- a/dep/acelite/ace/Service_Object.cpp +++ b/dep/acelite/ace/Service_Object.cpp @@ -1,4 +1,4 @@ -// $Id: Service_Object.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Service_Object.cpp 93539 2011-03-13 09:40:44Z vzykov $ #include "ace/config-all.h" @@ -36,9 +36,9 @@ ACE_Service_Type::dump (void) const // the generated C++ code. ACE_OS::fprintf(stderr, "// [ST] dump, this=%p, name=%s, type=%p, so=%p, active=%d\n", - this, - this->name_, - this->type_, + static_cast<void const *> (this), + ACE_TEXT_ALWAYS_CHAR (this->name_), + static_cast<void const *> (this->type_), (this->type_ != 0) ? this->type_->object () : 0, this->active_); |