From 3568c72dc8476bc3a521150fff2e8bb6f193a7d8 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Thu, 20 Aug 2020 12:39:12 +0200
Subject: Layout and docu changes
* TAO/tao/Object.cpp:
* TAO/tao/Service_Callbacks.cpp:
* TAO/tao/Service_Callbacks.h:
---
TAO/tao/Object.cpp | 15 +++------------
TAO/tao/Service_Callbacks.cpp | 2 --
TAO/tao/Service_Callbacks.h | 5 +----
3 files changed, 4 insertions(+), 18 deletions(-)
(limited to 'TAO')
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index b96ae7b5125..2aeede4233d 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -342,13 +342,12 @@ CORBA::Object::_proxy_broker (TAO::Object_Proxy_Broker *proxy_broker)
CORBA::Boolean
CORBA::Object::is_nil_i (CORBA::Object_ptr obj)
{
-
- // If the profile length is zero for a non-evaluted IOR it is a
+ // If the profile length is zero for a non-evaluated IOR it is a
// null-object.
if ((!obj->is_evaluated ()) && obj->ior ().profiles.length () == 0)
return true;
- // To accomodate new definitions.
+ // To accommodate new definitions.
if (obj->orb_core_)
{
return obj->orb_core_->object_is_nil (obj);
@@ -357,8 +356,6 @@ CORBA::Object::is_nil_i (CORBA::Object_ptr obj)
return false;
}
-
-
#if (TAO_HAS_MINIMUM_CORBA == 0)
#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
@@ -692,8 +689,7 @@ CORBA::Object::proxy_broker (void) const
{
// Paranoid check. We *should* never access the proxy_broker
// when the object has not been initialised so there *should*
- // alway be a stub, but just in case...
-
+ // always be a stub, but just in case...
if (this->protocol_proxy_)
{
return this->protocol_proxy_->object_proxy_broker ();
@@ -872,7 +868,6 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
{
// If the user has set up a eager strategy..
CORBA::String_var type_hint;
-
if (!(cdr >> type_hint.inout ()))
return false;
@@ -904,7 +899,6 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
// Ownership of type_hint is given to TAO_Stub
// TAO_Stub will make a copy of mp!
-
TAO_Stub *objdata = 0;
try
@@ -1009,7 +1003,6 @@ operator<< (std::ostream &strm, CORBA::Object_ptr _tao_objref)
// Traits specializations for CORBA::Object.
namespace TAO
{
-
void In_Object_Argument_Cloner_T::duplicate
(CORBA::InterfaceDef_ptr)
{
@@ -1046,8 +1039,6 @@ namespace TAO
}
} // close TAO namespace
-
TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void) = 0;
-
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index b830c4d863c..ac33d59c6a5 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -16,7 +16,6 @@ TAO_Service_Callbacks::select_profile (const TAO_MProfile & /*mprofile*/,
return false;
}
-
CORBA::Boolean
TAO_Service_Callbacks::object_is_nil (CORBA::Object_ptr /* obj */)
{
@@ -25,7 +24,6 @@ TAO_Service_Callbacks::object_is_nil (CORBA::Object_ptr /* obj */)
return true;
}
-
TAO_Service_Callbacks::Profile_Equivalence
TAO_Service_Callbacks::is_profile_equivalent (const TAO_Profile *,
const TAO_Profile *)
diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h
index 9940ab56ac0..1fd5c281e78 100644
--- a/TAO/tao/Service_Callbacks.h
+++ b/TAO/tao/Service_Callbacks.h
@@ -51,13 +51,12 @@ namespace IOP
* @brief An Abstract Base class for the hooks in the ORB.
*
* This class (would) define all the hooks that may be needed by
- * the ORB to override some of its default behaviour. The methods
+ * the ORB to override some of its default behavior. The methods
* can be potentially used to call service level specific
* processing that may be required.
*/
class TAO_Export TAO_Service_Callbacks
{
-
public:
enum Profile_Equivalence
@@ -67,7 +66,6 @@ public:
DONT_KNOW
};
-
/// Dtor
virtual ~TAO_Service_Callbacks (void);
@@ -79,7 +77,6 @@ public:
/// Check whether @a obj is nil or not.
virtual CORBA::Boolean object_is_nil (CORBA::Object_ptr obj);
-
/// Check for equivalency of the two profiles
virtual Profile_Equivalence is_profile_equivalent (const TAO_Profile *,
const TAO_Profile *);
--
cgit v1.2.1
From fefa0d5f1850d0f1e633c4182702698ce64f6eb8 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Thu, 20 Aug 2020 14:41:22 +0200
Subject: Layout and true/false changes
* ACE/ace/INET_Addr.cpp:
* TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
* TAO/tao/DynamicInterface/DII_Arguments.cpp:
* TAO/tao/DynamicInterface/Server_Request.cpp:
---
TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp | 6 +++---
TAO/tao/DynamicInterface/DII_Arguments.cpp | 1 -
TAO/tao/DynamicInterface/Server_Request.cpp | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
(limited to 'TAO')
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
index 2b421eb3c91..bd5ebe7efa6 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
@@ -411,7 +411,7 @@ TAO_AMH_DSI_Response_Handler::gateway_exception_reply (
this->_tao_out.write_char_array (encap.buffer (),
ACE_Utils::truncate_cast (encap.length ()));
// This will prevent the marshaling of any parameters into this reply.
- // this->sent_gateway_exception_ = 1;
+ // this->sent_gateway_exception_ = true;
this->_tao_rh_send_reply ();
}
catch (const CORBA::Exception &)
@@ -456,7 +456,7 @@ TAO_AMH_DSI_Response_Handler::gateway_exception_reply (
// to the original source of the reply.
this->_tao_out.write_octet_array_mb (encap.start());
// This will prevent the marshaling of any parameters into this reply.
- // this->sent_gateway_exception_ = 1;
+ // this->sent_gateway_exception_ = true;
this->_tao_rh_send_reply ();
}
catch (const CORBA::Exception &)
@@ -484,7 +484,7 @@ TAO_AMH_DSI_Response_Handler::_unchecked_narrow (CORBA::Object_ptr obj)
if (CORBA::is_nil (obj))
return TAO_AMH_DSI_Response_Handler::_nil ();
- return dynamic_cast < TAO_AMH_DSI_Response_Handler_ptr > (obj);
+ return dynamic_cast (obj);
}
const char*
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
index d95e1c7ab1b..7ca4ea488b9 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -59,7 +59,6 @@ namespace TAO
CORBA::Boolean
NVList_Argument::demarshal (TAO_InputCDR &cdr)
{
-
try
{
// Now, get all the "return", "out", and "inout" parameters
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index e946d3179b8..6c4fcd680da 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -37,7 +37,7 @@ CORBA::ServerRequest::_decr_refcount (void)
}
CORBA::ServerRequest::ServerRequest (TAO_ServerRequest &orb_server_request)
- : lazy_evaluation_ (0),
+ : lazy_evaluation_ (false),
ctx_ (CORBA::Context::_nil ()),
params_ (CORBA::NVList::_nil ()),
retval_ (0),
--
cgit v1.2.1
From bbe905207b94a34fb3000be67ba9c02e2de6dbd4 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Thu, 20 Aug 2020 15:24:36 +0200
Subject: Layout changes
* TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp:
* TAO/tao/AnyTypeCode/Any_Array_Impl_T.h:
* TAO/tao/AnyTypeCode/Any_Special_Impl_T.h:
* TAO/tao/AnyTypeCode/Enum_TypeCode.cpp:
* TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp:
* TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp:
* TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp:
* TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp:
* TAO/tao/AnyTypeCode/Union_TypeCode.cpp:
* TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp:
* TAO/tao/AnyTypeCode/Value_TypeCode.cpp:
* TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp:
* TAO/tao/AnyTypeCode/append.cpp:
* TAO/tao/CORBANAME_Parser.cpp:
* TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
* TAO/tao/CSD_Framework/CSD_POA.cpp:
* TAO/tao/Connector_Registry.cpp:
* TAO/tao/DynamicAny/DynCommon.cpp:
* TAO/tao/DynamicAny/DynStruct_i.cpp:
* TAO/tao/DynamicAny/DynUnion_i.cpp:
* TAO/tao/DynamicAny/DynValueBox_i.cpp:
* TAO/tao/DynamicAny/DynValue_i.cpp:
* TAO/tao/RTScheduling/RTScheduler_Initializer.cpp:
* TAO/tao/RTScheduling/RTScheduler_Manager.inl:
* TAO/tao/RTScheduling/Request_Interceptor.cpp:
* TAO/tao/Strategies/COIOP_Profile.h:
* TAO/tao/Strategies/SCIOP_Profile.cpp:
* TAO/tao/Strategies/SCIOP_Profile.h:
* TAO/tao/Strategies/SHMIOP_Profile.cpp:
* TAO/tao/Strategies/SHMIOP_Profile.h:
* TAO/tao/Strategies/UIOP_Connector.h:
* TAO/tao/Transport_Connector.cpp:
* TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
---
TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp | 3 +-
TAO/tao/AnyTypeCode/Any_Array_Impl_T.h | 3 +-
TAO/tao/AnyTypeCode/Any_Special_Impl_T.h | 3 +-
TAO/tao/AnyTypeCode/Enum_TypeCode.cpp | 3 +-
TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp | 3 +-
TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp | 3 +-
TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp | 23 +++++-----------
TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp | 3 +-
TAO/tao/AnyTypeCode/Union_TypeCode.cpp | 3 +-
TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp | 3 +-
TAO/tao/AnyTypeCode/Value_TypeCode.cpp | 13 +++------
TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp | 3 +-
TAO/tao/AnyTypeCode/append.cpp | 24 ++++++----------
TAO/tao/CORBANAME_Parser.cpp | 3 +-
.../CSD_Default_Servant_Dispatcher.cpp | 3 +-
TAO/tao/CSD_Framework/CSD_POA.cpp | 3 +-
TAO/tao/Connector_Registry.cpp | 6 ++--
TAO/tao/DynamicAny/DynCommon.cpp | 3 +-
TAO/tao/DynamicAny/DynStruct_i.cpp | 12 +++-----
TAO/tao/DynamicAny/DynUnion_i.cpp | 13 +++------
TAO/tao/DynamicAny/DynValueBox_i.cpp | 2 +-
TAO/tao/DynamicAny/DynValue_i.cpp | 4 +--
TAO/tao/RTScheduling/RTScheduler_Initializer.cpp | 3 +-
TAO/tao/RTScheduling/RTScheduler_Manager.inl | 3 +-
TAO/tao/RTScheduling/Request_Interceptor.cpp | 3 +-
TAO/tao/Strategies/COIOP_Profile.h | 3 +-
TAO/tao/Strategies/SCIOP_Profile.cpp | 6 ++--
TAO/tao/Strategies/SCIOP_Profile.h | 6 ++--
TAO/tao/Strategies/SHMIOP_Profile.cpp | 6 ++--
TAO/tao/Strategies/SHMIOP_Profile.h | 6 ++--
TAO/tao/Strategies/UIOP_Connector.h | 3 +-
TAO/tao/Transport_Connector.cpp | 3 +-
TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp | 32 ++++++++--------------
33 files changed, 71 insertions(+), 142 deletions(-)
(limited to 'TAO')
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
index 678233f3951..48dfb7e9f17 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
@@ -161,8 +161,7 @@ TAO::Any_Array_Impl_T::free_value (void)
template
void
-TAO::Any_Array_Impl_T::_tao_decode (TAO_InputCDR &cdr
- )
+TAO::Any_Array_Impl_T::_tao_decode (TAO_InputCDR &cdr)
{
if (! this->demarshal_value (cdr))
{
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
index b2879bf3438..660d3080136 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
@@ -51,8 +51,7 @@ namespace TAO
virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
CORBA::Boolean demarshal_value (TAO_InputCDR &);
- virtual void _tao_decode (TAO_InputCDR &
- );
+ virtual void _tao_decode (TAO_InputCDR &);
virtual const void *value (void) const;
virtual void free_value (void);
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
index c153ea9ce8c..19631ca8c2d 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
@@ -52,8 +52,7 @@ namespace TAO
virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
CORBA::Boolean demarshal_value (TAO_InputCDR &);
- virtual void _tao_decode (TAO_InputCDR &
- );
+ virtual void _tao_decode (TAO_InputCDR &);
virtual const void *value (void) const;
virtual void free_value (void);
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
index 2297a263a00..37e64256a52 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
@@ -157,8 +157,7 @@ TAO::TypeCode::Enumcreate_enum_tc (this->base_attributes_.id (),
"" /* empty name */,
tc_enumerators,
- this->nenumerators_
- );
+ this->nenumerators_);
}
template
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
index 5ef55878740..75fb4ee17c8 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
@@ -154,8 +154,7 @@ TAO::TypeCode::Enumcreate_enum_tc (this->base_attributes_.id (),
"" /* empty name */,
tc_enumerators,
- this->nenumerators_
- );
+ this->nenumerators_);
}
char const *
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
index 06aadae7364..212bd380a39 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
@@ -121,8 +121,7 @@ TAO::TypeCode::Struct::get_string (lhs_field.name);
- char const * const rhs_name = tc->member_name (i
- );
+ char const * const rhs_name = tc->member_name (i);
if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
return false;
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
index 32f411cb9e5..0f55940911a 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
@@ -18,13 +18,11 @@ TAO::TypeCode::Case::~Case (void)
template
bool
TAO::TypeCode::Case::equal (CORBA::ULong index,
- CORBA::TypeCode_ptr tc
- ) const
+ CORBA::TypeCode_ptr tc) const
{
// Check case names.
char const * const lhs_name = this->name ();
- char const * const rhs_name = tc->member_name (index
- );
+ char const * const rhs_name = tc->member_name (index);
if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
return false;
@@ -36,24 +34,20 @@ TAO::TypeCode::Case::equal (CORBA::ULong index,
);
CORBA::Boolean const equal_members =
- lhs_tc->equal (rhs_tc.in ()
- );
+ lhs_tc->equal (rhs_tc.in ());
if (!equal_members)
return false;
// Check case label.
- return this->equal_label (index,
- tc
- );
+ return this->equal_label (index, tc);
}
template
bool
TAO::TypeCode::Case::equivalent (
CORBA::ULong index,
- CORBA::TypeCode_ptr tc
- ) const
+ CORBA::TypeCode_ptr tc) const
{
// Member names are ignore when determining equivalence.
@@ -64,17 +58,14 @@ TAO::TypeCode::Case::equivalent (
);
CORBA::Boolean const equivalent_members =
- lhs_tc->equivalent (rhs_tc.in ()
- );
+ lhs_tc->equivalent (rhs_tc.in ());
if (!equivalent_members)
return 0;
// Check case label.
// The label must be equal when determining equivalence, too.
- return this->equal_label (index,
- tc
- );
+ return this->equal_label (index, tc);
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
index 86219d92c73..faf3d0745af 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
@@ -112,8 +112,7 @@ bool
TAO::TypeCode::Case_T::equal_label (CORBA::ULong index,
- CORBA::TypeCode_ptr tc
- ) const
+ CORBA::TypeCode_ptr tc) const
{
CORBA::Any_var const any = tc->member_label (index);
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
index accfab8d9d9..6a6a6b145b9 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
@@ -254,8 +254,7 @@ TAO::TypeCode::Unioncases_[i]->type ()->get_compact_typecode (
-// );
+// this->cases_[i]->type ()->get_compact_typecode ();
// }
// }
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
index b3bb39e4aac..14193893e5e 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
@@ -218,8 +218,7 @@ TAO::TypeCode::Unioncases_[i]->type ()->get_compact_typecode (
-// );
+// this->cases_[i]->type ()->get_compact_typecode ();
// }
// }
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
index a720506dc0b..e19f8a95c33 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
@@ -162,8 +162,7 @@ TAO::TypeCode::Valueconcrete_base_type ();
CORBA::Boolean const equal_concrete_base_types =
- this->equal (rhs_concrete_base_type.in ()
- );
+ this->equal (rhs_concrete_base_type.in ());
if (!equal_concrete_base_types)
return false;
@@ -180,9 +179,7 @@ TAO::TypeCode::Valuefields_[i];
CORBA::Visibility const lhs_visibility = lhs_field.visibility;
- CORBA::Visibility const rhs_visibility =
- tc->member_visibility (i
- );
+ CORBA::Visibility const rhs_visibility = tc->member_visibility (i);
if (lhs_visibility != rhs_visibility)
return false;
@@ -262,8 +259,7 @@ TAO::TypeCode::Valuemember_type (i);
CORBA::Boolean const equiv_types =
- lhs_tc->equivalent (rhs_tc.in ()
- );
+ lhs_tc->equivalent (rhs_tc.in ());
if (!equiv_types)
return false;
@@ -300,8 +296,7 @@ TAO::TypeCode::Value::get_typecode (
- this->fields_[i].type)->get_compact_typecode (
- );
+ this->fields_[i].type)->get_compact_typecode ();
tc_fields[i].visibility = this->fields_[i].visibility;
}
}
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
index 6bff91a30bc..311b8f541a8 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
@@ -244,8 +244,7 @@ TAO::TypeCode::Value::get_typecode (
- this->fields_[i].type)->get_compact_typecode (
- );
+ this->fields_[i].type)->get_compact_typecode ();
tc_fields[i].visibility = this->fields_[i].visibility;
}
}
diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp
index 0ae018b16e5..2caccfeab7d 100644
--- a/TAO/tao/AnyTypeCode/append.cpp
+++ b/TAO/tao/AnyTypeCode/append.cpp
@@ -586,8 +586,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
tc->member_type (current_member);
return TAO_Marshal_Object::perform_append (member_tc.in (),
src,
- dest
- );
+ dest);
}
TAO::traverse_status
@@ -809,8 +808,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc,
{
retval = TAO_Marshal_Object::perform_append (tc2.in (),
src,
- dest
- );
+ dest);
}
break;
}// end of switch
@@ -996,8 +994,7 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc,
{
retval = TAO_Marshal_Object::perform_append (tc2.in (),
src,
- dest
- );
+ dest);
}
break;
}// end of switch
@@ -1050,8 +1047,7 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc,
TAO::traverse_status
TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc,
TAO_InputCDR *src,
- TAO_OutputCDR *dest
- )
+ TAO_OutputCDR *dest)
{
TAO::traverse_status retval =
TAO::TRAVERSE_CONTINUE;
@@ -1092,8 +1088,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc,
TAO::traverse_status
TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
TAO_InputCDR *src,
- TAO_OutputCDR *dest
- )
+ TAO_OutputCDR *dest)
{
CORBA::Boolean continue_append = true;
@@ -1120,8 +1115,7 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
TAO::traverse_status
TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc,
TAO_InputCDR *src,
- TAO_OutputCDR *dest
- )
+ TAO_OutputCDR *dest)
{
TAO::traverse_status retval =
TAO::TRAVERSE_CONTINUE;
@@ -1181,8 +1175,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc,
param = tc->content_type ();
retval = TAO_Marshal_Object::perform_append (param.in (),
src,
- dest
- );
+ dest);
}
else // tc->kind () must be tk_value or tk_event
{
@@ -1212,8 +1205,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc,
retval =
TAO_Marshal_Object::perform_append (param.in (),
src,
- dest
- );
+ dest);
}
}
}
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 0cdd89afda9..507c7bfd5cf 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -95,8 +95,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb)
// Obtain a reference to the naming context
CORBA::Object_var name_context =
- orb->string_to_object (corbaloc_addr.c_str ()
- );
+ orb->string_to_object (corbaloc_addr.c_str ());
// Check if the Object reference is nil.
if (CORBA::is_nil (name_context.in ()))
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
index 28bbada650c..84741bf7299 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
@@ -30,8 +30,7 @@ TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
lock,
thread_lock,
orb_core,
- object_adapter
- ),
+ object_adapter),
CORBA::NO_MEMORY ());
diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp
index a77bb5f32e9..9729e0950ac 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.cpp
+++ b/TAO/tao/CSD_Framework/CSD_POA.cpp
@@ -70,8 +70,7 @@ TAO_CSD_POA::new_POA (const String &name,
lock,
thread_lock,
orb_core,
- object_adapter
- ),
+ object_adapter),
CORBA::NO_MEMORY ());
TAO_CSD_Strategy_Repository *repo =
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 9df7f6418fc..378e780292d 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -115,8 +115,7 @@ TAO_Connector_Registry::close_all (void)
int
TAO_Connector_Registry::make_mprofile (const char *ior,
- TAO_MProfile &mprofile
- )
+ TAO_MProfile &mprofile)
{
if (!ior)
// Failure: Null IOR string pointer
@@ -137,8 +136,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior,
{
const int mp_result =
(*connector)->make_mprofile (ior,
- mprofile
- );
+ mprofile);
if (mp_result == 0)
return 0; // Success
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 55492e790c3..530d84b8426 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -733,8 +733,7 @@ TAO_DynCommon::get_val (void)
// ****************************************************************
CORBA::Boolean
-TAO_DynCommon::seek (CORBA::Long slot
- )
+TAO_DynCommon::seek (CORBA::Long slot)
{
if (this->destroyed_)
{
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index bd366d20ad2..0301858b44c 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -305,8 +305,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values)
// member_type() does not work with aliased type codes.
CORBA::TypeCode_var unaliased_tc =
- TAO_DynAnyFactory::strip_alias (this->type_.in ()
- );
+ TAO_DynAnyFactory::strip_alias (this->type_.in ());
for (CORBA::ULong i = 0; i < length; ++i)
{
@@ -397,8 +396,7 @@ TAO_DynStruct_i::set_members_as_dyn_any (
// member_type() does not work with aliased type codes.
CORBA::TypeCode_var unaliased_tc =
- TAO_DynAnyFactory::strip_alias (this->type_.in ()
- );
+ TAO_DynAnyFactory::strip_alias (this->type_.in ());
for (CORBA::ULong i = 0; i < length; ++i)
{
@@ -435,8 +433,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any)
CORBA::TypeCode_var tc = any.type ();
CORBA::Boolean equivalent =
- this->type_->equivalent (tc.in ()
- );
+ this->type_->equivalent (tc.in ());
if (equivalent)
{
@@ -474,8 +471,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any)
CORBA::TypeCode_var field_tc;
CORBA::TypeCode_var unaliased =
- TAO::unaliased_typecode (this->type_.in ()
- );
+ TAO::unaliased_typecode (this->type_.in ());
for (CORBA::ULong i = 0; i < this->component_count_; ++i)
{
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 92007447d85..d8e1165b480 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -108,8 +108,7 @@ TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc)
}
CORBA::TypeCode_var first_type =
- unaliased_tc->member_type (this->current_position_
- );
+ unaliased_tc->member_type (this->current_position_);
// Recursively initialize the member to its default value.
this->member_ =
@@ -261,8 +260,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any)
CORBA::ULong index = static_cast (default_index);
CORBA::TypeCode_var default_tc =
- tc->member_type (index
- );
+ tc->member_type (index);
CORBA::Any default_any;
TAO::Unknown_IDL_Type *unk = 0;
@@ -562,9 +560,7 @@ TAO_DynUnion_i::member (void)
// A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
// Set the flag so the caller can't destroy.
- this->set_flag (this->member_.in (),
- 0
- );
+ this->set_flag (this->member_.in (), 0);
return DynamicAny::DynAny::_duplicate (this->member_.in ());
}
@@ -635,8 +631,7 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any)
// Set the from_factory arg to FALSE, so any problems will throw
// TypeMismatch.
- this->set_from_any (any
- );
+ this->set_from_any (any);
}
else
{
diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp
index 4f6976e784e..e4c4711cfec 100644
--- a/TAO/tao/DynamicAny/DynValueBox_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp
@@ -336,7 +336,7 @@ TAO_DynValueBox_i::to_any (void)
// Is this an NULL Valuetype?
if (!CORBA::ValueBase::_tao_write_special_value (
out_cdr, reinterpret_cast (
- this->is_null_ ? 0 : this ) ))
+ this->is_null_ ? 0 : this)))
{
// Build , which states if chunking is used
// and if type information ((list of) repository id(s))
diff --git a/TAO/tao/DynamicAny/DynValue_i.cpp b/TAO/tao/DynamicAny/DynValue_i.cpp
index 7a58d303fb3..6f319728c3d 100644
--- a/TAO/tao/DynamicAny/DynValue_i.cpp
+++ b/TAO/tao/DynamicAny/DynValue_i.cpp
@@ -704,7 +704,7 @@ TAO_DynValue_i::to_outputCDR (TAO_OutputCDR &out_cdr)
if (!CORBA::ValueBase::_tao_write_special_value (
out_cdr,
reinterpret_cast
- (this->is_null_ ? 0 : this) ))
+ (this->is_null_ ? 0 : this)))
{
// OK since a special_value hasn't been written we are
// NOT a NULL or indirect ValueType. We need to create
@@ -1201,7 +1201,7 @@ TAO_DynValue_i::from_inputCDR (TAO_InputCDR &strm)
// base-type's state.
if (!( (currentBase || !requires_truncation) ?
ci.handle_chunking (strm) :
- ci.skip_chunks (strm) ))
+ ci.skip_chunks (strm)))
{
TAOLIB_DEBUG ((LM_DEBUG,
ACE_TEXT ("TAO (%P|%t) - %N:%l TAO_DynValue_i::from_inputCDR() ")
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
index e2203898718..a431e8c4be4 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
@@ -119,8 +119,7 @@ TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr
// counting.
// Narrow to a TAO_ORBInitInfo object to get access to the
// orb_core() TAO extension.
- //TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info
- // );
+ //TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info);
if (TAO_debug_level > 0)
TAOLIB_DEBUG ((LM_DEBUG,
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.inl b/TAO/tao/RTScheduling/RTScheduler_Manager.inl
index 06c377c6a36..8247beea3a8 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.inl
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.inl
@@ -217,8 +217,7 @@ TAO_RTScheduler_Manager::rtscheduler (void)
}
ACE_INLINE void
-TAO_RTScheduler_Manager::rtscheduler (RTScheduling::Scheduler_ptr rtscheduler
- )
+TAO_RTScheduler_Manager::rtscheduler (RTScheduling::Scheduler_ptr rtscheduler)
{
this->rtscheduler_ = RTScheduling::Scheduler::_duplicate (rtscheduler);
this->orb_->orb ()->register_initial_reference (
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index 37c187c7ad9..985e219d14a 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -253,8 +253,7 @@ Server_Interceptor::receive_request_service_contexts (
}
void
-Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
- )
+Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
{
if (TAO_debug_level > 0)
TAOLIB_DEBUG ((LM_DEBUG,
diff --git a/TAO/tao/Strategies/COIOP_Profile.h b/TAO/tao/Strategies/COIOP_Profile.h
index 3a32e5e2c00..3ee737d614b 100644
--- a/TAO/tao/Strategies/COIOP_Profile.h
+++ b/TAO/tao/Strategies/COIOP_Profile.h
@@ -79,8 +79,7 @@ protected:
/// Template methods. Please see tao/Profile.h for documentation.
virtual int decode_profile (TAO_InputCDR& cdr);
- virtual void parse_string_i (const char *string
- );
+ virtual void parse_string_i (const char *string);
virtual void create_profile_body (TAO_OutputCDR &cdr) const;
virtual int decode_endpoints (void);
virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index dc81b03e23d..a5088c77aa5 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -132,8 +132,7 @@ TAO_SCIOP_Profile::decode_profile (TAO_InputCDR& cdr)
}
void
-TAO_SCIOP_Profile::parse_string_i (const char *ior
- )
+TAO_SCIOP_Profile::parse_string_i (const char *ior)
{
// Pull off the "hostname:port/" part of the objref
// Copy the string because we are going to modify it...
@@ -257,8 +256,7 @@ TAO_SCIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
}
CORBA::ULong
-TAO_SCIOP_Profile::hash (CORBA::ULong max
- )
+TAO_SCIOP_Profile::hash (CORBA::ULong max)
{
// Get the hash value for all endpoints.
CORBA::ULong hashval = 0;
diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h
index 5b39d19758a..0b043b1784d 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.h
+++ b/TAO/tao/Strategies/SCIOP_Profile.h
@@ -75,8 +75,7 @@ public:
virtual int encode_endpoints (void);
virtual TAO_Endpoint *endpoint (void);
virtual CORBA::ULong endpoint_count (void) const;
- virtual CORBA::ULong hash (CORBA::ULong max
- );
+ virtual CORBA::ULong hash (CORBA::ULong max);
/**
* Add to this profile's list of endpoints (it is inserted
* next to the head of the list). This profiles takes ownership of
@@ -89,8 +88,7 @@ protected:
/// Template methods. Please see Profile.h for the documentation.
virtual int decode_profile (TAO_InputCDR &cdr);
virtual int decode_endpoints (void);
- virtual void parse_string_i (const char *string
- );
+ virtual void parse_string_i (const char *string);
virtual void create_profile_body (TAO_OutputCDR &cdr) const;
virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 17a3b19add8..7b43eb77f60 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -123,8 +123,7 @@ TAO_SHMIOP_Profile::decode_profile (TAO_InputCDR& cdr)
}
void
-TAO_SHMIOP_Profile::parse_string_i (const char *string
- )
+TAO_SHMIOP_Profile::parse_string_i (const char *string)
{
// Pull off the "hostname:port/" part of the objref
// Copy the string because we are going to modify it...
@@ -284,8 +283,7 @@ TAO_SHMIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
}
CORBA::ULong
-TAO_SHMIOP_Profile::hash (CORBA::ULong max
- )
+TAO_SHMIOP_Profile::hash (CORBA::ULong max)
{
// Get the hashvalue for all endpoints.
CORBA::ULong hashval = 0;
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index 3dce4c81f9c..666b5b633ba 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -78,8 +78,7 @@ public:
virtual int encode_endpoints (void);
virtual TAO_Endpoint *endpoint (void);
virtual CORBA::ULong endpoint_count (void) const;
- virtual CORBA::ULong hash (CORBA::ULong max
- );
+ virtual CORBA::ULong hash (CORBA::ULong max);
/**
* Add to this profile's list of endpoints (it is inserted
* next to the head of the list). This profiles takes ownership of
@@ -91,8 +90,7 @@ protected:
/// Template methods. Please see tao/Profile.h for documentation.
virtual int decode_profile (TAO_InputCDR& cdr);
- virtual void parse_string_i (const char *string
- );
+ virtual void parse_string_i (const char *string);
virtual void create_profile_body (TAO_OutputCDR &cdr) const;
virtual int decode_endpoints (void);
virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h
index b3cafb31e62..76a974e3498 100644
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ b/TAO/tao/Strategies/UIOP_Connector.h
@@ -69,8 +69,7 @@ public:
virtual int check_prefix (const char *endpoint);
- virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len
- );
+ virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len);
virtual char object_key_delimiter (void) const;
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index 6a47a484bf3..e76ebe93340 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -238,8 +238,7 @@ TAO_Connector::make_mprofile (const char *string, TAO_MProfile &mprofile)
// Initialize a Profile using the individual endpoint
// string.
// @@ Not exception safe! We need a TAO_Profile_var!
- profile->parse_string (endpoint.c_str ()
- );
+ profile->parse_string (endpoint.c_str ());
// Give up ownership of the profile.
if (mprofile.give_profile (profile) == -1)
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index c1e11a1484c..822dcde97a4 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -251,8 +251,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
CORBA::TypeCode_var const tmp = member.label.type ();
CORBA::Boolean const equiv =
- discriminator_type->equivalent (tmp.in ()
- );
+ discriminator_type->equivalent (tmp.in ());
if (!equiv)
{
@@ -266,8 +265,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
CORBA::Boolean const unique_labels =
this->unique_label_values (members,
discriminator_type,
- raw_default_index
- );
+ raw_default_index);
if (!unique_labels)
{
@@ -746,8 +744,7 @@ TAO_TypeCodeFactory_i::create_value_tc (
type_modifier,
concrete_base,
members,
- CORBA::tk_value
- );
+ CORBA::tk_value);
}
CORBA::TypeCode_ptr
@@ -799,27 +796,23 @@ TAO_TypeCodeFactory_i::create_abstract_interface_tc (
{
return this->create_tc_common (id,
name,
- CORBA::tk_abstract_interface
- );
+ CORBA::tk_abstract_interface);
}
CORBA::TypeCode_ptr
TAO_TypeCodeFactory_i::create_local_interface_tc (
const char *id,
- const char *name
- )
+ const char *name)
{
return this->create_tc_common (id,
name,
- CORBA::tk_local_interface
- );
+ CORBA::tk_local_interface);
}
CORBA::TypeCode_ptr
TAO_TypeCodeFactory_i::create_component_tc (
const char *id,
- const char *name
- )
+ const char *name)
{
return this->create_tc_common (id,
name,
@@ -1534,12 +1527,10 @@ CORBA::Boolean
TAO_TypeCodeFactory_i::unique_label_values (
const CORBA::UnionMemberSeq &members,
CORBA::TypeCode_ptr disc_tc,
- CORBA::ULong default_index_slot
- )
+ CORBA::ULong default_index_slot)
{
- CORBA::TCKind disc_kind = disc_tc->kind ();
-
- CORBA::ULong length = members.length ();
+ CORBA::TCKind const disc_kind = disc_tc->kind ();
+ CORBA::ULong const length = members.length ();
// We have already checked for valid discriminator type
// and valid label types, so we won't check for any of that here.
@@ -1689,8 +1680,7 @@ TAO_TypeCodeFactory_i::unique_label_values (
}
CORBA::Boolean
-TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc
- )
+TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc)
{
CORBA::TCKind const kind = tc->kind ();
--
cgit v1.2.1
From c61b0db31cda9725e27e512b8a847651fb7708d0 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Thu, 20 Aug 2020 16:06:33 +0200
Subject: Upgrade doxygen files to latest doxygen version
---
TAO/etc/tao.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_anytypecode.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_av.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_compression.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_cosevent.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_cosnaming.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_cosnotification.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_costime.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_costrader.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_dynamicany.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_dynamicinterface.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_esf.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_ifr.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_implrepo.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_iormanip.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_iortable.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_pi.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_pi_server.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_portablegroup.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_portableserver.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_rtcorba.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_rtevent.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_rtportableserver.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_security.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_smartproxies.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_ssliop.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_strategies.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_transportcurrent.doxygen | 55 ++++++++++++++++++++++--------------
TAO/etc/tao_ziop.doxygen | 55 ++++++++++++++++++++++--------------
29 files changed, 986 insertions(+), 609 deletions(-)
(limited to 'TAO')
diff --git a/TAO/etc/tao.doxygen b/TAO/etc/tao.doxygen
index 4e2199d3fdc..a311d92e0c4 100644
--- a/TAO/etc/tao.doxygen
+++ b/TAO/etc/tao.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1218,9 +1214,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1488,6 +1484,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1508,8 +1515,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1537,7 +1550,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1579,7 +1592,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_anytypecode.doxygen b/TAO/etc/tao_anytypecode.doxygen
index 741dec934f1..196e9269040 100644
--- a/TAO/etc/tao_anytypecode.doxygen
+++ b/TAO/etc/tao_anytypecode.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_av.doxygen b/TAO/etc/tao_av.doxygen
index 4bd9a6bc3d3..884f88702dc 100644
--- a/TAO/etc/tao_av.doxygen
+++ b/TAO/etc/tao_av.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -844,8 +838,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1219,9 +1215,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1489,6 +1485,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1509,8 +1516,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1538,7 +1551,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1580,7 +1593,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_compression.doxygen b/TAO/etc/tao_compression.doxygen
index cd8db10747e..88d5e855cdc 100644
--- a/TAO/etc/tao_compression.doxygen
+++ b/TAO/etc/tao_compression.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_cosevent.doxygen b/TAO/etc/tao_cosevent.doxygen
index a21cd94f304..304e0249f74 100644
--- a/TAO/etc/tao_cosevent.doxygen
+++ b/TAO/etc/tao_cosevent.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -843,8 +837,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = CEC_*.cpp \
CEC_*.h \
@@ -1218,9 +1214,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1488,6 +1484,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1508,8 +1515,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1537,7 +1550,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1579,7 +1592,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_cosnaming.doxygen b/TAO/etc/tao_cosnaming.doxygen
index 13098bfb6bd..9d61f00d2f4 100644
--- a/TAO/etc/tao_cosnaming.doxygen
+++ b/TAO/etc/tao_cosnaming.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -842,8 +836,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1217,9 +1213,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1487,6 +1483,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1507,8 +1514,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1536,7 +1549,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1578,7 +1591,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_cosnotification.doxygen b/TAO/etc/tao_cosnotification.doxygen
index c66a32b082b..4b7979df16e 100644
--- a/TAO/etc/tao_cosnotification.doxygen
+++ b/TAO/etc/tao_cosnotification.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -848,8 +842,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1222,9 +1218,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1492,6 +1488,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1512,8 +1519,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1541,7 +1554,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1583,7 +1596,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_costime.doxygen b/TAO/etc/tao_costime.doxygen
index adb3ac1642d..97c9fce2adc 100644
--- a/TAO/etc/tao_costime.doxygen
+++ b/TAO/etc/tao_costime.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -842,8 +836,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1217,9 +1213,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1487,6 +1483,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1507,8 +1514,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1536,7 +1549,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1578,7 +1591,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_costrader.doxygen b/TAO/etc/tao_costrader.doxygen
index eb351a053e0..f8c1bc849c3 100644
--- a/TAO/etc/tao_costrader.doxygen
+++ b/TAO/etc/tao_costrader.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -844,8 +838,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1218,9 +1214,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1488,6 +1484,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1508,8 +1515,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1537,7 +1550,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1579,7 +1592,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_dynamicany.doxygen b/TAO/etc/tao_dynamicany.doxygen
index edad2820081..d0c8b898dc0 100644
--- a/TAO/etc/tao_dynamicany.doxygen
+++ b/TAO/etc/tao_dynamicany.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_dynamicinterface.doxygen b/TAO/etc/tao_dynamicinterface.doxygen
index aaa50d8a5fe..b8adfc38c07 100644
--- a/TAO/etc/tao_dynamicinterface.doxygen
+++ b/TAO/etc/tao_dynamicinterface.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_esf.doxygen b/TAO/etc/tao_esf.doxygen
index 2401194fe0e..0cc0a371ab9 100644
--- a/TAO/etc/tao_esf.doxygen
+++ b/TAO/etc/tao_esf.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1216,9 +1212,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1486,6 +1482,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1506,8 +1513,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1535,7 +1548,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1577,7 +1590,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_ifr.doxygen b/TAO/etc/tao_ifr.doxygen
index 595a9385e78..a69a631bcee 100644
--- a/TAO/etc/tao_ifr.doxygen
+++ b/TAO/etc/tao_ifr.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h
@@ -1213,9 +1209,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1483,6 +1479,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1503,8 +1510,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1532,7 +1545,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1574,7 +1587,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_implrepo.doxygen b/TAO/etc/tao_implrepo.doxygen
index e40fe46d510..ddf4b6e3b7a 100644
--- a/TAO/etc/tao_implrepo.doxygen
+++ b/TAO/etc/tao_implrepo.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_iormanip.doxygen b/TAO/etc/tao_iormanip.doxygen
index cf5aef0c74d..8c5e2b2deac 100644
--- a/TAO/etc/tao_iormanip.doxygen
+++ b/TAO/etc/tao_iormanip.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_iortable.doxygen b/TAO/etc/tao_iortable.doxygen
index c5dff5bc3c5..4284b1284de 100644
--- a/TAO/etc/tao_iortable.doxygen
+++ b/TAO/etc/tao_iortable.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_pi.doxygen b/TAO/etc/tao_pi.doxygen
index b148d459deb..b88d4cd8073 100644
--- a/TAO/etc/tao_pi.doxygen
+++ b/TAO/etc/tao_pi.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_pi_server.doxygen b/TAO/etc/tao_pi_server.doxygen
index ef2c58a35b8..9d03d88c152 100644
--- a/TAO/etc/tao_pi_server.doxygen
+++ b/TAO/etc/tao_pi_server.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_portablegroup.doxygen b/TAO/etc/tao_portablegroup.doxygen
index e9d89ab0bd5..923f485092f 100644
--- a/TAO/etc/tao_portablegroup.doxygen
+++ b/TAO/etc/tao_portablegroup.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -843,8 +837,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1217,9 +1213,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1487,6 +1483,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1507,8 +1514,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1536,7 +1549,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1578,7 +1591,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_portableserver.doxygen b/TAO/etc/tao_portableserver.doxygen
index fc56a89f6df..09dc3ee3853 100644
--- a/TAO/etc/tao_portableserver.doxygen
+++ b/TAO/etc/tao_portableserver.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_rtcorba.doxygen b/TAO/etc/tao_rtcorba.doxygen
index 3e49971fab5..6e0ef6271d0 100644
--- a/TAO/etc/tao_rtcorba.doxygen
+++ b/TAO/etc/tao_rtcorba.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_rtevent.doxygen b/TAO/etc/tao_rtevent.doxygen
index ff4bfb09283..8463b7d2d88 100644
--- a/TAO/etc/tao_rtevent.doxygen
+++ b/TAO/etc/tao_rtevent.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -850,8 +844,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = EC_*.cpp \
EC_*.h \
@@ -1227,9 +1223,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1497,6 +1493,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1517,8 +1524,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1546,7 +1559,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1588,7 +1601,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_rtportableserver.doxygen b/TAO/etc/tao_rtportableserver.doxygen
index f8a76f6869b..e6b886eac01 100644
--- a/TAO/etc/tao_rtportableserver.doxygen
+++ b/TAO/etc/tao_rtportableserver.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_security.doxygen b/TAO/etc/tao_security.doxygen
index 225186b1134..54add27328b 100644
--- a/TAO/etc/tao_security.doxygen
+++ b/TAO/etc/tao_security.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -846,8 +840,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1221,9 +1217,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1491,6 +1487,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1511,8 +1518,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1540,7 +1553,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1582,7 +1595,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_smartproxies.doxygen b/TAO/etc/tao_smartproxies.doxygen
index a138a7626f3..7d132ced155 100644
--- a/TAO/etc/tao_smartproxies.doxygen
+++ b/TAO/etc/tao_smartproxies.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_ssliop.doxygen b/TAO/etc/tao_ssliop.doxygen
index 4d4190bef1f..209ec0cac0c 100644
--- a/TAO/etc/tao_ssliop.doxygen
+++ b/TAO/etc/tao_ssliop.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -846,8 +840,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1221,9 +1217,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1491,6 +1487,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1511,8 +1518,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1540,7 +1553,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1582,7 +1595,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_strategies.doxygen b/TAO/etc/tao_strategies.doxygen
index 999247b2bd2..fcb06a0386b 100644
--- a/TAO/etc/tao_strategies.doxygen
+++ b/TAO/etc/tao_strategies.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_transportcurrent.doxygen b/TAO/etc/tao_transportcurrent.doxygen
index 4075de9ef98..da031acd3de 100644
--- a/TAO/etc/tao_transportcurrent.doxygen
+++ b/TAO/etc/tao_transportcurrent.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
diff --git a/TAO/etc/tao_ziop.doxygen b/TAO/etc/tao_ziop.doxygen
index 850e9c2771f..6db2a0c30ad 100644
--- a/TAO/etc/tao_ziop.doxygen
+++ b/TAO/etc/tao_ziop.doxygen
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.8.18
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -253,12 +253,6 @@ TAB_SIZE = 8
ALIASES =
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST =
-
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
# only. Doxygen will then generate output that is more tailored for C. For
# instance, some of the names that are used will be different. The list of all
@@ -299,14 +293,14 @@ OPTIMIZE_OUTPUT_SLICE = NO
# parses. With this tag you can assign which parser to use for a given
# extension. Doxygen has a built-in mapping, but you can override or extend it
# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
#
# Note: For files without extension you can use no_extension as a placeholder.
#
@@ -525,8 +519,8 @@ HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
# The default value is: NO.
HIDE_FRIEND_COMPOUNDS = NO
@@ -841,8 +835,10 @@ INPUT_ENCODING = UTF-8
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
FILE_PATTERNS = *.cpp \
*.h \
@@ -1215,9 +1211,9 @@ HTML_TIMESTAMP = NO
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
+# are dynamically created via JavaScript. If disabled, the navigation index will
# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
+# page. Disable this option to support browsers that do not have JavaScript,
# like the Qt help browser.
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1485,6 +1481,17 @@ TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT = png
+
# Use this tag to change the font size of LaTeX formulas included as images in
# the HTML documentation. When you change the font size after a successful
# doxygen run you need to manually remove any form_*.png images from the HTML
@@ -1505,8 +1512,14 @@ FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE =
+
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
# installed or if you want to formulas look prettier in the HTML output. When
# enabled you may also need to install MathJax separately and configure the path
@@ -1534,7 +1547,7 @@ MATHJAX_FORMAT = HTML-CSS
# Content Delivery Network so you can quickly see the result without installing
# MathJax. However, it is strongly recommended to install a local copy of
# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
@@ -1576,7 +1589,7 @@ MATHJAX_CODEFILE =
SEARCHENGINE = YES
# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
+# implemented using a web server instead of a web client using JavaScript. There
# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
# setting. When disabled, doxygen will generate a PHP script for searching and
# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
--
cgit v1.2.1
From 2e743e10ceb17abf3eeb02ed74bbe65839fff6b5 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Sat, 22 Aug 2020 12:55:49 +0200
Subject: Fixed typo in comment
* TAO/tests/AMI/run_test.pl:
---
TAO/tests/AMI/run_test.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'TAO')
diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl
index 13f9a99095c..884119168eb 100755
--- a/TAO/tests/AMI/run_test.pl
+++ b/TAO/tests/AMI/run_test.pl
@@ -63,7 +63,7 @@ if ($client->PutFile ($iorbase) == -1) {
$SV->Kill (); $SV->TimedWait (1);
exit 1;
}
-# copy the configruation file.
+# copy the configuration file.
if ($client->PutFile ($conf_file) == -1) {
print STDERR "ERROR: cannot set file <$client_conf>\n";
$SV->Kill (); $SV->TimedWait (1);
--
cgit v1.2.1
From 69d236085b3493ec61ef3a092b9cfe7585629c66 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Sat, 22 Aug 2020 15:37:33 +0200
Subject: Windows only on pull request
* .github/workflows/windows.yml:
* TAO/examples/Simple/Simple_util.h:
---
TAO/examples/Simple/Simple_util.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'TAO')
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 005f514c9b0..b2df4e6925a 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -28,7 +28,7 @@
* A template server definition. This template can be used by
* single server/client projects for definition of their
* server/clients. See the directories time, bank, echo for
- * further details of implemenatation.
+ * further details of implementation.
*/
template
class Server
--
cgit v1.2.1
From c3c16c78dfec71183de20d1ec95e3cda0aeee557 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Mon, 24 Aug 2020 17:29:22 +0200
Subject: Fixed typo
* ACE/ace/Obstack_T.h:
* TAO/docs/releasenotes/trader.html:
* TAO/orbsvcs/tests/Property/client.cpp:
* TAO/orbsvcs/tests/Simple_Naming/README:
---
TAO/docs/releasenotes/trader.html | 2 +-
TAO/orbsvcs/tests/Property/client.cpp | 4 ++--
TAO/orbsvcs/tests/Simple_Naming/README | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'TAO')
diff --git a/TAO/docs/releasenotes/trader.html b/TAO/docs/releasenotes/trader.html
index 175743ff7cd..95c1126de98 100644
--- a/TAO/docs/releasenotes/trader.html
+++ b/TAO/docs/releasenotes/trader.html
@@ -978,7 +978,7 @@ loop.
-There are two executables that test the Trading Service funtionality --- one to test
+
There are two executables that test the Trading Service functionality --- one to test
the exporter role, and the other, the importer role. To run the tests simply launch the Trading_Service
application, then run the export_test executable found in the orbsvcs/tests/Trading
directory. When the export_test ceases to output data and enters the event loop,
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index b1d8451a31e..02c8642afea 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -170,7 +170,7 @@ Client::test_get_all_property_names (void)
CORBA::ULong how_many = num_of_properties / 2;
// The extra ptr's and out's required to avoind SunnCC's warning
- // when foo.out () is passed to a funtion.
+ // when foo.out () is passed to a function.
CosPropertyService::PropertyNames_var names_var;
CosPropertyService::PropertyNames *names_ptr = 0;
CosPropertyService::PropertyNames_out names_out (names_ptr);
@@ -502,7 +502,7 @@ Client::test_get_all_properties (void)
CosPropertyService::Property* property_ptr = 0;
CosPropertyService::Property_out property_out (property_ptr);
- // Call the funtion.
+ // Call the function.
CORBA::Boolean next_one_result = iterator->next_one (property_out);
// Get the value to the _var variable.
diff --git a/TAO/orbsvcs/tests/Simple_Naming/README b/TAO/orbsvcs/tests/Simple_Naming/README
index be49d98e286..fe856d9e10b 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/README
+++ b/TAO/orbsvcs/tests/Simple_Naming/README
@@ -156,7 +156,7 @@ root->resolve (level1/level2/foo) to make sure correct reference is returned.
Expected Output:
-All funtions work properly
+All functions work properly
********************************************
Exceptions Test.
--
cgit v1.2.1
From bda85e4db023e38cf6f314e7c80698be40ee4bce Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Tue, 25 Aug 2020 14:32:50 +0200
Subject: Use bool for found_a_port
* TAO/tao/Strategies/SCIOP_Acceptor.cpp:
---
TAO/tao/Strategies/SCIOP_Acceptor.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'TAO')
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index 65e10a506ff..87a70f8345e 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -525,7 +525,7 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr,
{
ACE_Multihomed_INET_Addr a(addr);
- int found_a_port = 0;
+ bool found_a_port = false;
ACE_UINT32 last_port = requested_port + this->port_span_ - 1;
if (last_port > ACE_MAX_DEFAULT_PORT)
{
@@ -547,13 +547,13 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr,
this->accept_strategy_,
this->concurrency_strategy_) != -1)
{
- found_a_port = 1;
+ found_a_port = true;
break;
}
}
// Now, if we couldn't locate a port, we punt
- if (! found_a_port)
+ if (!found_a_port)
{
if (TAO_debug_level > 0)
TAOLIB_DEBUG ((LM_DEBUG,
@@ -1000,7 +1000,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str)
}
else if (name == "portspan")
{
- int range = static_cast (ACE_OS::atoi (value.c_str ()));
+ int const range = static_cast (ACE_OS::atoi (value.c_str ()));
// @@ What's the lower bound on the range? zero, or one?
if (range < 1 || range > ACE_MAX_DEFAULT_PORT)
TAOLIB_ERROR_RETURN ((LM_ERROR,
--
cgit v1.2.1
From ec41c7dc9431f851d4b9231f8fb7a1c54054a4cd Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Tue, 25 Aug 2020 15:21:04 +0200
Subject: Const changes and removed some unnessary casts
* TAO/tao/IIOP_Acceptor.cpp:
* TAO/tao/ORB_Core.cpp:
* TAO/tao/RTCORBA/RT_ORB_Loader.cpp:
* TAO/tao/Strategies/SCIOP_Acceptor.cpp:
* TAO/tao/default_resource.cpp:
* TAO/tao/default_server.cpp:
---
TAO/tao/IIOP_Acceptor.cpp | 2 +-
TAO/tao/ORB_Core.cpp | 26 +++++++++++++-------------
TAO/tao/RTCORBA/RT_ORB_Loader.cpp | 4 ++--
TAO/tao/Strategies/SCIOP_Acceptor.cpp | 2 +-
TAO/tao/default_resource.cpp | 2 +-
TAO/tao/default_server.cpp | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
(limited to 'TAO')
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 3a7f2807b69..3e5dd1f6c97 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -1230,7 +1230,7 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc,
-1);
if (name == "portspan")
{
- int range = static_cast (ACE_OS::atoi (value.c_str ()));
+ int const range = ACE_OS::atoi (value.c_str ());
// @@ What's the lower bound on the range? zero, or one?
if (range < 1 || range > ACE_MAX_DEFAULT_PORT)
TAOLIB_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index e91407c0d79..7a9a212df75 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -698,7 +698,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
else if (0 != (current_arg = arg_shifter.get_the_parameter
(ACE_TEXT("-ORBPreferIPV6Interfaces"))))
{
- int prefer_ipv6_interfaces = ACE_OS::atoi (current_arg);
+ int const prefer_ipv6_interfaces = ACE_OS::atoi (current_arg);
if (prefer_ipv6_interfaces)
this->orb_params ()->prefer_ipv6_interfaces (true);
else
@@ -709,7 +709,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
else if (0 != (current_arg = arg_shifter.get_the_parameter
(ACE_TEXT("-ORBConnectIPV6Only"))))
{
- int connect_ipv6_only = ACE_OS::atoi (current_arg);
+ int const connect_ipv6_only = ACE_OS::atoi (current_arg);
if (connect_ipv6_only)
this->orb_params ()->connect_ipv6_only (true);
else
@@ -720,7 +720,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
else if ((current_arg = arg_shifter.get_the_parameter
(ACE_TEXT("-ORBUseIPV6LinkLocal"))))
{
- int use_ipv6_link_local = ACE_OS::atoi (current_arg);
+ int const use_ipv6_link_local = ACE_OS::atoi (current_arg);
if (use_ipv6_link_local)
this->orb_params ()->use_ipv6_link_local (true);
else
@@ -1105,7 +1105,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
else if (0 != (current_arg = arg_shifter.get_the_parameter
(ACE_TEXT("-ORBForwardInvocationOnObjectNotExist"))))
{
- int forward = ACE_OS::atoi (current_arg);
+ int const forward = ACE_OS::atoi (current_arg);
if (forward)
this->orb_params_.forward_invocation_on_object_not_exist (true);
else
@@ -1116,14 +1116,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
else if (0 != (current_arg = arg_shifter.get_the_parameter
(ACE_TEXT("-ORBForwardOnTransientLimit"))))
{
- int limit = ACE_OS::atoi (current_arg);
+ int const limit = ACE_OS::atoi (current_arg);
this->orb_params_.forward_on_exception_limit (TAO::FOE_TRANSIENT, limit);
arg_shifter.consume_arg ();
}
else if (0 != (current_arg = arg_shifter.get_the_parameter
(ACE_TEXT("-ORBForwardOnCommFailureLimit"))))
{
- int limit = ACE_OS::atoi (current_arg);
+ int const limit = ACE_OS::atoi (current_arg);
this->orb_params_.forward_on_exception_limit (
TAO::FOE_COMM_FAILURE, limit);
arg_shifter.consume_arg ();
@@ -1131,7 +1131,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
else if (0 != (current_arg = arg_shifter.get_the_parameter
(ACE_TEXT("-ORBForwardOnObjectNotExistLimit"))))
{
- int limit = ACE_OS::atoi (current_arg);
+ int const limit = ACE_OS::atoi (current_arg);
this->orb_params_.forward_on_exception_limit (
TAO::FOE_OBJECT_NOT_EXIST, limit);
arg_shifter.consume_arg ();
@@ -1139,7 +1139,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
else if (0 != (current_arg = arg_shifter.get_the_parameter
(ACE_TEXT("-ORBForwardOnInvObjrefLimit"))))
{
- int limit = ACE_OS::atoi (current_arg);
+ int const limit = ACE_OS::atoi (current_arg);
this->orb_params_.forward_on_exception_limit (
TAO::FOE_INV_OBJREF, limit);
arg_shifter.consume_arg ();
@@ -1147,7 +1147,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
else if (0 != (current_arg = arg_shifter.get_the_parameter
(ACE_TEXT("-ORBForwardOnReplyClosedLimit"))))
{
- int limit = ACE_OS::atoi (current_arg);
+ int const limit = ACE_OS::atoi (current_arg);
this->orb_params_.invocation_retry_params ()
.forward_on_reply_closed_limit_ = limit;
arg_shifter.consume_arg ();
@@ -1155,7 +1155,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
else if (0 != (current_arg = arg_shifter.get_the_parameter
(ACE_TEXT("-ORBForwardDelay"))))
{
- int msecs = ACE_OS::atoi (current_arg);
+ int const msecs = ACE_OS::atoi (current_arg);
ACE_Time_Value delay(0, 1000*msecs);
this->orb_params_.forward_on_exception_delay (delay);
arg_shifter.consume_arg ();
@@ -1163,7 +1163,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
else if (0 != (current_arg = arg_shifter.get_the_parameter
(ACE_TEXT("-ORBForwardOnceOnObjectNotExist"))))
{
- int forward = ACE_OS::atoi (current_arg);
+ int const forward = ACE_OS::atoi (current_arg);
if (forward)
this->orb_params_.forward_once_exception (TAO::FOE_OBJECT_NOT_EXIST);
@@ -1172,7 +1172,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
else if (0 != (current_arg = arg_shifter.get_the_parameter
(ACE_TEXT("-ORBForwardOnceOnCommFailure"))))
{
- int forward = ACE_OS::atoi (current_arg);
+ int const forward = ACE_OS::atoi (current_arg);
if (forward)
this->orb_params_.forward_once_exception (TAO::FOE_COMM_FAILURE);
@@ -1181,7 +1181,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
else if (0 != (current_arg = arg_shifter.get_the_parameter
(ACE_TEXT("-ORBForwardOnceOnTransient"))))
{
- int forward = ACE_OS::atoi (current_arg);
+ int const forward = ACE_OS::atoi (current_arg);
if (forward)
this->orb_params_.forward_once_exception (TAO::FOE_TRANSIENT);
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index 4ba033315b0..5e2f2cc3ff2 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -147,7 +147,7 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[])
(ACE_TEXT("-RTORBDynamicThreadIdleTimeout"))))
{
const ACE_TCHAR *name = current_arg;
- int timeout = ACE_OS::atoi (name);
+ int const timeout = ACE_OS::atoi (name);
dynamic_thread_time = ACE_Time_Value (0, timeout);
lifespan = TAO_RT_ORBInitializer::TAO_RTCORBA_DT_IDLE;
arg_shifter.consume_arg ();
@@ -156,7 +156,7 @@ TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[])
(ACE_TEXT("-RTORBDynamicThreadRunTime"))))
{
const ACE_TCHAR *name = current_arg;
- int timeout = ACE_OS::atoi (name);
+ int const timeout = ACE_OS::atoi (name);
dynamic_thread_time = ACE_Time_Value (0, timeout);
lifespan = TAO_RT_ORBInitializer::TAO_RTCORBA_DT_FIXED;
arg_shifter.consume_arg ();
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index 87a70f8345e..ec0af739457 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -1000,7 +1000,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str)
}
else if (name == "portspan")
{
- int const range = static_cast (ACE_OS::atoi (value.c_str ()));
+ int const range = ACE_OS::atoi (value.c_str ());
// @@ What's the lower bound on the range? zero, or one?
if (range < 1 || range > ACE_MAX_DEFAULT_PORT)
TAOLIB_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 8ea0122bbb4..becfa443f70 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -429,7 +429,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
++curarg;
if (curarg < argc)
{
- int tmp = ACE_OS::atoi (argv[curarg]);
+ int const tmp = ACE_OS::atoi (argv[curarg]);
if (tmp == 0)
this->drop_replies_ = false;
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index f37c5d498c3..b75b2cff94f 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -129,7 +129,7 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
else
{
this->thread_per_connection_use_timeout_ = 1;
- int milliseconds = ACE_OS::atoi (name);
+ int const milliseconds = ACE_OS::atoi (name);
this->thread_per_connection_timeout_.set (0,
1000 * milliseconds);
}
--
cgit v1.2.1
From e0a6ada7a4296a0abc33cd98ba3e36df03eb9c5b Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Tue, 25 Aug 2020 18:17:15 +0200
Subject: Layout changes
* TAO/tao/Strategies/SCIOP_Acceptor.h:
---
TAO/tao/Strategies/SCIOP_Acceptor.h | 4 ----
1 file changed, 4 deletions(-)
(limited to 'TAO')
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h
index d386e78f29e..ed76fe47c55 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.h
@@ -11,7 +11,6 @@
*/
// ===================================================================
-
#ifndef TAO_SCIOP_ACCEPTOR_H
#define TAO_SCIOP_ACCEPTOR_H
#include /**/ "ace/pre.h"
@@ -109,7 +108,6 @@ public:
char *&host);
protected:
-
/**
* Implement the common part of the open*() methods. This method is
* virtual to allow a derived class implementation to be invoked
@@ -204,7 +202,6 @@ protected:
TAO_ORB_Core *orb_core_;
private:
-
/// the concrete acceptor, as a pointer to it's base class.
TAO_SCIOP_BASE_ACCEPTOR base_acceptor_;
@@ -212,7 +209,6 @@ private:
TAO_SCIOP_CREATION_STRATEGY *creation_strategy_;
TAO_SCIOP_CONCURRENCY_STRATEGY *concurrency_strategy_;
TAO_SCIOP_ACCEPT_STRATEGY *accept_strategy_;
-
};
TAO_END_VERSIONED_NAMESPACE_DECL
--
cgit v1.2.1
From e3c786e54c4aab48cf39949f69bc18fc3dee1055 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Fri, 28 Aug 2020 16:51:47 +0200
Subject: Generate also a private move constructor/assignment and use
ACE_UNIMPLEMENTED_FUNC in order to get `= delete` with C++11 and newer
* TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
---
TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
(limited to 'TAO')
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index 761b7806411..71486b6ab5c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -254,13 +254,20 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
if (! node->is_abstract ())
{
*os << "// Private and unimplemented for concrete interfaces." << be_nl
- << node->local_name () << " (const "
- << node->local_name () << " &);" << be_nl_2;
+ << "ACE_UNIMPLEMENTED_FUNC (" << node->local_name () << " (const "
+ << node->local_name () << " &));"
+ << "\n#if defined (ACE_HAS_CPP11)" << be_nl
+ << "ACE_UNIMPLEMENTED_FUNC (" << node->local_name () << " ("
+ << node->local_name () << " &&));"
+ << "\n#endif /* ACE_HAS_CPP11 */" << be_nl;
}
- *os << "void operator= (const " << node->local_name () << " &);";
-
- *os << be_uidt_nl
+ *os << "ACE_UNIMPLEMENTED_FUNC (" << node->local_name ()
+ << " &operator= (const " << node->local_name () << " &));"
+ << "\n#if defined (ACE_HAS_CPP11)" << be_nl
+ << "ACE_UNIMPLEMENTED_FUNC (" << node->local_name ()
+ << " &operator= (" << node->local_name () << " &&));"
+ << "\n#endif /* ACE_HAS_CPP11 */" << be_uidt_nl
<< "};";
be_visitor_context ctx (*this->ctx_);
--
cgit v1.2.1
From ad42f8ce4169c55170a5aa6ff87ba7d76dd8ead5 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Fri, 28 Aug 2020 16:51:58 +0200
Subject: Layout change
* TAO/TAO_IDL/be/be_interface.cpp:
---
TAO/TAO_IDL/be/be_interface.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'TAO')
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index fc1bba18bd5..e1a31fe90ce 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -734,7 +734,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
// interface _var and _out template classes, as well as by the
// template sequence classes for object references.
void
-be_interface:: gen_var_out_seq_decls (void)
+be_interface::gen_var_out_seq_decls (void)
{
if (this->var_out_seq_decls_gen_)
{
--
cgit v1.2.1
From 8154ac1e47daf9cd93dadf61561d854b29f4f574 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Fri, 28 Aug 2020 16:52:09 +0200
Subject: Const change
* TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp:
---
TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'TAO')
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 704b3cde555..f4eee04b4de 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -577,7 +577,7 @@ int
TAO::SSLIOP::Acceptor::parse_options_i (int &argc, ACE_CString ** argv)
{
//first, do the base class parser, then parse the leftovers.
- int result = this->IIOP_SSL_Acceptor::parse_options_i(argc,argv);
+ int const result = this->IIOP_SSL_Acceptor::parse_options_i(argc,argv);
if (result == -1)
return result;
--
cgit v1.2.1
From 064720271e9e6c629aeba94bcf012bf4c77ebc7e Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Sun, 30 Aug 2020 11:11:34 +0200
Subject: Removed unnecessary semicolon after ACE_UNIMPLEMENTED_FUNC
* TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
---
TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'TAO')
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index 71486b6ab5c..ffa18935c51 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -255,18 +255,18 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
{
*os << "// Private and unimplemented for concrete interfaces." << be_nl
<< "ACE_UNIMPLEMENTED_FUNC (" << node->local_name () << " (const "
- << node->local_name () << " &));"
+ << node->local_name () << " &))"
<< "\n#if defined (ACE_HAS_CPP11)" << be_nl
<< "ACE_UNIMPLEMENTED_FUNC (" << node->local_name () << " ("
- << node->local_name () << " &&));"
+ << node->local_name () << " &&))"
<< "\n#endif /* ACE_HAS_CPP11 */" << be_nl;
}
*os << "ACE_UNIMPLEMENTED_FUNC (" << node->local_name ()
- << " &operator= (const " << node->local_name () << " &));"
+ << " &operator= (const " << node->local_name () << " &))"
<< "\n#if defined (ACE_HAS_CPP11)" << be_nl
<< "ACE_UNIMPLEMENTED_FUNC (" << node->local_name ()
- << " &operator= (" << node->local_name () << " &&));"
+ << " &operator= (" << node->local_name () << " &&))"
<< "\n#endif /* ACE_HAS_CPP11 */" << be_uidt_nl
<< "};";
--
cgit v1.2.1
From fdeff1b597fed3d27b975d0486ba4966a89b977b Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
Date: Thu, 17 Sep 2020 13:37:08 +0200
Subject: Remove manual narrow support and use dynamic_cast
---
TAO/TAO_IDL/ast/ast_annotation_appl.cpp | 5 +-
TAO/TAO_IDL/ast/ast_annotation_appls.cpp | 2 +-
TAO/TAO_IDL/ast/ast_annotation_decl.cpp | 9 +-
TAO/TAO_IDL/ast/ast_annotation_member.cpp | 3 -
TAO/TAO_IDL/ast/ast_argument.cpp | 2 -
TAO/TAO_IDL/ast/ast_array.cpp | 2 -
TAO/TAO_IDL/ast/ast_attribute.cpp | 6 +-
TAO/TAO_IDL/ast/ast_component.cpp | 34 ++-----
TAO/TAO_IDL/ast/ast_component_fwd.cpp | 2 -
TAO/TAO_IDL/ast/ast_concrete_type.cpp | 1 -
TAO/TAO_IDL/ast/ast_connector.cpp | 5 +-
TAO/TAO_IDL/ast/ast_constant.cpp | 2 -
TAO/TAO_IDL/ast/ast_consumes.cpp | 2 -
TAO/TAO_IDL/ast/ast_decl.cpp | 23 ++---
TAO/TAO_IDL/ast/ast_emits.cpp | 2 -
TAO/TAO_IDL/ast/ast_enum.cpp | 10 +-
TAO/TAO_IDL/ast/ast_enum_val.cpp | 2 -
TAO/TAO_IDL/ast/ast_eventtype.cpp | 6 --
TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp | 4 -
TAO/TAO_IDL/ast/ast_exception.cpp | 7 +-
TAO/TAO_IDL/ast/ast_expression.cpp | 8 +-
TAO/TAO_IDL/ast/ast_extended_port.cpp | 5 +-
TAO/TAO_IDL/ast/ast_factory.cpp | 12 +--
TAO/TAO_IDL/ast/ast_field.cpp | 6 +-
TAO/TAO_IDL/ast/ast_finder.cpp | 4 -
TAO/TAO_IDL/ast/ast_fixed.cpp | 2 -
TAO/TAO_IDL/ast/ast_generator.cpp | 11 +--
TAO/TAO_IDL/ast/ast_home.cpp | 20 +---
TAO/TAO_IDL/ast/ast_interface.cpp | 53 ++++-------
TAO/TAO_IDL/ast/ast_interface_fwd.cpp | 12 +--
TAO/TAO_IDL/ast/ast_mirror_port.cpp | 3 -
TAO/TAO_IDL/ast/ast_module.cpp | 39 ++++----
TAO/TAO_IDL/ast/ast_native.cpp | 4 -
TAO/TAO_IDL/ast/ast_operation.cpp | 23 ++---
TAO/TAO_IDL/ast/ast_param_holder.cpp | 3 -
TAO/TAO_IDL/ast/ast_porttype.cpp | 10 +-
TAO/TAO_IDL/ast/ast_predefined_type.cpp | 4 -
TAO/TAO_IDL/ast/ast_provides.cpp | 2 -
TAO/TAO_IDL/ast/ast_publishes.cpp | 2 -
TAO/TAO_IDL/ast/ast_recursive.cpp | 10 +-
TAO/TAO_IDL/ast/ast_root.cpp | 3 -
TAO/TAO_IDL/ast/ast_sequence.cpp | 8 +-
TAO/TAO_IDL/ast/ast_string.cpp | 4 -
TAO/TAO_IDL/ast/ast_structure.cpp | 23 ++---
TAO/TAO_IDL/ast/ast_structure_fwd.cpp | 2 -
TAO/TAO_IDL/ast/ast_template_module.cpp | 16 ++--
TAO/TAO_IDL/ast/ast_template_module_inst.cpp | 5 +-
TAO/TAO_IDL/ast/ast_template_module_ref.cpp | 5 +-
TAO/TAO_IDL/ast/ast_type.cpp | 4 +-
TAO/TAO_IDL/ast/ast_typedef.cpp | 6 +-
TAO/TAO_IDL/ast/ast_union.cpp | 37 ++++---
TAO/TAO_IDL/ast/ast_union_branch.cpp | 4 +-
TAO/TAO_IDL/ast/ast_union_fwd.cpp | 4 -
TAO/TAO_IDL/ast/ast_uses.cpp | 2 -
TAO/TAO_IDL/ast/ast_valuebox.cpp | 4 -
TAO/TAO_IDL/ast/ast_valuetype.cpp | 22 ++---
TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp | 4 -
TAO/TAO_IDL/ast/ast_visitor_reifying.cpp | 12 +--
TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp | 44 ++++-----
TAO/TAO_IDL/be/be_argument.cpp | 4 +-
TAO/TAO_IDL/be/be_array.cpp | 14 +--
TAO/TAO_IDL/be/be_attribute.cpp | 6 +-
TAO/TAO_IDL/be/be_component.cpp | 27 +++---
TAO/TAO_IDL/be/be_component_fwd.cpp | 4 -
TAO/TAO_IDL/be/be_connector.cpp | 8 +-
TAO/TAO_IDL/be/be_constant.cpp | 4 -
TAO/TAO_IDL/be/be_consumes.cpp | 4 +-
TAO/TAO_IDL/be/be_decl.cpp | 44 ++++-----
TAO/TAO_IDL/be/be_emits.cpp | 4 +-
TAO/TAO_IDL/be/be_enum.cpp | 5 -
TAO/TAO_IDL/be/be_enum_val.cpp | 3 -
TAO/TAO_IDL/be/be_eventtype.cpp | 5 -
TAO/TAO_IDL/be/be_eventtype_fwd.cpp | 5 -
TAO/TAO_IDL/be/be_exception.cpp | 5 -
TAO/TAO_IDL/be/be_extended_port.cpp | 5 +-
TAO/TAO_IDL/be/be_factory.cpp | 3 -
TAO/TAO_IDL/be/be_field.cpp | 6 +-
TAO/TAO_IDL/be/be_finder.cpp | 3 -
TAO/TAO_IDL/be/be_fixed.cpp | 2 -
TAO/TAO_IDL/be/be_generator.cpp | 6 +-
TAO/TAO_IDL/be/be_global.cpp | 4 +-
TAO/TAO_IDL/be/be_home.cpp | 9 +-
TAO/TAO_IDL/be/be_identifier_helper.cpp | 2 +-
TAO/TAO_IDL/be/be_interface.cpp | 31 +++---
TAO/TAO_IDL/be/be_interface_fwd.cpp | 8 +-
TAO/TAO_IDL/be/be_mirror_port.cpp | 3 -
TAO/TAO_IDL/be/be_module.cpp | 3 -
TAO/TAO_IDL/be/be_native.cpp | 4 -
TAO/TAO_IDL/be/be_operation.cpp | 5 +-
TAO/TAO_IDL/be/be_param_holder.cpp | 3 -
TAO/TAO_IDL/be/be_porttype.cpp | 3 -
TAO/TAO_IDL/be/be_predefined_type.cpp | 4 -
TAO/TAO_IDL/be/be_produce.cpp | 2 +-
TAO/TAO_IDL/be/be_provides.cpp | 4 +-
TAO/TAO_IDL/be/be_publishes.cpp | 4 +-
TAO/TAO_IDL/be/be_root.cpp | 5 -
TAO/TAO_IDL/be/be_scope.cpp | 32 +++----
TAO/TAO_IDL/be/be_sequence.cpp | 40 ++++----
TAO/TAO_IDL/be/be_string.cpp | 2 -
TAO/TAO_IDL/be/be_structure.cpp | 7 +-
TAO/TAO_IDL/be/be_structure_fwd.cpp | 4 -
TAO/TAO_IDL/be/be_template_module.cpp | 3 -
TAO/TAO_IDL/be/be_template_module_inst.cpp | 3 -
TAO/TAO_IDL/be/be_template_module_ref.cpp | 3 -
TAO/TAO_IDL/be/be_type.cpp | 12 +--
TAO/TAO_IDL/be/be_typedef.cpp | 8 +-
TAO/TAO_IDL/be/be_union.cpp | 17 ++--
TAO/TAO_IDL/be/be_union_branch.cpp | 12 +--
TAO/TAO_IDL/be/be_union_fwd.cpp | 4 -
TAO/TAO_IDL/be/be_uses.cpp | 4 +-
TAO/TAO_IDL/be/be_util.cpp | 12 +--
TAO/TAO_IDL/be/be_valuebox.cpp | 4 -
TAO/TAO_IDL/be/be_valuetype.cpp | 27 +++---
TAO/TAO_IDL/be/be_valuetype_fwd.cpp | 5 -
TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp | 16 ++--
TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp | 22 ++---
TAO/TAO_IDL/be/be_visitor_arg_traits.cpp | 14 +--
TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_argument/argument.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp | 14 +--
TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp | 14 +--
TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp | 14 +--
TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp | 16 ++--
TAO/TAO_IDL/be/be_visitor_array/array.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp | 12 +--
TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp | 10 +-
TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp | 16 ++--
TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp | 4 +-
.../be/be_visitor_attribute/set_from_extracted.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp | 28 +++---
TAO/TAO_IDL/be/be_visitor_component/component.cpp | 4 +-
.../component_ami_rh_ex_base.cpp | 2 +-
.../be_visitor_component/component_ami_rh_exh.cpp | 2 +-
.../be_visitor_component/component_ami_rh_exs.cpp | 2 +-
.../be/be_visitor_component/component_exh.cpp | 4 +-
.../be/be_visitor_component/component_exs.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_component_scope.cpp | 6 +-
.../be_visitor_connector/connector_dds_ex_base.cpp | 10 +-
.../be/be_visitor_connector/connector_dds_exh.cpp | 8 +-
.../be/be_visitor_connector/connector_dds_exs.cpp | 4 +-
.../be/be_visitor_connector/executor_ami_exs.cpp | 4 +-
.../be/be_visitor_connector/facet_ami_exh.cpp | 6 +-
.../be/be_visitor_connector/facet_ami_exs.cpp | 14 +--
TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_decl.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp | 4 +-
.../be/be_visitor_exception/ctor_assign.cpp | 6 +-
.../be/be_visitor_exception/exception_ctor.cpp | 8 +-
TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp | 6 +-
TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp | 34 +++----
TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp | 10 +-
TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp | 6 +-
TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp | 6 +-
TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp | 8 +-
TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp | 6 +-
TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp | 10 +-
TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp | 8 +-
TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp | 2 +-
.../be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp | 10 +-
.../be_visitor_interface/ami4ccm_sendc_ex_idl.cpp | 6 +-
TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp | 2 +-
.../be_visitor_interface/direct_proxy_impl_sh.cpp | 6 +-
.../be_visitor_interface/direct_proxy_impl_ss.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp | 8 +-
TAO/TAO_IDL/be/be_visitor_interface/interface.cpp | 2 +-
.../be/be_visitor_interface/interface_ch.cpp | 8 +-
.../be/be_visitor_interface/interface_cs.cpp | 8 +-
.../be/be_visitor_interface/interface_is.cpp | 2 +-
.../be/be_visitor_interface/interface_sh.cpp | 4 +-
.../be/be_visitor_interface/interface_ss.cpp | 4 +-
.../be/be_visitor_interface/interface_svts.cpp | 4 +-
.../be/be_visitor_interface/smart_proxy_ch.cpp | 4 +-
.../be/be_visitor_interface/smart_proxy_cs.cpp | 2 +-
.../be/be_visitor_interface_fwd/any_op_ch.cpp | 2 +-
.../be_visitor_interface_fwd/interface_fwd_ch.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp | 8 +-
TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp | 6 +-
TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp | 10 +-
TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp | 8 +-
.../ami_handler_reply_stub_operation_cs.cpp | 8 +-
TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp | 10 +-
TAO/TAO_IDL/be/be_visitor_operation/argument.cpp | 6 +-
.../be/be_visitor_operation/argument_invoke.cpp | 4 +-
.../be/be_visitor_operation/argument_marshal.cpp | 10 +-
.../be_visitor_operation/direct_proxy_impl_ss.cpp | 6 +-
.../be/be_visitor_operation/exceptlist_cs.cpp | 2 +-
.../be/be_visitor_operation/exceptlist_ss.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_operation/operation.cpp | 22 ++---
.../be/be_visitor_operation/operation_ch.cpp | 4 +-
.../be/be_visitor_operation/operation_cs.cpp | 8 +-
.../be/be_visitor_operation/operation_exs.cpp | 4 +-
.../be/be_visitor_operation/operation_ih.cpp | 2 +-
.../be/be_visitor_operation/operation_is.cpp | 2 +-
.../be/be_visitor_operation/operation_sh.cpp | 2 +-
.../be/be_visitor_operation/operation_ss.cpp | 10 +-
.../be/be_visitor_operation/operation_svs.cpp | 2 +-
.../be/be_visitor_operation/smart_proxy_ch.cpp | 2 +-
.../be/be_visitor_operation/smart_proxy_cs.cpp | 8 +-
TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp | 6 +-
.../be/be_visitor_operation/upcall_command_ss.cpp | 12 +--
TAO/TAO_IDL/be/be_visitor_scope.cpp | 8 +-
TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp | 10 +-
TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp | 6 +-
TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp | 8 +-
TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp | 4 +-
.../be_visitor_structure_fwd/structure_fwd_ch.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_template_export.cpp | 8 +-
TAO/TAO_IDL/be/be_visitor_traits.cpp | 10 +-
.../be/be_visitor_typecode/alias_typecode.cpp | 4 +-
.../be/be_visitor_typecode/enum_typecode.cpp | 2 +-
.../be/be_visitor_typecode/struct_typecode.cpp | 10 +-
.../be/be_visitor_typecode/typecode_defn.cpp | 14 +--
.../be/be_visitor_typecode/union_typecode.cpp | 12 +--
.../be/be_visitor_typecode/value_typecode.cpp | 14 +--
TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp | 6 +-
TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp | 8 +-
TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp | 8 +-
TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp | 4 +-
.../be/be_visitor_union/discriminant_ch.cpp | 4 +-
.../be/be_visitor_union/discriminant_ci.cpp | 4 +-
.../be/be_visitor_union/discriminant_cs.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_union/union.cpp | 6 +-
TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp | 4 +-
.../be/be_visitor_union_branch/cdr_op_ch.cpp | 2 +-
.../be/be_visitor_union_branch/cdr_op_cs.cpp | 30 +++---
.../be/be_visitor_union_branch/private_ch.cpp | 6 +-
.../be_visitor_union_branch/public_assign_cs.cpp | 48 +++++-----
.../be/be_visitor_union_branch/public_ch.cpp | 6 +-
.../be/be_visitor_union_branch/public_ci.cpp | 48 +++++-----
.../public_constructor_cs.cpp | 28 +++---
.../be/be_visitor_union_branch/public_cs.cpp | 6 +-
.../be/be_visitor_union_branch/public_reset_cs.cpp | 56 +++++------
.../be/be_visitor_union_fwd/union_fwd_ch.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp | 6 +-
.../be/be_visitor_valuebox/union_member_ci.cpp | 6 +-
TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp | 18 ++--
TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp | 12 +--
TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp | 10 +-
TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp | 12 +--
TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp | 2 +-
.../be/be_visitor_valuetype/field_cdr_ch.cpp | 2 +-
.../be/be_visitor_valuetype/field_cdr_cs.cpp | 34 +++----
TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp | 4 +-
TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp | 8 +-
TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp | 26 ++---
TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp | 6 +-
TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp | 24 ++---
.../be/be_visitor_valuetype/valuetype_ch.cpp | 10 +-
.../be/be_visitor_valuetype/valuetype_cs.cpp | 14 +--
.../be/be_visitor_valuetype/valuetype_init_ch.cpp | 2 +-
.../be/be_visitor_valuetype/valuetype_obv_ch.cpp | 2 +-
.../be/be_visitor_valuetype/valuetype_obv_cs.cpp | 26 ++---
.../be/be_visitor_valuetype/valuetype_ss.cpp | 2 +-
.../be/be_visitor_valuetype_fwd/any_op_ch.cpp | 2 +-
.../be/be_visitor_valuetype_fwd/cdr_op_ch.cpp | 4 +-
.../be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp | 2 +-
TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp | 42 ++++----
TAO/TAO_IDL/be_include/be_argument.h | 3 -
TAO/TAO_IDL/be_include/be_array.h | 4 -
TAO/TAO_IDL/be_include/be_attribute.h | 4 -
TAO/TAO_IDL/be_include/be_component.h | 5 -
TAO/TAO_IDL/be_include/be_component_fwd.h | 4 -
TAO/TAO_IDL/be_include/be_connector.h | 4 -
TAO/TAO_IDL/be_include/be_constant.h | 3 -
TAO/TAO_IDL/be_include/be_consumes.h | 3 -
TAO/TAO_IDL/be_include/be_decl.h | 4 -
TAO/TAO_IDL/be_include/be_emits.h | 3 -
TAO/TAO_IDL/be_include/be_enum.h | 4 -
TAO/TAO_IDL/be_include/be_enum_val.h | 3 -
TAO/TAO_IDL/be_include/be_eventtype.h | 4 -
TAO/TAO_IDL/be_include/be_eventtype_fwd.h | 3 -
TAO/TAO_IDL/be_include/be_exception.h | 4 -
TAO/TAO_IDL/be_include/be_extended_port.h | 2 -
TAO/TAO_IDL/be_include/be_factory.h | 4 -
TAO/TAO_IDL/be_include/be_field.h | 4 -
TAO/TAO_IDL/be_include/be_finder.h | 4 -
TAO/TAO_IDL/be_include/be_fixed.h | 2 -
TAO/TAO_IDL/be_include/be_home.h | 5 -
TAO/TAO_IDL/be_include/be_interface.h | 5 -
TAO/TAO_IDL/be_include/be_interface_fwd.h | 3 -
TAO/TAO_IDL/be_include/be_mirror_port.h | 2 -
TAO/TAO_IDL/be_include/be_module.h | 4 -
TAO/TAO_IDL/be_include/be_native.h | 3 -
TAO/TAO_IDL/be_include/be_operation.h | 4 -
TAO/TAO_IDL/be_include/be_param_holder.h | 3 -
TAO/TAO_IDL/be_include/be_porttype.h | 3 -
TAO/TAO_IDL/be_include/be_predefined_type.h | 3 -
TAO/TAO_IDL/be_include/be_provides.h | 3 -
TAO/TAO_IDL/be_include/be_publishes.h | 3 -
TAO/TAO_IDL/be_include/be_root.h | 4 -
TAO/TAO_IDL/be_include/be_scope.h | 3 -
TAO/TAO_IDL/be_include/be_sequence.h | 4 -
TAO/TAO_IDL/be_include/be_string.h | 4 -
TAO/TAO_IDL/be_include/be_structure.h | 5 -
TAO/TAO_IDL/be_include/be_structure_fwd.h | 3 -
TAO/TAO_IDL/be_include/be_template_module.h | 3 -
TAO/TAO_IDL/be_include/be_template_module_inst.h | 3 -
TAO/TAO_IDL/be_include/be_template_module_ref.h | 3 -
TAO/TAO_IDL/be_include/be_type.h | 4 -
TAO/TAO_IDL/be_include/be_typedef.h | 4 -
TAO/TAO_IDL/be_include/be_union.h | 5 -
TAO/TAO_IDL/be_include/be_union_branch.h | 3 -
TAO/TAO_IDL/be_include/be_union_fwd.h | 3 -
TAO/TAO_IDL/be_include/be_uses.h | 3 -
TAO/TAO_IDL/be_include/be_valuebox.h | 3 -
TAO/TAO_IDL/be_include/be_valuetype.h | 5 -
TAO/TAO_IDL/be_include/be_valuetype_fwd.h | 3 -
TAO/TAO_IDL/fe/fe_component_header.cpp | 14 +--
TAO/TAO_IDL/fe/fe_declarator.cpp | 6 +-
TAO/TAO_IDL/fe/fe_home_header.cpp | 14 +--
TAO/TAO_IDL/fe/fe_init.cpp | 2 +-
TAO/TAO_IDL/fe/fe_interface_header.cpp | 22 ++---
TAO/TAO_IDL/fe/fe_obv_header.cpp | 14 +--
TAO/TAO_IDL/fe/fe_utils.cpp | 16 ++--
TAO/TAO_IDL/fe/idl.tab.cpp | 106 ++++++++++-----------
TAO/TAO_IDL/fe/idl.ypp | 106 ++++++++++-----------
TAO/TAO_IDL/include/ast_annotation_appl.h | 6 --
TAO/TAO_IDL/include/ast_annotation_decl.h | 6 --
TAO/TAO_IDL/include/ast_annotation_member.h | 6 --
TAO/TAO_IDL/include/ast_argument.h | 4 -
TAO/TAO_IDL/include/ast_array.h | 4 -
TAO/TAO_IDL/include/ast_attribute.h | 4 -
TAO/TAO_IDL/include/ast_component.h | 5 -
TAO/TAO_IDL/include/ast_component_fwd.h | 4 -
TAO/TAO_IDL/include/ast_concrete_type.h | 3 -
TAO/TAO_IDL/include/ast_connector.h | 5 -
TAO/TAO_IDL/include/ast_constant.h | 4 -
TAO/TAO_IDL/include/ast_consumes.h | 3 -
TAO/TAO_IDL/include/ast_decl.h | 4 -
TAO/TAO_IDL/include/ast_emits.h | 3 -
TAO/TAO_IDL/include/ast_enum.h | 5 -
TAO/TAO_IDL/include/ast_enum_val.h | 3 -
TAO/TAO_IDL/include/ast_eventtype.h | 5 -
TAO/TAO_IDL/include/ast_eventtype_fwd.h | 4 -
TAO/TAO_IDL/include/ast_exception.h | 5 -
TAO/TAO_IDL/include/ast_extended_port.h | 4 -
TAO/TAO_IDL/include/ast_factory.h | 5 -
TAO/TAO_IDL/include/ast_field.h | 4 -
TAO/TAO_IDL/include/ast_finder.h | 4 -
TAO/TAO_IDL/include/ast_fixed.h | 2 -
TAO/TAO_IDL/include/ast_home.h | 5 -
TAO/TAO_IDL/include/ast_interface.h | 5 -
TAO/TAO_IDL/include/ast_interface_fwd.h | 4 -
TAO/TAO_IDL/include/ast_mirror_port.h | 4 -
TAO/TAO_IDL/include/ast_module.h | 4 -
TAO/TAO_IDL/include/ast_native.h | 3 -
TAO/TAO_IDL/include/ast_operation.h | 5 -
TAO/TAO_IDL/include/ast_param_holder.h | 3 -
TAO/TAO_IDL/include/ast_porttype.h | 5 -
TAO/TAO_IDL/include/ast_predefined_type.h | 3 -
TAO/TAO_IDL/include/ast_provides.h | 3 -
TAO/TAO_IDL/include/ast_publishes.h | 3 -
TAO/TAO_IDL/include/ast_root.h | 5 -
TAO/TAO_IDL/include/ast_sequence.h | 4 -
TAO/TAO_IDL/include/ast_string.h | 3 -
TAO/TAO_IDL/include/ast_structure.h | 5 -
TAO/TAO_IDL/include/ast_structure_fwd.h | 4 -
TAO/TAO_IDL/include/ast_template_module.h | 4 -
TAO/TAO_IDL/include/ast_template_module_inst.h | 3 -
TAO/TAO_IDL/include/ast_template_module_ref.h | 3 -
TAO/TAO_IDL/include/ast_type.h | 4 -
TAO/TAO_IDL/include/ast_typedef.h | 3 -
TAO/TAO_IDL/include/ast_union.h | 4 -
TAO/TAO_IDL/include/ast_union_branch.h | 4 -
TAO/TAO_IDL/include/ast_union_fwd.h | 4 -
TAO/TAO_IDL/include/ast_uses.h | 3 -
TAO/TAO_IDL/include/ast_valuebox.h | 3 -
TAO/TAO_IDL/include/ast_valuetype.h | 5 -
TAO/TAO_IDL/include/ast_valuetype_fwd.h | 4 -
TAO/TAO_IDL/include/utl_scope.h | 4 -
TAO/TAO_IDL/narrow/narrow.cpp | 70 +++++++-------
TAO/TAO_IDL/util/utl_scope.cpp | 44 ++++-----
403 files changed, 1225 insertions(+), 1983 deletions(-)
(limited to 'TAO')
diff --git a/TAO/TAO_IDL/ast/ast_annotation_appl.cpp b/TAO/TAO_IDL/ast/ast_annotation_appl.cpp
index aed09a6c3cf..75eb854757c 100644
--- a/TAO/TAO_IDL/ast/ast_annotation_appl.cpp
+++ b/TAO/TAO_IDL/ast/ast_annotation_appl.cpp
@@ -103,9 +103,6 @@ const char *AST_Annotation_Appl::original_name () const
return original_name_;
}
-IMPL_NARROW_FROM_DECL (AST_Annotation_Appl)
-IMPL_NARROW_FROM_SCOPE (AST_Annotation_Appl)
-
bool
AST_Annotation_Appl::apply_from (AST_Annotation_Decl *decl)
{
@@ -117,7 +114,7 @@ AST_Annotation_Appl::apply_from (AST_Annotation_Decl *decl)
si.next ())
{
AST_Annotation_Member *member =
- AST_Annotation_Member::narrow_from_decl (si.item ());
+ dynamic_cast (si.item ());
if (member)
{
AST_Annotation_Member *new_member = fe_add_annotation_member (
diff --git a/TAO/TAO_IDL/ast/ast_annotation_appls.cpp b/TAO/TAO_IDL/ast/ast_annotation_appls.cpp
index 7f4949ddbd2..d96c302fbee 100644
--- a/TAO/TAO_IDL/ast/ast_annotation_appls.cpp
+++ b/TAO/TAO_IDL/ast/ast_annotation_appls.cpp
@@ -114,5 +114,5 @@ AST_Annotation_Appls::find (const char *annotation)
return 0;
}
- return find (AST_Annotation_Decl::narrow_from_decl (decl));
+ return find (dynamic_cast (decl));
}
diff --git a/TAO/TAO_IDL/ast/ast_annotation_decl.cpp b/TAO/TAO_IDL/ast/ast_annotation_decl.cpp
index 45eab38d7d6..280c085a50f 100644
--- a/TAO/TAO_IDL/ast/ast_annotation_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_annotation_decl.cpp
@@ -40,9 +40,6 @@ void AST_Annotation_Decl::destroy ()
AST_Decl::destroy ();
}
-IMPL_NARROW_FROM_DECL (AST_Annotation_Decl)
-IMPL_NARROW_FROM_SCOPE (AST_Annotation_Decl)
-
void
AST_Annotation_Decl::escape_name (Identifier *name)
{
@@ -86,19 +83,19 @@ AST_Annotation_Decl::fe_add_annotation_member (
}
}
- AST_Annotation_Decl *s = AST_Annotation_Decl::narrow_from_scope (this);
+ AST_Annotation_Decl *s = dynamic_cast (this);
if (s)
{
s->fields ().enqueue_tail (annotation_member);
}
- return AST_Annotation_Member::narrow_from_decl (d);
+ return dynamic_cast (d);
}
AST_Constant *
AST_Annotation_Decl::fe_add_constant (AST_Constant *t)
{
- return AST_Constant::narrow_from_decl (fe_add_decl (t));
+ return dynamic_cast (fe_add_decl (t));
}
int
diff --git a/TAO/TAO_IDL/ast/ast_annotation_member.cpp b/TAO/TAO_IDL/ast/ast_annotation_member.cpp
index d15d73b557a..8c872a7777a 100644
--- a/TAO/TAO_IDL/ast/ast_annotation_member.cpp
+++ b/TAO/TAO_IDL/ast/ast_annotation_member.cpp
@@ -57,9 +57,6 @@ AST_Annotation_Member::destroy ()
AST_Field::destroy ();
}
-IMPL_NARROW_FROM_DECL (AST_Annotation_Member);
-IMPL_NARROW_FROM_SCOPE (AST_Annotation_Member);
-
void
AST_Annotation_Member::dump (ACE_OSTREAM_TYPE &o)
{
diff --git a/TAO/TAO_IDL/ast/ast_argument.cpp b/TAO/TAO_IDL/ast/ast_argument.cpp
index 5867a6c0763..4bea2d21cfc 100644
--- a/TAO/TAO_IDL/ast/ast_argument.cpp
+++ b/TAO/TAO_IDL/ast/ast_argument.cpp
@@ -133,5 +133,3 @@ AST_Argument::direction (void)
{
return this->pd_direction;
}
-
-IMPL_NARROW_FROM_DECL(AST_Argument)
diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp
index 110279a2411..fc96ef025ba 100644
--- a/TAO/TAO_IDL/ast/ast_array.cpp
+++ b/TAO/TAO_IDL/ast/ast_array.cpp
@@ -270,8 +270,6 @@ AST_Array::set_dims (AST_Expression **ds,
this->pd_n_dims = nds;
}
-IMPL_NARROW_FROM_DECL(AST_Array)
-
AST_Annotation_Appls &
AST_Array::base_type_annotations ()
{
diff --git a/TAO/TAO_IDL/ast/ast_attribute.cpp b/TAO/TAO_IDL/ast/ast_attribute.cpp
index 3dc8331d3a8..d16804d1467 100644
--- a/TAO/TAO_IDL/ast/ast_attribute.cpp
+++ b/TAO/TAO_IDL/ast/ast_attribute.cpp
@@ -232,7 +232,7 @@ AST_Attribute::fe_add_get_exceptions (UTL_NameList *t)
return 0;
}
- fe = AST_Type::narrow_from_decl (d);
+ fe = dynamic_cast (d);
UTL_ExceptList *el = 0;
ACE_NEW_RETURN (el,
@@ -285,7 +285,7 @@ AST_Attribute::fe_add_set_exceptions (UTL_NameList *t)
return 0;
}
- fe = AST_Type::narrow_from_decl (d);
+ fe = dynamic_cast (d);
UTL_ExceptList *el = 0;
ACE_NEW_RETURN (el,
@@ -310,5 +310,3 @@ AST_Attribute::annotatable () const
{
return true;
}
-
-IMPL_NARROW_FROM_DECL(AST_Attribute)
diff --git a/TAO/TAO_IDL/ast/ast_component.cpp b/TAO/TAO_IDL/ast/ast_component.cpp
index c1cbe1729b5..14d697af2b8 100644
--- a/TAO/TAO_IDL/ast/ast_component.cpp
+++ b/TAO/TAO_IDL/ast/ast_component.cpp
@@ -53,7 +53,7 @@ AST_Component::~AST_Component (void)
void
AST_Component::redefine (AST_Interface *from)
{
- AST_Component *c = AST_Component::narrow_from_decl (from);
+ AST_Component *c = dynamic_cast (from);
if (c == 0)
{
@@ -113,7 +113,7 @@ AST_Component::look_in_supported (UTL_ScopedName *e,
}
AST_Interface *i =
- AST_Interface::narrow_from_decl (*is);
+ dynamic_cast (*is);
d = (i)->lookup_by_name_r (e, full_def_only);
@@ -212,57 +212,43 @@ AST_Component::ast_accept (ast_visitor *visitor)
AST_Provides *
AST_Component::fe_add_provides (AST_Provides *p)
{
- return
- AST_Provides::narrow_from_decl (
- this->fe_add_ref_decl (p));
+ return dynamic_cast (this->fe_add_ref_decl (p));
}
AST_Uses *
AST_Component::fe_add_uses (AST_Uses *u)
{
- return
- AST_Uses::narrow_from_decl (
- this->fe_add_ref_decl (u));
+ return dynamic_cast (this->fe_add_ref_decl (u));
}
AST_Publishes *
AST_Component::fe_add_publishes (AST_Publishes *p)
{
- return
- AST_Publishes::narrow_from_decl (
- this->fe_add_ref_decl (p));
+ return dynamic_cast (this->fe_add_ref_decl (p));
}
AST_Emits *
AST_Component::fe_add_emits (AST_Emits *e)
{
- return
- AST_Emits::narrow_from_decl (
- this->fe_add_ref_decl (e));
+ return dynamic_cast (this->fe_add_ref_decl (e));
}
AST_Consumes *
AST_Component::fe_add_consumes (AST_Consumes *c)
{
- return
- AST_Consumes::narrow_from_decl (
- this->fe_add_ref_decl (c));
+ return dynamic_cast (this->fe_add_ref_decl (c));
}
AST_Extended_Port *
AST_Component::fe_add_extended_port (AST_Extended_Port *p)
{
- return
- AST_Extended_Port::narrow_from_decl (
- this->fe_add_ref_decl (p));
+ return dynamic_cast (this->fe_add_ref_decl (p));
}
AST_Mirror_Port *
AST_Component::fe_add_mirror_port (AST_Mirror_Port *p)
{
- return
- AST_Mirror_Port::narrow_from_decl (
- this->fe_add_ref_decl (p));
+ return dynamic_cast (this->fe_add_ref_decl (p));
}
int
@@ -282,5 +268,3 @@ AST_Component::be_add_uses (AST_Uses *i,
return 0;
}
-IMPL_NARROW_FROM_DECL (AST_Component)
-IMPL_NARROW_FROM_SCOPE (AST_Component)
diff --git a/TAO/TAO_IDL/ast/ast_component_fwd.cpp b/TAO/TAO_IDL/ast/ast_component_fwd.cpp
index 597f6434d52..361faa89a99 100644
--- a/TAO/TAO_IDL/ast/ast_component_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_component_fwd.cpp
@@ -50,5 +50,3 @@ AST_ComponentFwd::is_fwd (void)
{
return true; // This is a fwd declared type
}
-
-IMPL_NARROW_FROM_DECL (AST_ComponentFwd)
diff --git a/TAO/TAO_IDL/ast/ast_concrete_type.cpp b/TAO/TAO_IDL/ast/ast_concrete_type.cpp
index fb198cd9d89..dc3c3648174 100644
--- a/TAO/TAO_IDL/ast/ast_concrete_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_concrete_type.cpp
@@ -87,4 +87,3 @@ AST_ConcreteType::destroy (void)
this->AST_Type::destroy ();
}
-IMPL_NARROW_FROM_DECL(AST_ConcreteType)
diff --git a/TAO/TAO_IDL/ast/ast_connector.cpp b/TAO/TAO_IDL/ast/ast_connector.cpp
index e92a55de7d7..0b2fe0ca15b 100644
--- a/TAO/TAO_IDL/ast/ast_connector.cpp
+++ b/TAO/TAO_IDL/ast/ast_connector.cpp
@@ -45,7 +45,7 @@ AST_Connector::~AST_Connector (void)
AST_Connector *
AST_Connector::base_connector (void) const
{
- return AST_Connector::narrow_from_decl (this->pd_base_component);
+ return dynamic_cast (this->pd_base_component);
}
void
@@ -82,6 +82,3 @@ AST_Connector::ast_accept (ast_visitor *visitor)
{
return visitor->visit_connector (this);
}
-
-IMPL_NARROW_FROM_DECL (AST_Connector)
-IMPL_NARROW_FROM_SCOPE (AST_Connector)
diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp
index f3a51add81e..674d63dbdf4 100644
--- a/TAO/TAO_IDL/ast/ast_constant.cpp
+++ b/TAO/TAO_IDL/ast/ast_constant.cpp
@@ -298,5 +298,3 @@ AST_Constant::enum_full_name (void)
return 0;
}
}
-
-IMPL_NARROW_FROM_DECL(AST_Constant)
diff --git a/TAO/TAO_IDL/ast/ast_consumes.cpp b/TAO/TAO_IDL/ast/ast_consumes.cpp
index 1a1308094aa..48720706f83 100644
--- a/TAO/TAO_IDL/ast/ast_consumes.cpp
+++ b/TAO/TAO_IDL/ast/ast_consumes.cpp
@@ -44,5 +44,3 @@ AST_Consumes::destroy (void)
{
this->AST_Field::destroy ();
}
-
-IMPL_NARROW_FROM_DECL(AST_Consumes)
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index 96a46df6707..59152a256b2 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -385,7 +385,7 @@ AST_Decl::set_prefix_with_typeprefix_r (const char *value,
// This will recursively catch all previous openings of a module.
if (this->node_type () == AST_Decl::NT_module)
{
- AST_Module *m = AST_Module::narrow_from_decl (this);
+ AST_Module *m = dynamic_cast (this);
while (!!(m = m->previous_opening ()))
{
for (UTL_ScopeActiveIterator si (m, UTL_Scope::IK_decls);
@@ -867,7 +867,7 @@ AST_Decl::has_ancestor (AST_Decl *s)
return true;
}
- AST_Module *m = AST_Module::narrow_from_decl (s);
+ AST_Module *m = dynamic_cast (s);
if (m)
{
while (!!(m = m->previous_opening ()))
@@ -1470,7 +1470,7 @@ AST_Decl::contains_wstring (void)
{
case AST_Decl::NT_array:
{
- AST_Array *a = AST_Array::narrow_from_decl (this);
+ AST_Array *a = dynamic_cast (this);
this->contains_wstring_ = a->base_type ()->contains_wstring ();
break;
}
@@ -1479,14 +1479,14 @@ AST_Decl::contains_wstring (void)
case AST_Decl::NT_struct:
case AST_Decl::NT_union:
{
- AST_Structure *s = AST_Structure::narrow_from_decl (this);
+ AST_Structure *s = dynamic_cast (this);
this->contains_wstring_ = s->contains_wstring ();
break;
}
case AST_Decl::NT_sequence:
{
- AST_Sequence *s = AST_Sequence::narrow_from_decl (this);
+ AST_Sequence *s = dynamic_cast (this);
this->contains_wstring_ = s->base_type ()->contains_wstring ();
break;
}
@@ -1495,14 +1495,14 @@ AST_Decl::contains_wstring (void)
case AST_Decl::NT_field:
case AST_Decl::NT_union_branch:
{
- AST_Field *f = AST_Field::narrow_from_decl (this);
+ AST_Field *f = dynamic_cast (this);
this->contains_wstring_ = f->field_type ()->contains_wstring ();
break;
}
case AST_Decl::NT_typedef:
{
- AST_Typedef *td = AST_Typedef::narrow_from_decl (this);
+ AST_Typedef *td = dynamic_cast (this);
this->contains_wstring_ =
td->primitive_base_type ()->contains_wstring ();
break;
@@ -1536,11 +1536,11 @@ AST_Decl::masking_checks (AST_Decl *mod)
return true;
}
- AST_Module *me_mod = AST_Module::narrow_from_decl (this);
+ AST_Module *me_mod = dynamic_cast (this);
if (me_mod != 0)
{
- AST_Module *po_mod = AST_Module::narrow_from_decl (mod);
+ AST_Module *po_mod = dynamic_cast (mod);
if (po_mod)
{
while (!!(po_mod = po_mod->previous_opening ()))
@@ -1568,11 +1568,6 @@ AST_Decl::in_tmpl_mod_not_aliased (bool val)
this->in_tmpl_mod_not_aliased_ = val;
}
-//Narrowing methods for AST_Decl.
-
-IMPL_NARROW_FROM_DECL(AST_Decl)
-
-
void
AST_Decl::annotation_appls (const AST_Annotation_Appls &annotations)
{
diff --git a/TAO/TAO_IDL/ast/ast_emits.cpp b/TAO/TAO_IDL/ast/ast_emits.cpp
index 581b557ec9b..eaecaea725f 100644
--- a/TAO/TAO_IDL/ast/ast_emits.cpp
+++ b/TAO/TAO_IDL/ast/ast_emits.cpp
@@ -43,5 +43,3 @@ AST_Emits::destroy (void)
{
this->AST_Field::destroy ();
}
-
-IMPL_NARROW_FROM_DECL(AST_Emits)
diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp
index 6ad9afb3fc9..0be8d222345 100644
--- a/TAO/TAO_IDL/ast/ast_enum.cpp
+++ b/TAO/TAO_IDL/ast/ast_enum.cpp
@@ -117,7 +117,7 @@ AST_Enum::value_to_name (const unsigned long v)
for (UTL_ScopeActiveIterator i (this, IK_decls); !i.is_done (); i.next ())
{
d = i.item ();
- item = AST_EnumVal::narrow_from_decl (d);
+ item = dynamic_cast (d);
if (item->constant_value ()->ev ()->u.ulval == v)
{
@@ -140,7 +140,7 @@ AST_Enum::lookup_by_value (const AST_Expression *v)
i.next ())
{
d = i.item ();
- item = AST_EnumVal::narrow_from_decl (d);
+ item = dynamic_cast (d);
AST_Expression *cv = item->constant_value ();
if (cv == v)
@@ -371,9 +371,3 @@ AST_Enum::destroy (void)
this->UTL_Scope::destroy ();
this->AST_ConcreteType::destroy ();
}
-
-
-
-
-IMPL_NARROW_FROM_DECL(AST_Enum)
-IMPL_NARROW_FROM_SCOPE(AST_Enum)
diff --git a/TAO/TAO_IDL/ast/ast_enum_val.cpp b/TAO/TAO_IDL/ast/ast_enum_val.cpp
index eef74bb560a..5769cb28487 100644
--- a/TAO/TAO_IDL/ast/ast_enum_val.cpp
+++ b/TAO/TAO_IDL/ast/ast_enum_val.cpp
@@ -103,8 +103,6 @@ AST_EnumVal::ast_accept (ast_visitor *visitor)
return visitor->visit_enum_val (this);
}
-IMPL_NARROW_FROM_DECL(AST_EnumVal)
-
AST_Enum *
AST_EnumVal::enum_parent ()
{
diff --git a/TAO/TAO_IDL/ast/ast_eventtype.cpp b/TAO/TAO_IDL/ast/ast_eventtype.cpp
index 107dc1fc1b8..98de5fa0ca3 100644
--- a/TAO/TAO_IDL/ast/ast_eventtype.cpp
+++ b/TAO/TAO_IDL/ast/ast_eventtype.cpp
@@ -121,9 +121,3 @@ AST_EventType::ast_accept (ast_visitor *visitor)
{
return visitor->visit_eventtype (this);
}
-
- // Narrowing.
-
-IMPL_NARROW_FROM_DECL(AST_EventType)
-IMPL_NARROW_FROM_SCOPE(AST_EventType)
-
diff --git a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
index 41690400f88..f9c02872ec6 100644
--- a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
@@ -51,7 +51,3 @@ void
AST_EventTypeFwd::destroy (void)
{
}
-
-
-
-IMPL_NARROW_FROM_DECL (AST_EventTypeFwd)
diff --git a/TAO/TAO_IDL/ast/ast_exception.cpp b/TAO/TAO_IDL/ast/ast_exception.cpp
index f2dddf6946b..387921a3218 100644
--- a/TAO/TAO_IDL/ast/ast_exception.cpp
+++ b/TAO/TAO_IDL/ast/ast_exception.cpp
@@ -137,7 +137,7 @@ AST_Exception::in_recursion (ACE_Unbounded_Queue &list)
// Continue until each element is visited.
for (UTL_ScopeActiveIterator i (this, IK_decls);!i.is_done ();i.next ())
{
- AST_Field *field = AST_Field::narrow_from_decl (i.item ());
+ AST_Field *field = dynamic_cast (i.item ());
if (field == 0)
// This will be an enum value or other legitimate non-field
@@ -150,7 +150,7 @@ AST_Exception::in_recursion (ACE_Unbounded_Queue &list)
if (type->node_type () == AST_Decl::NT_typedef)
{
- AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
+ AST_Typedef *td = dynamic_cast (type);
type = td->primitive_base_type ();
}
@@ -202,6 +202,3 @@ AST_Exception::destroy (void)
{
this->AST_Structure::destroy ();
}
-
-IMPL_NARROW_FROM_DECL(AST_Exception)
-IMPL_NARROW_FROM_SCOPE(AST_Exception)
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index 34014a58cc2..c0303b60d21 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -116,7 +116,7 @@ AST_Expression::AST_Expression (UTL_ScopedName *nm)
if (d->node_type () == AST_Decl::NT_param_holder)
{
this->param_holder_ =
- AST_Param_Holder::narrow_from_decl (d);
+ dynamic_cast (d);
}
}
@@ -2517,12 +2517,12 @@ AST_Expression::eval_symbol (AST_Expression::EvalKind ek)
if (d->node_type () == AST_Decl::NT_enum_val)
{
- AST_EnumVal *enumval = AST_EnumVal::narrow_from_decl (d);
+ AST_EnumVal *enumval = dynamic_cast (d);
enum_parent (enumval->enum_parent ());
}
// OK, now evaluate the constant we just got, to produce its value.
- c = AST_Constant::narrow_from_decl (d);
+ c = dynamic_cast (d);
if (c == 0)
{
@@ -2575,7 +2575,7 @@ AST_Expression::check_and_coerce (AST_Expression::ExprType t,
if (d->node_type () == AST_Decl::NT_typedef)
{
- AST_Typedef *td = AST_Typedef::narrow_from_decl (d);
+ AST_Typedef *td = dynamic_cast (d);
d = td->primitive_base_type ();
}
diff --git a/TAO/TAO_IDL/ast/ast_extended_port.cpp b/TAO/TAO_IDL/ast/ast_extended_port.cpp
index 66a755dcb0e..18bd45e6a9f 100644
--- a/TAO/TAO_IDL/ast/ast_extended_port.cpp
+++ b/TAO/TAO_IDL/ast/ast_extended_port.cpp
@@ -28,7 +28,7 @@ AST_Extended_Port::~AST_Extended_Port (void)
AST_PortType *
AST_Extended_Port::port_type (void) const
{
- return AST_PortType::narrow_from_decl (this->field_type ());
+ return dynamic_cast (this->field_type ());
}
void
@@ -50,6 +50,3 @@ AST_Extended_Port::ast_accept (ast_visitor *visitor)
{
return visitor->visit_extended_port (this);
}
-
-IMPL_NARROW_FROM_DECL (AST_Extended_Port)
-
diff --git a/TAO/TAO_IDL/ast/ast_factory.cpp b/TAO/TAO_IDL/ast/ast_factory.cpp
index 15b779fbd10..70f05f3ac5d 100644
--- a/TAO/TAO_IDL/ast/ast_factory.cpp
+++ b/TAO/TAO_IDL/ast/ast_factory.cpp
@@ -190,9 +190,9 @@ AST_Factory::compute_argument_attr (void)
{
this->argument_count_++;
- arg = AST_Argument::narrow_from_decl (d);
+ arg = dynamic_cast (d);
- type = AST_Type::narrow_from_decl (arg->field_type ());
+ type = dynamic_cast (arg->field_type ());
if (type->node_type () == AST_Decl::NT_native)
{
@@ -209,7 +209,7 @@ AST_Argument *
AST_Factory::fe_add_argument (AST_Argument *t)
{
return
- AST_Argument::narrow_from_decl (
+ dynamic_cast (
this->fe_add_ref_decl (t));
}
@@ -246,7 +246,7 @@ AST_Factory::fe_add_exceptions (UTL_NameList *t)
return 0;
}
- fe = AST_Type::narrow_from_decl (d);
+ fe = dynamic_cast (d);
UTL_ExceptList *el = 0;
ACE_NEW_RETURN (el,
@@ -307,7 +307,3 @@ AST_Factory::ast_accept (ast_visitor *visitor)
{
return visitor->visit_factory (this);
}
-
-IMPL_NARROW_FROM_DECL(AST_Factory)
-IMPL_NARROW_FROM_SCOPE(AST_Factory)
-
diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp
index 15f5d97b957..71dc55e963a 100644
--- a/TAO/TAO_IDL/ast/ast_field.cpp
+++ b/TAO/TAO_IDL/ast/ast_field.cpp
@@ -108,7 +108,7 @@ AST_Field::AST_Field (AST_Type *ft,
if (fnt == AST_Decl::NT_param_holder)
{
AST_Param_Holder *ph =
- AST_Param_Holder::narrow_from_decl (ft);
+ dynamic_cast (ft);
if (ph->info ()->type_ == AST_Decl::NT_const)
{
@@ -141,7 +141,7 @@ AST_Field::AST_Field (AST_Decl::NodeType nt,
if (fnt == AST_Decl::NT_param_holder)
{
AST_Param_Holder *ph =
- AST_Param_Holder::narrow_from_decl (ft);
+ dynamic_cast (ft);
if (ph->info ()->type_ == AST_Decl::NT_const)
{
@@ -234,8 +234,6 @@ AST_Field::contains_wstring (void)
return this->ref_type_->contains_wstring ();
}
-IMPL_NARROW_FROM_DECL(AST_Field)
-
bool AST_Field::annotatable () const
{
return true;
diff --git a/TAO/TAO_IDL/ast/ast_finder.cpp b/TAO/TAO_IDL/ast/ast_finder.cpp
index 5945fdb228c..fe474026188 100644
--- a/TAO/TAO_IDL/ast/ast_finder.cpp
+++ b/TAO/TAO_IDL/ast/ast_finder.cpp
@@ -58,7 +58,3 @@ AST_Finder::ast_accept (ast_visitor *visitor)
{
return visitor->visit_finder (this);
}
-
-IMPL_NARROW_FROM_DECL(AST_Finder)
-IMPL_NARROW_FROM_SCOPE(AST_Finder)
-
diff --git a/TAO/TAO_IDL/ast/ast_fixed.cpp b/TAO/TAO_IDL/ast/ast_fixed.cpp
index ded0d58b581..a001d37421c 100644
--- a/TAO/TAO_IDL/ast/ast_fixed.cpp
+++ b/TAO/TAO_IDL/ast/ast_fixed.cpp
@@ -54,5 +54,3 @@ AST_Expression *AST_Fixed::scale ()
{
return pd_scale;
}
-
-IMPL_NARROW_FROM_DECL(AST_Fixed)
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
index 0c1c673aca6..ec289b43547 100644
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ b/TAO/TAO_IDL/ast/ast_generator.cpp
@@ -139,7 +139,7 @@ AST_Generator::create_module (UTL_Scope *s,
{
// Can't just check node type here, since it could be a
// template module or template module instantiation.
- AST_Module *m = AST_Module::narrow_from_decl (iter.item ());
+ AST_Module *m = dynamic_cast (iter.item ());
if (m && m->local_name ()->compare (n->last_component ()))
{
// Create this new module with referance to the
@@ -155,8 +155,7 @@ AST_Generator::create_module (UTL_Scope *s,
// is itself a module, and has been previously opened, any
// of the previous openings may contain a previous opening
// of the module we're creating.
- // AST_Module *prev_module = AST_Module::narrow_from_scope (s);
- AST_Module *prev_module = AST_Module::narrow_from_scope (s);
+ AST_Module *prev_module = dynamic_cast (s);
if (prev_module)
{
while (!!(prev_module= prev_module->previous_opening ()))
@@ -165,7 +164,7 @@ AST_Generator::create_module (UTL_Scope *s,
!iter.is_done ();
iter.next ())
{
- AST_Module *m = AST_Module::narrow_from_decl (iter.item ());
+ AST_Module *m = dynamic_cast (iter.item ());
if (m && m->local_name ()->compare (n->last_component ()))
{
// Create this new module with referance to the
@@ -269,7 +268,7 @@ AST_Generator::create_valuetype (UTL_ScopedName *n,
0);
// The following helps with OBV_ namespace generation.
- AST_Module *m = AST_Module::narrow_from_scope (retval->defined_in ());
+ AST_Module *m = dynamic_cast (retval->defined_in ());
if (m)
{
m->set_has_nested_valuetype ();
@@ -336,7 +335,7 @@ AST_Generator::create_eventtype (UTL_ScopedName *n,
0);
// The following helps with OBV_ namespace generation.
- AST_Module *m = AST_Module::narrow_from_scope (retval->defined_in ());
+ AST_Module *m = dynamic_cast (retval->defined_in ());
if (m != 0)
{
diff --git a/TAO/TAO_IDL/ast/ast_home.cpp b/TAO/TAO_IDL/ast/ast_home.cpp
index b7e773b1fdd..057080b35e2 100644
--- a/TAO/TAO_IDL/ast/ast_home.cpp
+++ b/TAO/TAO_IDL/ast/ast_home.cpp
@@ -43,8 +43,7 @@ AST_Home::AST_Home (UTL_ScopedName *n,
{
FE_Utils::tmpl_mod_ref_check (this, base_home);
- AST_ValueType *pk =
- AST_ValueType::narrow_from_decl (primary_key);
+ AST_ValueType *pk = dynamic_cast (primary_key);
if (pk != 0)
{
@@ -107,8 +106,7 @@ AST_Home::look_in_supported (UTL_ScopedName *e,
continue;
}
- AST_Interface *i =
- AST_Interface::narrow_from_decl (*is);
+ AST_Interface *i = dynamic_cast (*is);
d = (i)->lookup_by_name_r (e, full_def_only);
@@ -266,21 +264,11 @@ AST_Home::ast_accept (ast_visitor *visitor)
AST_Factory *
AST_Home::fe_add_factory (AST_Factory *f)
{
- return
- AST_Factory::narrow_from_decl (
- this->fe_add_decl (f));
+ return dynamic_cast (this->fe_add_decl (f));
}
AST_Finder *
AST_Home::fe_add_finder (AST_Finder *f)
{
- return
- AST_Finder::narrow_from_decl (
- this->fe_add_decl (f));
+ return dynamic_cast (this->fe_add_decl (f));
}
-
- // Narrowing.
-
-IMPL_NARROW_FROM_DECL(AST_Home)
-IMPL_NARROW_FROM_SCOPE(AST_Home)
-
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index 9e3d780b418..909c3bf602f 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -184,33 +184,25 @@ AST_Interface::is_defined (void)
AST_Constant *
AST_Interface::fe_add_constant (AST_Constant *t)
{
- return
- AST_Constant::narrow_from_decl (
- this->fe_add_decl (t));
+ return dynamic_cast (this->fe_add_decl (t));
}
AST_Exception *
AST_Interface::fe_add_exception (AST_Exception *t)
{
- return
- AST_Exception::narrow_from_decl (
- this->fe_add_decl (t));
+ return dynamic_cast (this->fe_add_decl (t));
}
AST_Attribute *
AST_Interface::fe_add_attribute (AST_Attribute *t)
{
- return
- AST_Attribute::narrow_from_decl (
- this->fe_add_decl (t));
+ return dynamic_cast (this->fe_add_decl (t));
}
AST_Operation *
AST_Interface::fe_add_operation (AST_Operation *t)
{
- return
- AST_Operation::narrow_from_decl (
- this->fe_add_decl (t));
+ return dynamic_cast (this->fe_add_decl (t));
}
AST_Structure *
@@ -228,25 +220,19 @@ AST_Interface::fe_add_structure_fwd (AST_StructureFwd *t)
AST_Enum *
AST_Interface::fe_add_enum (AST_Enum *t)
{
- return
- AST_Enum::narrow_from_decl (
- this->fe_add_decl (t));
+ return dynamic_cast (this->fe_add_decl (t));
}
AST_Union *
AST_Interface::fe_add_union (AST_Union *t)
{
- return
- AST_Union::narrow_from_decl (
- this->fe_add_full_struct_type (t));
+ return dynamic_cast (this->fe_add_full_struct_type (t));
}
AST_UnionFwd *
AST_Interface::fe_add_union_fwd (AST_UnionFwd *t)
{
- return
- AST_UnionFwd::narrow_from_decl (
- this->fe_add_fwd_struct_type (t));
+ return dynamic_cast (this->fe_add_fwd_struct_type (t));
}
// Add an AST_EnumVal node (an enumerator) to this scope.
@@ -257,7 +243,7 @@ AST_EnumVal *
AST_Interface::fe_add_enum_val (AST_EnumVal *t)
{
return
- AST_EnumVal::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -266,7 +252,7 @@ AST_Typedef *
AST_Interface::fe_add_typedef (AST_Typedef *t)
{
return
- AST_Typedef::narrow_from_decl (
+ dynamic_cast (
this->fe_add_ref_decl (t));
}
@@ -274,7 +260,7 @@ AST_Native *
AST_Interface::fe_add_native (AST_Native *t)
{
return
- AST_Native::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -443,7 +429,7 @@ AST_Interface::redef_clash_populate_r (AST_Type *t)
if (nt != AST_Decl::NT_param_holder)
{
AST_Interface *i =
- AST_Interface::narrow_from_decl (t);
+ dynamic_cast (t);
AST_Type **parents = i->inherits ();
long n_parents = i->n_inherits ();
@@ -456,7 +442,7 @@ AST_Interface::redef_clash_populate_r (AST_Type *t)
if (nt == AST_Decl::NT_valuetype || nt == AST_Decl::NT_eventtype)
{
- AST_ValueType *v = AST_ValueType::narrow_from_decl (t);
+ AST_ValueType *v = dynamic_cast (t);
AST_Type **supports = v->supports ();
long n_supports = v->n_supports ();
@@ -467,7 +453,7 @@ AST_Interface::redef_clash_populate_r (AST_Type *t)
}
else if (nt == AST_Decl::NT_component)
{
- AST_Component *c = AST_Component::narrow_from_decl (t);
+ AST_Component *c = dynamic_cast (t);
AST_Type **supports = c->supports ();
long n_supports = c->n_supports ();
@@ -507,7 +493,7 @@ AST_Interface::insert_non_dup (AST_Type *t,
bool abstract_paths_only)
{
AST_Interface *f =
- AST_Interface::narrow_from_decl (t);
+ dynamic_cast (t);
// Now check if the dequeued element has any ancestors. If yes, insert
// them inside the queue making sure that there are no duplicates.
@@ -829,7 +815,7 @@ AST_Interface::look_in_inherited (UTL_ScopedName *e,
nis--, is++)
{
AST_Interface *i =
- AST_Interface::narrow_from_decl (*is);
+ dynamic_cast (*is);
if (i == 0)
{
@@ -897,7 +883,7 @@ AST_Interface::look_in_inherited_local (Identifier *e,
nis--, is++)
{
AST_Interface *i =
- AST_Interface::narrow_from_decl (*is);
+ dynamic_cast (*is);
if (i == 0)
{
@@ -1010,7 +996,7 @@ AST_Interface::analyze_parentage (void)
for (long i = 0; i < this->pd_n_inherits; ++i)
{
AST_Interface *parent =
- AST_Interface::narrow_from_decl (this->pd_inherits[i]);
+ dynamic_cast (this->pd_inherits[i]);
if (parent == 0)
{
@@ -1035,7 +1021,7 @@ AST_Interface::analyze_parentage (void)
while (s != 0)
{
AST_Template_Module *m =
- AST_Template_Module::narrow_from_scope (s);
+ dynamic_cast (s);
if (m != 0)
{
@@ -1151,6 +1137,3 @@ AST_Interface::annotatable () const
{
return true;
}
-
-IMPL_NARROW_FROM_DECL(AST_Interface)
-IMPL_NARROW_FROM_SCOPE(AST_Interface)
diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
index 655008fd030..9eeb47cc4c7 100644
--- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
@@ -136,14 +136,14 @@ AST_InterfaceFwd::full_def_seen (void)
if (AST_Decl::NT_module == s->scope_node_type ())
{
- AST_Module *m = AST_Module::narrow_from_scope (s);
+ AST_Module *m = dynamic_cast (s);
AST_Decl *d =
m->look_in_prev_mods_local (this->local_name (),
false);
if (0 != d)
{
- i = AST_Interface::narrow_from_decl (d);
+ i = dynamic_cast (d);
if (0 != i && i->is_defined ())
{
@@ -156,7 +156,7 @@ AST_InterfaceFwd::full_def_seen (void)
!iter.is_done ();
iter.next ())
{
- i = AST_Interface::narrow_from_decl (iter.item ());
+ i = dynamic_cast (iter.item ());
if (0 != i && this->local_name ()->compare (i->local_name ()))
{
@@ -224,7 +224,7 @@ AST_InterfaceFwd::is_defined (void)
if (!this->is_defined_)
{
AST_Module *m =
- AST_Module::narrow_from_scope (this->defined_in ());
+ dynamic_cast (this->defined_in ());
if (0 != m)
{
@@ -242,7 +242,7 @@ AST_InterfaceFwd::is_defined (void)
}
AST_InterfaceFwd *fwd =
- AST_InterfaceFwd::narrow_from_decl (d);
+ dynamic_cast (d);
// Since fwd_redefinition_helper() is called
// before fe_add_interface(), we can't check
@@ -306,5 +306,3 @@ AST_InterfaceFwd::adjust_found (
return this;
}
-
-IMPL_NARROW_FROM_DECL (AST_InterfaceFwd)
diff --git a/TAO/TAO_IDL/ast/ast_mirror_port.cpp b/TAO/TAO_IDL/ast/ast_mirror_port.cpp
index 640e556d5ea..c9456fa137a 100644
--- a/TAO/TAO_IDL/ast/ast_mirror_port.cpp
+++ b/TAO/TAO_IDL/ast/ast_mirror_port.cpp
@@ -47,6 +47,3 @@ AST_Mirror_Port::ast_accept (ast_visitor *visitor)
{
return visitor->visit_mirror_port (this);
}
-
-IMPL_NARROW_FROM_DECL (AST_Mirror_Port)
-
diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp
index b428d3c5dd6..7161b5b66a4 100644
--- a/TAO/TAO_IDL/ast/ast_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_module.cpp
@@ -131,9 +131,6 @@ AST_Module::destroy (void)
this->AST_Decl::destroy ();
}
-IMPL_NARROW_FROM_DECL(AST_Module)
-IMPL_NARROW_FROM_SCOPE(AST_Module)
-
// Dump this AST_Module node to the ostream o.
void
AST_Module::dump (ACE_OSTREAM_TYPE &o)
@@ -164,7 +161,7 @@ AST_Module::set_has_nested_valuetype (void)
UTL_Scope *parent = this->defined_in ();
if (parent && !this->pd_has_nested_valuetype_)
{
- AST_Module *pm = AST_Module::narrow_from_scope (parent);
+ AST_Module *pm = dynamic_cast (parent);
if (pm)
{
pm->set_has_nested_valuetype ();
@@ -226,7 +223,7 @@ AST_Module::referenced (AST_Decl *e,
return false;
}
- AST_Type *t = AST_Type::narrow_from_decl (d);
+ AST_Type *t = dynamic_cast (d);
return (!t || t->is_defined ());
}
@@ -345,7 +342,7 @@ AST_Module::special_lookup (UTL_ScopedName *e,
AST_PredefinedType *
AST_Module::fe_add_predefined_type (AST_PredefinedType *t)
{
- return AST_PredefinedType::narrow_from_decl (
+ return dynamic_cast (
this->fe_add_decl (t));
}
@@ -393,7 +390,7 @@ AST_Module::fe_add_module (AST_Module *t)
}
// has_ancestor() returns TRUE if both nodes are the same.
- m = AST_Module::narrow_from_decl (d);
+ m = dynamic_cast (d);
if (t != m && t->has_ancestor (d))
{
idl_global->err ()->redefinition_in_scope (t, d);
@@ -464,7 +461,7 @@ AST_Template_Module_Inst *
AST_Module::fe_add_template_module_inst (AST_Template_Module_Inst *t)
{
return
- AST_Template_Module_Inst::narrow_from_decl (
+ dynamic_cast (
this->fe_add_ref_decl (t));
}
@@ -479,7 +476,7 @@ AST_ValueBox *
AST_Module::fe_add_valuebox (AST_ValueBox *t)
{
return
- AST_ValueBox::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -508,7 +505,7 @@ AST_Connector *
AST_Module::fe_add_connector (AST_Connector *t)
{
return
- AST_Connector::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -516,7 +513,7 @@ AST_Home *
AST_Module::fe_add_home (AST_Home *t)
{
return
- AST_Home::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -552,7 +549,7 @@ AST_Constant *
AST_Module::fe_add_constant (AST_Constant *t)
{
return
- AST_Constant::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -560,7 +557,7 @@ AST_Exception *
AST_Module::fe_add_exception (AST_Exception *t)
{
return
- AST_Exception::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -568,7 +565,7 @@ AST_Union *
AST_Module::fe_add_union (AST_Union *t)
{
return
- AST_Union::narrow_from_decl (
+ dynamic_cast (
this->fe_add_full_struct_type (t));
}
@@ -576,7 +573,7 @@ AST_UnionFwd *
AST_Module::fe_add_union_fwd (AST_UnionFwd *t)
{
return
- AST_UnionFwd::narrow_from_decl (
+ dynamic_cast (
this->fe_add_fwd_struct_type (t));
}
@@ -596,7 +593,7 @@ AST_Enum *
AST_Module::fe_add_enum (AST_Enum *t)
{
return
- AST_Enum::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -608,7 +605,7 @@ AST_EnumVal *
AST_Module::fe_add_enum_val (AST_EnumVal *t)
{
return
- AST_EnumVal::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -616,7 +613,7 @@ AST_Typedef *
AST_Module::fe_add_typedef (AST_Typedef *t)
{
return
- AST_Typedef::narrow_from_decl (
+ dynamic_cast (
this->fe_add_ref_decl (t));
}
@@ -624,7 +621,7 @@ AST_Native *
AST_Module::fe_add_native (AST_Native *t)
{
return
- AST_Native::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -632,7 +629,7 @@ AST_PortType *
AST_Module::fe_add_porttype (AST_PortType *t)
{
return
- AST_PortType::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -646,6 +643,6 @@ AST_Annotation_Decl *
AST_Module::fe_add_annotation_decl (
AST_Annotation_Decl *annotation_decl)
{
- return AST_Annotation_Decl::narrow_from_decl (
+ return dynamic_cast (
fe_add_decl (annotation_decl));
}
diff --git a/TAO/TAO_IDL/ast/ast_native.cpp b/TAO/TAO_IDL/ast/ast_native.cpp
index db4cbca8c65..a07ccfc1e33 100644
--- a/TAO/TAO_IDL/ast/ast_native.cpp
+++ b/TAO/TAO_IDL/ast/ast_native.cpp
@@ -45,7 +45,3 @@ AST_Native::ast_accept (ast_visitor *visitor)
{
return visitor->visit_native (this);
}
-
-
-
-IMPL_NARROW_FROM_DECL(AST_Native)
diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp
index d82257840b4..653da88fd75 100644
--- a/TAO/TAO_IDL/ast/ast_operation.cpp
+++ b/TAO/TAO_IDL/ast/ast_operation.cpp
@@ -122,7 +122,7 @@ AST_Operation::AST_Operation (AST_Type *rt,
}
else
{
- pdt = AST_PredefinedType::narrow_from_decl (rt);
+ pdt = dynamic_cast (rt);
if (pdt == 0 || pdt->pt () != AST_PredefinedType::PT_void)
{
@@ -145,7 +145,7 @@ AST_Operation::void_return_type (void)
AST_Type* type = this->return_type ();
return (type->node_type () == AST_Decl::NT_pre_defined
- && (AST_PredefinedType::narrow_from_decl (type)->pt ()
+ && (dynamic_cast (type)->pt ()
== AST_PredefinedType::PT_void));
}
@@ -177,7 +177,7 @@ AST_Operation::count_arguments_with_direction (int direction_mask)
si.next ())
{
AST_Argument *arg =
- AST_Argument::narrow_from_decl (si.item ());
+ dynamic_cast (si.item ());
if ((arg->direction () & direction_mask) != 0)
{
@@ -264,7 +264,7 @@ AST_Operation::compute_argument_attr (void)
{
this->argument_count_++;
- arg = AST_Argument::narrow_from_decl (d);
+ arg = dynamic_cast (d);
if (arg->direction() == AST_Argument::dir_IN ||
arg->direction() == AST_Argument::dir_INOUT)
@@ -273,7 +273,7 @@ AST_Operation::compute_argument_attr (void)
}
- type = AST_Type::narrow_from_decl (arg->field_type ());
+ type = dynamic_cast (arg->field_type ());
if (type->node_type () == AST_Decl::NT_native)
{
@@ -283,7 +283,7 @@ AST_Operation::compute_argument_attr (void)
}
}
- type = AST_Type::narrow_from_decl (this->return_type ());
+ type = dynamic_cast (this->return_type ());
if (type->node_type () == AST_Decl::NT_native)
{
@@ -343,7 +343,7 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t)
case AST_Decl::NT_param_holder:
{
AST_Param_Holder *ph =
- AST_Param_Holder::narrow_from_decl (d);
+ dynamic_cast (d);
nt = ph->info ()->type_;
@@ -359,7 +359,7 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t)
case AST_Decl::NT_typedef:
{
AST_Typedef *td =
- AST_Typedef::narrow_from_decl (d);
+ dynamic_cast (d);
nt = td->primitive_base_type ()->node_type ();
@@ -399,7 +399,7 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t)
bool oneway_op =
(this->flags () == AST_Operation::OP_oneway);
- fe = AST_Type::narrow_from_decl (d);
+ fe = dynamic_cast (d);
if (oneway_op && fe != 0)
{
@@ -446,7 +446,7 @@ AST_Argument *
AST_Operation::fe_add_argument (AST_Argument *t)
{
return
- AST_Argument::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -566,6 +566,3 @@ AST_Operation::annotatable () const
{
return true;
}
-
-IMPL_NARROW_FROM_DECL(AST_Operation)
-IMPL_NARROW_FROM_SCOPE(AST_Operation)
diff --git a/TAO/TAO_IDL/ast/ast_param_holder.cpp b/TAO/TAO_IDL/ast/ast_param_holder.cpp
index a421873ba19..aa4ac97a198 100644
--- a/TAO/TAO_IDL/ast/ast_param_holder.cpp
+++ b/TAO/TAO_IDL/ast/ast_param_holder.cpp
@@ -44,6 +44,3 @@ void
AST_Param_Holder::dump (ACE_OSTREAM_TYPE & /* o */)
{
}
-
-IMPL_NARROW_FROM_DECL (AST_Param_Holder)
-
diff --git a/TAO/TAO_IDL/ast/ast_porttype.cpp b/TAO/TAO_IDL/ast/ast_porttype.cpp
index 28e9cf634c0..96d9f397f1c 100644
--- a/TAO/TAO_IDL/ast/ast_porttype.cpp
+++ b/TAO/TAO_IDL/ast/ast_porttype.cpp
@@ -48,7 +48,7 @@ AST_Provides *
AST_PortType::fe_add_provides (AST_Provides *p)
{
return
- AST_Provides::narrow_from_decl (
+ dynamic_cast (
this->fe_add_ref_decl (p));
}
@@ -56,7 +56,7 @@ AST_Uses *
AST_PortType::fe_add_uses (AST_Uses *u)
{
return
- AST_Uses::narrow_from_decl (
+ dynamic_cast (
this->fe_add_ref_decl (u));
}
@@ -64,10 +64,6 @@ AST_Attribute *
AST_PortType::fe_add_attribute (AST_Attribute *t)
{
return
- AST_Attribute::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
-
-IMPL_NARROW_FROM_DECL (AST_PortType)
-IMPL_NARROW_FROM_SCOPE (AST_PortType)
-
diff --git a/TAO/TAO_IDL/ast/ast_predefined_type.cpp b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
index db6d0923737..8ce1533a825 100644
--- a/TAO/TAO_IDL/ast/ast_predefined_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
@@ -272,7 +272,3 @@ AST_PredefinedType::pt (void)
{
return this->pd_pt;
}
-
-
-
-IMPL_NARROW_FROM_DECL(AST_PredefinedType)
diff --git a/TAO/TAO_IDL/ast/ast_provides.cpp b/TAO/TAO_IDL/ast/ast_provides.cpp
index 07bfd679480..aa7e07267f6 100644
--- a/TAO/TAO_IDL/ast/ast_provides.cpp
+++ b/TAO/TAO_IDL/ast/ast_provides.cpp
@@ -44,5 +44,3 @@ AST_Provides::destroy (void)
{
this->AST_Field::destroy ();
}
-
-IMPL_NARROW_FROM_DECL(AST_Provides)
diff --git a/TAO/TAO_IDL/ast/ast_publishes.cpp b/TAO/TAO_IDL/ast/ast_publishes.cpp
index 07a31eb4d41..7d44b54be22 100644
--- a/TAO/TAO_IDL/ast/ast_publishes.cpp
+++ b/TAO/TAO_IDL/ast/ast_publishes.cpp
@@ -43,5 +43,3 @@ AST_Publishes::destroy (void)
{
this->AST_Field::destroy ();
}
-
-IMPL_NARROW_FROM_DECL(AST_Publishes)
diff --git a/TAO/TAO_IDL/ast/ast_recursive.cpp b/TAO/TAO_IDL/ast/ast_recursive.cpp
index d981d3cddb6..6f483984d17 100644
--- a/TAO/TAO_IDL/ast/ast_recursive.cpp
+++ b/TAO/TAO_IDL/ast/ast_recursive.cpp
@@ -120,7 +120,7 @@ AST_illegal_recursive_type (AST_Decl *t)
}
AST_Decl::NodeType nt;
- AST_Type *ut = AST_Type::narrow_from_decl (t);
+ AST_Type *ut = dynamic_cast (t);
if (ut != 0)
{
@@ -152,7 +152,7 @@ AST_illegal_recursive_type (AST_Decl *t)
if (t->node_type () == AST_Decl::NT_struct)
{
check_for_struct = true;
- st1 = AST_Structure::narrow_from_decl (t);
+ st1 = dynamic_cast (t);
if (st1 == 0)
{
@@ -162,7 +162,7 @@ AST_illegal_recursive_type (AST_Decl *t)
else if (t->node_type () == AST_Decl::NT_union)
{
check_for_union = true;
- un1 = AST_Union::narrow_from_decl (t);
+ un1 = dynamic_cast (t);
if (un1 == 0)
{
@@ -192,7 +192,7 @@ AST_illegal_recursive_type (AST_Decl *t)
if (s->scope_node_type () == AST_Decl::NT_struct
&& check_for_struct == true)
{
- st2 = AST_Structure::narrow_from_scope (s);
+ st2 = dynamic_cast (s);
if (st2 != 0 && st2 == st1)
{
@@ -202,7 +202,7 @@ AST_illegal_recursive_type (AST_Decl *t)
else if (s->scope_node_type () == AST_Decl::NT_union
&& check_for_union == true)
{
- un2 = AST_Union::narrow_from_scope (s);
+ un2 = dynamic_cast (s);
if (un2 != 0 && un2 == un1)
{
diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp
index 220b85babc3..51106457bd3 100644
--- a/TAO/TAO_IDL/ast/ast_root.cpp
+++ b/TAO/TAO_IDL/ast/ast_root.cpp
@@ -220,6 +220,3 @@ AST_Root::fini (void)
this->UTL_Scope::destroy ();
this->AST_Decl::destroy ();
}
-
-IMPL_NARROW_FROM_DECL(AST_Root)
-IMPL_NARROW_FROM_SCOPE(AST_Root)
diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp
index 0ab4820c2da..6d1c20adb60 100644
--- a/TAO/TAO_IDL/ast/ast_sequence.cpp
+++ b/TAO/TAO_IDL/ast/ast_sequence.cpp
@@ -114,7 +114,7 @@ AST_Sequence::AST_Sequence (AST_Expression *ms,
if (bnt == AST_Decl::NT_param_holder)
{
AST_Param_Holder *ph =
- AST_Param_Holder::narrow_from_decl (bt);
+ dynamic_cast (bt);
if (ph->info ()->type_ == AST_Decl::NT_const)
{
@@ -159,7 +159,7 @@ AST_Sequence::in_recursion (ACE_Unbounded_Queue &list)
list.enqueue_tail(this);
- AST_Type *type = AST_Type::narrow_from_decl (this->base_type ());
+ AST_Type *type = dynamic_cast (this->base_type ());
if (type == 0)
{
@@ -173,7 +173,7 @@ AST_Sequence::in_recursion (ACE_Unbounded_Queue &list)
if (nt == AST_Decl::NT_typedef)
{
- AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
+ AST_Typedef *td = dynamic_cast (type);
type = td->primitive_base_type ();
nt = type->node_type ();
}
@@ -281,8 +281,6 @@ AST_Sequence::destroy (void)
this->AST_ConcreteType::destroy ();
}
-IMPL_NARROW_FROM_DECL(AST_Sequence)
-
AST_Annotation_Appls &
AST_Sequence::base_type_annotations ()
{
diff --git a/TAO/TAO_IDL/ast/ast_string.cpp b/TAO/TAO_IDL/ast/ast_string.cpp
index 18366d6d89f..21b82bade87 100644
--- a/TAO/TAO_IDL/ast/ast_string.cpp
+++ b/TAO/TAO_IDL/ast/ast_string.cpp
@@ -192,7 +192,3 @@ AST_String::width (void)
{
return this->pd_width;
}
-
-
-
-IMPL_NARROW_FROM_DECL(AST_String)
diff --git a/TAO/TAO_IDL/ast/ast_structure.cpp b/TAO/TAO_IDL/ast/ast_structure.cpp
index 0bd62aa3c8c..401abd7dd93 100644
--- a/TAO/TAO_IDL/ast/ast_structure.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure.cpp
@@ -159,7 +159,7 @@ AST_Structure::in_recursion (ACE_Unbounded_Queue &list)
!si.is_done ();
si.next ())
{
- AST_Field *field = AST_Field::narrow_from_decl (si.item ());
+ AST_Field *field = dynamic_cast (si.item ());
if (field == 0)
// This will be an enum value or other legitimate non-field
@@ -172,7 +172,7 @@ AST_Structure::in_recursion (ACE_Unbounded_Queue &list)
if (type->node_type () == AST_Decl::NT_typedef)
{
- AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
+ AST_Typedef *td = dynamic_cast (type);
type = td->primitive_base_type ();
}
@@ -300,7 +300,7 @@ AST_Structure::legal_for_primary_key (void) const
!si.is_done ();
si.next ())
{
- AST_Field *f = AST_Field::narrow_from_decl (si.item ());
+ AST_Field *f = dynamic_cast (si.item ());
if (f != 0 && !f->field_type ()->legal_for_primary_key ())
{
@@ -351,7 +351,7 @@ AST_Union *
AST_Structure::fe_add_union (AST_Union *t)
{
return
- AST_Union::narrow_from_decl (
+ dynamic_cast (
this->fe_add_full_struct_type (t));
}
@@ -359,7 +359,7 @@ AST_Enum *
AST_Structure::fe_add_enum (AST_Enum *t)
{
return
- AST_Enum::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -371,7 +371,7 @@ AST_EnumVal *
AST_Structure::fe_add_enum_val (AST_EnumVal *t)
{
return
- AST_EnumVal::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -450,7 +450,7 @@ AST_Structure::fwd_redefinition_helper (AST_Structure *&i,
|| nt == AST_Decl::NT_union_fwd)
{
AST_StructureFwd *fwd_def =
- AST_StructureFwd::narrow_from_decl (d);
+ dynamic_cast (d);
fd = fwd_def->full_definition ();
}
@@ -458,7 +458,7 @@ AST_Structure::fwd_redefinition_helper (AST_Structure *&i,
else if (nt == AST_Decl::NT_struct
|| nt == AST_Decl::NT_union)
{
- fd = AST_Structure::narrow_from_decl (d);
+ fd = dynamic_cast (d);
}
// Successful?
@@ -552,7 +552,7 @@ AST_Structure::compute_size_type (void)
continue;
}
- AST_Field *f = AST_Field::narrow_from_decl (d);
+ AST_Field *f = dynamic_cast (d);
AST_Type *t = f->field_type ();
if (t != 0)
@@ -566,7 +566,7 @@ AST_Structure::compute_size_type (void)
{
ACE_DEBUG ((LM_DEBUG,
"WARNING (%N:%l) be_structure::compute_size_type - "
- "narrow_from_decl returned 0\n"));
+ "dynamic_cast returned 0\n"));
}
}
@@ -586,9 +586,6 @@ AST_Structure::destroy (void)
this->UTL_Scope::destroy ();
}
-IMPL_NARROW_FROM_DECL(AST_Structure)
-IMPL_NARROW_FROM_SCOPE(AST_Structure)
-
bool AST_Structure::annotatable () const
{
return true;
diff --git a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
index 6f444e67dae..ea9771c9770 100644
--- a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
@@ -109,5 +109,3 @@ AST_StructureFwd::adjust_found (
return this;
}
-
-IMPL_NARROW_FROM_DECL (AST_StructureFwd)
diff --git a/TAO/TAO_IDL/ast/ast_template_module.cpp b/TAO/TAO_IDL/ast/ast_template_module.cpp
index 364040dc4ca..254a1c5b275 100644
--- a/TAO/TAO_IDL/ast/ast_template_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_template_module.cpp
@@ -62,7 +62,7 @@ AST_Template_Module::match_arg_names (FE_Utils::T_ARGLIST *args)
if (d->node_type () == AST_Decl::NT_typedef)
{
AST_Typedef *td =
- AST_Typedef::narrow_from_decl (d);
+ dynamic_cast (d);
d = td->primitive_base_type ();
}
@@ -78,7 +78,7 @@ AST_Template_Module::match_arg_names (FE_Utils::T_ARGLIST *args)
if (n == 0)
{
AST_Constant *c =
- AST_Constant::narrow_from_decl (d);
+ dynamic_cast (d);
s = c->exprtype_to_string ();
}
@@ -105,7 +105,7 @@ AST_Template_Module::match_param_refs (UTL_StrList *refs,
while (enclosing == 0 && s != 0)
{
- enclosing = AST_Template_Module::narrow_from_scope (s);
+ enclosing = dynamic_cast (s);
s = ScopeAsDecl (s)->defined_in ();
}
@@ -162,7 +162,7 @@ AST_Template_Module::fe_add_template_module_ref (
AST_Template_Module_Ref *m)
{
return
- AST_Template_Module_Ref::narrow_from_decl (
+ dynamic_cast (
this->fe_add_ref_decl (m));
}
@@ -182,7 +182,7 @@ AST_Template_Module::match_one_param (FE_Utils::T_Param_Info *param,
if (d->node_type () == AST_Decl::NT_typedef)
{
- AST_Typedef *td = AST_Typedef::narrow_from_decl (d);
+ AST_Typedef *td = dynamic_cast (d);
d = td->primitive_base_type ();
}
@@ -191,7 +191,7 @@ AST_Template_Module::match_one_param (FE_Utils::T_Param_Info *param,
if (other_type == AST_Decl::NT_const)
{
AST_Constant *c =
- AST_Constant::narrow_from_decl (d);
+ dynamic_cast (d);
AST_Expression *ex = c->constant_value ();
@@ -278,7 +278,3 @@ AST_Template_Module::match_param_by_type (
return false;
}
-
-IMPL_NARROW_FROM_DECL (AST_Template_Module)
-IMPL_NARROW_FROM_SCOPE (AST_Template_Module)
-
diff --git a/TAO/TAO_IDL/ast/ast_template_module_inst.cpp b/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
index 1156d1b020d..6f0a4874149 100644
--- a/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
+++ b/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
@@ -28,7 +28,7 @@ AST_Template_Module *
AST_Template_Module_Inst::ref (void) const
{
return
- AST_Template_Module::narrow_from_decl (this->field_type ());
+ dynamic_cast (this->field_type ());
}
FE_Utils::T_ARGLIST const *
@@ -58,6 +58,3 @@ AST_Template_Module_Inst::ast_accept (ast_visitor *visitor)
{
return visitor->visit_template_module_inst (this);
}
-
-IMPL_NARROW_FROM_DECL (AST_Template_Module_Inst)
-
diff --git a/TAO/TAO_IDL/ast/ast_template_module_ref.cpp b/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
index 4110fe518d6..b3152255c38 100644
--- a/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
+++ b/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
@@ -31,7 +31,7 @@ AST_Template_Module *
AST_Template_Module_Ref::ref (void) const
{
return
- AST_Template_Module::narrow_from_decl (this->field_type ());
+ dynamic_cast (this->field_type ());
}
UTL_StrList *
@@ -87,6 +87,3 @@ AST_Template_Module_Ref::processed (bool val)
{
this->processed_ = val;
}
-
-IMPL_NARROW_FROM_DECL (AST_Template_Module_Ref)
-
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp
index 899ab6257ca..f9cb40d2297 100644
--- a/TAO/TAO_IDL/ast/ast_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_type.cpp
@@ -217,7 +217,7 @@ AST_Type::unaliased_type (void)
while (nt == AST_Decl::NT_typedef)
{
- td = AST_Typedef::narrow_from_decl (t);
+ td = dynamic_cast (t);
t = td->base_type ();
nt = t->node_type ();
}
@@ -542,5 +542,3 @@ AST_Type::destroy (void)
this->AST_Decl::destroy ();
}
-
-IMPL_NARROW_FROM_DECL(AST_Type)
diff --git a/TAO/TAO_IDL/ast/ast_typedef.cpp b/TAO/TAO_IDL/ast/ast_typedef.cpp
index 4d682812334..d54bd51ec86 100644
--- a/TAO/TAO_IDL/ast/ast_typedef.cpp
+++ b/TAO/TAO_IDL/ast/ast_typedef.cpp
@@ -111,8 +111,8 @@ AST_Typedef::primitive_base_type (void) const
while (d && d->node_type () == AST_Decl::NT_typedef)
{
- temp = AST_Typedef::narrow_from_decl (d);
- d = AST_Type::narrow_from_decl (temp->base_type ());
+ temp = dynamic_cast (d);
+ d = dynamic_cast (temp->base_type ());
}
return d;
@@ -196,8 +196,6 @@ AST_Typedef::destroy (void)
this->AST_Type::destroy ();
}
-IMPL_NARROW_FROM_DECL(AST_Typedef)
-
AST_Annotation_Appls &
AST_Typedef::annotations ()
{
diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp
index ba352d8d7e6..7db3dbf9ba0 100644
--- a/TAO/TAO_IDL/ast/ast_union.cpp
+++ b/TAO/TAO_IDL/ast/ast_union.cpp
@@ -123,7 +123,7 @@ AST_Union::AST_Union (AST_ConcreteType *dt,
// the pd_udisc_type field.
if (dt->node_type () == AST_Decl::NT_pre_defined)
{
- pdt = AST_PredefinedType::narrow_from_decl (dt);
+ pdt = dynamic_cast (dt);
if (pdt == 0)
{
@@ -200,7 +200,7 @@ AST_Union::~AST_Union (void)
void
AST_Union::redefine (AST_Structure *from)
{
- AST_Union *u = AST_Union::narrow_from_decl (from);
+ AST_Union *u = dynamic_cast (from);
if (u == 0)
{
@@ -266,7 +266,7 @@ AST_Union::in_recursion (ACE_Unbounded_Queue &list)
si.next ())
{
AST_UnionBranch *field =
- AST_UnionBranch::narrow_from_decl (si.item ());
+ dynamic_cast (si.item ());
if (field == 0)
// This will be an enum value or other legitimate non-field
@@ -279,7 +279,7 @@ AST_Union::in_recursion (ACE_Unbounded_Queue &list)
if (type->node_type () == AST_Decl::NT_typedef)
{
- AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
+ AST_Typedef *td = dynamic_cast (type);
type = td->primitive_base_type ();
}
@@ -323,7 +323,7 @@ AST_Union::lookup_default (void)
if (d->node_type () == AST_Decl::NT_union_branch)
{
- b = AST_UnionBranch::narrow_from_decl (d);
+ b = dynamic_cast (d);
if (b == 0)
{
@@ -375,7 +375,7 @@ AST_Union::lookup_label (AST_UnionBranch *b)
if (d->node_type () == AST_Decl::NT_union_branch)
{
- fb = AST_UnionBranch::narrow_from_decl (d);
+ fb = dynamic_cast (d);
if (fb == 0)
{
@@ -405,7 +405,7 @@ AST_Union::lookup_enum (AST_UnionBranch *b)
{
AST_UnionLabel *label = b->label();
AST_Expression *lv = label->label_val ();
- AST_Enum *e = AST_Enum::narrow_from_decl (this->pd_disc_type);
+ AST_Enum *e = dynamic_cast (this->pd_disc_type);
AST_Decl *d = 0;
AST_UnionBranch *fb = 0;
@@ -450,7 +450,7 @@ AST_Union::lookup_enum (AST_UnionBranch *b)
if (d->node_type () == AST_Decl::NT_union_branch)
{
- fb = AST_UnionBranch::narrow_from_decl (d);
+ fb = dynamic_cast (d);
if (fb == 0)
{
@@ -549,7 +549,7 @@ AST_Union::compute_default_value (void)
{
// Get the next AST decl node.
AST_UnionBranch *ub =
- AST_UnionBranch::narrow_from_decl (si.item ());
+ dynamic_cast (si.item ());
if (ub != 0)
{
@@ -716,7 +716,7 @@ AST_Union::compute_default_value (void)
{
// Get the next AST decl node
AST_UnionBranch *ub =
- AST_UnionBranch::narrow_from_decl (si.item ());
+ dynamic_cast (si.item ());
if (ub != 0)
{
@@ -895,7 +895,7 @@ AST_Union::compute_default_index (void)
if (!d->imported ())
{
- ub = AST_UnionBranch::narrow_from_decl (d);
+ ub = dynamic_cast (d);
for (unsigned long j = 0; j < ub->label_list_length (); ++j)
{
@@ -925,7 +925,7 @@ AST_UnionBranch *
AST_Union::fe_add_union_branch (AST_UnionBranch *t)
{
return
- AST_UnionBranch::narrow_from_decl (
+ dynamic_cast (
this->fe_add_ref_decl (t));
}
@@ -933,7 +933,7 @@ AST_Union *
AST_Union::fe_add_union (AST_Union *t)
{
return
- AST_Union::narrow_from_decl (
+ dynamic_cast (
this->fe_add_full_struct_type (t));
}
@@ -947,7 +947,7 @@ AST_Enum *
AST_Union::fe_add_enum (AST_Enum *t)
{
return
- AST_Enum::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -959,7 +959,7 @@ AST_EnumVal *
AST_Union::fe_add_enum_val (AST_EnumVal *t)
{
return
- AST_EnumVal::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (t));
}
@@ -1001,7 +1001,7 @@ AST_Union::compute_size_type (void)
continue;
}
- AST_Field *f = AST_Field::narrow_from_decl (d);
+ AST_Field *f = dynamic_cast (d);
if (f != 0)
{
@@ -1016,7 +1016,7 @@ AST_Union::compute_size_type (void)
{
ACE_DEBUG ((LM_DEBUG,
"WARNING (%N:%l) be_union::compute_size_type - "
- "narrow_from_decl returned 0\n"));
+ "dynamic_cast returned 0\n"));
}
}
@@ -1043,9 +1043,6 @@ AST_Union::udisc_type (void)
return this->pd_udisc_type;
}
-IMPL_NARROW_FROM_DECL(AST_Union)
-IMPL_NARROW_FROM_SCOPE(AST_Union)
-
AST_Annotation_Appls &
AST_Union::disc_annotations ()
{
diff --git a/TAO/TAO_IDL/ast/ast_union_branch.cpp b/TAO/TAO_IDL/ast/ast_union_branch.cpp
index e0a205b9a87..19c0291fa1c 100644
--- a/TAO/TAO_IDL/ast/ast_union_branch.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_branch.cpp
@@ -211,7 +211,7 @@ AST_UnionBranch::add_labels (AST_Union *u)
if (enum_labels)
{
ex->ev ()->et = AST_Expression::EV_enum;
- AST_Enum *disc = AST_Enum::narrow_from_decl (u->disc_type ());
+ AST_Enum *disc = dynamic_cast (u->disc_type ());
AST_EnumVal *dval = disc->lookup_by_value (ex);
if (dval == 0)
@@ -241,5 +241,3 @@ AST_UnionBranch::coerce_labels (AST_Union *u)
lv->set_ev (lv->coerce (u->udisc_type ()));
}
}
-
-IMPL_NARROW_FROM_DECL(AST_UnionBranch)
diff --git a/TAO/TAO_IDL/ast/ast_union_fwd.cpp b/TAO/TAO_IDL/ast/ast_union_fwd.cpp
index df21ba3993a..97aa9e76881 100644
--- a/TAO/TAO_IDL/ast/ast_union_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_fwd.cpp
@@ -48,7 +48,3 @@ AST_UnionFwd::destroy (void)
{
this->AST_StructureFwd::destroy ();
}
-
-
-
-IMPL_NARROW_FROM_DECL (AST_UnionFwd)
diff --git a/TAO/TAO_IDL/ast/ast_uses.cpp b/TAO/TAO_IDL/ast/ast_uses.cpp
index 630a313f9ff..b770da8229a 100644
--- a/TAO/TAO_IDL/ast/ast_uses.cpp
+++ b/TAO/TAO_IDL/ast/ast_uses.cpp
@@ -52,5 +52,3 @@ AST_Uses::destroy (void)
{
this->AST_Field::destroy ();
}
-
-IMPL_NARROW_FROM_DECL(AST_Uses)
diff --git a/TAO/TAO_IDL/ast/ast_valuebox.cpp b/TAO/TAO_IDL/ast/ast_valuebox.cpp
index 9502a41a4ae..87ea113e996 100644
--- a/TAO/TAO_IDL/ast/ast_valuebox.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuebox.cpp
@@ -49,7 +49,3 @@ AST_ValueBox::destroy (void)
{
this->AST_ConcreteType::destroy ();
}
-
-IMPL_NARROW_FROM_DECL(AST_ValueBox)
-
-
diff --git a/TAO/TAO_IDL/ast/ast_valuetype.cpp b/TAO/TAO_IDL/ast/ast_valuetype.cpp
index 2f27d8ed3e6..a80a9836ef2 100644
--- a/TAO/TAO_IDL/ast/ast_valuetype.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuetype.cpp
@@ -143,7 +143,7 @@ AST_ValueType::in_recursion (ACE_Unbounded_Queue &list)
0);
}
- AST_Field *field = AST_Field::narrow_from_decl (d);
+ AST_Field *field = dynamic_cast (d);
if (field == 0)
{
@@ -162,7 +162,7 @@ AST_ValueType::in_recursion (ACE_Unbounded_Queue &list)
if (type->node_type () == AST_Decl::NT_typedef)
{
- AST_Typedef *td = AST_Typedef::narrow_from_decl (type);
+ AST_Typedef *td = dynamic_cast (type);
type = td->primitive_base_type ();
}
@@ -186,7 +186,7 @@ AST_ValueType::in_recursion (ACE_Unbounded_Queue &list)
void
AST_ValueType::redefine (AST_Interface *from)
{
- AST_ValueType *vt = AST_ValueType::narrow_from_decl (from);
+ AST_ValueType *vt = dynamic_cast (from);
if (vt == 0)
{
@@ -276,7 +276,7 @@ AST_ValueType::look_in_supported (UTL_ScopedName *e,
}
AST_Interface *i =
- AST_Interface::narrow_from_decl (*is);
+ dynamic_cast (*is);
d = (i)->lookup_by_name_r (e, full_def_only);
@@ -357,7 +357,7 @@ AST_ValueType::legal_for_primary_key (void) const
!i.is_done ();
i.next ())
{
- AST_Field *f = AST_Field::narrow_from_decl (i.item ());
+ AST_Field *f = dynamic_cast (i.item ());
// We're not interested in any valuetype decls that aren't fields.
if (f == 0)
@@ -478,7 +478,7 @@ AST_Factory *
AST_ValueType::fe_add_factory (AST_Factory *f)
{
return
- AST_Factory::narrow_from_decl (
+ dynamic_cast (
this->fe_add_decl (f));
}
@@ -497,7 +497,7 @@ AST_ValueType::derived_from_primary_key_base (const AST_ValueType *node,
}
AST_ValueType *concrete_parent =
- AST_ValueType::narrow_from_decl (node->inherits_concrete ());
+ dynamic_cast (node->inherits_concrete ());
if (this->derived_from_primary_key_base (concrete_parent, pk_base))
{
@@ -508,7 +508,7 @@ AST_ValueType::derived_from_primary_key_base (const AST_ValueType *node,
for (long i = 0; i < node->pd_n_inherits; ++i)
{
- AST_ValueType *tmp = AST_ValueType::narrow_from_decl (v[i]);
+ AST_ValueType *tmp = dynamic_cast (v[i]);
if (this->derived_from_primary_key_base (tmp, pk_base))
{
@@ -543,7 +543,7 @@ AST_ValueType::lookup_primary_key_base (void) const
return 0;
}
- retval = AST_ValueType::narrow_from_decl (d);
+ retval = dynamic_cast (d);
if (retval == 0)
{
@@ -556,7 +556,3 @@ AST_ValueType::lookup_primary_key_base (void) const
return retval;
}
-
-IMPL_NARROW_FROM_DECL(AST_ValueType)
-IMPL_NARROW_FROM_SCOPE(AST_ValueType)
-
diff --git a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
index 89b8a902a2c..09c082c9f20 100644
--- a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
@@ -50,7 +50,3 @@ AST_ValueTypeFwd::destroy (void)
{
this->AST_InterfaceFwd::destroy ();
}
-
-
-
-IMPL_NARROW_FROM_DECL (AST_ValueTypeFwd)
diff --git a/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp b/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp
index 0a6132034c6..6ef4ba5333d 100644
--- a/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp
+++ b/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp
@@ -349,7 +349,7 @@ ast_visitor_reifying::visit_array (AST_Array *node)
-1);
}
- bt = AST_Type::narrow_from_decl (this->reified_node_);
+ bt = dynamic_cast (this->reified_node_);
AST_Expression **dims = node->dims ();
AST_Expression *v = 0;
@@ -379,7 +379,7 @@ ast_visitor_reifying::visit_array (AST_Array *node)
}
AST_Constant *c =
- AST_Constant::narrow_from_decl (this->reified_node_);
+ dynamic_cast (this->reified_node_);
ACE_NEW_RETURN (v,
AST_Expression (c->constant_value (),
@@ -448,7 +448,7 @@ ast_visitor_reifying::visit_sequence (AST_Sequence *node)
-1);
}
- bt = AST_Type::narrow_from_decl (this->reified_node_);
+ bt = dynamic_cast (this->reified_node_);
AST_Expression *v = node->max_size ();
AST_Param_Holder *ph = v->param_holder ();
@@ -466,7 +466,7 @@ ast_visitor_reifying::visit_sequence (AST_Sequence *node)
}
AST_Constant *c =
- AST_Constant::narrow_from_decl (this->reified_node_);
+ dynamic_cast (this->reified_node_);
v = c->constant_value ();
}
@@ -516,7 +516,7 @@ ast_visitor_reifying::visit_string (AST_String *node)
}
AST_Constant *c =
- AST_Constant::narrow_from_decl (this->reified_node_);
+ dynamic_cast (this->reified_node_);
b = c->constant_value ();
}
@@ -645,7 +645,7 @@ ast_visitor_reifying::template_module_rel_name (AST_Decl *d)
while (tmp != 0)
{
- if (AST_Template_Module::narrow_from_decl (tmp) != 0)
+ if (dynamic_cast (tmp) != 0)
{
ACE_CString head (tmp->local_name ()->get_string ());
diff --git a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
index 5edba8b1543..c26e5abf6e0 100644
--- a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
+++ b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
@@ -264,7 +264,7 @@ ast_visitor_tmpl_module_inst::visit_provides (AST_Provides *node)
UTL_ScopedName sn (node->local_name (), 0);
AST_Type *p_type =
- AST_Type::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->provides_type ()));
AST_Provides *added_provides =
@@ -282,7 +282,7 @@ ast_visitor_tmpl_module_inst::visit_uses (AST_Uses *node)
UTL_ScopedName sn (node->local_name (), 0);
AST_Type *u_type =
- AST_Type::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->uses_type ()));
AST_Uses *added_uses =
@@ -301,7 +301,7 @@ ast_visitor_tmpl_module_inst::visit_publishes (AST_Publishes *node)
UTL_ScopedName sn (node->local_name (), 0);
AST_Type *p_type =
- AST_Type::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->publishes_type ()));
AST_Publishes *added_publishes =
@@ -319,7 +319,7 @@ ast_visitor_tmpl_module_inst::visit_emits (AST_Emits *node)
UTL_ScopedName sn (node->local_name (), 0);
AST_Type *e_type =
- AST_Type::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->emits_type ()));
AST_Emits *added_emits =
@@ -336,7 +336,7 @@ ast_visitor_tmpl_module_inst::visit_consumes (AST_Consumes *node)
UTL_ScopedName sn (node->local_name (), 0);
AST_Type *c_type =
- AST_Type::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->consumes_type ()));
AST_Consumes *added_consumes =
@@ -352,7 +352,7 @@ ast_visitor_tmpl_module_inst::visit_extended_port (
AST_Extended_Port *node)
{
AST_PortType *pt =
- AST_PortType::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->port_type ()));
UTL_ScopedName sn (node->local_name (), 0);
@@ -370,7 +370,7 @@ ast_visitor_tmpl_module_inst::visit_mirror_port (
AST_Mirror_Port *node)
{
AST_PortType *pt =
- AST_PortType::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->port_type ()));
UTL_ScopedName sn (node->local_name (), 0);
@@ -387,7 +387,7 @@ int
ast_visitor_tmpl_module_inst::visit_connector (AST_Connector *node)
{
AST_Connector *parent =
- AST_Connector::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->base_connector ()));
UTL_ScopedName sn (node->local_name (), 0);
@@ -432,7 +432,7 @@ ast_visitor_tmpl_module_inst::visit_home (AST_Home *node)
UTL_ScopedName *managed_comp_name = 0;
AST_Component *managed_comp =
- AST_Component::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->managed_component ()));
if (managed_comp != 0)
@@ -443,7 +443,7 @@ ast_visitor_tmpl_module_inst::visit_home (AST_Home *node)
UTL_ScopedName *p_key_name = 0;
AST_ValueType *p_key =
- AST_ValueType::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->primary_key ()));
if (p_key != 0)
@@ -593,7 +593,7 @@ int
ast_visitor_tmpl_module_inst::visit_union_branch (AST_UnionBranch *node)
{
AST_Type *ft =
- AST_Type::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->field_type ()));
UTL_ScopedName sn (node->local_name (), 0);
@@ -608,7 +608,7 @@ ast_visitor_tmpl_module_inst::visit_union_branch (AST_UnionBranch *node)
// add_to_scope() so we need to reuse it.
AST_Union *u =
- AST_Union::narrow_from_scope (idl_global->scopes ().top ());
+ dynamic_cast (idl_global->scopes ().top ());
u->fe_add_union_branch (added_branch);
@@ -684,7 +684,7 @@ ast_visitor_tmpl_module_inst::visit_module (AST_Module *node)
added_module->from_inst (this->tmi_);
AST_Module *m =
- AST_Module::narrow_from_scope (idl_global->scopes ().top ());
+ dynamic_cast (idl_global->scopes ().top ());
m->fe_add_module (added_module);
@@ -752,7 +752,7 @@ ast_visitor_tmpl_module_inst::visit_template_module_inst (
// Add the new module to the scope containing the template
// module instantiation.
AST_Module *m =
- AST_Module::narrow_from_scope (idl_global->scopes ().top ());
+ dynamic_cast (idl_global->scopes ().top ());
m->fe_add_module (instance);
@@ -959,7 +959,7 @@ int
ast_visitor_tmpl_module_inst::visit_attribute (AST_Attribute *node)
{
AST_Type *ft =
- AST_Type::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->field_type ()));
AST_Attribute *added_attr =
@@ -988,7 +988,7 @@ int
ast_visitor_tmpl_module_inst::visit_operation (AST_Operation *node)
{
AST_Type *rt =
- AST_Type::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->return_type ()));
Identifier id (node->local_name ()->get_string ());
@@ -1030,7 +1030,7 @@ int
ast_visitor_tmpl_module_inst::visit_argument (AST_Argument *node)
{
AST_Type *t =
- AST_Type::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->field_type ()));
if (t == 0)
@@ -1056,7 +1056,7 @@ int
ast_visitor_tmpl_module_inst::visit_typedef (AST_Typedef *node)
{
AST_Type *bt =
- AST_Type::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->base_type ()));
UTL_ScopedName sn (node->local_name (), 0);
@@ -1096,7 +1096,7 @@ ast_visitor_tmpl_module_inst::visit_constant (AST_Constant *node)
}
AST_Constant *c =
- AST_Constant::narrow_from_decl (rv.reified_node ());
+ dynamic_cast (rv.reified_node ());
/// We don't use the reified node's ExprType here, since
/// it was created from a template arg that (for const
@@ -1162,7 +1162,7 @@ int
ast_visitor_tmpl_module_inst::visit_field (AST_Field *node)
{
AST_Type *t =
- AST_Type::narrow_from_decl (
+ dynamic_cast (
this->reify_type (node->field_type ()));
AST_Field *added_field =
@@ -1287,7 +1287,7 @@ ast_visitor_tmpl_module_inst::reify_exception_list (
i.next ())
{
AST_Type *ex =
- AST_Type::narrow_from_decl (this->reify_type (i.item ()));
+ dynamic_cast (this->reify_type (i.item ()));
UTL_ExceptList *ex_list = 0;
ACE_NEW_RETURN (ex_list,
@@ -1316,7 +1316,7 @@ ast_visitor_tmpl_module_inst::create_name_list (AST_Type **list,
for (long i = 0; i < length; ++i)
{
AST_Type *item =
- AST_Type::narrow_from_decl (this->reify_type (list[i]));
+ dynamic_cast (this->reify_type (list[i]));
// We copy each name added so we can call destroy() on the
// list, which disposes of the contents as well as the
diff --git a/TAO/TAO_IDL/be/be_argument.cpp b/TAO/TAO_IDL/be/be_argument.cpp
index 9d1ceb84907..5a22098460c 100644
--- a/TAO/TAO_IDL/be/be_argument.cpp
+++ b/TAO/TAO_IDL/be/be_argument.cpp
@@ -46,7 +46,7 @@ be_argument::be_argument (AST_Argument::Direction d,
&& !dcl->is_local ()
&& (idl_global->in_main_file () || dcl->is_abstract ()))
{
- be_type *bt = be_type::narrow_from_decl (ft);
+ be_type *bt = dynamic_cast (ft);
bt->seen_in_operation (true);
be_util::set_arg_seen_bit (bt);
idl_global->need_skeleton_includes_ = true;
@@ -66,5 +66,3 @@ be_argument::destroy (void)
this->be_decl::destroy ();
this->AST_Argument::destroy ();
}
-
-IMPL_NARROW_FROM_DECL (be_argument)
diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp
index 5c7ef0972f2..b7013e03ae0 100644
--- a/TAO/TAO_IDL/be/be_array.cpp
+++ b/TAO/TAO_IDL/be/be_array.cpp
@@ -69,7 +69,7 @@ be_array::create_name (void)
NAMEBUFSIZE);
// Retrieve the base type.
// The name always starts this way.
- be_type *bt = be_type::narrow_from_decl (this->base_type ());
+ be_type *bt = dynamic_cast (this->base_type ());
if (!bt)
{
@@ -116,7 +116,7 @@ be_array::create_name (void)
}
// Now see if we have a fully scoped name and if so, generate one.
- scope = be_scope::narrow_from_scope (this->defined_in ())->decl ();
+ scope = dynamic_cast (this->defined_in ())->decl ();
if (scope)
{
@@ -239,7 +239,7 @@ void
be_array::gen_ostream_operator (TAO_OutStream *os,
bool use_underscore)
{
- be_scope* scope = be_scope::narrow_from_scope (this->defined_in ());
+ be_scope* scope = dynamic_cast (this->defined_in ());
be_decl* parent = scope->decl ();
ACE_CString arg_name (ACE_CString (parent->full_name ())
+ "::"
@@ -288,7 +288,7 @@ be_array::gen_ostream_operator (TAO_OutStream *os,
instance_name += "]";
}
- be_type *bt = be_type::narrow_from_decl (this->base_type ());
+ be_type *bt = dynamic_cast (this->base_type ());
bt->gen_member_ostream_operator (os,
instance_name.c_str (),
use_underscore,
@@ -314,7 +314,7 @@ be_array::gen_member_ostream_operator (TAO_OutStream *os,
bool use_underscore,
bool accessor)
{
- be_scope* scope = be_scope::narrow_from_scope (this->defined_in ());
+ be_scope* scope = dynamic_cast (this->defined_in ());
be_decl* parent = scope->decl ();
ACE_CString decl_name (ACE_CString (parent->full_name ())
+ "::"
@@ -346,7 +346,3 @@ be_array::destroy (void)
this->be_type::destroy ();
this->AST_Array::destroy ();
}
-
-
-
-IMPL_NARROW_FROM_DECL (be_array)
diff --git a/TAO/TAO_IDL/be/be_attribute.cpp b/TAO/TAO_IDL/be/be_attribute.cpp
index 3e0931ae0bf..95a4fde944e 100644
--- a/TAO/TAO_IDL/be/be_attribute.cpp
+++ b/TAO/TAO_IDL/be/be_attribute.cpp
@@ -44,7 +44,7 @@ be_attribute::be_attribute (bool ro,
{
// For the return types of the two operations
// generated from this attribute.
- be_util::set_arg_seen_bit (be_type::narrow_from_decl (ft));
+ be_util::set_arg_seen_bit (dynamic_cast (ft));
}
}
@@ -52,7 +52,7 @@ be_type *
be_attribute::field_type (void) const
{
return
- be_type::narrow_from_decl (
+ dynamic_cast (
this->AST_Attribute::field_type ());
}
@@ -68,5 +68,3 @@ be_attribute::destroy (void)
this->be_decl::destroy ();
this->AST_Attribute::destroy ();
}
-
-IMPL_NARROW_FROM_DECL (be_attribute)
diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp
index be0855463bf..17a32bdb146 100644
--- a/TAO/TAO_IDL/be/be_component.cpp
+++ b/TAO/TAO_IDL/be/be_component.cpp
@@ -81,14 +81,14 @@ be_component *
be_component::base_component (void) const
{
return
- be_component::narrow_from_decl (
+ dynamic_cast (
this->AST_Component::base_component ());
}
void
be_component::redefine (AST_Interface *from)
{
- be_component *bc = be_component::narrow_from_decl (from);
+ be_component *bc = dynamic_cast (from);
this->var_out_seq_decls_gen_ = bc->var_out_seq_decls_gen_;
AST_Component::redefine (from);
}
@@ -168,9 +168,6 @@ be_component::n_emits (void) const
return this->n_emits_;
}
-IMPL_NARROW_FROM_DECL (be_component)
-IMPL_NARROW_FROM_SCOPE (be_component)
-
void
be_component::scan (UTL_Scope *s)
{
@@ -197,7 +194,7 @@ be_component::scan (UTL_Scope *s)
{
case AST_Decl::NT_provides:
++this->n_provides_;
- p = AST_Provides::narrow_from_decl (d);
+ p = dynamic_cast (d);
if (!p->provides_type ()->is_local ())
{
@@ -207,7 +204,7 @@ be_component::scan (UTL_Scope *s)
continue;
case AST_Decl::NT_uses:
++this->n_uses_;
- u = AST_Uses::narrow_from_decl (d);
+ u = dynamic_cast (d);
if (u->is_multiple ())
{
@@ -230,15 +227,15 @@ be_component::scan (UTL_Scope *s)
++this->n_emits_;
continue;
case AST_Decl::NT_ext_port:
- ep = AST_Extended_Port::narrow_from_decl (d);
+ ep = dynamic_cast (d);
this->scan (ep->port_type ());
continue;
case AST_Decl::NT_mirror_port:
- mp = AST_Mirror_Port::narrow_from_decl (d);
+ mp = dynamic_cast (d);
this->mirror_scan (mp->port_type ());
continue;
case AST_Decl::NT_attr:
- a = AST_Attribute::narrow_from_decl (d);;
+ a = dynamic_cast (d);;
if (!a->readonly ())
{
@@ -263,7 +260,7 @@ be_component::scan (UTL_Scope *s)
}
}
- AST_Component *c = AST_Component::narrow_from_scope (s);
+ AST_Component *c = dynamic_cast (s);
AST_Interface *iface = 0;
if (c != 0)
@@ -280,7 +277,7 @@ be_component::scan (UTL_Scope *s)
// will be 0 and the call will return immediately.
this->scan (c->base_component ());
}
- else if ((iface = AST_Interface::narrow_from_scope (s)) != 0)
+ else if ((iface = dynamic_cast (s)) != 0)
{
for (long i = 0; i < iface->n_inherits (); ++i)
{
@@ -402,7 +399,7 @@ be_component::mirror_scan (AST_PortType *pt)
{
case AST_Decl::NT_provides:
++this->n_uses_;
- p = AST_Provides::narrow_from_decl (d);
+ p = dynamic_cast (d);
if (!p->provides_type ()->is_local ())
{
@@ -412,7 +409,7 @@ be_component::mirror_scan (AST_PortType *pt)
continue;
case AST_Decl::NT_uses:
++this->n_provides_;
- u = AST_Uses::narrow_from_decl (d);
+ u = dynamic_cast (d);
if (!u->uses_type ()->is_local ())
{
@@ -421,7 +418,7 @@ be_component::mirror_scan (AST_PortType *pt)
continue;
case AST_Decl::NT_attr:
- a = AST_Attribute::narrow_from_decl (d);;
+ a = dynamic_cast (d);;
if (!a->readonly ())
{
diff --git a/TAO/TAO_IDL/be/be_component_fwd.cpp b/TAO/TAO_IDL/be/be_component_fwd.cpp
index 7cc6a8f441b..961d969663f 100644
--- a/TAO/TAO_IDL/be/be_component_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_component_fwd.cpp
@@ -53,7 +53,3 @@ be_component_fwd::accept (be_visitor *visitor)
? 0
: visitor->visit_component_fwd (this));
}
-
-
-
-IMPL_NARROW_FROM_DECL (be_component_fwd)
diff --git a/TAO/TAO_IDL/be/be_connector.cpp b/TAO/TAO_IDL/be/be_connector.cpp
index b1c4c1c68a9..f1dd8ed87d7 100644
--- a/TAO/TAO_IDL/be/be_connector.cpp
+++ b/TAO/TAO_IDL/be/be_connector.cpp
@@ -112,12 +112,12 @@ be_connector::check_ancestors (void)
// If we have a templated module, enable it as dds_connector_
// for the moment
AST_Module *m =
- AST_Module::narrow_from_scope (this->defined_in ());
+ dynamic_cast (this->defined_in ());
AST_Template_Module_Inst *t_inst = 0;
while (t_inst == 0 && m != 0)
{
t_inst = m->from_inst ();
- m = AST_Module::narrow_from_scope (m->defined_in ());
+ m = dynamic_cast (m->defined_in ());
}
if (t_inst != 0 && t_inst->template_args () != 0)
{
@@ -132,7 +132,3 @@ be_connector::check_ancestors (void)
base = base->base_connector ();
}
}
-
-IMPL_NARROW_FROM_DECL (be_connector)
-IMPL_NARROW_FROM_SCOPE (be_connector)
-
diff --git a/TAO/TAO_IDL/be/be_constant.cpp b/TAO/TAO_IDL/be/be_constant.cpp
index e1ea76357cf..2e08aa3a757 100644
--- a/TAO/TAO_IDL/be/be_constant.cpp
+++ b/TAO/TAO_IDL/be/be_constant.cpp
@@ -38,7 +38,3 @@ be_constant::destroy (void)
this->be_decl::destroy ();
this->AST_Constant::destroy ();
}
-
-
-
-IMPL_NARROW_FROM_DECL (be_constant)
diff --git a/TAO/TAO_IDL/be/be_consumes.cpp b/TAO/TAO_IDL/be/be_consumes.cpp
index 479ef491ae5..b38cafc0813 100644
--- a/TAO/TAO_IDL/be/be_consumes.cpp
+++ b/TAO/TAO_IDL/be/be_consumes.cpp
@@ -28,7 +28,7 @@ be_eventtype *
be_consumes::consumes_type (void) const
{
return
- be_eventtype::narrow_from_decl (
+ dynamic_cast (
this->AST_Consumes::consumes_type ());
}
@@ -44,5 +44,3 @@ be_consumes::destroy (void)
this->AST_Consumes::destroy ();
this->be_field::destroy ();
}
-
-IMPL_NARROW_FROM_DECL (be_consumes)
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index 51b8d05803b..ec9a1396e90 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -130,7 +130,7 @@ be_decl::compute_full_name (const char *prefix,
{
// Get scope name.
be_decl * const parent =
- be_scope::narrow_from_scope (this->defined_in ())->decl ();
+ dynamic_cast (this->defined_in ())->decl ();
if (parent == 0)
{
@@ -199,7 +199,7 @@ be_decl::compute_flat_name (const char *prefix,
{
// Get scope name.
be_decl * const parent =
- be_scope::narrow_from_scope (this->defined_in ())->decl ();
+ dynamic_cast (this->defined_in ())->decl ();
if (parent == 0)
{
ACE_ERROR ((LM_ERROR,
@@ -255,42 +255,42 @@ be_decl::scope (void)
// Resolve forward declared interface by looking at full_definition()
// field and iterating.
d =
- be_interface::narrow_from_decl (
- (be_interface_fwd::narrow_from_decl (this))->full_definition ()
+ dynamic_cast (
+ (dynamic_cast (this))->full_definition ()
);
// Fall through
case AST_Decl::NT_interface:
- return be_interface::narrow_from_decl (d);
+ return dynamic_cast (d);
case AST_Decl::NT_module:
- return be_module::narrow_from_decl (d);
+ return dynamic_cast (d);
case AST_Decl::NT_root:
- return be_root::narrow_from_decl (d);
+ return dynamic_cast (d);
case AST_Decl::NT_except:
- return be_exception::narrow_from_decl (d);
+ return dynamic_cast (d);
case AST_Decl::NT_union:
- return be_union::narrow_from_decl (d);
+ return dynamic_cast (d);
case AST_Decl::NT_struct:
- return be_structure::narrow_from_decl (d);
+ return dynamic_cast (d);
case AST_Decl::NT_enum:
- return be_enum::narrow_from_decl (d);
+ return dynamic_cast (d);
case AST_Decl::NT_op:
- return be_operation::narrow_from_decl (d);
+ return dynamic_cast (d);
case AST_Decl::NT_factory:
- return be_factory::narrow_from_decl (d);
+ return dynamic_cast (d);
case AST_Decl::NT_finder:
- return be_finder::narrow_from_decl (d);
+ return dynamic_cast (d);
case AST_Decl::NT_sequence:
- return be_sequence::narrow_from_decl (d);
+ return dynamic_cast (d);
case AST_Decl::NT_valuetype:
- return be_valuetype::narrow_from_decl (d);
+ return dynamic_cast (d);
case AST_Decl::NT_component:
- return be_component::narrow_from_decl (d);
+ return dynamic_cast (d);
case AST_Decl::NT_eventtype:
- return be_eventtype::narrow_from_decl (d);
+ return dynamic_cast (d);
case AST_Decl::NT_home:
- return be_home::narrow_from_decl (d);
+ return dynamic_cast (d);
default:
- return (be_scope *)0;
+ return 0;
}
}
@@ -838,7 +838,3 @@ be_decl::accept (be_visitor *visitor)
{
return visitor->visit_decl (this);
}
-
-
-
-IMPL_NARROW_FROM_DECL (be_decl)
diff --git a/TAO/TAO_IDL/be/be_emits.cpp b/TAO/TAO_IDL/be/be_emits.cpp
index af1edb18102..acd34dd794d 100644
--- a/TAO/TAO_IDL/be/be_emits.cpp
+++ b/TAO/TAO_IDL/be/be_emits.cpp
@@ -28,7 +28,7 @@ be_eventtype *
be_emits::emits_type (void) const
{
return
- be_eventtype::narrow_from_decl (
+ dynamic_cast (
this->AST_Emits::emits_type ());
}
@@ -44,5 +44,3 @@ be_emits::destroy (void)
this->AST_Emits::destroy ();
this->be_field::destroy ();
}
-
-IMPL_NARROW_FROM_DECL (be_emits)
diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp
index 520c315ef7d..8e47fa45c85 100644
--- a/TAO/TAO_IDL/be/be_enum.cpp
+++ b/TAO/TAO_IDL/be/be_enum.cpp
@@ -92,8 +92,3 @@ be_enum::accept (be_visitor *visitor)
{
return visitor->visit_enum (this);
}
-
-
-
-IMPL_NARROW_FROM_DECL (be_enum)
-IMPL_NARROW_FROM_SCOPE (be_enum)
diff --git a/TAO/TAO_IDL/be/be_enum_val.cpp b/TAO/TAO_IDL/be/be_enum_val.cpp
index 0970f1b2a6e..5f614198e58 100644
--- a/TAO/TAO_IDL/be/be_enum_val.cpp
+++ b/TAO/TAO_IDL/be/be_enum_val.cpp
@@ -42,6 +42,3 @@ be_enum_val::destroy (void)
this->AST_EnumVal::destroy ();
this->be_decl::destroy ();
}
-
-IMPL_NARROW_FROM_DECL (be_enum_val)
-
diff --git a/TAO/TAO_IDL/be/be_eventtype.cpp b/TAO/TAO_IDL/be/be_eventtype.cpp
index 96b08a05e19..f2d8fc5ea5f 100644
--- a/TAO/TAO_IDL/be/be_eventtype.cpp
+++ b/TAO/TAO_IDL/be/be_eventtype.cpp
@@ -111,8 +111,3 @@ be_eventtype::destroy (void)
{
this->be_valuetype::destroy ();
}
-
-
-
-IMPL_NARROW_FROM_DECL (be_eventtype)
-IMPL_NARROW_FROM_SCOPE (be_eventtype)
diff --git a/TAO/TAO_IDL/be/be_eventtype_fwd.cpp b/TAO/TAO_IDL/be/be_eventtype_fwd.cpp
index cd04d3a931f..b51c7e839b3 100644
--- a/TAO/TAO_IDL/be/be_eventtype_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_eventtype_fwd.cpp
@@ -59,8 +59,3 @@ be_eventtype_fwd::destroy (void)
{
this->be_valuetype_fwd::destroy ();
}
-
-
-
-IMPL_NARROW_FROM_DECL (be_eventtype_fwd)
-
diff --git a/TAO/TAO_IDL/be/be_exception.cpp b/TAO/TAO_IDL/be/be_exception.cpp
index 24101456c2d..d6600b1381d 100644
--- a/TAO/TAO_IDL/be/be_exception.cpp
+++ b/TAO/TAO_IDL/be/be_exception.cpp
@@ -68,8 +68,3 @@ be_exception::accept (be_visitor *visitor)
{
return visitor->visit_exception (this);
}
-
-
-
-IMPL_NARROW_FROM_DECL (be_exception)
-IMPL_NARROW_FROM_SCOPE (be_exception)
diff --git a/TAO/TAO_IDL/be/be_extended_port.cpp b/TAO/TAO_IDL/be/be_extended_port.cpp
index bf7be8e98b8..5a6d46b7abd 100644
--- a/TAO/TAO_IDL/be/be_extended_port.cpp
+++ b/TAO/TAO_IDL/be/be_extended_port.cpp
@@ -30,7 +30,7 @@ be_porttype *
be_extended_port::port_type (void) const
{
return
- be_porttype::narrow_from_decl (
+ dynamic_cast