From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Mon, 31 Aug 2020 00:47:52 +0000 (-0700)
Subject: disambiguate lib/vpsc #includes
X-Git-Tag: 2.46.0~20^2^2~52^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78c44844fc8a2fcd49fae55d995a93c069f871bb;p=graphviz

disambiguate lib/vpsc #includes

Fixes #1785.
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bcaac255..ed3ea24d6 100644
--- 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 37a35b2e3..6433f388b 100644
--- 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 0f99e5da2..bcd467dab 100644
--- 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 2bfa94e4c..e284d8c33 100644
--- 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