Skip to content

Commit

Permalink
Merge 63a9712 into 9089be5
Browse files Browse the repository at this point in the history
  • Loading branch information
thearusable authored Jan 16, 2023
2 parents 9089be5 + 63a9712 commit 2b66dc0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions cmake/load_bundled_libraries.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

include(SetCXXCompilerFlags)

# Export a minimum version flag for any bundled libraries that don't set their own
set(CMAKE_CXX_STANDARD 14)

# Optionally include libfort which is used by diagnostics
if (vt_libfort_enabled)
set(FORT_ENABLE_TESTING OFF CACHE INTERNAL "")
Expand Down
2 changes: 1 addition & 1 deletion src/vt/utils/adt/union.h
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ struct AlignedCharUnion : UnionCopy<T, void, Ts...> {

template <typename U>
void staticAssertCorrectness() const {
detail::AllUnique<T, Ts...>{};
(void) detail::AllUnique<T, Ts...>{};
static_assert(
detail::MustBe<U, T, Ts...>::is_same, "Must be the valid type in union"
);
Expand Down

0 comments on commit 2b66dc0

Please sign in to comment.