summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a6
-rw-r--r--TAO/tests/ior_corbaloc/client.cpp2
-rw-r--r--TAO/tests/ior_corbaloc/corbaname_client.cpp2
-rw-r--r--TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp1
-rw-r--r--TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h2
-rw-r--r--TAO/tests/ior_corbaloc/server.cpp19
-rw-r--r--TAO/tests/ior_corbaloc/status_i.cpp14
-rw-r--r--TAO/tests/ior_corbaloc/status_i.h11
-rw-r--r--THANKS1
9 files changed, 26 insertions, 32 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 6240012c166..1b352669922 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Thu Apr 18 13:58:11 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
+
+ * tests/ior_corbaloc/status_i.h (print_status): Replaced a hard-coded
+ "throw" statement with an ACE_THROW_SPEC macro. Thanks to Ma
+ Ting Chong <ma_ting_chong@hotmail.com> for reporting this.
+
Thu Apr 18 12:20:16 2002 Balachandran Natarajan <bala@cs.wustl.edu>
* tao/IIOP_Acceptor.cpp: Added a missing template instantiation to
diff --git a/TAO/tests/ior_corbaloc/client.cpp b/TAO/tests/ior_corbaloc/client.cpp
index d88cef1f264..1cbae2ff35e 100644
--- a/TAO/tests/ior_corbaloc/client.cpp
+++ b/TAO/tests/ior_corbaloc/client.cpp
@@ -1,5 +1,4 @@
// $Id$
-//
// ============================================================================
//
@@ -22,7 +21,6 @@
int main (int argc, char *argv [])
{
-
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
diff --git a/TAO/tests/ior_corbaloc/corbaname_client.cpp b/TAO/tests/ior_corbaloc/corbaname_client.cpp
index 03cae419d01..f3e96d4ab5c 100644
--- a/TAO/tests/ior_corbaloc/corbaname_client.cpp
+++ b/TAO/tests/ior_corbaloc/corbaname_client.cpp
@@ -1,4 +1,3 @@
-
//=============================================================================
/**
* @file corbaname_client.cpp
@@ -13,7 +12,6 @@
*/
//=============================================================================
-
#include "ior_corbaloc_client_i.h"
int main (int argc, char *argv [])
diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp
index e00481deee0..e5907181cf4 100644
--- a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp
+++ b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp
@@ -1,5 +1,4 @@
// $Id$
-//
// ===========================================================
//
diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h
index 060c38d1a77..ae3bf9bf963 100644
--- a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h
+++ b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h
@@ -19,7 +19,6 @@
//
//============================================================
-
#if !defined (IOR_CORBALOC_CLIENT_I_H)
#define IOR_CORBALOC_CLIENT_I_H
@@ -51,7 +50,6 @@ class IOR_corbaloc_Client_i
/// Naming context
CosNaming::NamingContextExt_var naming_context_;
-
};
#endif /* IOR_CORBALOC_CLIENT_I_H */
diff --git a/TAO/tests/ior_corbaloc/server.cpp b/TAO/tests/ior_corbaloc/server.cpp
index 4396c20085e..415daf348c1 100644
--- a/TAO/tests/ior_corbaloc/server.cpp
+++ b/TAO/tests/ior_corbaloc/server.cpp
@@ -1,19 +1,15 @@
// $Id$
// server.cpp
-//
#include "status_i.h"
#include "tao/PortableServer/PortableServer.h"
#include "orbsvcs/orbsvcs/CosNamingC.h"
-
int main (int argc, char* argv[])
{
-
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
-
// First initialize the ORB, that will remove some arguments...
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv,
@@ -21,10 +17,11 @@ int main (int argc, char* argv[])
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- if(argc < 2){
- ACE_DEBUG((LM_DEBUG, "\nUsage:\n %s [NAME to insert in Naming Service]\n", argv[0]));
- return -1;
- }
+ if (argc < 2)
+ {
+ ACE_DEBUG ((LM_DEBUG, "\nUsage:\n %s [NAME to insert in Naming Service]\n", argv[0]));
+ return -1;
+ }
// Get a reference to the RootPOA
CORBA::Object_var poa_object =
orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
@@ -46,7 +43,7 @@ int main (int argc, char* argv[])
// Create the servant
corbaloc_Status_i status_i;
- status_i.set_name(argv[1]);
+ status_i.set_name (argv[1]);
// Activate it to obtain the reference
corbaloc::Status_var status =
status_i._this ();
@@ -59,7 +56,7 @@ int main (int argc, char* argv[])
// Narrow down the reference
CosNaming::NamingContext_var naming_context =
- CosNaming::NamingContext::_narrow (naming_context_object.in()
+ CosNaming::NamingContext::_narrow (naming_context_object.in ()
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -82,7 +79,7 @@ int main (int argc, char* argv[])
ACE_TRY_CHECK;
}
ACE_CATCH (CORBA::SystemException, ex) {
- ACE_PRINT_EXCEPTION(ex, "CORBA exception raised! ");
+ ACE_PRINT_EXCEPTION (ex, "CORBA exception raised! ");
}
ACE_CATCHANY {
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in server");
diff --git a/TAO/tests/ior_corbaloc/status_i.cpp b/TAO/tests/ior_corbaloc/status_i.cpp
index d0a9207c320..4afe89b4709 100644
--- a/TAO/tests/ior_corbaloc/status_i.cpp
+++ b/TAO/tests/ior_corbaloc/status_i.cpp
@@ -3,7 +3,7 @@
#include "status_i.h"
corbaloc_Status_i::corbaloc_Status_i (ACE_ENV_ARG_DECL_NOT_USED)
- : server_name_()
+ : server_name_()
{
// Constructor
}
@@ -12,12 +12,10 @@ CORBA::Boolean
corbaloc_Status_i::print_status (ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
-
- // If the server received the request from the client,
- // return true == 0;
- ACE_DEBUG((LM_DEBUG,
- "Invoking print_status() method for servant with name: %s\nregistered in Naming Service\n",
-
- server_name_.c_str() ));
+ // If the server received the request from the client, return true
+ // == 0;
+ ACE_DEBUG ((LM_DEBUG,
+ "Invoking print_status() method for servant with name: %s\nregistered in Naming Service\n",
+ server_name_.c_str ()));
return 0;
}
diff --git a/TAO/tests/ior_corbaloc/status_i.h b/TAO/tests/ior_corbaloc/status_i.h
index 0c06fa8cc6d..90e6021959a 100644
--- a/TAO/tests/ior_corbaloc/status_i.h
+++ b/TAO/tests/ior_corbaloc/status_i.h
@@ -1,23 +1,22 @@
-//
// $Id$
-//
#ifndef STATUS_I_H
#define STATUS_I_H
#include "corbalocS.h"
-class corbaloc_Status_i : public POA_corbaloc::Status {
+class corbaloc_Status_i : public POA_corbaloc::Status
+{
public:
corbaloc_Status_i (ACE_ENV_ARG_DECL_WITH_DEFAULTS);
CORBA::Boolean print_status (ACE_ENV_ARG_DECL_WITH_DEFAULTS)
- throw (CORBA::SystemException);
+ ACE_THROW_SPEC ((CORBA::SystemException));
+
+ void set_name (const char *name) { server_name_ = name; }
- void set_name(const char *name){ server_name_=name; }
private:
ACE_CString server_name_;
-
};
#endif /* STATUS_I_H */
diff --git a/THANKS b/THANKS
index 1d6b4fab5cc..575f14bb13f 100644
--- a/THANKS
+++ b/THANKS
@@ -1501,6 +1501,7 @@ Tom Phan <tomp@telhub.com>
Andrew Guy <andrew.guy@monis.com>
Bharathi Kangatharan <bharathi.kangatharan@baesystems.com>
Jean Quinsat <jean.quinsat@airbus.com>
+Ma Ting Chong <ma_ting_chong@hotmail.com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile
View Lorry Controller Status