summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-04-09 14:43:21 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-04-09 14:43:21 +0000
commitf34721566a7e33eef7d0794ccda9984e64c1b823 (patch)
tree546925923d92dcaa380c8e11ad4c045c3e1b1dcd
parent74fb854ab3348d31ad20ba842a85d0b5a8c79f7f (diff)
downloadATCD-f34721566a7e33eef7d0794ccda9984e64c1b823.tar.gz
ChangeLogTag: Wed Apr 9 09:40:43 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tests/Param_Test/server.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/AMI/client.cpp22
3 files changed, 20 insertions, 11 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 579277e137a..97eed7a6626 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Wed Apr 9 09:40:43 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * tests/Param_Test.server.cpp:
+ * tests/Portable_Interceptors/AMI/client.cpp:
+
+ Fixed warnings.
+
Wed Apr 9 08:23:28 2003 Chad Elliott <elliott_c@ociweb.com>
* tao/tao.mpc:
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
index 65fafdf9c64..1b640bc78b3 100644
--- a/TAO/tests/Param_Test/server.cpp
+++ b/TAO/tests/Param_Test/server.cpp
@@ -145,7 +145,7 @@ main (int argc, char *argv[])
str.in ()));
}
- FILE *ior_output_file = ACE_OS::fopen (ior_output_filename, "w");
+ ior_output_file = ACE_OS::fopen (ior_output_filename, "w");
if (ior_output_file == 0)
{
diff --git a/TAO/tests/Portable_Interceptors/AMI/client.cpp b/TAO/tests/Portable_Interceptors/AMI/client.cpp
index 0490db9d37a..0d75ad80413 100644
--- a/TAO/tests/Portable_Interceptors/AMI/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/client.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (AMI,
const char *ior = "file://test.ior";
static int exit_status = 0;
-const int ITERATIONS = 100;
+const unsigned long ITERATIONS = 100;
int
parse_args (int argc, char *argv[])
@@ -135,13 +135,15 @@ static void test_synchronous (Test::Echo_ptr echo
Echo_Client_Request_Interceptor::request_count;
unsigned long initial_reply_count =
Echo_Client_Request_Interceptor::reply_count;
- for(int i = 0; i != ITERATIONS; ++i)
- {
- CORBA::String_var s =
- echo->echo_operation ("dummy message"
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- }
+
+ for (unsigned long i = 0; i != ITERATIONS; ++i)
+ {
+ CORBA::String_var s =
+ echo->echo_operation ("dummy message"
+ ACE_ENV_ARG_PARAMETER);
+ ACE_CHECK;
+ }
+
unsigned long total_request_count =
Echo_Client_Request_Interceptor::request_count - initial_request_count;
unsigned long total_reply_count =
@@ -175,7 +177,7 @@ static void test_ami (Test::Echo_ptr echo
unsigned long initial_other_count =
Echo_Client_Request_Interceptor::other_count;
- for(int i = 0; i != ITERATIONS; ++i)
+ for (unsigned long i = 0; i != ITERATIONS; ++i)
{
echo->sendc_echo_operation(
echo_handler.in (), "dummy message" ACE_ENV_ARG_PARAMETER);
@@ -250,7 +252,7 @@ static void test_ami_errors (CORBA::ORB_ptr orb,
unsigned long initial_exception_count =
Echo_Client_Request_Interceptor::exception_count;
- for (int i = 0; i != ITERATIONS; ++i)
+ for (unsigned long i = 0; i != ITERATIONS; ++i)
{
ACE_TRY
{