summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2008-10-20 13:21:58 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2008-10-20 13:21:58 +0000
commitadd046f94e58d757d4595ed7555b02d80c5302ee (patch)
tree1a58c5e2763d6f4e2b25f74dfe19ae52870c55c2 /TAO
parent34c349c67e3f51174df388887907af557809b20b (diff)
downloadATCD-add046f94e58d757d4595ed7555b02d80c5302ee.tar.gz
Mon Oct 20 13:09:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/orbsvcs/examples/LoadBalancing/server.cpp7
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp7
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp6
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/supplier.cpp3
5 files changed, 21 insertions, 10 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 276a59b6572..c2e118a2458 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Mon Oct 20 13:09:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * orbsvcs/examples/LoadBalancing/server.cpp
+ * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
+ * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
+ * orbsvcs/tests/FtRtEvent/supplier.cpp
+ Use ACE_OS::atof
+
Mon Oct 20 12:25:45 UTC 2008 Simon McQueen <sm@prismtech.com>
* TAO_IDL/be/be_visitor_component/component_ch.cpp:
diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
index 865bb9787c9..ac4f3c2ce74 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
@@ -3,6 +3,7 @@
#include "ORBInitializer.h"
#include "RPS_Monitor.h"
#include "ace/OS.h"
+#include "ace/OS_NS_stdlib.h"
#include "ace/Get_Opt.h"
@@ -41,17 +42,17 @@ parse_args (int argc, ACE_TCHAR *argv[])
case 'r':
reject_threshold =
- static_cast<CORBA::Float> (::atof (ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ())));
+ static_cast<CORBA::Float> (ACE_OS::atof (get_opts.opt_arg ()));
break;
case 'c':
critical_threshold =
- static_cast<CORBA::Float> (::atof (ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ())));
+ static_cast<CORBA::Float> (ACE_OS::atof (get_opts.opt_arg ()));
break;
case 'd':
dampening =
- static_cast<CORBA::Float> (::atof (ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ())));
+ static_cast<CORBA::Float> (ACE_OS::atof (get_opts.opt_arg ()));
break;
case '?':
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
index aa3ffcae137..fad24330e63 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
@@ -8,6 +8,7 @@
#include "ace/Get_Opt.h"
#include "ace/Sched_Params.h"
#include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_stdlib.h"
#include "tao/Strategies/advanced_resource.h"
@@ -38,17 +39,17 @@ parse_args (int argc, ACE_TCHAR *argv[])
case 'r':
reject_threshold =
- static_cast<CORBA::Float> (::atof (get_opts.opt_arg ()));
+ static_cast<CORBA::Float> (ACE_OS::atof (get_opts.opt_arg ()));
break;
case 'c':
critical_threshold =
- static_cast<CORBA::Float> (::atof (get_opts.opt_arg ()));
+ static_cast<CORBA::Float> (ACE_OS::atof (get_opts.opt_arg ()));
break;
case 'd':
dampening =
- static_cast<CORBA::Float> (::atof (get_opts.opt_arg ()));
+ static_cast<CORBA::Float> (ACE_OS::atof (get_opts.opt_arg ()));
break;
case '?':
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
index ecbae781475..fd63a7ea433 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
@@ -42,17 +42,17 @@ parse_args (int argc, ACE_TCHAR *argv[])
case 'r':
reject_threshold =
- static_cast<CORBA::Float> (::atof (ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ())));
+ static_cast<CORBA::Float> (ACE_OS::atof (get_opts.opt_arg ()));
break;
case 'c':
critical_threshold =
- static_cast<CORBA::Float> (::atof (ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ())));
+ static_cast<CORBA::Float> (ACE_OS::atof (get_opts.opt_arg ()));
break;
case 'd':
dampening =
- static_cast<CORBA::Float> (::atof (ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ())));
+ static_cast<CORBA::Float> (ACE_OS::atof (get_opts.opt_arg ()));
break;
case '?':
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index 3917c241ef4..a17ddeb4ba1 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -4,6 +4,7 @@
#include "PushSupplier.h"
#include "ace/Get_Opt.h"
#include "ace/Auto_Ptr.h"
+#include "ace/OS_NS_stdlib.h"
#include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
@@ -43,7 +44,7 @@ get_event_channel(int argc, ACE_TCHAR** argv)
use_gateway = 0;
break;
case 't':
- timer_interval.set(atof(ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ())));
+ timer_interval.set(ACE_OS::atof(get_opt.opt_arg ()));
case 'h':
case '?':
ACE_DEBUG((LM_DEBUG,