Backed out changeset: 6b66f86b01e4

Should fix windows compile. Blame me and click (but mostly click)

--HG--
branch : trunk
This commit is contained in:
silinoron
2010-08-15 13:21:05 -07:00
parent e3b8a5923d
commit 4d5296299b
85 changed files with 590 additions and 5265 deletions
+8 -9
View File
@@ -4,7 +4,7 @@
/**
* @file Map_Manager.h
*
* $Id: Map_Manager.h 91066 2010-07-12 11:05:04Z johnnyw $
* $Id: Map_Manager.h 80826 2008-03-04 14:51:23Z wotte $
*
* @author Douglas C. Schmidt <[email protected]>
*/
@@ -111,11 +111,10 @@ class ACE_Map_Reverse_Iterator;
/**
* @class ACE_Map_Manager
*
* @brief
* Define a map abstraction that associates EXT_IDs with
* INT_IDs.
* @brief Define a map abstraction that associates <EXT_ID>s with
* <INT_ID>s.
*
* The EXT_ID must support @c operator==. This constraint can
* The <EXT_ID> must support <operator==>. This constraint can
* be alleviated via template specialization, as shown in the
* $ACE_ROOT/tests/Conn_Test.cpp test.
* This class uses an ACE_Allocator to allocate memory. The
@@ -123,7 +122,7 @@ class ACE_Map_Reverse_Iterator;
* ACE_Allocator with a persistable memory pool.
* This implementation of a map uses an array, which is searched
* linearly. For more efficient searching you should use the
* ACE_Hash_Map_Manager.
* <ACE_Hash_Map_Manager>.
*/
template <class EXT_ID, class INT_ID, class ACE_LOCK>
class ACE_Map_Manager
@@ -196,7 +195,7 @@ public:
/**
* Reassociate @a ext_id with @a int_id. If @a ext_id is not in the
* map then behaves just like bind(). Otherwise, store the old
* map then behaves just like <bind>. Otherwise, store the old
* values of @a int_id into the "out" parameter and rebind the new
* parameters.
* @retval 0 If a new entry is bound successfully.
@@ -262,12 +261,12 @@ public:
size_t total_size (void) const;
/**
* Returns a reference to the underlying ACE_LOCK. This makes it
* Returns a reference to the underlying <ACE_LOCK>. This makes it
* possible to acquire the lock explicitly, which can be useful in
* some cases if you instantiate the ACE_Atomic_Op with an
* ACE_Recursive_Mutex or ACE_Process_Mutex, or if you need to
* guard the state of an iterator.
* @note The right name would be lock, but HP/C++ will choke on that!
* @note The right name would be <lock>, but HP/C++ will choke on that!
*/
ACE_LOCK &mutex (void);