diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-03-21 13:09:20 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-03-21 13:09:20 +0000 |
| commit | dd19639363f189908d2a6c8e1fd1cb26b3182b4f (patch) | |
| tree | b1b37925562bb15bd8add8f6e00e5c7488b7bcf8 | |
| parent | 485aa947fd2fb4c6371cfbd175f7701e3c7c04cc (diff) | |
| download | ATCD-dd19639363f189908d2a6c8e1fd1cb26b3182b4f.tar.gz | |
Wed Mar 21 13:08:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com>
* tao/ZIOP/ZIOP_Service_Context_Handler.cpp:
* tao/orbconf.h
My system had defined TAO_HAS_ZIOP explicitly so I didn't see that
the mod to disable it (Fri Feb 24 09:18:00 UTC 2012 Johnny Willemsen)
when TAO_HAS_CORBA_MESSAGING is not defined was put in before this was
defaulted in this header. Move the ZIOP definitions to after the
TAO_HAS_CORBA_MESSAGING ones. I've also guarded the use in
ZIOP_Service_Context_Handler.cpp just to be safe.
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/orbconf.h | 18 |
3 files changed, 22 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 52e962420a7..3b1ff041144 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Wed Mar 21 13:08:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com> + + * tao/ZIOP/ZIOP_Service_Context_Handler.cpp: + * tao/orbconf.h + My system had defined TAO_HAS_ZIOP explicitly so I didn't see that + the mod to disable it (Fri Feb 24 09:18:00 UTC 2012 Johnny Willemsen) + when TAO_HAS_CORBA_MESSAGING is not defined was put in before this was + defaulted in this header. Move the ZIOP definitions to after the + TAO_HAS_CORBA_MESSAGING ones. I've also guarded the use in + ZIOP_Service_Context_Handler.cpp just to be safe. + Tue Mar 20 11:45:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com> * tao/GIOP_Message_Generator_Parser_12.cpp: diff --git a/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp b/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp index b92a40f2159..c63aa434fa2 100644 --- a/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp +++ b/TAO/tao/ZIOP/ZIOP_Service_Context_Handler.cpp @@ -26,6 +26,7 @@ TAO_ZIOP_Service_Context_Handler::process_service_context ( return 0; } +#if defined (TAO_HAS_ZIOP) && TAO_HAS_ZIOP == 1 // Create an input CDR from the context buffer TAO_InputCDR cdr (reinterpret_cast<const char*> (ctx.context_data.get_buffer ()), ctx.context_data.length () ); @@ -84,6 +85,7 @@ TAO_ZIOP_Service_Context_Handler::process_service_context ( } } } +#endif /* TAO_HAS_ZIOP */ return 0; } diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index d6c56dfb51e..ec2da8ca102 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -248,15 +248,6 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128; # define TAO_HAS_MONITOR_POINTS ACE_HAS_MONITOR_POINTS #endif -#if !defined (TAO_HAS_ZIOP) -# if (TAO_HAS_CORBA_MESSAGING == 1) -// ZIOP needs corba messaging to work -# define TAO_HAS_ZIOP 1 -#else -# define TAO_HAS_ZIOP 0 -# endif -#endif - // Avoid namespace pollution that's common on older UNIXes... #if defined (minor) #undef minor @@ -425,6 +416,15 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128; # define TAO_HAS_CORBA_MESSAGING 1 #endif /* !TAO_HAS_CORBA_MESSAGING */ +#if !defined (TAO_HAS_ZIOP) +# if (TAO_HAS_CORBA_MESSAGING == 1) +// ZIOP needs corba messaging to work +# define TAO_HAS_ZIOP 1 +#else +# define TAO_HAS_ZIOP 0 +# endif +#endif + // For all the policies, support is enabled by default if TAO is // configured for CORBA Messaging. If TAO is not configured for CORBA // Messaging, then policies cannot be enabled. Default support can be |