summaryrefslogtreecommitdiff
path: root/TAO/tests/NestedUpcall
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/NestedUpcall')
-rw-r--r--TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h4
-rw-r--r--TAO/tests/NestedUpcall/MT_Client_Test/client.h11
-rw-r--r--TAO/tests/NestedUpcall/MT_Client_Test/local_server.h13
-rw-r--r--TAO/tests/NestedUpcall/MT_Client_Test/server.h9
-rw-r--r--TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h2
-rw-r--r--TAO/tests/NestedUpcall/Reactor/client.h5
-rw-r--r--TAO/tests/NestedUpcall/Reactor/eh_i.h2
-rw-r--r--TAO/tests/NestedUpcall/Reactor/reactor_i.h2
-rw-r--r--TAO/tests/NestedUpcall/Reactor/server.h7
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h6
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h4
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h4
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/initiator.h9
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/server_A.h9
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/server_B.h9
15 files changed, 68 insertions, 28 deletions
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
index 0a2300f6110..d9b643a66ef 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
@@ -10,7 +10,7 @@
// MT_Object_A_i.h
//
// = DESCRIPTION
-// This class implements the Object A of the
+// This class implements the Object A of the
// Nested Upcalls - MT Client test
//
// = AUTHORS
@@ -18,7 +18,7 @@
//
// ============================================================================
-#if !defined (MT_OBJECT_IMPL_H)
+#ifndef MT_OBJECT_IMPL_H
# define MT_OBJECT_IMPL_H
#include "MT_Client_TestS.h"
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
index b46b41f6d79..b0ddfdec286 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
@@ -17,10 +17,15 @@
//
// ============================================================================
-#if !defined (MT_CLIENT_H)
+#ifndef MT_CLIENT_H
#define MT_CLIENT_H
#include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
#include "ace/Task.h"
#include "ace/Thread_Manager.h"
#include "tao/corba.h"
@@ -43,9 +48,9 @@ public:
int run (void);
// Execute client example code.
- int init (int argc,
+ int init (int argc,
char **argv,
- int client_number);
+ int client_number);
// Initialize the client communication endpoint with server.
private:
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
index 84bfc68d5fa..47448a588a0 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
@@ -10,7 +10,7 @@
// local_server.h
//
// = DESCRIPTION
-// This class implements a simple server for the
+// This class implements a simple server for the
// Nested Upcalls - MT Client test
//
// = AUTHORS
@@ -18,10 +18,15 @@
//
// ============================================================================
-#if !defined (MT_CLIENT_TEST_MT_SERVER_H)
+#ifndef MT_CLIENT_TEST_MT_SERVER_H
#define MT_CLIENT_TEST_MT_SERVER_H
#include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
#include "ace/Log_Msg.h"
#include "tao/TAO.h"
#include "MT_Object_i.h"
@@ -70,7 +75,7 @@ private:
// The ORB manager
MT_Object_i mT_Object_i_;
- // Implementation object
+ // Implementation object
MT_Object_var mT_Object_var_;
// reference for the distant MT Object
@@ -95,7 +100,7 @@ class MT_Server_Task : public ACE_Task<ACE_SYNCH>
// No big purpose, just wrapping
public:
MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr,
- int argc,
+ int argc,
char **argv,
TAO_ORB_Manager* orb_manager_ptr);
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
index cb58c0d6376..b744c1b78c3 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
@@ -10,7 +10,7 @@
// server_A.h
//
// = DESCRIPTION
-// This class implements a simple server for the
+// This class implements a simple server for the
// Nested Upcalls - MT Client test
//
// = AUTHORS
@@ -18,10 +18,15 @@
//
// ============================================================================
-#if !defined (MT_CLIENT_TEST_MT_OBJECT_SERVER_H)
+#ifndef MT_CLIENT_TEST_MT_OBJECT_SERVER_H
#define MT_CLIENT_TEST_MT_OBJECT_SERVER_H
#include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
#include "ace/Log_Msg.h"
#include "tao/TAO.h"
#include "MT_Object_i.h"
diff --git a/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h b/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h
index 73c3195c4fe..8198739eff4 100644
--- a/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h
+++ b/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h
@@ -13,7 +13,7 @@
//
// ============================================================================
-#if !defined (_NESTEDUPCALLS_I_H)
+#ifndef _NESTEDUPCALLS_I_H
#define _NESTEDUPCALLS_I_H
//#include "cubitS.h"
diff --git a/TAO/tests/NestedUpcall/Reactor/client.h b/TAO/tests/NestedUpcall/Reactor/client.h
index 706a4d9105a..5e2f2fbc187 100644
--- a/TAO/tests/NestedUpcall/Reactor/client.h
+++ b/TAO/tests/NestedUpcall/Reactor/client.h
@@ -18,6 +18,11 @@
// ============================================================================
#include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
#include "tao/corba.h"
#include "reactor_i.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.h b/TAO/tests/NestedUpcall/Reactor/eh_i.h
index c8443da0bcb..c3b0a729696 100644
--- a/TAO/tests/NestedUpcall/Reactor/eh_i.h
+++ b/TAO/tests/NestedUpcall/Reactor/eh_i.h
@@ -1,7 +1,7 @@
// -*- c++ -*-
// $Id$
-#if !defined (EVENTHANDLER_I_H)
+#ifndef EVENTHANDLER_I_H
# define EVENTHANDLER_I_H
#include "ReactorS.h"
diff --git a/TAO/tests/NestedUpcall/Reactor/reactor_i.h b/TAO/tests/NestedUpcall/Reactor/reactor_i.h
index 3d4ede734c9..bc7b11c391a 100644
--- a/TAO/tests/NestedUpcall/Reactor/reactor_i.h
+++ b/TAO/tests/NestedUpcall/Reactor/reactor_i.h
@@ -1,7 +1,7 @@
// -*- c++ -*-
// $Id$
-#if !defined (REACTOR_I_H)
+#ifndef REACTOR_I_H
# define REACTOR_I_H
#include "ReactorS.h"
diff --git a/TAO/tests/NestedUpcall/Reactor/server.h b/TAO/tests/NestedUpcall/Reactor/server.h
index cb02f84b701..73acff90fcf 100644
--- a/TAO/tests/NestedUpcall/Reactor/server.h
+++ b/TAO/tests/NestedUpcall/Reactor/server.h
@@ -18,10 +18,15 @@
//
// ============================================================================
-#if !defined (_NUC_SERVER_H)
+#ifndef _NUC_SERVER_H
#define _NUC_SERVER_H
#include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
#include "ace/Log_Msg.h"
#include "tao/TAO.h"
#include "orbsvcs/CosNamingC.h"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
index d96de135ef8..197b491070f 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
@@ -10,7 +10,7 @@
// Initiator_i.h
//
// = DESCRIPTION
-// This class implements the Initiator of the
+// This class implements the Initiator of the
// Nested Upcalls - Triangle test.
//
// = AUTHORS
@@ -18,7 +18,7 @@
//
// ============================================================================
-#if !defined (INITIATOR_IMPL_H)
+#ifndef INITIATOR_IMPL_H
# define INITIATOR_IMPL_H
#include "Triangle_TestS.h"
@@ -28,7 +28,7 @@ class Initiator_i : public POA_Initiator
// = TITLE
// Implement the <Initiator> IDL interface.
public:
- Initiator_i (Object_A_ptr object_A_ptr,
+ Initiator_i (Object_A_ptr object_A_ptr,
Object_B_ptr object_B_ptr);
// Constructor.
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
index a1da7af1796..3f41df62c63 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
@@ -10,7 +10,7 @@
// Object_A_i.h
//
// = DESCRIPTION
-// This class implements the Object A of the
+// This class implements the Object A of the
// Nested Upcalls - Triangle test.
//
// = AUTHORS
@@ -18,7 +18,7 @@
//
// ============================================================================
-#if !defined (OBJECT_B_IMPL_H)
+#ifndef OBJECT_B_IMPL_H
# define OBJECT_B_IMPL_H
#include "Triangle_TestS.h"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
index 0757357d510..01366ff476e 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
@@ -10,7 +10,7 @@
// Object_B_i.h
//
// = DESCRIPTION
-// This class implements the Object B of the
+// This class implements the Object B of the
// Nested Upcalls - Triangle test.
//
// = AUTHORS
@@ -18,7 +18,7 @@
//
// ============================================================================
-#if !defined (OBJECT_B_IMPL_H)
+#ifndef OBJECT_B_IMPL_H
# define OBJECT_B_IMPL_H
#include "Triangle_TestS.h"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
index 628889f8254..89c9d5e4ccc 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
@@ -10,7 +10,7 @@
// initiator.h
//
// = DESCRIPTION
-// This class implements a simple server for the
+// This class implements a simple server for the
// Nested Upcalls - Triangle test
//
// = AUTHORS
@@ -18,10 +18,15 @@
//
// ============================================================================
-#if !defined (_TRIANGLE_TEST_INITITATOR_SERVER_H)
+#ifndef _TRIANGLE_TEST_INITITATOR_SERVER_H
#define _TRIANGLE_TEST_INITITATOR_SERVER_H
#include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
#include "ace/Log_Msg.h"
#include "tao/TAO.h"
#include "Initiator_i.h"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
index 070bf80d0f9..b15a1618a1f 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
@@ -10,7 +10,7 @@
// server_A.h
//
// = DESCRIPTION
-// This class implements a simple server for the
+// This class implements a simple server for the
// Nested Upcalls - Triangle test
//
// = AUTHORS
@@ -18,10 +18,15 @@
//
// ============================================================================
-#if !defined (_TRIANGLE_TEST_OBJECT_A_SERVER_H)
+#ifndef _TRIANGLE_TEST_OBJECT_A_SERVER_H
#define _TRIANGLE_TEST_OBJECT_A_SERVER_H
#include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
#include "ace/Log_Msg.h"
#include "tao/TAO.h"
#include "Object_A_i.h"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
index 51028a046e2..9e5356842d6 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
@@ -10,7 +10,7 @@
// server_B.h
//
// = DESCRIPTION
-// This class implements a simple server for the
+// This class implements a simple server for the
// Nested Upcalls - Triangle test
//
// = AUTHORS
@@ -18,10 +18,15 @@
//
// ============================================================================
-#if !defined (_TRIANGLE_TEST_OBJECT_B_SERVER_H)
+#ifndef _TRIANGLE_TEST_OBJECT_B_SERVER_H
#define _TRIANGLE_TEST_OBJECT_B_SERVER_H
#include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
#include "ace/Log_Msg.h"
#include "tao/TAO.h"
#include "Object_B_i.h"
View Lorry Controller Status