summaryrefslogtreecommitdiff
path: root/boost/multi_index/detail/index_matcher.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/multi_index/detail/index_matcher.hpp')
-rw-r--r--boost/multi_index/detail/index_matcher.hpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/boost/multi_index/detail/index_matcher.hpp b/boost/multi_index/detail/index_matcher.hpp
index 582813730c..f3675acd40 100644
--- a/boost/multi_index/detail/index_matcher.hpp
+++ b/boost/multi_index/detail/index_matcher.hpp
@@ -1,4 +1,4 @@
-/* Copyright 2003-2008 Joaquin M Lopez Munoz.
+/* Copyright 2003-2013 Joaquin M Lopez Munoz.
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt)
@@ -9,7 +9,7 @@
#ifndef BOOST_MULTI_INDEX_DETAIL_INDEX_MATCHER_HPP
#define BOOST_MULTI_INDEX_DETAIL_INDEX_MATCHER_HPP
-#if defined(_MSC_VER)&&(_MSC_VER>=1200)
+#if defined(_MSC_VER)
#pragma once
#endif
@@ -106,14 +106,14 @@ class algorithm_base:private noncopyable
{
protected:
algorithm_base(const Allocator& al,std::size_t size):
- spc(al,size),size_(size),n(0),sorted(false)
+ spc(al,size),size_(size),n_(0),sorted(false)
{
}
void add(void* node)
{
- entries()[n]=entry(node,n);
- ++n;
+ entries()[n_]=entry(node,n_);
+ ++n_;
}
void begin_algorithm()const
@@ -183,7 +183,7 @@ private:
auto_space<entry,Allocator> spc;
std::size_t size_;
- std::size_t n;
+ std::size_t n_;
mutable bool sorted;
mutable std::size_t num_piles;
};