Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComList.h


Ignore:
Timestamp:
13 Aug 2015, 17:38:13 (9 years ago)
Author:
tech
Message:

Merged 14.1-update-dev1@1312.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComList.h

    r1179 r1313  
    22 * License, included below. This software may be subject to other third party
    33 * and contributor rights, including patent rights, and no such rights are
    4  * granted under this license. 
     4 * granted under this license.
    55 *
    6 * Copyright (c) 2010-2015, ITU/ISO/IEC
     6 * Copyright (c) 2010-2015, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    3636*/
    3737
    38 #ifndef _TCOMLIST_
    39 #define _TCOMLIST_
     38#ifndef __TCOMLIST__
     39#define __TCOMLIST__
    4040
    4141#if _MSC_VER > 1000
     
    5959/// list template
    6060template< class C >
    61 class TComList : public std::list< C >
     61class TComList : public std::list< C > // NOTE: should not inherit from STL classes
    6262{
    6363public:
    6464  typedef typename std::list<C>::iterator TComIterator;
    65  
     65
    6666  TComList& operator += ( const TComList& rcTComList)
    6767  {
     
    7272    return *this;
    7373  } // leszek
    74  
     74
    7575  C popBack()
    7676  {
     
    7979    return cT;
    8080  }
    81  
     81
    8282  C popFront()
    8383  {
     
    8686    return cT;
    8787  }
    88  
     88
    8989  Void pushBack( const C& rcT )
    9090  {
     
    9595    }
    9696  }
    97  
     97
    9898  Void pushFront( const C& rcT )
    9999  {
     
    104104    }
    105105  }
    106  
     106
    107107  TComIterator find( const C& rcT ) // leszek
    108108  {
    109     return find( this->begin(), this->end(), rcT );
     109    return std::list< C >::find( this->begin(), this->end(), rcT );
    110110  }
    111111};
Note: See TracChangeset for help on using the changeset viewer.