[mlpack-git] master: Merge pull request #641 from MarcosPividori/master (9b42c22)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/1f562a1aba7ae55475afcc95659511c2b7f694e5...5b8fdce471328f722fcd8c0f22a6d995ce22c98b

>---------------------------------------------------------------

commit 9b42c22105c23bb9d653f8eca21effbda12e68cf
Merge: 39eefde dd136db
Author: Ryan Curtin <ryan at ratml.org>
Date:   Mon May 23 13:53:13 2016 -0400

    Merge pull request #641 from MarcosPividori/master
    
    Properly use Enum type.


>---------------------------------------------------------------

9b42c22105c23bb9d653f8eca21effbda12e68cf
 src/mlpack/methods/neighbor_search/kfn_main.cpp      | 2 +-
 src/mlpack/methods/neighbor_search/knn_main.cpp      | 2 +-
 src/mlpack/methods/neighbor_search/ns_model.hpp      | 8 ++++----
 src/mlpack/methods/neighbor_search/ns_model_impl.hpp | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)