From 68c8bcc5e84335d77713a3889b88448ffcf755d9 Mon Sep 17 00:00:00 2001 From: Alex Hagiopol Date: Fri, 11 Mar 2016 11:32:20 -0500 Subject: [PATCH] Moved deprecated emul() to end of Vector.h --- gtsam/base/Vector.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gtsam/base/Vector.h b/gtsam/base/Vector.h index 3d8c09d1e..8b61e32f0 100644 --- a/gtsam/base/Vector.h +++ b/gtsam/base/Vector.h @@ -212,10 +212,6 @@ GTSAM_EXPORT ConstSubVector sub(const Vector &v, size_t i1, size_t i2); */ GTSAM_EXPORT void subInsert(Vector& fullVector, const Vector& subVector, size_t i); -#ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V4 -GTSAM_EXPORT inline Vector emul(const Vector &a, const Vector &b) {assert (b.size()==a.size()); return a.cwiseProduct(b);} -#endif - /** * elementwise division * @param a first vector @@ -351,6 +347,10 @@ GTSAM_EXPORT Vector concatVectors(const std::list& vs); */ GTSAM_EXPORT Vector concatVectors(size_t nrVectors, ...); +#ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V4 +GTSAM_EXPORT inline Vector emul(const Vector &a, const Vector &b) {assert (b.size()==a.size()); return a.cwiseProduct(b);} +#endif + } // namespace gtsam #include