ChangeLogTag: Thu Jun 21 07:49:15 2001 Chad Elliott <elliott_c@ociweb.com>

11 files changed, 33 insertions, 11 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index d055cb37d0f..fb8fad1c073 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,26 @@
+Thu Jun 21 07:49:15 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * examples/OBV/Simple_util.h:                       
+        * examples/Persistent_Grid/Simple_util.h:           
+        * examples/Simple/Simple_util.h:                    
+                                                            
+          Added ()'s around file name in the pragma implemenation directive.
+
+        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h:
+
+          Add AIX Visual Age C++ to the workaround for math.h.
+
+        * orbsvcs/orbsvcs/AV/AVStreams_i.h:
+        * orbsvcs/orbsvcs/AV/Transport.h:
+        * tao/IIOP_Connector.cpp:
+        * tao/IIOP_Connector.h:
+        * tao/Strategies/SHMIOP_Connector.h:
+        * tao/Strategies/UIOP_Connector.h:
+
+          Moved #include "ace/Connector.h" to be after #include of the
+          specific connector type to fix compile error on AIX, Visual Age
+          C++ 5.
+
 Thu Jun 21 06:52:02 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile:
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index 9c82ab72aaf..d5f6e17fad1 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -167,7 +167,7 @@ protected:
 #include "Simple_util.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation "Simple_util.cpp"
+#pragma implementation ("Simple_util.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #endif /* TAO_UTIL_H */
diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h
index db694a759d8..d0b689a685b 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.h
+++ b/TAO/examples/Persistent_Grid/Simple_util.h
@@ -159,7 +159,7 @@ protected:
 #include "Simple_util.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation "Simple_util.cpp"
+#pragma implementation ("Simple_util.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #endif /* TAO_UTIL_H */
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 96b01533d00..45faa61e3fb 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -172,7 +172,7 @@ protected:
 #include "Simple_util.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation "Simple_util.cpp"
+#pragma implementation ("Simple_util.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #endif /* TAO_UTIL_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index a7d51e0fcd2..cbd49f7cc0b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -22,8 +22,8 @@
 #include "ace/Containers_T.h"
 #include "ace/Process.h"
 #include "ace/SOCK_CODgram.h"
-#include "ace/Connector.h"
 #include "ace/SOCK_Connector.h"
+#include "ace/Connector.h"
 #include "ace/Acceptor.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/Svc_Handler.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h
index 687b56fc4a2..a3d8fa35c58 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h
@@ -18,8 +18,8 @@
 #include "ace/Service_Object.h"
 #include "ace/Acceptor.h"
 #include "ace/SOCK_Acceptor.h"
-#include "ace/Connector.h"
 #include "ace/SOCK_Connector.h"
+#include "ace/Connector.h"
 #include "ace/Addr.h"
 #include "ace/SOCK_Dgram.h"
 #include "orbsvcs/AV/AV_export.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index 332138db27a..e4b85300ea1 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -43,7 +43,7 @@
 #endif /* CHORUS_MVME */
 
 // FUZZ: disable check_for_math_include
-#if defined(ACE_HAS_EXCEPTIONS) && !defined (__KCC)
+#if defined(ACE_HAS_EXCEPTIONS) && !defined (__KCC) && !defined (__xlC__)
   // Some plaforms define an exception structure in math.h...
 # if defined (__GNUG__)
     // And some compilers have this workaround.  Disable it with this
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 99ae81920b2..0561c25189a 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -12,7 +12,6 @@
 #include "tao/Protocols_Hooks.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "ace/Strategies_T.h"
-#include "ace/SOCK_Connector.h"
 
 ACE_RCSID (TAO,
            IIOP_Connector,
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 497998586a2..bdfb62885f1 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -20,13 +20,13 @@
 #define TAO_IIOP_CONNECTOR_H
 #include "ace/pre.h"
 
-#include "ace/Connector.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SOCK_Connector.h"
+#include "ace/Connector.h"
+
 #include "tao/Pluggable.h"
 #include "tao/Connector_Impl.h"
 #include "tao/IIOP_Connection_Handler.h"
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h
index 02fc0fd8238..dbeab430b41 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.h
+++ b/TAO/tao/Strategies/SHMIOP_Connector.h
@@ -26,8 +26,8 @@
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "ace/Connector.h"
 #include "ace/MEM_Connector.h"
+#include "ace/Connector.h"
 #include "tao/Pluggable.h"
 #include "SHMIOP_Connection_Handler.h"
 #include "tao/Resource_Factory.h"
diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h
index 395fb5d2f04..a3c42053215 100644
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ b/TAO/tao/Strategies/UIOP_Connector.h
@@ -27,8 +27,8 @@
 
 # if TAO_HAS_UIOP == 1
 
-#include "ace/Connector.h"
 #include "ace/LSOCK_Connector.h"
+#include "ace/Connector.h"
 #include "UIOP_Connection_Handler.h"
 #include "tao/Resource_Factory.h"
 #include "tao/Connector_Impl.h"