Skip to content
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

Fixes to prevent clang-diagnostic errors #643

Merged
merged 2 commits into from
Oct 28, 2020
Merged

Fixes to prevent clang-diagnostic errors #643

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
fa7a1f3
Fixes to prevent clang-diagnostic when running clang-tidy with Micros…
johngladp May 27, 2020
7fe2b62
Used boolean rather than bitwise operator.
johngladp May 27, 2020
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 include/cereal/details/polymorphic_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ namespace cereal

auto ptr = PolymorphicCasters::template downcast<T>( dptr, baseInfo );

#ifdef _MSC_VER
#if defined(_MSC_VER) && !defined(__clang__)
savePolymorphicSharedPtr( ar, ptr, ::cereal::traits::has_shared_from_this<T>::type() ); // MSVC doesn't like typename here
#else // not _MSC_VER
savePolymorphicSharedPtr( ar, ptr, typename ::cereal::traits::has_shared_from_this<T>::type() );
Expand Down
2 changes: 1 addition & 1 deletion include/cereal/details/static_object.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt) */

#ifdef _MSC_VER
#if defined(_MSC_VER) && !defined(__clang__)
# define CEREAL_DLL_EXPORT __declspec(dllexport)
# define CEREAL_USED
#else // clang or gcc
Expand Down