From 01bb34c0dda0a810d1abd259c96bc9bc751acabb Mon Sep 17 00:00:00 2001 From: khizmax Date: Sun, 2 Nov 2014 17:36:42 +0300 Subject: [PATCH] Remove old VC std::map from tests --- tests/unit/map2/std_map.h | 14 ------ tests/unit/map2/std_map_vc.h | 88 ------------------------------------ 2 files changed, 102 deletions(-) delete mode 100644 tests/unit/map2/std_map.h delete mode 100644 tests/unit/map2/std_map_vc.h diff --git a/tests/unit/map2/std_map.h b/tests/unit/map2/std_map.h deleted file mode 100644 index d6b49e04..00000000 --- a/tests/unit/map2/std_map.h +++ /dev/null @@ -1,14 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDSUNIT_STD_MAP_H -#define __CDSUNIT_STD_MAP_H - -#if CDS_COMPILER == CDS_COMPILER_MSVC -# include "map2/std_map_vc.h" -#elif CDS_COMPILER == CDS_COMPILER_GCC || CDS_COMPILER == CDS_COMPILER_CLANG -# include "map2/std_map_gcc.h" -#else -# error "std::map is undefined for this compiler" -#endif - -#endif // #ifndef __CDSUNIT_STD_MAP_H diff --git a/tests/unit/map2/std_map_vc.h b/tests/unit/map2/std_map_vc.h deleted file mode 100644 index 021005e4..00000000 --- a/tests/unit/map2/std_map_vc.h +++ /dev/null @@ -1,88 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDSUNIT_STD_MAP_VC_H -#define __CDSUNIT_STD_MAP_VC_H - -#include -#include // ref -#include //unique_lock - -namespace map2 { - template - class StdMap: public std::map, Alloc> - { - Lock m_lock; - typedef std::unique_lock AutoLock; - typedef std::map, Alloc> base_class; - public: - typedef typename base_class::mapped_type value_type; - typedef typename base_class::value_type pair_type; - typedef size_t item_counter; - - StdMap( size_t nMapSize, size_t nLoadFactor ) - {} - - bool find( const Key& key ) - { - AutoLock al( m_lock ); - return base_class::find( key ) != base_class::end(); - } - - bool insert( const Key& key, const Value& val ) - { - AutoLock al( m_lock ); - return base_class::insert( base_class::value_type(key, val)).second; - } - - template - bool insert( const Key& key, const T& val, Func func ) - { - AutoLock al( m_lock ); - std::pair pRet = base_class::insert( base_class::value_type(key, Value() )); - if ( pRet.second ) { - func( pRet.first->second, val ); - return true; - } - return false; - } - - template - std::pair ensure( const T& key, Func func ) - { - AutoLock al( m_lock ); - std::pair pRet = base_class::insert( base_class::value_type(key, Value() )); - if ( pRet.second ) { - func( true, *pRet.first ); - return std::make_pair( true, true ); - } - else { - func( false, *pRet.first ); - return std::make_pair( true, false ); - } - } - - bool erase( const Key& key ) - { - AutoLock al( m_lock ); - return base_class::erase( key ) != 0; - } - - template - bool erase( const T& key, Func func ) - { - AutoLock al( m_lock ); - base_class::iterator it = base_class::find( key ); - if ( it != base_class::end() ) { - func( *it ); - - base_class::erase( it ); - return true; - } - return false; - } - - std::ostream& dump( std::ostream& stm ) { return stm; } - }; -} - -#endif // #ifndef __CDSUNIT_STD_MAP_VC_H -- 2.34.1