summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2019-01-10 10:28:47 +0100
committerGitHub <noreply@github.com>2019-01-10 10:28:47 +0100
commit5d12213921c474e44aeb4a89f3ef3ee671fdb0df (patch)
tree8e395a612ac24c370dc22b908440447abfe6e205 /TAO
parenta2f9a9ef8bf6b76a631e748ee89467926d2781ac (diff)
parentfec796bd6ad79e40a42b9e95021edeecd883739d (diff)
downloadATCD-5d12213921c474e44aeb4a89f3ef3ee671fdb0df.tar.gz
Merge pull request #789 from jwillemsen/master
Fixed local variable not used warnings
Diffstat (limited to 'TAO')
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp3
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp4
4 files changed, 8 insertions, 9 deletions
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
index e65cce6fe4e..04aab458c3c 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp
@@ -111,7 +111,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
hello->check_extended_context ();
}
- catch (Test::MyException& my_ex)
+ catch (const Test::MyException&)
{
ACE_DEBUG ((LM_ERROR, "Error - REGRESSION - extended format service context not transmitted\n"));
result = 1;
@@ -130,7 +130,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
return 1;
}
-
if (result)
{
ACE_DEBUG ((LM_ERROR, "Error: REGRESSION identified!!!\n"));
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
index 5f900e05b55..8e486c88e5e 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
@@ -656,7 +656,7 @@ do_failover_name_test (
CosNaming::NamingContext_var nc =
CosNaming::NamingContext::_narrow (obj1_on_replica.in ());
}
- catch (const CosNaming::NamingContext::NotFound& ex)
+ catch (const CosNaming::NamingContext::NotFound&)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("INFO: Unable to resolve wide context object from ")
@@ -1291,7 +1291,7 @@ do_persistence_name_test (
CosNaming::NamingContext_var nc =
CosNaming::NamingContext::_narrow (obj1_on_replica.in ());
}
- catch (const CosNaming::NamingContext::NotFound& ex)
+ catch (const CosNaming::NamingContext::NotFound&)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("INFO: Unable to resolve wide context object from ")
@@ -1876,7 +1876,7 @@ do_equivalence_name_test (
CosNaming::NamingContext_var nc =
CosNaming::NamingContext::_narrow (obj1_on_replica.in ());
}
- catch (const CosNaming::NamingContext::NotFound& ex)
+ catch (const CosNaming::NamingContext::NotFound&)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("INFO: Unable to resolve wide context object from ")
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
index a97114e1d40..b9e1fd75cab 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
@@ -57,7 +57,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
proxyCon_obj = sa->obtain_notification_push_consumer(ctype, proxy_id);
}
- catch(CosNotifyChannelAdmin::AdminLimitExceeded& err)
+ catch(const CosNotifyChannelAdmin::AdminLimitExceeded&)
{
std::cerr << "CosNotifyChannelAdmin::AdminLimitExceeded Exception!" << std::endl;
throw;
@@ -71,7 +71,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ppc->connect_structured_push_supplier(sps.in());
}
- catch (CosEventChannelAdmin::AlreadyConnected& ac)
+ catch (const CosEventChannelAdmin::AlreadyConnected&)
{
std::cerr << "CosEventChannelAdmin::AlreadyConnected" << std::endl;
throw;
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
index 9aa4bca5e30..78440bec547 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
@@ -59,7 +59,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
proxyCon_obj = sa->obtain_notification_push_consumer(ctype, proxy_id);
}
- catch(CosNotifyChannelAdmin::AdminLimitExceeded& err)
+ catch(const CosNotifyChannelAdmin::AdminLimitExceeded&)
{
std::cerr << "CosNotifyChannelAdmin::AdminLimitExceeded Exception!" << std::endl;
throw;
@@ -73,7 +73,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ppc->connect_structured_push_supplier(sps.in());
}
- catch (CosEventChannelAdmin::AlreadyConnected& ac)
+ catch (const CosEventChannelAdmin::AlreadyConnected&)
{
std::cerr << "CosEventChannelAdmin::AlreadyConnected" << std::endl;
throw;