Skip to content

Fix multi_threaded_map/_vector tests on Clang #1230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennykerr merged 2 commits into from
Nov 21, 2022
Merged

Fix multi_threaded_map/_vector tests on Clang #1230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
785c6fd
Fix multi_threaded_map/_vector tests on Clang
alvinhochun Nov 17, 2022
ba98f0e
Merge branch 'master' into alvin/mingw-tests
kennykerr Nov 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ endforeach()

add_executable(test-vanilla main.cpp ${TEST_SRCS})
set_target_properties(test-vanilla PROPERTIES OUTPUT_NAME "test")
target_link_libraries(test-vanilla runtimeobject)
target_link_libraries(test-vanilla runtimeobject synchronization)

target_precompile_headers(test-vanilla PRIVATE pch.h)
set_source_files_properties(
Expand Down
1 change: 0 additions & 1 deletion test/test/multi_threaded_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ namespace concurrent_collections
concurrency_checked_random_access_iterator(container const* c, iterator it) : owner(c), iterator(it) {}

// Implicit conversion from non-const iterator to const iterator.
template<typename = std::enable_if_t<!std::is_same_v<ConvertibleFrom, void>>>
concurrency_checked_random_access_iterator(concurrency_checked_random_access_iterator<container, ConvertibleFrom> other) : owner(other.owner), iterator(other.inner()) { }

concurrency_checked_random_access_iterator(concurrency_checked_random_access_iterator const&) = default;
Expand Down
4 changes: 0 additions & 4 deletions test/test/multi_threaded_map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@

#include "multi_threaded_common.h"

// FIXME: Fail to compile with Clang due to "error : no type named 'type' in 'std::enable_if<false>'"
#if !defined(__clang__)

using namespace winrt;
using namespace Windows::Foundation;
using namespace Windows::Foundation::Collections;
Expand Down Expand Up @@ -338,4 +335,3 @@ TEST_CASE("multi_threaded_observable_map")
test_map_concurrency<int, MapKind::IObservableMap>();
test_map_concurrency<IInspectable, MapKind::IObservableMap>();
}
#endif
6 changes: 1 addition & 5 deletions test/test/multi_threaded_vector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

#include "multi_threaded_common.h"

// FIXME: Fail to compile with Clang due to "error : no type named 'type' in 'std::enable_if<false>'"
#if !defined(__clang__)

using namespace winrt;
using namespace Windows::Foundation;
using namespace Windows::Foundation::Collections;
Expand Down Expand Up @@ -84,7 +81,7 @@ namespace
}
else
{
return vector.as<IObservableVector<IInspectable>>();
return vector.template as<IObservableVector<IInspectable>>();
}
}
}
Expand Down Expand Up @@ -469,4 +466,3 @@ TEST_CASE("multi_threaded_observable_vector")
test_vector_concurrency<IInspectable, VectorKind::IObservableVector>();
test_vector_concurrency<IInspectable, VectorKind::IObservableVectorAsInspectable>();
}
#endif