diff options
author | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-03-12 15:34:32 +0000 |
---|---|---|
committer | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-03-12 15:34:32 +0000 |
commit | 4321cae1dfc1997e17faf3a08a9d7fba5b096fe4 (patch) | |
tree | 3a46a2ee7bc6924f77669ac62a3032f25206856b | |
parent | d4cac252685ad0e720d5137f8baf94e4fe70ba30 (diff) | |
download | ATCD-4321cae1dfc1997e17faf3a08a9d7fba5b096fe4.tar.gz |
Merged revisions 80905-80907,80911,80914,80916,80919 via svnmerge from
https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/TAO
........
r80905 | pollackj | 2008-03-11 13:53:32 -0500 (Tue, 11 Mar 2008) | 1 line
Tue Mar 11 18:51:10 UTC 2008 Jonathan Pollack <pollack_j@ociweb.com>
........
r80906 | pollackj | 2008-03-11 14:48:27 -0500 (Tue, 11 Mar 2008) | 1 line
Tue Mar 11 19:46:44 UTC 2008 Jonathan Pollack <pollack_j@ociweb.com>
........
r80907 | parsons | 2008-03-11 15:27:17 -0500 (Tue, 11 Mar 2008) | 1 line
ChangeLogTag: Tue Mar 11 20:25:13 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu>
........
r80911 | johnnyw | 2008-03-12 02:09:31 -0500 (Wed, 12 Mar 2008) | 1 line
Wed Mar 12 07:08:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
........
r80914 | johnnyw | 2008-03-12 06:56:20 -0500 (Wed, 12 Mar 2008) | 1 line
Wed Mar 12 11:55:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
........
r80916 | johnnyw | 2008-03-12 08:00:12 -0500 (Wed, 12 Mar 2008) | 1 line
Wed Mar 12 12:59:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
........
r80919 | pollackj | 2008-03-12 08:44:23 -0500 (Wed, 12 Mar 2008) | 1 line
Wed Mar 12 13:43:34 UTC 2008 Jonathan Pollack <pollack_j@ociweb.com>
........
-rw-r--r-- | TAO/ChangeLog | 49 | ||||
-rw-r--r-- | TAO/TAO_IDL/ast/ast_component.cpp | 13 | ||||
-rw-r--r-- | TAO/TAO_IDL/ast/ast_interface.cpp | 7 | ||||
-rw-r--r-- | TAO/TAO_IDL/include/ast_component.h | 4 | ||||
-rw-r--r-- | TAO/TAO_IDL/include/ast_interface.h | 2 | ||||
-rw-r--r-- | TAO/configure.ac | 1 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp | 9 | ||||
-rw-r--r-- | TAO/tao/FoxResource/FoxResource_Loader.h | 2 | ||||
-rw-r--r-- | TAO/tao/FoxResource/TAO_FoxResource_Export.h | 76 |
9 files changed, 103 insertions, 60 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7bf27707a74..572ba7fcd60 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,52 @@ +Wed Mar 12 13:43:34 UTC 2008 Jonathan Pollack <pollack_j@ociweb.com> + + * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp: + + Fixed a comment that was triggering an error in the fuzz build. + +Wed Mar 12 12:59:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * configure.ac: + Added support for fox, thanks to Thomas Girard + <thomas dot g dot girard at free dot fr> for reporting this + +Wed Mar 12 11:55:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/ForResource/TAO_FoxResource_Export.h: + Corrected this file, thanks to Thomas Girard + <thomas dot g dot girard at free dot fr> for reporting this + +Wed Mar 12 07:08:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/FoxResource/FoxResource_Loader.h: + Added missing fox include, thanks to Thomas Girard + <thomas dot g dot girard at free dot fr> for reporting this + +Tue Mar 11 20:25:13 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/include/ast_interface.h: + * TAO_IDL/include/ast_component.h: + * TAO_IDL/ast/ast_component.cpp: + + Removed AST_Component override of redef_clash(), it does + nothing but call the base class version in AST_Interface. + Also made the AST_Interface version non-virtual. + +Tue Mar 11 19:46:44 UTC 2008 Jonathan Pollack <pollack_j@ociweb.com> + + * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp: + + The IFR now throws an exception when referenced types are + unknown, rather than crashing without an error. + +Tue Mar 11 18:51:10 UTC 2008 Jonathan Pollack <pollack_j@ociweb.com> + + * TAO_IDL/ast/ast_interface.cpp: + + The -Cw option generated a warning message instead of an error, + but it had the same end result: a premature exit from a method + call. This has been fixed. + Mon Mar 10 08:02:30 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * MPC/config/dynamicinterface.mpb: diff --git a/TAO/TAO_IDL/ast/ast_component.cpp b/TAO/TAO_IDL/ast/ast_component.cpp index 1acd410a581..79aeef67367 100644 --- a/TAO/TAO_IDL/ast/ast_component.cpp +++ b/TAO/TAO_IDL/ast/ast_component.cpp @@ -223,18 +223,5 @@ AST_Component::ast_accept (ast_visitor *visitor) return visitor->visit_component (this); } -bool -AST_Component::redef_clash (void) -{ - if (this->AST_Interface::redef_clash ()) - { - return 1; - } - - return 0; -} - - - IMPL_NARROW_FROM_DECL(AST_Component) IMPL_NARROW_FROM_SCOPE(AST_Component) diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp index 7f3af8c35ec..1d0e74dc02b 100644 --- a/TAO/TAO_IDL/ast/ast_interface.cpp +++ b/TAO/TAO_IDL/ast/ast_interface.cpp @@ -1494,7 +1494,7 @@ AST_Interface::redef_clash (void) *group2_member, group2_member_item ); - return 1; + return true; } else if (pid1->case_compare_quiet (pid2) == true) { @@ -1506,6 +1506,7 @@ AST_Interface::redef_clash (void) group1_member_item, group2_member_item ); + return true; } else { @@ -1516,15 +1517,13 @@ AST_Interface::redef_clash (void) group2_member_item ); } - - return 1; } } // end of FOR (group2_member_items) } // end of FOR (group2_iter) } // end of FOR (group1_member_items) } // end of FOR (group1_iter) - return 0; + return false; } // Look through inherited interfaces. diff --git a/TAO/TAO_IDL/include/ast_component.h b/TAO/TAO_IDL/include/ast_component.h index fc2d32402b1..55401c2273d 100644 --- a/TAO/TAO_IDL/include/ast_component.h +++ b/TAO/TAO_IDL/include/ast_component.h @@ -80,10 +80,6 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - // Check if we have redefined any of our parents' operations or attributes, - // and check if there is such a clash among the parents - virtual bool redef_clash (void); - private: AST_Component *pd_base_component; ACE_Unbounded_Queue<port_description> pd_provides; diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h index 79ba0435f9d..1517f8a0dd4 100644 --- a/TAO/TAO_IDL/include/ast_interface.h +++ b/TAO/TAO_IDL/include/ast_interface.h @@ -121,7 +121,7 @@ public: // Check if we have redefined any of our parents' operations or attributes, // and check if there is such a clash among the parents - virtual bool redef_clash (void); + bool redef_clash (void); // Accessors for the member. bool home_equiv (void) const; diff --git a/TAO/configure.ac b/TAO/configure.ac index 5e4371b2ff7..470f1e3e57c 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -181,6 +181,7 @@ ACE_ENABLE_FL_REACTOR ACE_ENABLE_QT_REACTOR ACE_ENABLE_TK_REACTOR ACE_ENABLE_XT_REACTOR +ACE_ENABLE_FOX_REACTOR ACE_PATH_ZZIP ACE_PATH_ZLIB diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index d8bc07b3390..32f314e4dfd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -1119,6 +1119,15 @@ TAO_IFR_Service_Utils::fill_valuemember_seq ( char * TAO_IFR_Service_Utils::reference_to_path (CORBA::IRObject_ptr obj) { + if (CORBA::is_nil (obj)) + { + ACE_DEBUG ((LM_DEBUG, + "reference_to_path - null object; check the include " + "order of IDL\n")); + + throw CORBA::INTF_REPOS (); + } + PortableServer::ObjectId object_id; TAO::ObjectKey object_key = obj->_stubobj ()->profile_in_use ()->object_key (); diff --git a/TAO/tao/FoxResource/FoxResource_Loader.h b/TAO/tao/FoxResource/FoxResource_Loader.h index 684cc3d3ebd..9788c6ecb40 100644 --- a/TAO/tao/FoxResource/FoxResource_Loader.h +++ b/TAO/tao/FoxResource/FoxResource_Loader.h @@ -24,6 +24,8 @@ #include "tao/Versioned_Namespace.h" +#include <fox/fx.h> + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/FoxResource/TAO_FoxResource_Export.h b/TAO/tao/FoxResource/TAO_FoxResource_Export.h index 34904a6d9af..dc8ce7b0db6 100644 --- a/TAO/tao/FoxResource/TAO_FoxResource_Export.h +++ b/TAO/tao/FoxResource/TAO_FoxResource_Export.h @@ -2,57 +2,57 @@ // -*- C++ -*- // $Id$ // Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -s TAO_TkResource +// This file is generated automatically by generate_export_file.pl -s TAO_FoxResource // ------------------------------ -#ifndef TAO_TKRESOURCE_EXPORT_H -#define TAO_TKRESOURCE_EXPORT_H +#ifndef TAO_FOXRESOURCE_EXPORT_H +#define TAO_FOXRESOURCE_EXPORT_H #include "ace/config-all.h" -#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_TKRESOURCE_HAS_DLL) -# define TAO_TKRESOURCE_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && TAO_TKRESOURCE_HAS_DLL */ - -#if !defined (TAO_TKRESOURCE_HAS_DLL) -# define TAO_TKRESOURCE_HAS_DLL 1 -#endif /* ! TAO_TKRESOURCE_HAS_DLL */ - -#if defined (TAO_TKRESOURCE_HAS_DLL) && (TAO_TKRESOURCE_HAS_DLL == 1) -# if defined (TAO_TKRESOURCE_BUILD_DLL) -# define TAO_TkResource_Export ACE_Proper_Export_Flag -# define TAO_TKRESOURCE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_TKRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_TKRESOURCE_BUILD_DLL */ -# define TAO_TkResource_Export ACE_Proper_Import_Flag -# define TAO_TKRESOURCE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_TKRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_TKRESOURCE_BUILD_DLL */ -#else /* TAO_TKRESOURCE_HAS_DLL == 1 */ -# define TAO_TkResource_Export -# define TAO_TKRESOURCE_SINGLETON_DECLARATION(T) -# define TAO_TKRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_TKRESOURCE_HAS_DLL == 1 */ - -// Set TAO_TKRESOURCE_NTRACE = 0 to turn on library specific tracing even if +#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_FOXRESOURCE_HAS_DLL) +# define TAO_FOXRESOURCE_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && TAO_FOXRESOURCE_HAS_DLL */ + +#if !defined (TAO_FOXRESOURCE_HAS_DLL) +# define TAO_FOXRESOURCE_HAS_DLL 1 +#endif /* ! TAO_FOXRESOURCE_HAS_DLL */ + +#if defined (TAO_FOXRESOURCE_HAS_DLL) && (TAO_FOXRESOURCE_HAS_DLL == 1) +# if defined (TAO_FOXRESOURCE_BUILD_DLL) +# define TAO_FoxResource_Export ACE_Proper_Export_Flag +# define TAO_FOXRESOURCE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define TAO_FOXRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* TAO_FOXRESOURCE_BUILD_DLL */ +# define TAO_FoxResource_Export ACE_Proper_Import_Flag +# define TAO_FOXRESOURCE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define TAO_FOXRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* TAO_FOXRESOURCE_BUILD_DLL */ +#else /* TAO_FOXRESOURCE_HAS_DLL == 1 */ +# define TAO_FoxResource_Export +# define TAO_FOXRESOURCE_SINGLETON_DECLARATION(T) +# define TAO_FOXRESOURCE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* TAO_FOXRESOURCE_HAS_DLL == 1 */ + +// Set TAO_FOXRESOURCE_NTRACE = 0 to turn on library specific tracing even if // tracing is turned off for ACE. -#if !defined (TAO_TKRESOURCE_NTRACE) +#if !defined (TAO_FOXRESOURCE_NTRACE) # if (ACE_NTRACE == 1) -# define TAO_TKRESOURCE_NTRACE 1 +# define TAO_FOXRESOURCE_NTRACE 1 # else /* (ACE_NTRACE == 1) */ -# define TAO_TKRESOURCE_NTRACE 0 +# define TAO_FOXRESOURCE_NTRACE 0 # endif /* (ACE_NTRACE == 1) */ -#endif /* !TAO_TKRESOURCE_NTRACE */ +#endif /* !TAO_FOXRESOURCE_NTRACE */ -#if (TAO_TKRESOURCE_NTRACE == 1) -# define TAO_TKRESOURCE_TRACE(X) -#else /* (TAO_TKRESOURCE_NTRACE == 1) */ +#if (TAO_FOXRESOURCE_NTRACE == 1) +# define TAO_FOXRESOURCE_TRACE(X) +#else /* (TAO_FOXRESOURCE_NTRACE == 1) */ # if !defined (ACE_HAS_TRACE) # define ACE_HAS_TRACE # endif /* ACE_HAS_TRACE */ -# define TAO_TKRESOURCE_TRACE(X) ACE_TRACE_IMPL(X) +# define TAO_FOXRESOURCE_TRACE(X) ACE_TRACE_IMPL(X) # include "ace/Trace.h" -#endif /* (TAO_TKRESOURCE_NTRACE == 1) */ +#endif /* (TAO_FOXRESOURCE_NTRACE == 1) */ -#endif /* TAO_TKRESOURCE_EXPORT_H */ +#endif /* TAO_FOXRESOURCE_EXPORT_H */ // End of auto generated file. |