summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2014-12-28 14:33:33 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2014-12-28 14:33:33 +0100
commit4a1ecc377dd589421255f17b12dc2cb419d06b63 (patch)
tree6131dfc0cf584df75643094af06d805e8fb47625
parent06325909ca408a6f4720ef00e4a92b26302f8690 (diff)
downloadATCD-4a1ecc377dd589421255f17b12dc2cb419d06b63.tar.gz
Renamed argument from error to error_message to get rid of false tagged error in our nologging build
* TAO/tests/Bug_3524_Regression/client.cpp:
-rw-r--r--TAO/tests/Bug_3524_Regression/client.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/TAO/tests/Bug_3524_Regression/client.cpp b/TAO/tests/Bug_3524_Regression/client.cpp
index 3b511be26f8..209067c3b4e 100644
--- a/TAO/tests/Bug_3524_Regression/client.cpp
+++ b/TAO/tests/Bug_3524_Regression/client.cpp
@@ -37,7 +37,7 @@ call_method (::Test::A_ptr server,
const char * arg1,
::CORBA::String_out & arg2,
char *& arg3,
- const char * error)
+ const char * error_message)
{
try
{
@@ -48,7 +48,7 @@ call_method (::Test::A_ptr server,
ACE_ERROR ((LM_ERROR,
"ERROR: No %C",
- error));
+ error_message));
return 1;
}
catch (const CORBA::BAD_PARAM &)
@@ -59,7 +59,7 @@ call_method (::Test::A_ptr server,
{
ACE_ERROR ((LM_ERROR,
"ERROR: Wrong %C",
- error));
+ error_message));
return 1;
}