diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-03 10:23:43 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-07-03 10:23:43 +0000 |
| commit | 7ca2817e99839da1e069690eb1a1f8d91bd2129a (patch) | |
| tree | c2c356b33420c4f4ad06957e9ed1c6b192a361e1 | |
| parent | 79e960e3914fb7b61ddbc0f2256ee8ba5311a3e0 (diff) | |
| download | ATCD-7ca2817e99839da1e069690eb1a1f8d91bd2129a.tar.gz | |
ChangeLogTag: Mon Jul 3 09:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/PI/ORBInitializer.pidl | 4 | ||||
| -rw-r--r-- | TAO/tests/IDL_Test/typeprefix.idl | 6 |
3 files changed, 15 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ce5024f3351..5fbad760d1d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Mon Jul 3 10:21:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/PI/ORBInitializer.pidl: + Added workaround for bug 2569 to get the solaris/icc builds + running again. + + * tests/IDL_Test/typeprefix.idl: + Comment part of this test case to get the builds running again + Mon Jul 3 09:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * TAO_IDL/be/be_visitor_exception/exception_cs.cpp: diff --git a/TAO/tao/PI/ORBInitializer.pidl b/TAO/tao/PI/ORBInitializer.pidl index 9c6cee85180..f8f871449a6 100644 --- a/TAO/tao/PI/ORBInitializer.pidl +++ b/TAO/tao/PI/ORBInitializer.pidl @@ -24,11 +24,13 @@ #ifndef _ORB_INITIALIZER_PIDL #define _ORB_INITIALIZER_PIDL +#include "tao/PI/ORBInitInfo.pidl" + module PortableInterceptor { typeprefix PortableInterceptor "omg.org"; - local interface ORBInitInfo; +// local interface ORBInitInfo; local interface ORBInitializer { diff --git a/TAO/tests/IDL_Test/typeprefix.idl b/TAO/tests/IDL_Test/typeprefix.idl index 3884eeeeaea..67e4d1ac709 100644 --- a/TAO/tests/IDL_Test/typeprefix.idl +++ b/TAO/tests/IDL_Test/typeprefix.idl @@ -6,15 +6,15 @@ module A { typeprefix A "TAO"; - interface B; + interface B {}; interface C{ void op (in B a); }; }; - +/* module A { typeprefix A "TAO"; interface B{}; -}; +};*/ |