diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2011-12-16 18:23:39 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2011-12-16 18:23:39 +0000 |
| commit | 8da216ac978f80b7849f6cbc1b91771f150001ad (patch) | |
| tree | 79dddd9a9467c5535366e3f42d1b8f6cf6f5d968 | |
| parent | 7edb42420455388ee911c464c4b71c5bb4041f8b (diff) | |
| download | ATCD-8da216ac978f80b7849f6cbc1b91771f150001ad.tar.gz | |
Fri Dec 16 18:22:39 UTC 2011 Martin Corino <mcorino@remedy.nl>
* tao/Time_Policy_Manager.cpp:
Changed to fix wchar compile problems.
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/Time_Policy_Manager.cpp | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 87ffb8996d8..a7bfb3efb5a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Dec 16 18:22:39 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * tao/Time_Policy_Manager.cpp: + + Changed to fix wchar compile problems. + Thu Dec 15 20:46:52 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp: diff --git a/TAO/tao/Time_Policy_Manager.cpp b/TAO/tao/Time_Policy_Manager.cpp index be496fc739a..9223f1bd934 100644 --- a/TAO/tao/Time_Policy_Manager.cpp +++ b/TAO/tao/Time_Policy_Manager.cpp @@ -62,7 +62,7 @@ TAO_Time_Policy_Manager::parse_args (int argc, ACE_TCHAR* argv[]) else { this->time_policy_setting_ = TAO_DYN_TIME_POLICY; - this->time_policy_name_ = name; + this->time_policy_name_ = ACE_TEXT_ALWAYS_CHAR (name); } } } @@ -85,11 +85,11 @@ ACE_Timer_Queue * TAO_Time_Policy_Manager::create_timer_queue (void) // load strategy if (this->time_policy_setting_ == TAO_OS_TIME_POLICY) { - this->time_policy_name_ = ACE_TEXT ("TAO_SYSTEM_TIME_POLICY"); + this->time_policy_name_ = "TAO_SYSTEM_TIME_POLICY"; } else if (this->time_policy_setting_ == TAO_HR_TIME_POLICY) { - this->time_policy_name_ = ACE_TEXT ("TAO_HR_TIME_POLICY"); + this->time_policy_name_ = "TAO_HR_TIME_POLICY"; } this->time_policy_strategy_ = ACE_Dynamic_Service<TAO_Time_Policy_Strategy>::instance ( |