From 4a1ecc377dd589421255f17b12dc2cb419d06b63 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Sun, 28 Dec 2014 14:33:33 +0100
Subject: 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:

---
 TAO/tests/Bug_3524_Regression/client.cpp | 6 +++---
 1 file 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;
     }
 
-- 
cgit v1.2.1