[Boost-commit] svn:boost r57139 - in trunk: boost/unordered/detail libs/unordered/test/unordered

Subject: [Boost-commit] svn:boost r57139 - in trunk: boost/unordered/detail libs/unordered/test/unordered
From: daniel_james_at_[hidden]
Date: 2009-10-24 13:53:04

Author: danieljames
Date: 2009-10-24 13:53:03 EDT (Sat, 24 Oct 2009)
New Revision: 57139
URL: http://svn.boost.org/trac/boost/changeset/57139

Log:
Fix unordered for intel strict.
Text files modified: 
   trunk/boost/unordered/detail/equivalent.hpp    |    10 +++++-----                              
   trunk/boost/unordered/detail/unique.hpp        |    17 ++++++++---------                       
   trunk/libs/unordered/test/unordered/Jamfile.v2 |     2 +-                                      
   3 files changed, 14 insertions(+), 15 deletions(-)

Modified: trunk/boost/unordered/detail/equivalent.hpp
==============================================================================
--- trunk/boost/unordered/detail/equivalent.hpp	(original)
+++ trunk/boost/unordered/detail/equivalent.hpp	2009-10-24 13:53:03 EDT (Sat, 24 Oct 2009)
@@ -28,7 +28,7 @@
             node_ptr it1 = i->next_;
             while(BOOST_UNORDERED_BORLAND_BOOL(it1))
             {
-                node_ptr it2 = other.find_iterator(get_key_from_ptr(it1));
+                node_ptr it2 = other.find_iterator(this->get_key_from_ptr(it1));
                 if(!BOOST_UNORDERED_BORLAND_BOOL(it2)) return false;
                 
                 node_ptr end1 = node::next_group(it1);
@@ -77,7 +77,7 @@
         hash_equivalent_table<H, P, A, K>::iterator_base
         hash_equivalent_table<H, P, A, K>::emplace_impl(node_constructor& a)
     {
-        key_type const& k = get_key(a.value());
+        key_type const& k = this->get_key(a.value());
         std::size_t hash_value = this->hash_function()(k);
         
         if(!this->size_) {
@@ -85,7 +85,7 @@
         }
         else {
             bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value);
-            node_ptr position = find_iterator(bucket, k);
+            node_ptr position = this->find_iterator(bucket, k);
 
             // reserve has basic exception safety if the hash function
             // throws, strong otherwise.
@@ -100,9 +100,9 @@
     inline void hash_equivalent_table<H, P, A, K>
             ::emplace_impl_no_rehash(node_constructor& a)
     {
-        key_type const& k = get_key(a.value());
+        key_type const& k = this->get_key(a.value());
         bucket_ptr bucket = this->get_bucket(this->bucket_index(k));
-        add_node(a, bucket, find_iterator(bucket, k));
+        add_node(a, bucket, this->find_iterator(bucket, k));
     }
 
 #if defined(BOOST_UNORDERED_STD_FORWARD)

Modified: trunk/boost/unordered/detail/unique.hpp
==============================================================================
--- trunk/boost/unordered/detail/unique.hpp	(original)
+++ trunk/boost/unordered/detail/unique.hpp	2009-10-24 13:53:03 EDT (Sat, 24 Oct 2009)
@@ -28,7 +28,7 @@
             node_ptr it1 = i->next_;
             while(BOOST_UNORDERED_BORLAND_BOOL(it1))
             {
-                node_ptr it2 = other.find_iterator(get_key_from_ptr(it1));
+                node_ptr it2 = other.find_iterator(this->get_key_from_ptr(it1));
                 if(!BOOST_UNORDERED_BORLAND_BOOL(it2)) return false;
                 if(!extractor::compare_mapped(
                     node::get_value(it1), node::get_value(it2)))
@@ -76,7 +76,7 @@
             return *this->emplace_empty_impl_with_node(a, 1);
         }
 
-        node_ptr pos = find_iterator(bucket, k);
+        node_ptr pos = this->find_iterator(bucket, k);
 
         if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {
             return node::get_value(pos);
@@ -102,14 +102,13 @@
 
     template <class H, class P, class A, class K>
     inline BOOST_DEDUCED_TYPENAME hash_unique_table<H, P, A, K>::emplace_return
-    hash_unique_table<H, P, A, K>
-        ::emplace_impl_with_node(node_constructor& a)
+    hash_unique_table<H, P, A, K>::emplace_impl_with_node(node_constructor& a)
     {
         // No side effects in this initial code
-        key_type const& k = get_key(a.value());
+        key_type const& k = this->get_key(a.value());
         std::size_t hash_value = this->hash_function()(k);
         bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value);
-        node_ptr pos = find_iterator(bucket, k);
+        node_ptr pos = this->find_iterator(bucket, k);
         
         if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {
             // Found an existing key, return it (no throw).
@@ -139,7 +138,7 @@
         // No side effects in this initial code
         std::size_t hash_value = this->hash_function()(k);
         bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value);
-        node_ptr pos = find_iterator(bucket, k);
+        node_ptr pos = this->find_iterator(bucket, k);
 
         if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {
             // Found an existing key, return it (no throw).
@@ -203,7 +202,7 @@
         std::size_t hash_value = this->hash_function()(k);                     \
         bucket_ptr bucket                                                      \
             = this->bucket_ptr_from_hash(hash_value);                          \
-        node_ptr pos = find_iterator(bucket, k);                               \
+        node_ptr pos = this->find_iterator(bucket, k);                         \
                                                                                \
         if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {                               \
             return emplace_return(iterator_base(bucket, pos), false);          \
@@ -330,7 +329,7 @@
             key_type const& k = extractor::extract(*i);
             std::size_t hash_value = this->hash_function()(k);
             bucket_ptr bucket = this->bucket_ptr_from_hash(hash_value);
-            node_ptr pos = find_iterator(bucket, k);
+            node_ptr pos = this->find_iterator(bucket, k);
 
             if (!BOOST_UNORDERED_BORLAND_BOOL(pos)) {
                 // Doesn't already exist, add to bucket.

Modified: trunk/libs/unordered/test/unordered/Jamfile.v2
==============================================================================
--- trunk/libs/unordered/test/unordered/Jamfile.v2	(original)
+++ trunk/libs/unordered/test/unordered/Jamfile.v2	2009-10-24 13:53:03 EDT (Sat, 24 Oct 2009)
@@ -8,7 +8,7 @@
 project unordered-test/unordered
     : requirements
         <warnings>all
-        <toolset>intel:<warnings>on
+        <toolset>intel:<warnings>on <cxxflags>-strict_ansi
         <toolset>msvc:<cxxflags>/W4
         <toolset>gcc:<cxxflags>"-Wsign-promo -Wunused-parameter"
     ;