diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-08-10 17:11:33 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-08-10 17:11:33 +0000 |
| commit | cce2d7980e1c4132f0277378ba97ec7025c488c3 (patch) | |
| tree | db9913e9d32b52e0d3a5e32a2df27e7001a9dce1 /TAO/orbsvcs/orbsvcs/Naming/FaultTolerant | |
| parent | 9f64d6c517c1db1924d755505d3fe69a9aa8d171 (diff) | |
| download | ATCD-cce2d7980e1c4132f0277378ba97ec7025c488c3.tar.gz | |
Sat Aug 10 17:11:21 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h:
* orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h:
* orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp:
* orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp:
Reapplied, didn't solve the ft failures, need to do some
time travel on the repo to see where this got introduced
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/FaultTolerant')
4 files changed, 6 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h index 1303c78daae..8e1c7223dad 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h @@ -62,7 +62,7 @@ public: static void set_naming_manager_impl (TAO_FT_Naming_Manager *mgr_impl); - bool is_object_group (const CORBA::Object_ptr obj) const; + CORBA::Boolean is_object_group (CORBA::Object_ptr obj) const; protected: static TAO_FT_Naming_Manager *naming_manager_impl_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp index f6bb7c47296..eab29ba788b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp @@ -45,7 +45,7 @@ TAO_FT_Storable_Naming_Context::is_object_group (CORBA::Object_ptr obj) const { // Ensure the object is not nil first. If so, it cannot be an ObjectGroup. if (CORBA::is_nil (obj)) - return 0; + return false; // If there is a tagged component with tag = IOP::TAG_FT_GROUP in the // object reference then it is an object group diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h index 96b0f4d0317..b319cec235e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h @@ -62,7 +62,7 @@ public: // naming context implementations. static void set_naming_manager (TAO_FT_Naming_Manager *mgr_impl); - bool is_object_group (const CORBA::Object_ptr obj) const; + CORBA::Boolean is_object_group (CORBA::Object_ptr obj) const; /** * Tell the peer replica that this context has been updated. diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp index 7de874084f0..d19b70cadfd 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp @@ -1,28 +1,23 @@ // $Id$ -#include /**/ "ace/pre.h" - #include "orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h" #include "orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Constructor. +/// Constructor. TAO_FT_Storable_Naming_Context_Factory::TAO_FT_Storable_Naming_Context_Factory ( size_t hash_table_size) : TAO_Storable_Naming_Context_Factory (hash_table_size) { - } - /// Destructor. Does not deallocate the hash map: if an instance of - /// this class goes out of scope, its hash_map remains in persistent storage. +/// Destructor. Does not deallocate the hash map: if an instance of +/// this class goes out of scope, its hash_map remains in persistent storage. TAO_FT_Storable_Naming_Context_Factory::~TAO_FT_Storable_Naming_Context_Factory (void) { - } - TAO_Storable_Naming_Context* TAO_FT_Storable_Naming_Context_Factory::create_naming_context_impl ( CORBA::ORB_ptr orb, @@ -45,5 +40,4 @@ TAO_FT_Storable_Naming_Context_Factory::create_naming_context_impl ( return context_impl; } - TAO_END_VERSIONED_NAMESPACE_DECL |