Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace obsolete stx-btree with tlx. #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace obsolete stx-btree with tlx. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/svbs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

#include <treedec/degree_config.hpp>
#include <stx/btree_set.h>
#include <tlx/container/btree_set.hpp>

template<class G>
struct m_deg_config : public misc::detail::deg_config<G> {
Expand All @@ -45,4 +45,4 @@ template<class G>
struct svbs_config : public gala::graph_cfg_default<G> {
};

typedef gala::graph< stx::btree_set, std::vector, gala::vertex_ptr_tag, svbs_config> simplegraph_vector_bs;
typedef gala::graph< tlx::btree_set, std::vector, gala::vertex_ptr_tag, svbs_config> simplegraph_vector_bs;
2 changes: 1 addition & 1 deletion examples/svbs_random.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ struct svbs_config : public gala::graph_cfg_default<G> {
};
}

typedef gala::graph< stx::btree_set, std::vector, gala::vertex_ptr_tag, svbsr::svbs_config> svbs_random;
typedef gala::graph< tlx::btree_set, std::vector, gala::vertex_ptr_tag, svbsr::svbs_config> svbs_random;

namespace treedec{
template<>
Expand Down
6 changes: 3 additions & 3 deletions graph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#include <vector>
#include <map>
#include <forward_list>
#ifdef HAVE_STX_BTREE_SET_H
#include <stx/btree_set.h>
#ifdef HAVE_TLX_CONTAINER_BTREE_SET_HPP
#include <tlx/container/btree_set.hpp>
#endif
#include <type_traits>

Expand Down Expand Up @@ -2169,7 +2169,7 @@ graph<SGARGS>& graph<SGARGS>::assign_same(graph<SGARGS> const& x)
EL const& S = x.out_edges(sd); // ?!
bits::vertex_helper<VDP>::rebase(E, S, delta);
#if 0
incomplete();// does not work for stx
incomplete();// does not work for tlx

EL& MS = const_cast<EL&>(S); // HACK!?
E = MS;
Expand Down
10 changes: 5 additions & 5 deletions sethack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

#define likely(x) __builtin_expect((x),1)
#define unlikely(x) __builtin_expect((x),0)
#ifdef HAVE_STX_BTREE_SET_H
#include <stx/btree_set.h>
#ifdef HAVE_TLX_CONTAINER_BTREE_SET_HPP
#include <tlx/container/btree_set.hpp>
#endif
#include <set>
#include <unordered_set>
Expand Down Expand Up @@ -136,10 +136,10 @@ struct sethack_{ //
}
};
/*--------------------------------------------------------------------------*/
#ifdef HAVE_STX_BTREE_SET_H
#ifdef HAVE_TLX_CONTAINER_BTREE_SET_HPP
template<>
struct sethack_<stx::btree_set<size_t> >{ //
typedef stx::btree_set<size_t> S;
struct sethack_<tlx::btree_set<size_t> >{ //
typedef tlx::btree_set<size_t> S;
static typename S::iterator reverse(typename S::reverse_iterator& x)
{untested();
return S::iterator(x);
Expand Down
8 changes: 4 additions & 4 deletions sfinae.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

#include <deque>
#include <set>
#ifdef HAVE_STX_BTREE_SET_H
#include <stx/btree_set.h>
#ifdef HAVE_TLX_CONTAINER_BTREE_SET_HPP
#include <tlx/container/btree_set.hpp>
#endif
// #endif
#include <boost/container/flat_set.hpp>
Expand Down Expand Up @@ -75,10 +75,10 @@ std::set<typename S::value_type, typename S::key_compare, typename S::allocator_
static constexpr bool value = true;

};
#ifdef HAVE_STX_BTREE_SET_H
#ifdef HAVE_TLX_CONTAINER_BTREE_SET_HPP
template<class S, class T>
struct is_set<S, typename std::enable_if < std::is_same<
stx::btree_set<typename S::value_type, typename S::key_compare, typename S::allocator_type >, S
tlx::btree_set<typename S::value_type, typename S::key_compare, typename S::allocator_type >, S
>::value, any >::type , T>{ //

typedef T type;
Expand Down