Merge branch 'check' into dev

diff --cc cds/container/impl/ellen_bintree_map.h
index 7f0b6451388ecb0e6a166f9e873d6686399fc8ec,d38de89116d81d41e5733a09323c2c248bf74dec..654b21abe27b2061c9207db67850c3a1753b50a6
--- 1/cds/container/impl/ellen_bintree_map.h
--- 2/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 )
          {
 -            return base_class::extract_with_( result.guard(), key,
+             CDS_UNUSED( pred );
 +            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 )
          {
 -            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::key_accessor >() );
 +            return gp;
          }
  
          /// Clears the map (not atomic)

diff --cc cds/container/impl/ellen_bintree_set.h
index 72c5f4ecd3e8bc29e7b922e91fb4bbe1286c9732,6c8290c83051140cd5d6c52ef5eb60bd0aad6ef4..410a70d2098a4f4812954fb493cf3290631e9310
--- 1/cds/container/impl/ellen_bintree_set.h
--- 2/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 )
          {
 -            return base_class::extract_with_( result.guard(), key,
+             CDS_UNUSED( pred );
 +            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)