diff --git a/include/core/utils/loader.h b/include/core/utils/loader.h index 76ce583b26ee036fb9a670a5ef4444c06a8f5133..cc45b9e4a56a8a26cffa4c3c2fdb661e2df42da2 100644 --- a/include/core/utils/loader.h +++ b/include/core/utils/loader.h @@ -25,8 +25,6 @@ #include <map> #include <memory> - - namespace wolf { class Loader @@ -38,20 +36,20 @@ class Loader public: Loader(int flags = RTLD_LAZY); ~Loader(); - void load(std::string _libname_with_so); - void loadPlugin(std::string _plugin); - void close(std::string _libname_with_so); - void closePlugin(std::string _plugin); - void* isLoaded(std::string _libname_with_so) const; - void* isLoadedPlugin(std::string _plugin) const; - size_t size() const; + void load(std::string _libname_with_so); + void loadPlugin(std::string _plugin); + void close(std::string _libname_with_so); + void closePlugin(std::string _plugin); + void* isLoaded(std::string _libname_with_so) const; + void* isLoadedPlugin(std::string _plugin) const; + size_t size() const; }; typedef std::shared_ptr<Loader> LoaderPtr; inline size_t Loader::size() const { - return name_resources_.size(); + return name_resources_.size(); } } // namespace wolf diff --git a/src/problem/problem.cpp b/src/problem/problem.cpp index 2542162325144d1cccbd1a9d87a5263c4424e8ee..4d70114606c701497c0b82f78f79b486cfcfb496 100644 --- a/src/problem/problem.cpp +++ b/src/problem/problem.cpp @@ -385,7 +385,7 @@ ProcessorBasePtr Problem::installProcessor(const std::string& _params_yaml _params_yaml_filename); // Load yaml - auto server = yaml_schema_cpp::YamlServer(_schema_folders, _params_yaml_filename); + auto server = yaml_schema_cpp::YamlServer(_schema_folders, _params_yaml_filename); // Search and load plugins to get the installed schema folders registered searchAndLoadPlugins(server.getNode(), loader_); diff --git a/src/utils/loader.cpp b/src/utils/loader.cpp index 54d85ce7ef70a119c73dc397e96d5a5b178cc234..73e874ab614bc3308300a1ec86278458ba0f9bcd 100644 --- a/src/utils/loader.cpp +++ b/src/utils/loader.cpp @@ -32,7 +32,7 @@ namespace wolf { Loader::Loader(int _flags) : flags_(_flags) { - // Try to load plugin "core". Since it is already loaded (this class belongs to it), + // Try to load plugin "core". Since it is already loaded (this class belongs to it), // the resource will be stored in the 'name_resources_' std::map loadPlugin("core"); } diff --git a/src/utils/loader_utils.cpp b/src/utils/loader_utils.cpp index b3223190a82d6292dea9fb7fc088013b84c7ac28..f2f15dfdb0ca832cd5d8cffbdc57c0b063f2bd45 100644 --- a/src/utils/loader_utils.cpp +++ b/src/utils/loader_utils.cpp @@ -22,7 +22,6 @@ namespace wolf { - void searchAndLoadPlugins(const YAML::Node& _node, LoaderPtr _loader) { std::list<YAML::Node> visited_nodes; diff --git a/test/gtest_loader.cpp b/test/gtest_loader.cpp index 66b671c3f4d80b1eae106c1e06fd520bbac88cc1..7f92a3cbcfafd8bad569a665cfe3bf40633d2a98 100644 --- a/test/gtest_loader.cpp +++ b/test/gtest_loader.cpp @@ -36,7 +36,7 @@ TEST(loader_test, loadertest) { Loader loader = Loader(); - EXPECT_EQ(loader.size(), 1); // loader already store "core" resource + EXPECT_EQ(loader.size(), 1); // loader already store "core" resource EXPECT_TRUE(loader.isLoadedPlugin("core")); EXPECT_TRUE(loader.isLoaded("libwolfcore" + lib_extension));