TARGETS= minimise primer initial view
CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
-CXXWARNS= $(CWARNS) -Wno-shadow
+CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
OPTIMISE= -O2
CFLAGS= -MMD $(OPTIMISE) -g $(CWARNS)
#define VMASK (YMASK|XMASK)
#define ESHIFT (YBITS+XBITS)
-class Graph { }; // this is a dummy as our graph has no actual representation
-
using namespace boost;
/*
typedef counting_iterator<int> VertexIterator;
namespace boost {
+ class Graph { }; // this is a dummy as our graph has no actual representation
+
// We make Graph a model of various BGL Graph concepts.
// This mainly means that graph_traits<Graph> has lots of stuff.
public virtual vertex_list_graph_tag,
public virtual edge_list_graph_tag { };
+ template<>
struct graph_traits<Graph> {
// Concept Graph:
typedef int vertex_descriptor; /* vertex number, -1 => none */
}
// Concept VertexListGraph:
- inline std::pair<VertexIterator,VertexIterator> vertices(const Graph&) {
+ inline
+ std::pair<VertexIterator,VertexIterator> vertices(const Graph&) {
return std::make_pair(VertexIterator(0), VertexIterator(N));
}
inline unsigned num_vertices(const Graph&) { return N; }
static int dl_compare(const void *tav, const void *tbv) {
int i;
const Triangle *const *tap= tav, *ta= *tap;
- const Triangle *const *tbp= tbp, *tb= *tbp;
+ const Triangle *const *tbp= tbv, *tb= *tbp;
double za=0, zb=0;
for (i=0; i<3; i++) {
za += ta->vertex[i][2];
int i;
for (i=0; i<3; i++) {
- double *v= t->vertex[i];
+ const double *v= t->vertex[i];
double x= v[0];
double y= v[1];
double z= v[2];