From a68a96ccbbb475d7f3aa013e703fa7f93c4df372 Mon Sep 17 00:00:00 2001 From: Yashwant Singh Parihar Date: Wed, 19 Aug 2020 09:13:19 +0530 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Ryan Curtin --- CMake/R/ConfigureRCPP.cmake | 5 ++--- src/mlpack/core/util/io.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMake/R/ConfigureRCPP.cmake b/CMake/R/ConfigureRCPP.cmake index 756bfafec1..8b3e8ef3b0 100644 --- a/CMake/R/ConfigureRCPP.cmake +++ b/CMake/R/ConfigureRCPP.cmake @@ -10,11 +10,10 @@ include("${SOURCE_DIR}/CMake/StripType.cmake") strip_type("${PROGRAM_MAIN_FILE}") -# Extract the requried part from *main.cpp. +# Extract the required part from *main.cpp. # Example: mlpack/methods/adaboost/adaboost_main.cpp -string(REGEX MATCHALL "\\/src\\/[A-Za-z\\/._]*" INCLUDE_MODEL_SAFE +string(REGEX REPLACE "${SOURCE_DIR}\\/src\\/" "" INCLUDE_FILE "${PROGRAM_MAIN_FILE}") -string(REGEX REPLACE "\\/src\\/" "" INCLUDE_FILE "${INCLUDE_MODEL_SAFE}") file(READ "${MODEL_FILE}" MODEL_FILE_TYPE) if (NOT (MODEL_FILE_TYPE MATCHES "\"${MODEL_SAFE_TYPES}\"")) diff --git a/src/mlpack/core/util/io.cpp b/src/mlpack/core/util/io.cpp index 4d60f96411..2c357dac60 100644 --- a/src/mlpack/core/util/io.cpp +++ b/src/mlpack/core/util/io.cpp @@ -19,7 +19,7 @@ using namespace mlpack::util; // Fake ProgramDoc in case none is supplied. static ProgramDoc emptyProgramDoc = ProgramDoc("", "", []() { return ""; }, - []() { return ""; }, {}); + []() { return ""; }, {}); /* Constructors, Destructors, Copy */ /* Make the constructor private, to preclude unauthorized instances */