From 6ebdb9915b30de00c95db3e31ec5336054c71120 Mon Sep 17 00:00:00 2001
From: Yaroslav <krylov.yaroslav@gmail.com>
Date: Fri, 24 Aug 2018 10:09:17 +0300
Subject: [PATCH 1/2] Update smart_pointers_with_polymorphism.cpp

Fix Color::operator == in smart_pointers_with_polymorphism example
---
 examples/smart_pointers_with_polymorphism.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/smart_pointers_with_polymorphism.cpp b/examples/smart_pointers_with_polymorphism.cpp
index 2de503c..3b2e8a4 100644
--- a/examples/smart_pointers_with_polymorphism.cpp
+++ b/examples/smart_pointers_with_polymorphism.cpp
@@ -27,7 +27,7 @@ struct Color {
     float r{}, g{}, b{};
     bool operator == (const Color& o) const {
         return std::tie(r, g, b) ==
-               std::tie(o.r, o.g, b);
+               std::tie(o.r, o.g, o.b);
     }
 
 };

From 4a0b3cae98bf318787cfc5c56ae4eb842b63ab1b Mon Sep 17 00:00:00 2001
From: AJIOB <aleksandr9809@gmail.com>
Date: Sat, 15 Sep 2018 08:37:56 +0300
Subject: [PATCH 2/2] VS 2017.5.6 example compilation fix

---
 include/bitsery/adapter_reader.h           | 2 +-
 include/bitsery/adapter_writer.h           | 4 ++--
 include/bitsery/traits/core/std_defaults.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/bitsery/adapter_reader.h b/include/bitsery/adapter_reader.h
index 3b60576..0687154 100644
--- a/include/bitsery/adapter_reader.h
+++ b/include/bitsery/adapter_reader.h
@@ -240,7 +240,7 @@ namespace bitsery {
             auto bitsLeft = size;
             T res{};
             while (bitsLeft > 0) {
-                auto bits = std::min(bitsLeft, details::BitsSize<UnsignedValue>::value);
+                auto bits = (std::min)(bitsLeft, details::BitsSize<UnsignedValue>::value);
                 if (m_scratchBits < bits) {
                     UnsignedValue tmp;
                     _reader.template readBytes<sizeof(UnsignedValue), UnsignedValue>(tmp);
diff --git a/include/bitsery/adapter_writer.h b/include/bitsery/adapter_writer.h
index 907e474..42df5f0 100644
--- a/include/bitsery/adapter_writer.h
+++ b/include/bitsery/adapter_writer.h
@@ -295,7 +295,7 @@ namespace bitsery {
             auto value = v;
             auto bitsLeft = size;
             while (bitsLeft > 0) {
-                auto bits = std::min(bitsLeft, valueSize);
+                auto bits = (std::min)(bitsLeft, valueSize);
                 _scratch |= static_cast<ScratchType>( value ) << _scratchBits;
                 _scratchBits += bits;
                 if (_scratchBits >= valueSize) {
@@ -324,7 +324,7 @@ namespace bitsery {
             }
         }
 
-        const UnsignedType _MASK = std::numeric_limits<UnsignedType>::max();
+        const UnsignedType _MASK = (std::numeric_limits<UnsignedType>::max)();
         ScratchType _scratch{};
         size_t _scratchBits{};
         TWriter& _writer;
diff --git a/include/bitsery/traits/core/std_defaults.h b/include/bitsery/traits/core/std_defaults.h
index b001c9f..cc41f05 100644
--- a/include/bitsery/traits/core/std_defaults.h
+++ b/include/bitsery/traits/core/std_defaults.h
@@ -73,7 +73,7 @@ namespace bitsery {
                 auto newSize = static_cast<size_t>(container.size() * 1.5 + 128);
                 //make data cache friendly
                 newSize -= newSize % 64;//64 is cache line size
-                container.resize(std::max(newSize, container.capacity()));
+                container.resize((std::max)(newSize, container.capacity()));
             }
             using TIterator = typename T::iterator;
             using TValue = typename ContainerTraits<T>::TValue;