diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-08-29 05:09:46 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-08-29 05:09:46 +0000 |
| commit | 5dc06470381fd77820bf180f58e67f0cd7987703 (patch) | |
| tree | c5ce5b2a92bbf0c69f31320413a8c05afa6b44cd | |
| parent | ba6ec881dff19a91d7382b85cb3863e6626f5e33 (diff) | |
| download | ATCD-5dc06470381fd77820bf180f58e67f0cd7987703.tar.gz | |
ChangeLogTag:Thu Aug 28 22:04:40 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 18 | ||||
| -rw-r--r-- | TAO/tao/IOP_IORC.h | 10 | ||||
| -rw-r--r-- | TAO/tao/Stub.h | 7 | ||||
| -rw-r--r-- | TAO/tao/corbafwd.h | 15 |
4 files changed, 34 insertions, 16 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 349f4f03126..0ef1519645c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,10 +1,26 @@ +Thu Aug 28 22:04:40 2003 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tao/IOP_IORC.h: + + Made #undef of "IOR" (for HPUX) match the original one found in + corbafwd.h. It is more generic. + + * tao/Object.h: + * tao/Stub.h: + * tao/corbafwd.h: + + #undef "IOR" (for HPUX) after all headers have been included to + make sure it isn't indirectly redefined by other headers. + Addresses TAO HPUX build failures. + Thu Aug 28 19:15:44 2003 George Edwards <g.edwards@vanderbilt.edu> * tests/Portable_Interceptors/Bug_1559/interceptors.cpp: * tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp: * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp: - Fixed compilation errors related to misused ACE error handling macros. + Fixed compilation errors related to misused ACE error handling + macros. Thu Aug 28 18:35:44 2003 Ossama Othman <ossama@dre.vanderbilt.edu> diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h index dbf2a9c9c60..5491c582ef5 100644 --- a/TAO/tao/IOP_IORC.h +++ b/TAO/tao/IOP_IORC.h @@ -132,11 +132,11 @@ TAO_NAMESPACE IOP // TAO_IDL - Generated from // be/be_type.cpp:249 -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/inline.h and - // /usr/include/pa/inline.h -#undef IOR -#endif +#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 */ struct IOR; typedef diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 6840ed143f3..3ed0b64ddea 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -26,6 +26,13 @@ #include "tao/ORB.h" #include "tao/ORB_Core_Auto_Ptr.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 */ + + // Forward declarations. class TAO_RelativeRoundtripTimeoutPolicy; class TAO_Client_Priority_Policy; diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index d6cede1a2d0..07e013fb4ac 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -28,16 +28,6 @@ #include "ace/CDR_Base.h" -// @@ Why is this here? It should be moved to IOPC.h. -// -Ossama -#if defined (HPUX) -# if defined (IOR) - /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h - and we don't want that definition, see IOPC.h */ -# undef IOR -# endif /* IOR */ -#endif /* HPUX */ - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -45,6 +35,11 @@ #include "tao/orbconf.h" #include "tao/TAO_Export.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 (_MSC_VER) || defined (__BORLANDC__) # ifdef _DEBUG /* convert from VC++ convention ... */ |