disambiguate lib/vpsc #includes

Fixes #1785.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bcaac255e3e501c3510aa955c99bb8202ffac88..ed3ea24d68339c03b7a65086ba81496586468641 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix edgepaint -o option
 - Correct shebang of gvmap.sh to use ksh
 - Fix gvmap.sh -? option to exit with zero exit status
+- Graphviz doesn't build on MacOS with the latest libc++ #1785
 
 ## [2.44.1] - 2020-06-29
 

diff --git a/lib/neatogen/mosek_quad_solve.h b/lib/neatogen/mosek_quad_solve.h
index 37a35b2e38fbd5ca96581ad14a683494c3adf4fc..6433f388b7785f70b7cb56ce529312b7e58c717a 100644 (file)
--- a/lib/neatogen/mosek_quad_solve.h
+++ b/lib/neatogen/mosek_quad_solve.h
@@ -23,7 +23,7 @@
 
 #include <mosek.h> /* Include the MOSEK definition file. */
 #include "types.h"
-#include <csolve_VPSC.h>
+#include <vpsc/csolve_VPSC.h>
 
 typedef struct {
        int r;

diff --git a/lib/vpsc/constraint.h b/lib/vpsc/constraint.h
index 0f99e5da22dd724827a84c30354adffb49b6bac7..bcd467dabccd06f8de77d67ecfbdb8e5c6620e60 100644 (file)
--- a/lib/vpsc/constraint.h
+++ b/lib/vpsc/constraint.h
@@ -23,7 +23,7 @@
 #define SEEN_REMOVEOVERLAP_CONSTRAINT_H
 
 #include <iostream>
-#include "variable.h"
+#include <vpsc/variable.h>
 
 class Constraint
 {
@@ -42,7 +42,7 @@ public:
        bool equality;
 };
 #include <float.h>
-#include "block.h"
+#include <vpsc/block.h>
 static inline bool compareConstraints(Constraint *const &l, Constraint *const &r) {
        double const sl = 
                l->left->block->timeStamp > l->timeStamp

diff --git a/lib/vpsc/variable.h b/lib/vpsc/variable.h
index 2bfa94e4c1700449c698753cf8763b647f11c689..e284d8c3342c0e1538c586e6271722bd3ba4ca5e 100644 (file)
--- a/lib/vpsc/variable.h
+++ b/lib/vpsc/variable.h
@@ -23,7 +23,7 @@
 #include <iostream>
 class Block;
 class Constraint;
-#include "block.h"
+#include <vpsc/block.h>
 
 typedef std::vector<Constraint*> Constraints;
 class Variable