diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-09-09 06:33:06 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-09-09 06:33:06 +0000 |
| commit | 944d21179744e34c1a4ba8703bd8c4bc977e49c6 (patch) | |
| tree | fed6313eb8b85d914f6ac838a7451035092ef409 | |
| parent | c8c633155d945a7bd0561cf351a26a779c59af23 (diff) | |
| download | ATCD-944d21179744e34c1a4ba8703bd8c4bc977e49c6.tar.gz | |
ChangeLogTag:Mon Sep 8 23:29:17 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/IOP_IORC.h | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4ee6923ba0a..273b569fa96 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Sep 8 23:29:17 2003 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tao/IOP_IORC.h: + + Moved HPUX-specific "#undef IOR" immediately after the last + header include. It ended up being hidden in some cases, which + causes syntax errors in the `IOP_IORC.i' inline file to appear. + Mon Sep 8 23:21:51 2003 Ossama Othman <ossama@dre.vanderbilt.edu> * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile (LIBS): diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h index 5491c582ef5..12337e4b2cf 100644 --- a/TAO/tao/IOP_IORC.h +++ b/TAO/tao/IOP_IORC.h @@ -67,6 +67,12 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +#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 */ + // TAO_IDL - Generated from // be/be_visitor_module/module_ch.cpp:48 @@ -132,11 +138,6 @@ TAO_NAMESPACE IOP // TAO_IDL - Generated from // be/be_type.cpp:249 -#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 |