From: khizmax <libcds.dev@gmail.com>
Date: Tue, 18 Nov 2014 06:47:02 +0000 (+0300)
Subject: Merge branch 'check' into dev
X-Git-Tag: v2.0.0~74
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=68c4bb6ce67fc8fccf8d850868e1e95b91f334a4;p=libcds.git

Merge branch 'check' into dev
---

68c4bb6ce67fc8fccf8d850868e1e95b91f334a4
diff --cc cds/container/impl/ellen_bintree_map.h
index 7f0b6451,d38de891..654b21ab
--- a/cds/container/impl/ellen_bintree_map.h
+++ b/cds/container/impl/ellen_bintree_map.h
@@@ -384,12 -380,11 +386,13 @@@ namespace cds { namespace container 
              \p pred must imply the same element order as the comparator used for building the map.
          */
          template <typename Q, typename Less>
 -        bool extract_with( guarded_ptr& result, Q const& key, Less pred )
 +        guarded_ptr extract_with( Q const& key, Less pred )
          {
+             CDS_UNUSED( pred );
 -            return base_class::extract_with_( result.guard(), key,
 +            guarded_ptr gp;
 +            base_class::extract_with_( gp.guard(), key,
                  cds::details::predicate_wrapper< leaf_node, Less, typename maker::key_accessor >());
 +            return gp;
          }
  
          /// Find the key \p key
@@@ -478,12 -473,11 +483,13 @@@
              \p pred must imply the same element order as the comparator used for building the map.
          */
          template <typename Q, typename Less>
 -        bool get_with( guarded_ptr& result, Q const& key, Less pred )
 +        guarded_ptr get_with( Q const& key, Less pred )
          {
+             CDS_UNUSED( pred );
 -            return base_class::get_with_( result.guard(), key,
 +            guarded_ptr gp;
 +            base_class::get_with_( gp.guard(), key,
                  cds::details::predicate_wrapper< leaf_node, Less, typename maker::key_accessor >() );
 +            return gp;
          }
  
          /// Clears the map (not atomic)
diff --cc cds/container/impl/ellen_bintree_set.h
index 72c5f4ec,6c8290c8..410a70d2
--- a/cds/container/impl/ellen_bintree_set.h
+++ b/cds/container/impl/ellen_bintree_set.h
@@@ -398,12 -394,11 +400,13 @@@ namespace cds { namespace container 
              \p pred must imply the same element order as the comparator used for building the set.
          */
          template <typename Q, typename Less>
 -        bool extract_with( guarded_ptr& result, Q const& key, Less pred )
 +        guarded_ptr extract_with( Q const& key, Less pred )
          {
+             CDS_UNUSED( pred );
 -            return base_class::extract_with_( result.guard(), key,
 +            guarded_ptr gp;
 +            base_class::extract_with_( gp.guard(), key,
                  cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >());
 +            return gp;
          }
  
          /// Find the key \p key
@@@ -520,12 -516,11 +526,13 @@@
              \p pred must imply the same element order as the comparator used for building the set.
          */
          template <typename Q, typename Less>
 -        bool get_with( guarded_ptr& result, Q const& key, Less pred )
 +        guarded_ptr get_with( Q const& key, Less pred )
          {
 -            CDS_UNUSED( pred );
 -            return base_class::get_with_( result.guard(), key,
++            CDS_UNUSED(pred);
 +            guarded_ptr gp;
 +            base_class::get_with_( gp.guard(), key,
                  cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >() );
 +            return gp;
          }
  
          /// Clears the set (not atomic)