diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-01-30 16:45:26 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-01-30 16:45:26 +0000 |
| commit | bc2039137f89a1860dafd09d793712053d1b1632 (patch) | |
| tree | 8b14da22ba214fef9ae2ccba3fe15d0421a0e18c | |
| parent | 93aa57e142b65d4d55b3a55bfc736d39bd9e4431 (diff) | |
| download | ATCD-bc2039137f89a1860dafd09d793712053d1b1632.tar.gz | |
ChangeLogTag: Thu Jan 30 10:40:16 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be_include/be_visitor_context.h | 11 |
2 files changed, 20 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index cffb07bf466..22a453b9d8e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Thu Jan 30 10:40:16 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be_include/be_visitor_context.h: + + If there is a system macro defined called 'interface', which + there is on some versions of MingW, redefine + it around the declaration of class be_visitor_context, which + contains a method by that name. Thanks to Johnny Willemsem + <jwillemsem@remedy.nl> for sending in the patch. + Thu Jan 30 07:03:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/Makefile.RTOLDEvent diff --git a/TAO/TAO_IDL/be_include/be_visitor_context.h b/TAO/TAO_IDL/be_include/be_visitor_context.h index 4316d420ca4..fa53e612f9a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_context.h +++ b/TAO/TAO_IDL/be_include/be_visitor_context.h @@ -54,6 +54,12 @@ class be_typedef; class be_union; class be_union_branch; +// When interface is defined as macro redefine it as aceinterface +#if defined (interface) +# define aceinterface interface +# undef interface +#endif /* interface */ + class be_visitor_context { public: @@ -273,5 +279,8 @@ private: // See the method declaration above. }; - +#if defined (interface) +# define interface aceinterface +#endif /* interface */ + #endif /* BE_VISITOR_CONTEXT_H */ |