summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2012-08-22 09:13:39 +0000
committersma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2012-08-22 09:13:39 +0000
commita0b9249a9bcde617f56a72ba13a895f7c7bd2424 (patch)
tree385475ca54963dd0c2519a5b3c53356991ccbabf
parent3570805b57d66d6978c146e378e565c103819930 (diff)
downloadATCD-a0b9249a9bcde617f56a72ba13a895f7c7bd2424.tar.gz
Wed Aug 22 09:12:45 UTC 2012 Simon Massey <sma at prismtech dot com>
orbsvcs/tests/Notify/lib/Options_Parser.cpp: Missed a C+11 invalid type conversation warning.
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp4
2 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index aae9303b9f8..36a35a36e08 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 22 09:12:45 UTC 2012 Simon Massey <sma at prismtech dot com>
+
+ * orbsvcs/tests/Notify/lib/Options_Parser.cpp:
+
+ Missed a C+11 invalid type converstion warning.
+
Mon Aug 20 10:20:00 UTC 2012 Simon Massey <sma at prismtech dot com>
* orbsvcs/orbsvcs/PortableGroup/GOA.cpp:
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index 287c5407e3f..582dce71596 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -54,7 +54,7 @@ TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, A
{
arg_shifter.consume_arg ();
- int static_threads = 1;
+ CORBA::ULong static_threads = 1u;
if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Threads")) == 0)
{
@@ -62,7 +62,7 @@ TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, A
current_arg = arg_shifter.get_current ();
- static_threads = ACE_OS::atoi (current_arg);
+ static_threads = static_cast<CORBA::ULong> (ACE_OS::atoi (current_arg));
arg_shifter.consume_arg ();
}