Dep/ACE: Upgrade ACE -library to 5.8.3
--HG-- branch : trunk
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
/**
|
||||
* @file Map_T.h
|
||||
*
|
||||
* $Id: Map_T.h 84316 2009-02-03 19:46:05Z johnnyw $
|
||||
* $Id: Map_T.h 92097 2010-09-30 05:41:49Z msmit $
|
||||
*
|
||||
* @author Irfan Pyarali <[email protected]>
|
||||
*/
|
||||
@@ -14,10 +14,10 @@
|
||||
#define ACE_MAP_T_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
#include "ace/Pair_T.h"
|
||||
#include "ace/Map_Manager.h"
|
||||
#include "ace/Hash_Map_Manager_T.h"
|
||||
#include "ace/Active_Map_Manager.h"
|
||||
#include "ace/Pair_T.h"
|
||||
|
||||
#if !defined (ACE_LACKS_PRAGMA_ONCE)
|
||||
# pragma once
|
||||
@@ -830,7 +830,7 @@ class ACE_Active_Map_Manager_Adapter : public ACE_Map<KEY, VALUE>
|
||||
public:
|
||||
|
||||
// = Traits.
|
||||
typedef ACE_Pair<KEY, VALUE>
|
||||
typedef std::pair<KEY, VALUE>
|
||||
expanded_value;
|
||||
typedef ACE_Active_Map_Manager_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, expanded_value>
|
||||
iterator_impl;
|
||||
@@ -983,7 +983,7 @@ public:
|
||||
virtual void dump (void) const;
|
||||
|
||||
/// Accessor to implementation object.
|
||||
ACE_Active_Map_Manager<ACE_Pair<KEY, VALUE> > &impl (void);
|
||||
ACE_Active_Map_Manager<std::pair<KEY, VALUE> > &impl (void);
|
||||
|
||||
/// Accessor to key adapter.
|
||||
KEY_ADAPTER &key_adapter (void);
|
||||
@@ -999,7 +999,7 @@ protected:
|
||||
expanded_value *&internal_value);
|
||||
|
||||
/// All implementation details are forwarded to this class.
|
||||
ACE_Active_Map_Manager<ACE_Pair<KEY, VALUE> > implementation_;
|
||||
ACE_Active_Map_Manager<std::pair<KEY, VALUE> > implementation_;
|
||||
|
||||
/// Adapts between the user key and the Active_Map_Manager_Key.
|
||||
KEY_ADAPTER key_adapter_;
|
||||
|
||||
Reference in New Issue
Block a user