12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for previous commit that didn't work in GCC

release/4.3a0
Richard Roberts 2013-08-16 20:49:28 +00:00
parent 2f140669be
commit da1c3549a9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtsam/base/ConcurrentMap.h
View File

@ -82,10 +82,13 @@ public:
#ifndef GTSAM_USE_TBB #ifndef GTSAM_USE_TBB
// If we're not using TBB and this is actually a FastMap, we need to add these functions and hide // If we're not using TBB and this is actually a FastMap, we need to add these functions and hide
// the original erase functions. // the original erase functions.
iterator unsafe_erase(const_iterator position) { return Base::erase(position); } void unsafe_erase(typename Base::iterator position) { ((Base*)this)->erase(position); }
size_type unsafe_erase(const key_type& k) { return Base::erase(k); } typename Base::size_type unsafe_erase(const KEY& k) { return ((Base*)this)->erase(k); }
iterator unsafe_erase(const_iterator first, const_iterator last) { return Base::erase(first, last); } void unsafe_erase(typename Base::iterator first, typename Base::iterator last) {
void erase() { BOOST_STATIC_ASSERT_MSG(0, "For ConcurrentMap, use unsafe_erase instead of erase."); } return ((Base*)this)->erase(first, last); }
private:
void erase() {}
public:
#endif #endif
private: private: