From 8bf2e5c7dbcf3e9c9db6339d371fe17ba046ea75 Mon Sep 17 00:00:00 2001 From: MarcosPividori Date: Mon, 29 Aug 2016 14:56:31 -0300 Subject: [PATCH] Remove mlpack_deprecated from search mode flags, because it was resulting in too many warnings that can't be avoided. Until 3.0.0, there isn't any other method to change the search mode. --- .../methods/neighbor_search/neighbor_search.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mlpack/methods/neighbor_search/neighbor_search.hpp b/src/mlpack/methods/neighbor_search/neighbor_search.hpp index 555c4a401a..6cfaff1cac 100644 --- a/src/mlpack/methods/neighbor_search/neighbor_search.hpp +++ b/src/mlpack/methods/neighbor_search/neighbor_search.hpp @@ -501,24 +501,24 @@ class NeighborSearch //! Access whether or not search is done in naive linear scan mode. //! Deprecated. Will be removed in mlpack 3.0.0. - mlpack_deprecated bool Naive() const { return naive; } + bool Naive() const { return naive; } //! Modify whether or not search is done in naive linear scan mode. //! Deprecated. Will be removed in mlpack 3.0.0. - mlpack_deprecated bool& Naive() { return naive; } + bool& Naive() { return naive; } //! Access whether or not search is done in single-tree mode. //! Deprecated. Will be removed in mlpack 3.0.0. - mlpack_deprecated bool SingleMode() const { return singleMode; } + bool SingleMode() const { return singleMode; } //! Modify whether or not search is done in single-tree mode. //! Deprecated. Will be removed in mlpack 3.0.0. - mlpack_deprecated bool& SingleMode() { return singleMode; } + bool& SingleMode() { return singleMode; } //! Access whether or not search is done in greedy mode. //! Deprecated. Will be removed in mlpack 3.0.0. - mlpack_deprecated bool Greedy() const { return greedy; } + bool Greedy() const { return greedy; } //! Modify whether or not search is done in greedy mode. //! Deprecated. Will be removed in mlpack 3.0.0. - mlpack_deprecated bool& Greedy() { return greedy; } + bool& Greedy() { return greedy; } //! Access the relative error to be considered in approximate search. double Epsilon() const { return epsilon; }