ChangeLogTag: Thu Jan 2 00:15:57 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>

13 files changed, 44 insertions, 10 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7fb49bfd4e9..6eac9a67bc7 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,24 @@
+Thu Jan  2 00:15:57 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
+
+	* tests/Bug_1020_Regression/ORB_Task.cpp:
+	* tests/Bug_1020_Regression/client.cpp:
+	* tests/Bug_1270_Regression/ORB_Task.cpp:
+	* tests/Bug_1270_Regression/client.cpp:
+	* tests/Bug_1361_Regression/ORB_Task.cpp:
+	* tests/Bug_1361_Regression/client.cpp:
+	* tests/Nested_Upcall_Crash/Client_Peer.cpp:
+	* tests/Nested_Upcall_Crash/client.cpp:
+	* tests/Nested_Upcall_Crash/server.cpp:
+	* tests/Server_Connection_Purging/client.cpp: Added missing
+	  includes to keep the compilation on AIX happy. Missing header
+	  files were tao/Environment.h and ace/Reactor.h. 
+
+	* tao/Utils/Servant_Var.inl:
+	* tao/Utils/Servant_Var.h: #included ace/CORBA_Macros.h and
+	  tao/Environment.h to keep the AIX compilers happy. 
+	  
+	  Thanks to Jon Wackley for donating these patches. 
+
 Tue Dec 31 23:53:17 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
 	* TAO_IDL/include/idl_global.h: Added missing include to get it
diff --git a/TAO/tao/Utils/Servant_Var.h b/TAO/tao/Utils/Servant_Var.h
index b91d5a09812..31c12d7ca2c 100644
--- a/TAO/tao/Utils/Servant_Var.h
+++ b/TAO/tao/Utils/Servant_Var.h
@@ -18,6 +18,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/CORBA_macros.h"
+#include "tao/Environment.h"
+
 namespace TAO
 {
   namespace Utils
@@ -156,9 +159,9 @@ namespace TAO
 #include "Servant_Var.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
-// Don't use the pragma madness, the compiler(s?) that require it have
-// not been supported for a long time (and they could not deal with
-// namespace anyway!)
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Servant_Var.cpp")
+#endif
 
 #include "ace/post.h"
 #endif /*TAO_UTILS_SERVANT_VAR_H*/
diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl
index ad00a9e1eb3..dd3d1be9a80 100644
--- a/TAO/tao/Utils/Servant_Var.inl
+++ b/TAO/tao/Utils/Servant_Var.inl
@@ -46,7 +46,7 @@ operator=(Servant_Var<T> const & rhs)
 }
 
 template <class T>
-ACE_INLINE TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>::
+ACE_INLINE ACE_TYPENAME TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>::
 operator=(T * p)
 {
   TAO::Utils::Servant_Var<T> tmp(p);
@@ -93,7 +93,7 @@ Servant_Var(Servant_Var<Y> const & rhs)
 }
 
 template <class T> template <class Y>
-ACE_INLINE TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>::
+ACE_INLINE ACE_TYPENAME TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>::
 operator=(Servant_Var<Y> const & rhs)
 {
   TAO::Utils::Servant_Var<T> tmp(rhs);
@@ -102,7 +102,7 @@ operator=(Servant_Var<Y> const & rhs)
 }
 
 template <class T> template <class Y>
-ACE_INLINE TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>::
+ACE_INLINE ACE_TYPENAME TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>::
 operator=(Y * p)
 {
   TAO::Utils::Servant_Var<T> tmp(p);
@@ -180,8 +180,8 @@ _retn()
 
 template <class X, class Y>
 ACE_INLINE bool
-operator==(TAO::Utils::Servant_Var<X> const & x,
-           TAO::Utils::Servant_Var<Y> const & y)
+operator==(ACE_TYPENAME TAO::Utils::Servant_Var<X> const & x,
+           ACE_TYPENAME TAO::Utils::Servant_Var<Y> const & y)
 {
   return x.in() == y.in();
 }
@@ -190,8 +190,8 @@ operator==(TAO::Utils::Servant_Var<X> const & x,
 // $Id$
 template <class X, class Y>
 ACE_INLINE bool
-operator!=(TAO::Utils::Servant_Var<X> const & x,
-           TAO::Utils::Servant_Var<Y> const & y)
+operator!=(ACE_TYPENAME TAO::Utils::Servant_Var<X> const & x,
+           ACE_TYPENAME TAO::Utils::Servant_Var<Y> const & y)
 {
   return x.in() != y.in();
 }
diff --git a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp
index 925b221690b..86bdeedf8b3 100644
--- a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp
+++ b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp
@@ -7,6 +7,7 @@
  *
  */
 #include "ORB_Task.h"
+#include "tao/Environment.h"
 
 ACE_RCSID(Bug_1230_Regression, ORB_Task, "$Id$")
 
diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp
index 219b7a7b378..7e749580af9 100644
--- a/TAO/tests/Bug_1020_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Regression/client.cpp
@@ -6,6 +6,7 @@
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
+#include "ace/Reactor.h"
 
 ACE_RCSID(Bug_1230_Regression, client, "$Id$")
 
diff --git a/TAO/tests/Bug_1270_Regression/ORB_Task.cpp b/TAO/tests/Bug_1270_Regression/ORB_Task.cpp
index 1b6ceb98525..a011e89137d 100644
--- a/TAO/tests/Bug_1270_Regression/ORB_Task.cpp
+++ b/TAO/tests/Bug_1270_Regression/ORB_Task.cpp
@@ -7,6 +7,7 @@
  *
  */
 #include "ORB_Task.h"
+#include "tao/Environment.h"
 
 ACE_RCSID(Bug_1270_Regression, ORB_Task, "$Id$")
 
diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp
index ef8cb487861..5bdc3a618fc 100644
--- a/TAO/tests/Bug_1270_Regression/client.cpp
+++ b/TAO/tests/Bug_1270_Regression/client.cpp
@@ -6,6 +6,7 @@
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
+#include "ace/Reactor.h"
 
 ACE_RCSID(Bug_1270_Regression, client, "$Id$")
 
diff --git a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
index 732dc269e80..16ccdeb8661 100644
--- a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
+++ b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
@@ -7,6 +7,7 @@
  *
  */
 #include "ORB_Task.h"
+#include "tao/Environment.h"
 
 ACE_RCSID (Bug_1361_Regression,
            ORB_Task, "$Id$")
diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index ebba5698496..6e2540bc11b 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -6,6 +6,7 @@
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
+#include "ace/Reactor.h"
 
 ACE_RCSID(Bug_1270_Regression, client, "$Id$")
 
diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
index 5a17fc6282d..027682bd595 100644
--- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
@@ -9,6 +9,7 @@
 #include "Client_Peer.h"
 #include "Clock_Ticks.h"
 #include "tao/ORB_Core.h"
+#include "ace/Reactor.h"
 
 ACE_RCSID(Nested_Upcall_Crash, Client_Peer, "$Id$")
 
diff --git a/TAO/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp
index 42df6290f74..55a9dc1f236 100644
--- a/TAO/tests/Nested_Upcall_Crash/client.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/client.cpp
@@ -5,6 +5,7 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
+#include "ace/Reactor.h"
 
 ACE_RCSID(Nested_Upcall_Crash, client, "$Id$")
 
diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp
index cc9daade3ae..b5a4ab25b49 100644
--- a/TAO/tests/Nested_Upcall_Crash/server.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/server.cpp
@@ -5,6 +5,7 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
+#include "ace/Reactor.h"
 
 ACE_RCSID(Nested_Upcall_Crash, server, "$Id$")
 
diff --git a/TAO/tests/Server_Connection_Purging/client.cpp b/TAO/tests/Server_Connection_Purging/client.cpp
index bb6bf26f454..54d06c80a82 100644
--- a/TAO/tests/Server_Connection_Purging/client.cpp
+++ b/TAO/tests/Server_Connection_Purging/client.cpp
@@ -3,6 +3,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/TP_Reactor.h"
+#include "ace/Reactor.h"
 
 const char *host = "localhost";
 static int port = 10008;