Merge pull request #11 from karel-burda/develop

Develop
karel-burda · Oct 1, 2018 · 3f4b92a · 3f4b92a
2 parents 52d6297 + 2634cbf
commit 3f4b92a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
 
-project(function-loader VERSION 1.0.0 LANGUAGES CXX)
+project(function-loader VERSION 1.1.0 LANGUAGES CXX)
 
 include("cmake-helpers/cmake-helpers/messages.cmake")
 include("cmake-helpers/cmake-helpers/standard-settings.cmake")

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![Version](https://img.shields.io/badge/version-1.0.0-green.svg)
+![Version](https://img.shields.io/badge/version-1.1.0-green.svg)
 [![License](https://img.shields.io/badge/license-MIT_License-green.svg?style=flat)](LICENSE)
 [![Build Status](https://travis-ci.org/karel-burda/function-loader.svg?branch=master)](https://travis-ci.org/karel-burda/function-loader)
 [![Coverage Status](https://coveralls.io/repos/github/karel-burda/function-loader/badge.svg?branch=master)](https://coveralls.io/github/karel-burda/function-loader?branch=master)
@@ -47,8 +47,8 @@ try
 
     // get procedures at runtime from the shared library
     // see "demo-library.hpp" and "demo-library.cpp" in the "demo-library" directory
-    const auto func_simple = loader.get_procedure<void()>("function_with_no_params");
-    const auto func_more_complex = loader.get_procedure<int(float, const char *)>
+    const auto func_simple = loader.get_function<void()>("function_with_no_params");
+    const auto func_more_complex = loader.get_function<int(float, const char *)>
                                        ("function_with_return_value_and_params");
 
     // don't have to check for call-ability, otherwise the "function_does_not_exist" would be thrown

diff --git a/example/src/main.cpp b/example/src/main.cpp
@@ -21,8 +21,8 @@ static int show_usage()
 
         // get procedures at runtime from the shared library
         // see "demo-library.hpp" and "demo-library.cpp" in the "demo-library" directory
-        const auto func_void_no_params = loader.get_procedure<void()>("function_with_no_params");
-        const auto func_with_return_value_and_params = loader.get_procedure<int(float, const char *)>("function_with_return_value_and_params");
+        const auto func_void_no_params = loader.get_function<void()>("function_with_no_params");
+        const auto func_with_return_value_and_params = loader.get_function<int(float, const char *)>("function_with_return_value_and_params");
 
         // don't have to check for call-ability, otherwise the "function_does_not_exist" would be thrown
         func_void_no_params();

diff --git a/include/function_loader/function_loader.hpp b/include/function_loader/function_loader.hpp
@@ -29,7 +29,7 @@ class function_loader : public detail::function_loader_base
     /// @returns std::function that binds to the found function in a shared library
     /// @throws function_does_not_exist
     template<typename function_type>
-    std::function<function_type> get_procedure(const std::string & procedure_name)
+    std::function<function_type> get_function(const std::string & procedure_name)
     {
         void * procedure_address = get_function_address(library.get_handle(), procedure_name.c_str());
 

diff --git a/tests/unit/src/function_loader_test.cpp b/tests/unit/src/function_loader_test.cpp
@@ -36,25 +36,25 @@ TEST(function_loader, default_values)
     EXPECT_NE(&loader.library, nullptr);
 }
 
-TEST(function_loader, get_procedure)
+TEST(function_loader, get_function)
 {
     function_loader loader{ testing::get_demo_library_file_path() };
 
     {
-        const auto func_void_no_params = loader.get_procedure<void()>("function_with_no_params");
+        const auto func_void_no_params = loader.get_function<void()>("function_with_no_params");
 
         EXPECT_NO_THROW(func_void_no_params());
     }
 
     {
-        const auto func_with_return_value_and_params = loader.get_procedure<int(float, const char *)>("function_with_return_value_and_params");
+        const auto func_with_return_value_and_params = loader.get_function<int(float, const char *)>("function_with_return_value_and_params");
         int returnedValue = 0;
         EXPECT_NO_THROW(returnedValue = func_with_return_value_and_params(2.3f, "foo-bar-baz"));
         EXPECT_EQ(returnedValue, 999);
     }
 
     {
-        EXPECT_THROW(loader.get_procedure<int(float, const char *)>("function_that_does_not_exists"), exceptions::function_does_not_exist);
+        EXPECT_THROW(loader.get_function<int(float, const char *)>("function_that_does_not_exists"), exceptions::function_does_not_exist);
     }
 }
 
@@ -64,7 +64,7 @@ TEST(function_loader, exceptions)
     try
     {
         function_loader loader{ testing::get_demo_library_file_path() };
-        loader.get_procedure<void()>("foo-bar-baz");
+        loader.get_function<void()>("foo-bar-baz");
     }
     catch (const exceptions::function_does_not_exist & error)
     {