aboutsummaryrefslogtreecommitdiff
path: root/math/fityk/files/patch-src__guess.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'math/fityk/files/patch-src__guess.cpp')
-rw-r--r--math/fityk/files/patch-src__guess.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/math/fityk/files/patch-src__guess.cpp b/math/fityk/files/patch-src__guess.cpp
new file mode 100644
index 000000000000..b71ae44c0bba
--- /dev/null
+++ b/math/fityk/files/patch-src__guess.cpp
@@ -0,0 +1,12 @@
+--- src/guess.cpp.orig 2011-06-04 00:10:02 UTC
++++ src/guess.cpp
+@@ -15,7 +15,8 @@
+ #include "settings.h"
+
+ using namespace std;
+-using boost::array;
++// Macro to avoid ambiguity with std::array (C++11)
++#define array boost::array
+
+ const array<string, 3> Guess::linear_traits =
+ {{ "slope", "intercept", "avgy" }};