diff options
| author | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-10-29 16:38:51 +0000 |
|---|---|---|
| committer | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-10-29 16:38:51 +0000 |
| commit | fccacdfe6d620490c65edfdb26b8834ba47b2cdf (patch) | |
| tree | a1370b36bddc6bc2e841dfd07e1647f7514d951c | |
| parent | 841193466f01758e969ce2e23e3f14968893111a (diff) | |
| download | ATCD-fccacdfe6d620490c65edfdb26b8834ba47b2cdf.tar.gz | |
Thu Oct 29 16:36:53 UTC 2009 Yan Dai <dai_y@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 44b31639e38..a00f7231328 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 29 16:36:53 UTC 2009 Yan Dai <dai_y@ociweb.com> + + * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp: + + Fixed a compilation error on wchar build. + Thu Oct 29 15:34:15 UTC 2009 Vladimir Zykov <vladimir.zykov@prismtech.com> * bin/tao_orb_tests.lst: diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp index a18cadbde94..5f349c82353 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp @@ -64,7 +64,7 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[]) ACE_TEXT("(%P|%t) TAO_MonitorManager: Setting Orb arguments to: %s"), orbArgs)); } - this->task_.argv_.add (ACE_TEXT_ALWAYS_CHAR (orbArgs)); + this->task_.argv_.add (orbArgs); } else if (ACE_OS::strcmp (opts.long_option (), nonamesvc) == 0) { |