chiark
/
gitweb
/
~ianmdlvl
/
nlopt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5326ab4
)
backward compatibility with old Octave_map for #42
author
Steven G. Johnson
<stevenj@alum.mit.edu>
Thu, 9 Jul 2015 21:06:22 +0000
(17:06 -0400)
committer
Steven G. Johnson
<stevenj@alum.mit.edu>
Thu, 9 Jul 2015 21:06:22 +0000
(17:06 -0400)
octave/nlopt_optimize-oct.cc
patch
|
blob
|
history
diff --git
a/octave/nlopt_optimize-oct.cc
b/octave/nlopt_optimize-oct.cc
index a66da8e8be18e9a7b10c7f4bf8d3df5230390863..819db4ed37bcbb6129883c99627c9dafba6e864e 100644
(file)
--- 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)
{