diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-03-06 13:28:38 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-03-06 13:28:38 +0000 |
| commit | c67dac90270c3454b91ec78d2ebc0d9871a10831 (patch) | |
| tree | 2ee20df498b38e7b76496afe23a3004d850a48de | |
| parent | 377c450aa4422f6142cfbff22f9cef33d5826a7b (diff) | |
| download | ATCD-c67dac90270c3454b91ec78d2ebc0d9871a10831.tar.gz | |
Wed Mar 06 13:29:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com>
Fuzz fixes.
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/PI_Server/ServerRequestInterceptorC.h | 5 | ||||
| -rw-r--r-- | TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp | 14 | ||||
| -rw-r--r-- | TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl | 2 | ||||
| -rw-r--r-- | TAO/tests/Bug_4097_Regression/README | 2 |
5 files changed, 21 insertions, 11 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a780cba24e8..8d51a9fa660 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Wed Mar 06 13:29:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com> + + * tao/PI_Server/ServerRequestInterceptorC.h: + * tests/Bug_4097_Regression/Bug_4097_Regression.cpp: + * tests/Bug_4097_Regression/Bug_4097_Regression.idl: + * tests/Bug_4097_Regression/README: + + Fuzz fixes. + Wed Mar 06 09:20:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com> * docs/Tags.html: diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h index b32e581367a..85258aeb04b 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h @@ -152,7 +152,7 @@ namespace PortableInterceptor #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1 virtual void tao_ft_interception_point ( - ::PortableInterceptor::ServerRequestInfo_ptr, + ::PortableInterceptor::ServerRequestInfo_ptr, ::CORBA::OctetSeq_out ) {} @@ -290,7 +290,4 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" - #endif /* ifndef */ - - diff --git a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp index 8be1eef0039..7adeee035ea 100644 --- a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp +++ b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.cpp @@ -2,12 +2,12 @@ #include "Bug_4097_RegressionS.h" -#include <tao/corba.h> -#include <tao/ORB.h> -#include <tao/Object.h> -#include <tao/Object_T.h> -#include <tao/ORB_Core.h> -#include <tao/CodecFactory/CodecFactory.h> +#include "tao/corba.h" +#include "tao/ORB.h" +#include "tao/Object.h" +#include "tao/Object_T.h" +#include "tao/ORB_Core.h" +#include "tao/CodecFactory/CodecFactory.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" @@ -42,7 +42,7 @@ checkResult (const CORBA::Any &any, const MultiLabelUnion &mlu) } else { - ACE_DEBUG ((LM_DEBUG, ". DID NOT Extract from any (Test Failure)\n")); + ACE_DEBUG ((LM_DEBUG, ". DID NOT Extract from any (Test Failure)\n")); error = true; } diff --git a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl index 669e6a3f475..7fe7a9e7dab 100644 --- a/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl +++ b/TAO/tests/Bug_4097_Regression/Bug_4097_Regression.idl @@ -1,3 +1,5 @@ +// $Id$ + union MultiLabelUnion switch (long) { case 0: case 1: diff --git a/TAO/tests/Bug_4097_Regression/README b/TAO/tests/Bug_4097_Regression/README index 1a632b0ca69..de8833dadcd 100644 --- a/TAO/tests/Bug_4097_Regression/README +++ b/TAO/tests/Bug_4097_Regression/README @@ -1,3 +1,5 @@ +$Id$ + This is Prismtech Jira TAO-69 and Bugzilla_4097 Typecodes for UNIONs with multiple labels per individual case are |