diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-08-29 21:11:37 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-08-29 21:11:37 +0000 |
| commit | 2ae8a5b2453bcdfba506612c3a218ecf9b2f62df (patch) | |
| tree | c106c17956afb1280c4c8f229d74adacf5a5aa35 /TAO | |
| parent | 1cd7f7c4aedaaedc767d87450c368212a02cdb3e (diff) | |
| download | ATCD-2ae8a5b2453bcdfba506612c3a218ecf9b2f62df.tar.gz | |
Moved some #include "foo.i" outside of the __ACE_INLINE__ block
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/tao/corba.h | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index 97e84297e1c..2f72560f8fa 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -109,25 +109,39 @@ // include all the *.i file here #if defined (__ACE_INLINE__) -#include "tao/cdr.i" //always -#include "tao/typecode.i" -#include "tao/any.i" #include "tao/boa.i" #include "tao/giop.i" -#include "tao/object.i" // should always be -#include "tao/orbobj.i" #include "tao/svrrqst.i" //#include "tao/factories.i" #include "tao/params.i" -#include "tao/client_factory.i" #include "tao/server_factory.i" #include "tao/default_client.i" #include "tao/default_server.i" -#include "tao/marshal.i" // always -#include "tao/iiopobj.i" #include "tao/iioporb.i" #include "tao/connect.i" #include "tao/roa.i" #endif /* __ACE_INLINE__ */ +# if !defined(__ACE_INLINE__) +# undef ACE_INLINE +# define ACE_INLINE inline +# define do_undef_on_ACE_INLINE +# endif + +#include "tao/any.i" +#include "tao/cdr.i" //always +#include "tao/object.i" // should always be included +#include "tao/marshal.i" // always +#include "tao/typecode.i" +#include "tao/orbobj.i" +#include "tao/iiopobj.i" +#include "tao/client_factory.i" + +# if defined(do_undef_on_ACE_INLINE) +# undef do_undef_on_ACE_INLINE +# undef ACE_INLINE +# define ACE_INLINE +# endif + + #endif /* TAO_CORBA_H */ |