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.

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

Add MSVC 2019 to build, default ctor for static object #593

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# can use variables like {build} and {branch}
version: 1.2.{build}
version: 1.3.{build}
pull_requests:
do_not_increment_build_number: true

Expand All @@ -22,9 +22,14 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
VS_VERSION_MAJOR: 15
BOOST_ROOT: C:\Libraries\boost_1_66_0
# - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 Preview
# VS_VERSION_MAJOR: 16
# BOOST_ROOT: C:\Libraries\boost_1_66_0
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
VS_VERSION_MAJOR: 16
BOOST_ROOT: C:\Libraries\boost_1_71_0

matrix:
exclude:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
platform: Win32

platform:
- Win32
Expand Down
3 changes: 2 additions & 1 deletion include/cereal/details/static_object.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ namespace cereal
std::unique_lock<std::mutex> lock;
#else
public:
LockGuard(LockGuard const &) = default; // prevents implicit copy ctor warning
LockGuard() = default;
LockGuard(LockGuard const &) = default; // prevents implicit copy ctor warning
~LockGuard() CEREAL_NOEXCEPT {} // prevents variable not used
#endif
};
Expand Down
4 changes: 2 additions & 2 deletions unittests/load_construct.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ void test_memory_load_construct()
oar( o_constShared2v );
}

o_shared3->shared_from_this(); // tests github issue #68
o_constShared3->shared_from_this();
(void) o_shared3->shared_from_this(); // tests github issue #68
(void) o_constShared3->shared_from_this();

decltype(o_shared1) i_shared1;
decltype(o_shared2) i_shared2;
Expand Down