diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-09-10 15:19:41 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-09-10 15:19:41 +0000 |
| commit | 041ba9485f35697c32341d191e468f7ec22402a0 (patch) | |
| tree | 19a73bf94cd3b1889e849c735ac51822d931540e | |
| parent | b0985733eeeeb502219a6b42019b386984f1ea2a (diff) | |
| download | ATCD-041ba9485f35697c32341d191e468f7ec22402a0.tar.gz | |
ChangeLogTag:Wed Sep 10 08:15:13 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/IOP_IORC.i | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index cf4743a68ad..63e930c0598 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Wed Sep 10 08:15:13 2003 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tao/IOP_IORC.i: + + Explicitly #undef IOR in this file to work around an HPUX + namespace conflict. For some reason, the same #undef in + IOP_IORC.h is not enough. + Wed Sep 10 10:05:38 2003 Chad Elliott <elliott_c@ociweb.com> * orbsvcs/orbsvcs/AV.mpc: diff --git a/TAO/tao/IOP_IORC.i b/TAO/tao/IOP_IORC.i index cfdd9ccb662..b40f08bf0e4 100644 --- a/TAO/tao/IOP_IORC.i +++ b/TAO/tao/IOP_IORC.i @@ -54,6 +54,12 @@ CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be/be_visitor_sequence/cdr_op_ci.cpp:81 +#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_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_profiles_I_ #define _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_profiles_I_ @@ -233,4 +239,3 @@ CORBA::Boolean TAO_Export operator>> ( ); #endif /* _TAO_CDR_OP_IOP_ServiceContextList_I_ */ - |