diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-11-05 15:51:21 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-11-05 15:51:21 +0100 |
| commit | da981b00af6c6ffe6b3cef7df8840eb01ec45812 (patch) | |
| tree | 895f305f6ff1a81d5be4e9720e9791a13165448a | |
| parent | ec0df6cbcc64f4a361b4b003fca0c9964dead887 (diff) | |
| download | ATCD-da981b00af6c6ffe6b3cef7df8840eb01ec45812.tar.gz | |
Doxygen changes and use const int for the statics to resolve the issues with Embarcadero C++ Builder pre compiled header support
* TAO/tao/Messaging/Messaging.h:
* TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h:
| -rw-r--r-- | TAO/tao/Messaging/Messaging.h | 11 | ||||
| -rw-r--r-- | TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h index 709e0afbd11..d9520e92332 100644 --- a/TAO/tao/Messaging/Messaging.h +++ b/TAO/tao/Messaging/Messaging.h @@ -36,13 +36,7 @@ public: static int init (void); }; -static int -TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init (); - -// Typedef for the Reply Handler Skeleton. -// This is handcrafted not generated by the IDL compiler. - -class TAO_InputCDR; +static const int TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init (); enum TAO_AMI_Reply_Status { @@ -65,7 +59,10 @@ enum TAO_AMI_Reply_Status TAO_AMI_REPLY_LOCATION_FORWARD_PERM }; +class TAO_InputCDR; +/// Typedef for the Reply Handler Skeleton. +/// This is handcrafted not generated by the IDL compiler. typedef void (*TAO_Reply_Handler_Stub)( TAO_InputCDR &, Messaging::ReplyHandler_ptr, diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h index 93bfc9d2fd2..d2c013cf17d 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h @@ -47,11 +47,9 @@ public: static int Initializer (void); }; -static int -TAO_Requires_ValueType_Initializer = +static const int TAO_Requires_ValueType_Initializer = TAO_Valuetype_Adapter_Factory_Impl::Initializer (); - ACE_STATIC_SVC_DECLARE (TAO_Valuetype_Adapter_Factory_Impl) ACE_FACTORY_DECLARE (TAO_Valuetype, TAO_Valuetype_Adapter_Factory_Impl) |