ChangeLogTag:Sat Sep 6 08:08:19 2003 Ossama Othman <ossama@dre.vanderbilt.edu>

2 files changed, 67 insertions, 51 deletions

diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index 2b9d65662ce..3a6de74c60d 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -42,6 +42,12 @@
 #include "tao/VarOut_T.h"
 #include "Any_Dual_Impl_T.h"
 
+#if defined (HPUX) && defined (IOR)
+   /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h
+      and we don't want that definition.  See IOP_IORC.h. */
+# undef IOR
+#endif /* HPUX && IOR */
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -70,111 +76,111 @@
 
 TAO_NAMESPACE  GIOP
 {
-  
+
   // TAO_IDL - Generated from
   // be/be_visitor_typedef/typedef_ch.cpp:333
-  
+
   typedef CORBA::Short AddressingDisposition;
   typedef CORBA::Short_out AddressingDisposition_out;
-  
+
   // TAO_IDL - Generated from
   // be/be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AddressingDisposition;
-  
+
   // TAO_IDL - Generated from
   // be/be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::Short KeyAddr = 0;
-  
+
   // TAO_IDL - Generated from
   // be/be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::Short ProfileAddr = 1;
-  
+
   // TAO_IDL - Generated from
   // be/be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::Short ReferenceAddr = 2;
-  
+
   // TAO_IDL - Generated from
   // be/be_type.cpp:249
-  
+
   struct Version;
-  
+
   typedef
     TAO_Fixed_Var_T<
         Version
       >
     Version_var;
-  
+
   typedef
     Version &
     Version_out;
-  
+
   // TAO_IDL - Generated from
   // be/be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_Export Version
   {
     typedef Version_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::Octet major;
     CORBA::Octet minor;
   };
-  
+
   // TAO_IDL - Generated from
   // be/be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Version;
-  
+
   // TAO_IDL - Generated from
   // be/be_type.cpp:249
-  
+
   struct IORAddressingInfo;
-  
+
   typedef
     TAO_Var_Var_T<
         IORAddressingInfo
       >
     IORAddressingInfo_var;
-  
+
   typedef
     TAO_Out_T<
         IORAddressingInfo,
         IORAddressingInfo_var
       >
     IORAddressingInfo_out;
-  
+
   // TAO_IDL - Generated from
   // be/be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_Export IORAddressingInfo
   {
     typedef IORAddressingInfo_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::ULong selected_profile_index;
     IOP::IOR ior;
   };
-  
+
   // TAO_IDL - Generated from
   // be/be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORAddressingInfo;
-  
+
   // TAO_IDL - Generated from
   // be/be_type.cpp:249
-  
+
   class TargetAddress;
-  
+
   typedef
     TAO_Var_Var_T<
         TargetAddress
       >
     TargetAddress_var;
-  
+
   typedef
     TAO_Out_T<
         TargetAddress,
@@ -184,7 +190,7 @@ TAO_NAMESPACE  GIOP
 
 #if !defined (_GIOP_TARGETADDRESS_CH_)
 #define _GIOP_TARGETADDRESS_CH_
-  
+
   class TAO_Export TargetAddress
   {
   public:
@@ -192,49 +198,49 @@ TAO_NAMESPACE  GIOP
     TargetAddress (const TargetAddress &);
     ~TargetAddress (void);
     static void _tao_any_destructor (void*);
-    
+
     TargetAddress &operator= (const TargetAddress &);
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_union/discriminant_ch.cpp:114
-    
+
     void _d (CORBA::Short);
     CORBA::Short _d (void) const;
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_union/union_ch.cpp:108
-    
+
     typedef TargetAddress_var _var_type;
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_union_branch/public_ch.cpp:507
-    
+
     void object_key (const CORBA::OctetSeq &);
     const CORBA::OctetSeq &object_key (void) const;
     CORBA::OctetSeq &object_key (void);
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_union_branch/public_ch.cpp:615
-    
+
     void profile (const IOP::TaggedProfile &);
     const IOP::TaggedProfile &profile (void) const;
     IOP::TaggedProfile &profile (void);
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_union_branch/public_ch.cpp:615
-    
+
     void ior (const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &);
     const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void) const;
     ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void);
-    
+
     // TAO_IDL - Generated from
     // be/be_visitor_union/union_ch.cpp:142
-    
+
     void _default (void);
   private:
     CORBA::Short disc_;
     CORBA::Short holder_;
-    
+
     union
     {
       // TAO_IDL - Generated from
@@ -247,14 +253,14 @@ TAO_NAMESPACE  GIOP
       // be/be_visitor_union_branch/private_ch.cpp:482
       ACE_NESTED_CLASS (GIOP, IORAddressingInfo) *ior_;
     } u_;
-    
+
     // TAO extension - frees any allocated storage.
     void _reset (CORBA::Short, CORBA::Boolean /* finalize */);
   };
-  
+
   // TAO_IDL - Generated from
   // be/be_visitor_typecode/typecode_decl.cpp:44
-  
+
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TargetAddress;
 
 #endif /* end #if !defined */
@@ -334,4 +340,3 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
-
diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h
index 85374ca8e00..8e394261425 100644
--- a/TAO/tao/target_specification.h
+++ b/TAO/tao/target_specification.h
@@ -20,6 +20,17 @@
 
 #include "tao/corbafwd.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if defined (HPUX) && defined (IOR)
+   /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h
+      and we don't want that definition.  See IOP_IORC.h. */
+# undef IOR
+#endif /* HPUX && IOR */
+
+
 namespace IOP
 {
   struct IOR;