diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 1999-07-29 00:02:49 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 1999-07-29 00:02:49 +0000 |
| commit | 6c7d9347594a1f60effef3721dc933d1693a0401 (patch) | |
| tree | 5c8bfdc2b70dc3f24159ed7f36190db39610592b | |
| parent | 5467d55051192127ad4d9c0f7b665fd27d004c4b (diff) | |
| download | ATCD-6c7d9347594a1f60effef3721dc933d1693a0401.tar.gz | |
Fixed unused argument warnings that occurred when
TAO_HAS_MINIMUM_CORBA was defined.
| -rw-r--r-- | TAO/tao/Object_Adapter.cpp | 12 | ||||
| -rw-r--r-- | TAO/tao/POA.cpp | 10 |
2 files changed, 14 insertions, 8 deletions
diff --git a/TAO/tao/Object_Adapter.cpp b/TAO/tao/Object_Adapter.cpp index 78563422f9d..4da55b61a78 100644 --- a/TAO/tao/Object_Adapter.cpp +++ b/TAO/tao/Object_Adapter.cpp @@ -340,8 +340,11 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name, poa = parent; result = 0; - -#endif /* TAO_HAS_MINIMUM_CORBA */ +#else + ACE_UNUSED_ARG (folded_name); + ACE_UNUSED_ARG (poa); + ACE_UNUSED_ARG (ACE_TRY_ENV); +#endif /* !TAO_HAS_MINIMUM_CORBA */ return result; } @@ -931,8 +934,9 @@ TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (CORBA::Environmen // Locking error. ACE_THROW (CORBA::OBJ_ADAPTER ()); } - -#endif /* TAO_HAS_MINIMUM_CORBA */ +#else + ACE_UNUSED_ARG (ACE_TRY_ENV); +#endif /* !TAO_HAS_MINIMUM_CORBA */ } void diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp index f5569af9a86..e0928f0db10 100644 --- a/TAO/tao/POA.cpp +++ b/TAO/tao/POA.cpp @@ -363,8 +363,9 @@ TAO_POA::find_POA_i (const ACE_CString &child_name, result = -1; } } - -#endif /* TAO_HAS_MINIMUM_CORBA */ +#else + ACE_UNUSED_ARG (activate_it); +#endif /* !TAO_HAS_MINIMUM_CORBA */ if (result == 0) { @@ -1981,8 +1982,9 @@ TAO_POA::locate_servant_i (const char *operation, return servant; } } - -#endif /* TAO_HAS_MINIMUM_CORBA */ +#else + ACE_UNUSED_ARG (operation); +#endif /* !TAO_HAS_MINIMUM_CORBA */ // Failure ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (), |