From 905bd4fd2155847263692b008c4091050ddd1bf3 Mon Sep 17 00:00:00 2001 From: Stephen Tu Date: Tue, 13 Jan 2015 10:59:02 -0800 Subject: [PATCH] move matrix_completion_impl.hpp to matrix_completion.cpp avoid a possible multiple definitions issue at link time --- src/mlpack/methods/matrix_completion/CMakeLists.txt | 2 +- .../{matrix_completion_impl.hpp => matrix_completion.cpp} | 6 ++---- src/mlpack/methods/matrix_completion/matrix_completion.hpp | 3 --- 3 files changed, 3 insertions(+), 8 deletions(-) rename src/mlpack/methods/matrix_completion/{matrix_completion_impl.hpp => matrix_completion.cpp} (95%) diff --git a/src/mlpack/methods/matrix_completion/CMakeLists.txt b/src/mlpack/methods/matrix_completion/CMakeLists.txt index 282021f01ff..9c715248a03 100644 --- a/src/mlpack/methods/matrix_completion/CMakeLists.txt +++ b/src/mlpack/methods/matrix_completion/CMakeLists.txt @@ -2,7 +2,7 @@ # Anything not in this list will not be compiled into MLPACK. set(SOURCES matrix_completion.hpp - matrix_completion_impl.hpp + matrix_completion.cpp ) # Add directory name to sources. diff --git a/src/mlpack/methods/matrix_completion/matrix_completion_impl.hpp b/src/mlpack/methods/matrix_completion/matrix_completion.cpp similarity index 95% rename from src/mlpack/methods/matrix_completion/matrix_completion_impl.hpp rename to src/mlpack/methods/matrix_completion/matrix_completion.cpp index 89dc737ecd4..15224b5ce63 100644 --- a/src/mlpack/methods/matrix_completion/matrix_completion_impl.hpp +++ b/src/mlpack/methods/matrix_completion/matrix_completion.cpp @@ -4,8 +4,8 @@ * * Implementation of MatrixCompletion class. */ -#ifndef __MLPACK_METHODS_MATRIX_COMPLETION_MATRIX_COMPLETION_IMPL_HPP -#define __MLPACK_METHODS_MATRIX_COMPLETION_MATRIX_COMPLETION_IMPL_HPP + +#include "matrix_completion.hpp" namespace mlpack { namespace matrix_completion { @@ -107,5 +107,3 @@ size_t MatrixCompletion::DefaultRank(const size_t m, } // namespace matrix_completion } // namespace mlpack - -#endif diff --git a/src/mlpack/methods/matrix_completion/matrix_completion.hpp b/src/mlpack/methods/matrix_completion/matrix_completion.hpp index 0f6c5bb1583..718f46cb076 100644 --- a/src/mlpack/methods/matrix_completion/matrix_completion.hpp +++ b/src/mlpack/methods/matrix_completion/matrix_completion.hpp @@ -136,7 +136,4 @@ class MatrixCompletion } // namespace matrix_completion } // namespace mlpack -// Include implementation. -#include "matrix_completion_impl.hpp" - #endif