Commit f498d5b8 authored by Simon de Givry's avatar Simon de Givry Committed by Thomas Schiex
Browse files

[error] compilation issue with Boost inside VNS headers

parent a73f4b25
// Cmake generated version
#define Toulbar_VERSION "1.0.0-126-g10d7877-master-tainted (1543425235)"
#define Toulbar_VERSION "1.0.0-132-g977f947-master-tainted (1544046739)"
......@@ -10,6 +10,8 @@
#include "core/tb2wcsp.hpp"
#include "search/tb2clusters.hpp"
using namespace boost;
// loading decomposition for only a given file
void ClustersNeighborhoodStructure::load_decomposition()
{
......
......@@ -21,7 +21,6 @@
//TODO: is it need for other versions???
#define BOOSTGRAPH134
using namespace boost;
/**
* Basic structure
......@@ -44,11 +43,11 @@ struct cluster {
bool mark;
};
typedef property<vertex_index_t, int> variable_vertex;
typedef adjacency_list<vecS, vecS, undirectedS, variable_vertex, no_property, graph_name_t> TGraph;
typedef adjacency_list<vecS, vecS, undirectedS, cluster, separator> TCDGraph;
typedef graph_traits<TCDGraph>::vertex_descriptor TDCluster;
typedef graph_traits<TCDGraph>::edge_descriptor Cluster_edge;
typedef boost::property<boost::vertex_index_t, int> variable_vertex;
typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::undirectedS, variable_vertex, boost::no_property, boost::graph_name_t> TGraph;
typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::undirectedS, cluster, separator> TCDGraph;
typedef boost::graph_traits<TCDGraph>::vertex_descriptor TDCluster;
typedef boost::graph_traits<TCDGraph>::edge_descriptor Cluster_edge;
typedef set<int> zone;
#ifdef BOOSTGRAPH134
......
......@@ -9,6 +9,8 @@
#include "tb2vnsutils.hpp"
#include "core/tb2wcsp.hpp"
using namespace boost;
void fusionCluster(TCDGraph::vertex_descriptor v, TCDGraph::vertex_descriptor p, TCDGraph& cg)
{
set<int> varsfusion;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment