diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-08-09 16:45:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 16:45:51 +0200 |
| commit | 1194c8bf488a01fa6023c78c78e6470741f97cdc (patch) | |
| tree | bf7511d5bb8c5a06aebf1da22d8bba5fb25bfd2a | |
| parent | 3a8418963de29a0e4c768e429998fafb7083bf8f (diff) | |
| parent | dc2986dc12daef7392a8e2f4b277fba68391c9c0 (diff) | |
| download | ATCD-1194c8bf488a01fa6023c78c78e6470741f97cdc.tar.gz | |
Merge pull request #478 from jwillemsen/jwi-obvgiopflagsinline
Use new TAO_OBV_GIOP_FLAGS_INLINE_FUNCTION so that we can remove TAO_…
| -rw-r--r-- | TAO/tao/Valuetype/ValueBase.h | 28 | ||||
| -rw-r--r-- | TAO/tao/orbconf.h | 6 |
2 files changed, 17 insertions, 17 deletions
diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index 3080308c020..8ed388a77a0 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -357,6 +357,12 @@ namespace CORBA } // End CORBA namespace +# if defined (__ACE_INLINE__) +# define TAO_OBV_GIOP_FLAGS_INLINE_FUNCTION inline +# else +# define TAO_OBV_GIOP_FLAGS_INLINE_FUNCTION extern TAO_Valuetype_Export +# endif + /** * @namespace TAO_OBV_GIOP_Flags * @@ -377,17 +383,17 @@ namespace TAO_OBV_GIOP_Flags const CORBA::Long Indirection_tag = 0xFFFFFFFF; const CORBA::Long Null_tag = 0x00000000L; - TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_null_ref (CORBA::Long tag); - TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_value_tag (CORBA::Long tag); - TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_codebase_url (CORBA::Long tag); - TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_no_type_info (CORBA::Long tag); - TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_single_type_info (CORBA::Long tag); - TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_list_type_info (CORBA::Long tag); - TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_chunked (CORBA::Long tag); - TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_indirection_tag (CORBA::Long tag); - TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_indirection (CORBA::Long tag); - TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_block_size (CORBA::Long tag); - TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_end_tag (CORBA::Long tag); + TAO_OBV_GIOP_FLAGS_INLINE_FUNCTION CORBA::Boolean is_null_ref (CORBA::Long tag); + TAO_OBV_GIOP_FLAGS_INLINE_FUNCTION CORBA::Boolean is_value_tag (CORBA::Long tag); + TAO_OBV_GIOP_FLAGS_INLINE_FUNCTION CORBA::Boolean has_codebase_url (CORBA::Long tag); + TAO_OBV_GIOP_FLAGS_INLINE_FUNCTION CORBA::Boolean has_no_type_info (CORBA::Long tag); + TAO_OBV_GIOP_FLAGS_INLINE_FUNCTION CORBA::Boolean has_single_type_info (CORBA::Long tag); + TAO_OBV_GIOP_FLAGS_INLINE_FUNCTION CORBA::Boolean has_list_type_info (CORBA::Long tag); + TAO_OBV_GIOP_FLAGS_INLINE_FUNCTION CORBA::Boolean is_chunked (CORBA::Long tag); + TAO_OBV_GIOP_FLAGS_INLINE_FUNCTION CORBA::Boolean is_indirection_tag (CORBA::Long tag); + TAO_OBV_GIOP_FLAGS_INLINE_FUNCTION CORBA::Boolean is_indirection (CORBA::Long tag); + TAO_OBV_GIOP_FLAGS_INLINE_FUNCTION CORBA::Boolean is_block_size (CORBA::Long tag); + TAO_OBV_GIOP_FLAGS_INLINE_FUNCTION CORBA::Boolean is_end_tag (CORBA::Long tag); } TAO_Valuetype_Export CORBA::Boolean diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index 99ca81fbe1e..86530c3e4e7 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -186,12 +186,6 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128; # define TAO_CONNECTION_CACHE_MAXIMUM (ACE::max_handles () / 2) #endif /* TAO_CONNECTION_CACHE_MAXIMUM */ -# if defined (__ACE_INLINE__) -# define TAO_NAMESPACE_INLINE_FUNCTION inline -# else -# define TAO_NAMESPACE_INLINE_FUNCTION extern TAO_EXPORT_MACRO -# endif - #if !defined(TAO_NO_COPY_OCTET_SEQUENCES) # define TAO_NO_COPY_OCTET_SEQUENCES 1 #endif /* TAO_NO_COPY_OCTET_SEQUENCES */ |