From 4647ef8aee4d9e7e3603ff979102b356ec610363 Mon Sep 17 00:00:00 2001
From: bergmann <info@bergmann89.de>
Date: Fri, 4 Oct 2019 23:23:54 +0200
Subject: [PATCH] * Small improvements

---
 include/cppmp/misc/getter.inl          | 5 ++++-
 include/cppmp/traits/lambda_traits.inl | 2 +-
 test/cppmp/cppmp_traits_test.cpp       | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/cppmp/misc/getter.inl b/include/cppmp/misc/getter.inl
index 9e07838..b305abd 100644
--- a/include/cppmp/misc/getter.inl
+++ b/include/cppmp/misc/getter.inl
@@ -39,7 +39,10 @@ namespace cppmp
         template<typename T_object, typename T_value>
         struct getter_builder<
             list<T_value T_object::*>,
-            void>
+            enable_if_t<
+                !is_valid_v<lambda_traits<T_value T_object::*>>
+            >
+        >
         {
             struct getter_member_var
                 : public tag_getter
diff --git a/include/cppmp/traits/lambda_traits.inl b/include/cppmp/traits/lambda_traits.inl
index 7387c04..ea1d1d6 100644
--- a/include/cppmp/traits/lambda_traits.inl
+++ b/include/cppmp/traits/lambda_traits.inl
@@ -58,7 +58,7 @@ namespace cppmp
 
     template<typename T_object, typename T_return, typename... T_args>
     struct lambda_traits<T_return (T_object::*)(T_args...) const, void>
-        : public __impl::lambda_traits_impl<false, T_object, T_return, T_args...>
+        : public __impl::lambda_traits_impl<false, const T_object, T_return, T_args...>
         { };
 
 }
diff --git a/test/cppmp/cppmp_traits_test.cpp b/test/cppmp/cppmp_traits_test.cpp
index 505216b..abe0f86 100644
--- a/test/cppmp/cppmp_traits_test.cpp
+++ b/test/cppmp/cppmp_traits_test.cpp
@@ -34,7 +34,7 @@ static_assert(                   type0::is_mutable_v     ==     true,
 static_assert(                   type0::is_static_v      ==     false,                              "");
 static_assert(                   type0::argument_count_v ==     1,                                  "");
 
-static_assert(is_same_v<typename type1::object_type,            test_obj>,                          "");
+static_assert(is_same_v<typename type1::object_type,            const test_obj>,                    "");
 static_assert(is_same_v<typename type1::return_type,            double>,                            "");
 static_assert(is_same_v<typename type1::arguments_type,         std::tuple<float, std::string>>,    "");
 static_assert(                   type1::is_mutable_v     ==     false,                              "");