diff options
| -rw-r--r-- | TAO/tao/Active_Object_Map.i | 10 | ||||
| -rw-r--r-- | ace/Hash_Map_Manager_T.h | 15 | ||||
| -rw-r--r-- | ace/Hash_Map_Manager_T.i | 29 |
3 files changed, 54 insertions, 0 deletions
diff --git a/TAO/tao/Active_Object_Map.i b/TAO/tao/Active_Object_Map.i index 7b8416d685e..f84fc930374 100644 --- a/TAO/tao/Active_Object_Map.i +++ b/TAO/tao/Active_Object_Map.i @@ -563,6 +563,9 @@ ACE_INLINE int TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::bind (PortableServer::Servant servant, const PortableServer::ObjectId &id) { + ACE_UNUSED_ARG (servant); + ACE_UNUSED_ARG (id); + // Successful no-op return 0; } @@ -570,6 +573,8 @@ TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::bind (PortableServer::Serv ACE_INLINE int TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::unbind (PortableServer::Servant servant) { + ACE_UNUSED_ARG (servant); + // Successful no-op return 0; } @@ -578,6 +583,9 @@ ACE_INLINE int TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::find (const PortableServer::Servant servant, PortableServer::ObjectId &id) { + ACE_UNUSED_ARG (servant); + ACE_UNUSED_ARG (id); + // Unsuccessful no-op return -1; } @@ -585,6 +593,8 @@ TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::find (const PortableServer ACE_INLINE int TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::find (PortableServer::Servant servant) { + ACE_UNUSED_ARG (servant); + // Unsuccessful no-op return -1; } diff --git a/ace/Hash_Map_Manager_T.h b/ace/Hash_Map_Manager_T.h index 3311d106e43..bb52e73bcfe 100644 --- a/ace/Hash_Map_Manager_T.h +++ b/ace/Hash_Map_Manager_T.h @@ -557,6 +557,14 @@ public: // = Initialization method. ACE_Hash_Map_Iterator (ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &mm, int tail = 0); + // Construct from map + + ACE_Hash_Map_Iterator (ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base); + // Construct from base + + ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> & + operator= (ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base); + // Assignment from base }; template <class EXT_ID, class INT_ID, class ACE_LOCK> @@ -569,6 +577,13 @@ public: // = Initialization method. ACE_Hash_Map_Reverse_Iterator (ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &mm, int head = 0); + + ACE_Hash_Map_Reverse_Iterator (ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base); + // Construct from base + + ACE_Hash_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> & + operator= (ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base); + // Assignment from base }; #if defined (__ACE_INLINE__) diff --git a/ace/Hash_Map_Manager_T.i b/ace/Hash_Map_Manager_T.i index c26de8bf6ac..69168d56e0a 100644 --- a/ace/Hash_Map_Manager_T.i +++ b/ace/Hash_Map_Manager_T.i @@ -557,9 +557,38 @@ ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Hash_Map_Iterator (ACE_Hash } template <class EXT_ID, class INT_ID, class ACE_LOCK> +ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Hash_Map_Iterator (ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base) + : ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> (base) +{ +} + +template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> & +ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator= (ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base) +{ + ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK>::operator= (base); + + return *this; +} + +template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_Hash_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Hash_Map_Reverse_Iterator (ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &mm, int head) : ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> (mm, head) { } + +template <class EXT_ID, class INT_ID, class ACE_LOCK> +ACE_Hash_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Hash_Map_Reverse_Iterator (ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base) + : ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> (base) +{ +} + +template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_Hash_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> & +ACE_Hash_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator= (ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK> &base) +{ + ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, ACE_Hash<EXT_ID>, ACE_Equal_To<EXT_ID>, ACE_LOCK>::operator= (base); + + return *this; +} + |