Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -4,7 +4,9 @@
/**
* @file Map_Manager.h
*
* @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
* $Id: Map_Manager.h 97505 2014-01-06 15:38:30Z johnnyw $
*
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
*/
//=============================================================================
@ -451,7 +453,7 @@ class ACE_Map_Iterator_Base
{
public:
// = Initialization method.
/// Constructor. If head != 0, the iterator constructed is positioned
/// Contructor. If head != 0, the iterator constructed is positioned
/// at the head of the map, it is positioned at the end otherwise.
ACE_Map_Iterator_Base (ACE_Map_Manager <EXT_ID, INT_ID, ACE_LOCK> &mm);
@ -510,7 +512,7 @@ class ACE_Map_Const_Iterator_Base
{
public:
// = Initialization method.
/// Constructor. If head != 0, the iterator constructed is positioned
/// Contructor. If head != 0, the iterator constructed is positioned
/// at the head of the map, it is positioned at the end otherwise.
ACE_Map_Const_Iterator_Base (const ACE_Map_Manager <EXT_ID, INT_ID, ACE_LOCK> &mm);