chiark
/
gitweb
/
~ianmdlvl
/
nlopt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compatibility with octave < 4.2
[nlopt.git]
/
src
/
octave
/
nlopt_optimize-oct.cc
diff --git
a/src/octave/nlopt_optimize-oct.cc
b/src/octave/nlopt_optimize-oct.cc
index 44515b72d1df817a79e819dbe01249e492a89977..e51511905a3630ac5ae143a09d7a8257884a1f0b 100644
(file)
--- a/
src/octave/nlopt_optimize-oct.cc
+++ b/
src/octave/nlopt_optimize-oct.cc
@@
-34,6
+34,11
@@
#if OCTAVE_MAJOR_VERSION < 3 || (OCTAVE_MAJOR_VERSION == 3 && OCTAVE_MINOR_VERSION < 8)
# define octave_map Octave_map
#endif
#if OCTAVE_MAJOR_VERSION < 3 || (OCTAVE_MAJOR_VERSION == 3 && OCTAVE_MINOR_VERSION < 8)
# define octave_map Octave_map
#endif
+#if OCTAVE_MAJOR_VERSION < 4 || (OCTAVE_MAJOR_VERSION == 4 && OCTAVE_MINOR_VERSION < 2)
+# define err_user_supplied_eval gripe_user_supplied_eval
+# define err_user_returned_invalid gripe_user_returned_invalid
+# define numel length
+#endif
static int struct_val_default(octave_map &m, const std::string& k,
int dflt)
static int struct_val_default(octave_map &m, const std::string& k,
int dflt)