From: Steven G. Johnson <stevenj@alum.mit.edu>
Date: Thu, 9 Jul 2015 21:06:22 +0000 (-0400)
Subject: backward compatibility with old Octave_map for #42
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=857889e6df432e53978b4ddc83e0c90ffef52310;p=nlopt.git

backward compatibility with old Octave_map for #42
---

diff --git a/octave/nlopt_optimize-oct.cc b/octave/nlopt_optimize-oct.cc
index a66da8e..819db4e 100644
--- a/octave/nlopt_optimize-oct.cc
+++ b/octave/nlopt_optimize-oct.cc
@@ -29,6 +29,11 @@
 #include "nlopt.h"
 #include "nlopt_optimize_usage.h"
 
+#include <octave/version.h>
+#if OCTAVE_MAJOR_VERSION < 3 || (OCTAVE_MAJOR_VERSION == 3 && OCTAVE_MINOR_VERSION < 8)
+#  define octave_map Octave_map
+#endif
+
 static int struct_val_default(octave_map &m, const std::string& k,
 				 int dflt)
 {