Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Przemo committed Jun 26, 2018
1 parent 1fb65b6 commit ee8ae96
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.2.2)
project("owned_pointer" CXX)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(GMOCK_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/google-test/googlemock/include")
set(GTEST_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/google-test/googletest/include")

Expand Down
2 changes: 1 addition & 1 deletion inc/owned_pointer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ inline bool is_expired_enabled_f(const owned_pointer<T>& p) noexcept
return p.expired() || dynamic_cast<_priv::shared_secret*>(p.operator->()) != nullptr;
}

inline bool is_expired_enabled_f(...) noexcept
inline bool is_expired_enabled_f(...) noexcept
{
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions ut/owned_pointer_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,14 +171,14 @@ TEST_F(owned_pointer_ut, isExpiredEnabledTest)
ASSERT_FALSE(csp::is_expired_enabled<const csp::owned_pointer<int>>::value);
ASSERT_FALSE(csp::is_expired_enabled<const csp::owned_pointer<int>&>::value);
ASSERT_FALSE(csp::is_expired_enabled<const csp::owned_pointer<int>&&>::value);

ASSERT_TRUE(csp::is_expired_enabled<csp::owned_pointer<test_mock>>::value);
ASSERT_TRUE(csp::is_expired_enabled<csp::owned_pointer<test_mock>&>::value);
ASSERT_TRUE(csp::is_expired_enabled<csp::owned_pointer<test_mock>&&>::value);
ASSERT_TRUE(csp::is_expired_enabled<const csp::owned_pointer<test_mock>>::value);
ASSERT_TRUE(csp::is_expired_enabled<const csp::owned_pointer<test_mock>&>::value);
ASSERT_TRUE(csp::is_expired_enabled<const csp::owned_pointer<test_mock>&&>::value);

ASSERT_TRUE(csp::is_expired_enabled<csp::owned_pointer<const test_mock>>::value);
ASSERT_TRUE(csp::is_expired_enabled<csp::owned_pointer<const test_mock>&>::value);
ASSERT_TRUE(csp::is_expired_enabled<csp::owned_pointer<const test_mock>&&>::value);
Expand Down

0 comments on commit ee8ae96

Please sign in to comment.