Permalink
Browse files

Merge branch 'develop' of github.com:casadi/casadi into release-3.4.3

  • Loading branch information...
Joris Gillis
Joris Gillis committed May 3, 2018
2 parents 3df6605 + 9a8b152 commit 54bde1c242fbb229e05fe87310dce3371b1a4af9
@@ -123,6 +123,9 @@ if (!(x)) casadi_error("Assertion \"" CASADI_STR(x) "\" failed:\n"\
// This assertion if for internal errors caused by bugs in CasADi
#define casadi_assert_dev(x) casadi_assert(x, "Notify the CasADi developers.")
// This assertion if for internal errors caused by bugs in CasADi
#define casadi_report() casadi_error("Notify the CasADi developers.")
// Issue a warning, including location in the source code
#define casadi_warning(msg) \
casadi::message_prefix(casadi::uerr()) \
@@ -27,7 +27,6 @@
#include "casadi_misc.hpp"
#include "sx_function.hpp"
#include "mx_function.hpp"
#include "map.hpp"
#include "switch.hpp"
#include "bspline.hpp"
#include "nlpsol.hpp"
@@ -654,11 +653,10 @@ namespace casadi {
res[i] = horzcat(tmp);
}
// Construct function
return Function(name() + "_" + str(n), arg, res,
name_in(), name_out());
return Function(name() + "_" + str(n), arg, res, name_in(), name_out());
} else {
// Create Map object
return Map::create(parallelization, *this, n);
// Generate/retrieve potentially cached map
return (*this)->map(n, parallelization);
}
}
Oops, something went wrong.

0 comments on commit 54bde1c

Please sign in to comment.