aboutsummaryrefslogtreecommitdiff
path: root/dep/acelite/ace/Map_Manager.cpp
diff options
context:
space:
mode:
authorclick <none@none>2010-11-04 05:30:29 +0100
committerclick <none@none>2010-11-04 05:30:29 +0100
commit9b16ee203f3f8e6e21c4864bd3308bf58c7b6800 (patch)
tree14950af01860fc520bbbd320c7ad81ef0281cbf3 /dep/acelite/ace/Map_Manager.cpp
parent2604250c3c4efd93e9977f2eb72d6398a7a7bcb2 (diff)
Dep/ACE: Upgrade ACE -library to 5.8.3
--HG-- branch : trunk
Diffstat (limited to 'dep/acelite/ace/Map_Manager.cpp')
-rw-r--r--dep/acelite/ace/Map_Manager.cpp34
1 files changed, 1 insertions, 33 deletions
diff --git a/dep/acelite/ace/Map_Manager.cpp b/dep/acelite/ace/Map_Manager.cpp
index f1c8fbd63fb..54b7faf95b0 100644
--- a/dep/acelite/ace/Map_Manager.cpp
+++ b/dep/acelite/ace/Map_Manager.cpp
@@ -1,4 +1,4 @@
-// $Id: Map_Manager.cpp 80826 2008-03-04 14:51:23Z wotte $
+// $Id: Map_Manager.cpp 91809 2010-09-17 07:20:41Z johnnyw $
#ifndef ACE_MAP_MANAGER_CPP
#define ACE_MAP_MANAGER_CPP
@@ -640,38 +640,6 @@ ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const
#endif /* ACE_HAS_DUMP */
}
-template <class EXT_ID, class INT_ID, class ACE_LOCK>
-ACE_Map_Entry<EXT_ID, INT_ID>&
-ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
-{
- // @@ This function should be inlined. We moved it here to avoid a
- // compiler bug in SunCC 4.2. Once we know the correct patch to fix
- // the compiler problem, it should be moved back to .i file again.
- ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0;
-
- int result = this->next (retv);
- ACE_ASSERT (result != 0);
- ACE_UNUSED_ARG (result);
-
- return *retv;
-}
-
-template <class EXT_ID, class INT_ID, class ACE_LOCK>
-ACE_Map_Entry<EXT_ID, INT_ID>&
-ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
-{
- // @@ This function should be inlined. We moved it here to avoid a
- // compiler bug in SunCC 4.2. Once we know the correct patch to fix
- // the compiler problem, it should be moved back to .i file again.
- ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0;
-
- int result = this->next (retv);
- ACE_ASSERT (result != 0);
- ACE_UNUSED_ARG (result);
-
- return *retv;
-}
-
template <class EXT_ID, class INT_ID, class ACE_LOCK> void
ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
{