added inheritance extension, and ability to have internal contexts within serializer/deserializer

CHANGELOG.md

@@ -1,3 +1,63 @@
+# [4.2.0](https://github.com/fraillt/bitsery/compare/v4.1.0...v4.2.0) (2017-11-12)
+
+### Features
+
+* serializer/deserializer can now have **internal context(s)** via configuration.
+It is convenient way to pass context, when it doesn't convey useful information outside of serializer/deserializer and is default constructable.
+* added **contextOrNull\<T\>()** overload to *BasicSerializer/BasicDeserializer*.
+Difference between *contextOrNull\<T\>()* and *context\<T\>()* is, that using *context\<T\>()* code doesn't compile if T doesn't exists at all, while using *contextOrNull\<T\>()* code compiles, but returns *nullptr* at runtime.
+* added inheritance support via extensions.
+In order to correctly manage virtual inheritance two extensions was created in **<bitsery/ext/inheritance.h>** header:
+  * **BaseClass\<TBase\>** - use when inheriting from objects without virtual inheritance.
+  * **VirtualBaseClass\<TBase\>** - ensures that only one copy of each virtual base class is serialized.
+
+  To keep track of virtual base classes **InheritanceContext** is required, but it is optional if no virtual bases exists in serialization flow.
+  I.e. if context is not defined, code will not compile only if virtual inheritance is used.
+  See [inheritance](examples/inheritance.cpp) for usage example.
+
+### Improvements
+* added optional ctor parameter for *PointerOwner* and *PointerObserver* - **PointerType**, which specifies if pointer can be null or not.
+Default is **Nullable**.
+
+# [4.1.0](https://github.com/fraillt/bitsery/compare/v4.0.1...v4.1.0) (2017-10-27)
+
+### Features
+* added raw pointers support via extensions.
+In order to correctly manage pointer ownership, three extensions was created in **<bitsery/ext/pointer.h>** header:
+  * **PointerOwner** - manages life time of the pointer, creates or destroys if required.
+  * **PointerObserver** - doesn't own pointer so it doesn't create or destroy anything.
+  * **ReferencedByPointer** - when non-owning pointer (*PointerObserver*) points to reference type, this extension marks this object as a valid target for PointerObserver.
+
+  To validate and update pointers **PointerLinkingContext** have to be passed to serialization/deserialization.
+  It ensures that all pointers are valid, that same pointer doesn't have multiple owners, and non-owning pointers doesn't point outside of scope (i.e. non owning pointers points to data that is serialized/deserialized), see [raw_pointers example](examples/raw_pointers.cpp) for usage example.
+
+  *Currently polimorphism and std::shared_ptr,  std::unique_ptr is not supported.*
+
+* added **context\<T\>()** overload to *BasicSerializer/BasicDeserializer* and now they became typesafe.
+For better extensions support, added posibility to have multiple types in context with *std::tuple*.
+E.g. when using multiple extensions, that requires specific contexts, together with your custom context, you can define your context as *std::tuple\<PointerLinkingContext, MyContext\>* and in serialization function you can correctly get your data via *context\<MyContext\>()*.
+
+
+### Improvements
+
+* new **OutputBufferedStreamAdapter** use internal buffer instead of directly writing to stream, can get more than 2x performance increase.
+  * can use any contiguous container as internal buffer.
+  * when using fixed-size, stack allocated container (*std::array*), buffer size via constructor is ignored.
+  * default internal buffer is *std::array<char,256>*.
+* added *static_assert* when trying to use *BufferAdapter* with non contiguous container.
+
+
+# [4.0.1](https://github.com/fraillt/bitsery/compare/v4.0.0...v4.0.1) (2017-10-18)
+
+### Improvements
+
+* improved usage with Visual Studio:
+  * improved CMake.
+  * Visual Studio doesn't properly support expression SFINAE using std::void_t, so it was rewritten.
+* refactorings to remove compiler warnings when using *-Wextra -Wno-missing-braces -Wpedantic -Weffc++*
+* added assertion when session is empty (sessions is created via *growable* extension).
+* stream adapter manually *setstate* to *std::ios_base::eofbit* when unable to read required bytes.
+
 # [4.0.0](https://github.com/fraillt/bitsery/compare/v3.0.0...v4.0.0) (2017-10-13)
 
 I feel that current library public API is complete, and should be stable for long time.

CMakeLists.txt

@@ -2,7 +2,13 @@ cmake_minimum_required(VERSION 3.2)
 
 project(bitsery)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    set(COMPILE_FLAGS "")
+else()
+    set(COMPILE_FLAGS "-Wall -Wextra -Wno-missing-braces -Wpedantic -Weffc++")
+endif()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_FLAGS}")
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 

README.md

@@ -14,14 +14,15 @@ All cross-platform requirements are enforced at compile time, so serialized data
 
 * Cross-platform compatible.
 * Optimized for speed and space.
-* Allows flexible or/and verbose syntax for better serialization control.
 * No code generation required: no IDL or metadata, just use your types directly.
 * Runtime error checking on deserialization.
-* Supports forward/backward compatibility for your types.
-* 2-in-1 declarative control flow, same code for serialization and deserialization.
-* Allows fine-grained bit-level serialization control.
 * Can read/write from any source: stream (file, network stream. etc... ), or buffer (vector, c-array, etc...).
+* Don't pay for what you don't use! - customize your serialization via **extensions**. Some notable *extensions* allow:
+  * forward/backward compatibility for your types.
+  * raw pointers (no polymorphism yet).
+  * fine-grained bit-level serialization control.
 * Easily extendable for any type.
+* Allows flexible or/and verbose syntax for better serialization control.
 * Configurable endianess support.
 * No macros.
 
@@ -31,12 +32,12 @@ Look at the numbers and features list, and decide yourself.
 
 |                              | binary size | data size | serialize   | deserialize |
 |------------------------------|-------------|-----------|-------------|-------------|
-| **test_bitsery**             | 64704       | **7565**  | **1229 ms** | **1086 ms** |
-| **test_bitsery_compression** | 44000       | **4784**  | **1370 ms** | **2463 ms** |
-| test_yas                     | 63864       | 11311     | 1616 ms     | 1712 ms     |
-| test_yas_compression         | 72688       | 8523      | 2387 ms     | 2890 ms     |
-| test_cereal                  | 74848       | 11261     | 6708 ms     | 6799 ms     |
-| test_flatbuffers             | 67032       | 16100     | 8793 ms     | 3028 ms     |
+| **test_bitsery**             | 64704 B     | **7565 B**| **1229 ms** | **1086 ms** |
+| **test_bitsery_compression** | 64880 B     | **4784 B**| **1641 ms** | **2462 ms** |
+| test_yas                     | 63864 B     | 11311 B   | 1616 ms     | 1712 ms     |
+| test_yas_compression         | 72688 B     | 8523 B    | 2387 ms     | 2890 ms     |
+| test_cereal                  | 74848 B     | 11261 B   | 6708 ms     | 6799 ms     |
+| test_flatbuffers             | 67032 B     | 16100 B   | 8793 ms     | 3028 ms     |
 
 *benchmarked on Ubuntu with GCC 7.1.0, more details can be found [here](https://github.com/fraillt/cpp_serializers_benchmark.git)*
 

doc/README.md

@@ -9,6 +9,8 @@ Library design:
 * `extending library functionality`
 * `errors handling`
 * `forward/backward compatibility via Growable extension`
+* `pointers`
+* `inheritance`
 
 
 Core Serializer/Deserializer functions (alphabetical order):
@@ -17,19 +19,26 @@ Core Serializer/Deserializer functions (alphabetical order):
 * `container`
 * `ext`
 * `context`
+* `context<T>`
+* `contextOrNull<T>`
 * `object`
 * `text`
 * `value`
 
 Serializer/Deserializer extensions via `ext` method (alphabetical order):
+* `BaseClass`
 * `Entropy`
 * `Growable`
+* `PointerOwner`
+* `PointerObserver`
+* `ReferencedByPointer`
 * `StdMap`
 * `StdOptional`
 * `StdQueue`
 * `StdSet`
 * `StdStack`
 * `ValueRange`
+* `VirtualBaseClass`
 
 AdapterWriter/Reader functions:
 * `writeBits/readBits`
@@ -52,15 +61,12 @@ Input adapters (buffer and stream) functions:
 Output adapters (buffer and stream) functions:
 * `write`
 * `flush`
-* `writtenBytesCount`
+* `writtenBytesCount` (buffer adapter only)
 
 
 Tips and tricks:
 * if you're getting static assert "please define 'serialize' function", most likely it is because your **serialize** function is not defined in same namespace as object.
 
-Limitations:
-* max **text** or **container** size can be 2^(n-2) (where n = sizeof(std::size_t) * 8) for 32-bit systems it is 1073741823 (0x3FFFFFF).
-
 Other:
 * [Contributing](../CONTRIBUTING.md)
 * [Change log](../CHANGELOG.md)

doc/design/README.md

@@ -41,9 +41,9 @@ But do it on your own risk, and static assert using *assertFundamentalTypeSizes*
 It also doesn't serialize any type information, all information needed is writen in your code!
 * **No code generation required: no IDL or metadata** since it doesn't support any other formats except binary, it doesn't need any metadata.
 * **Runtime error checking on deserialization** library designed to be save with untrusted network data, that's why all overloads that work on containers has *maxSize* value, unless container is static size like *std::array*, this way bitsery ensures that no malicious data crash you.
-* **Supports forward/backward compatibility for your types** library has optional forward/backward compatibility for types implemented in *BasicBufferReader/BasicBufferWriter* by allowing to have inner data sessions in inside buffer.
+* **Supports forward/backward compatibility for your types** library has optional forward/backward compatibility for types implemented in *AdapterReader/Writer* by allowing to have inner data sessions inside buffer.
 This is the only functionality that requires dynamic memory allocation.
-*Glowable* extension use these sessions to add compatibility support for your types, in most basic form.
+*Growable* extension use these sessions to add compatibility support for your types, in most basic form.
 You can implement your own extensions if you want to be able to add default values.
 * **2-in-1 declarative control flow, same code for serialization and deserialization.** only one function to define, for serialization and deserialization in same manner as *cereal* does.
 It might be handy to have separate *load* and *save* functions, but Bitsery explicitly doesn't support it, to avoid any serialization deserialization divergence, because it is very hard to catch an errors if you make a bug in one of these functions.
@@ -67,5 +67,3 @@ To use same container for buffer writing/reading add specialization to *BufferAd
 You want to customize serialization flow - use extensions, only two methods to define, and *ExtensionTraits* to further customize usage.
 * **Configurable endianess support.** default is *Little Endian*, but if your primary target is PowerPC architecture, eg. PlayStation3, just change your configuration to be *Big Endian*.
 * **No macros.** Not so much to say, if you are like me, then it's a feature :)
-
-*project for performance benchmark will be added to separate github project, i'll give you a link to it when its done.*

examples/CMakeLists.txt

@@ -27,6 +27,12 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
 
 file(GLOB ExampleFiles ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
+if (WIN32)
+    message(WARNING "Removing example `flexible_assert_linux_x64` for Windows")
+    list(REMOVE_ITEM ExampleFiles ${CMAKE_CURRENT_SOURCE_DIR}/flexible_assert_linux_x64.cpp)
+endif()
+
+
 FOREACH(ExampleFile ${ExampleFiles})
     get_filename_component(ExampleName ${ExampleFile} NAME_WE)
     add_executable(${ExampleName} ${ExampleFile})

examples/basic_usage.cpp

@@ -20,7 +20,7 @@ void serialize(S& s, MyStruct& o) {
     s.value4b(o.i);//fundamental types (ints, floats, enums) of size 4b
     s.value2b(o.e);
     s.container4b(o.fs, 10);//resizable containers also requires maxSize, to make it safe from buffer-overflow attacks
-};
+}
 
 using namespace bitsery;
 

examples/bit_packing.cpp

@@ -0,0 +1,64 @@
+#include <bitsery/bitsery.h>
+#include <bitsery/adapter/buffer.h>
+//we'll be using std::array as a buffer type, so include traits for this
+#include <bitsery/traits/array.h>
+#include <bitsery/traits/string.h>
+#include <bitsery/traits/vector.h>
+//include extension that will allow to compress our data
+#include <bitsery/ext/value_range.h>
+
+namespace MyTypes {
+
+    struct Vec3 { float x, y, z; };
+
+    struct Monster {
+        Vec3 pos;
+        std::vector<Vec3> path;
+        std::string name;
+    };
+
+    template<typename S>
+    void serialize(S& s, MyTypes::Vec3 &o) {
+        s.value4b(o.x);
+        s.value4b(o.y);
+        s.value4b(o.z);
+    }
+
+    template <typename S>
+    void serialize (S& s, Monster& o) {
+        s.text1b(o.name, 20);
+        s.object(o.pos);
+        //compress path in a range of -1.0 .. 1.0 with 0.01 precision
+        //enableBitPacking creates separate serializer/deserializer object, that contains bit packing operations
+        s.enableBitPacking([&o](typename S::BPEnabledType& sbp) {
+            sbp.container(o.path, 1000, [&sbp](Vec3& vec3) {
+                constexpr bitsery::ext::ValueRange<float> range{-1.0f,1.0f, 0.01f};
+                sbp.ext(vec3.x, range);
+                sbp.ext(vec3.y, range);
+                sbp.ext(vec3.z, range);
+            });
+        });
+    }
+}
+
+using namespace bitsery;
+
+//use fixed-size buffer
+using Buffer = std::array<uint8_t, 10000>;
+using OutputAdapter = OutputBufferAdapter<Buffer>;
+using InputAdapter = InputBufferAdapter<Buffer>;
+
+int main() {
+    //set some random data
+    MyTypes::Monster data{};
+    data.name = "lew";
+
+    //create buffer to store data to
+    Buffer buffer{};
+    auto writtenSize = quickSerialization<OutputAdapter>(buffer, data);
+
+    MyTypes::Monster res{};
+    auto state = quickDeserialization<InputAdapter>({buffer.begin(), writtenSize}, res);
+
+    assert(state.first == ReaderError::NoError && state.second);
+}

examples/context_usage.cpp

@@ -0,0 +1,105 @@
+#include <bitsery/bitsery.h>
+#include <bitsery/adapter/buffer.h>
+
+#include <bitsery/traits/string.h>
+#include <bitsery/traits/vector.h>
+
+#include <bitsery/ext/value_range.h>
+
+namespace MyTypes {
+
+    struct Monster {
+        Monster() = default;
+        Monster(std::string _name, uint32_t minDmg, uint32_t maxDmg)
+                :name{_name}, minDamage{minDmg}, maxDamage{maxDmg} {}
+
+        std::string name{};
+        uint32_t minDamage{};
+        uint32_t maxDamage{};
+        //...
+    };
+
+    struct GameState {
+        std::vector<Monster> monsters;
+    };
+
+    //default flow for monster
+    template <typename S>
+    void serialize (S& s, Monster& o) {
+        s.text1b(o.name, 20);
+        s.value4b(o.minDamage);
+        s.value4b(o.maxDamage);
+    }
+
+    template<typename S>
+    void serialize(S& s, GameState &o) {
+        //we can have multiple types in context with std::tuple
+        //this cast also works if our context is the same as cast
+        auto maxMonsters = s.template context<int>();
+        //all data from context is always pointer
+        //if data type doesn't match then it will be compile time error
+        auto dmgRange = s.template context<std::pair<uint32_t, uint32_t>>();
+        s.container(o.monsters, *maxMonsters, [&s, dmgRange] (Monster& m) {
+            s.text1b(m.name, 20);
+            //we know min/max damage range for monsters, so we can use this range instead of full value
+            bitsery::ext::ValueRange<uint32_t> range{dmgRange->first, dmgRange->second};
+            //enable bit packing
+            s.enableBitPacking([&m, &range](typename S::BPEnabledType& sbp) {
+                sbp.ext(m.minDamage, range);
+                sbp.ext(m.maxDamage, range);
+            });
+        });
+    }
+
+}
+
+using namespace bitsery;
+
+//use fixed-size buffer
+using Buffer = std::vector<uint8_t>;
+using OutputAdapter = OutputBufferAdapter<Buffer>;
+using InputAdapter = InputBufferAdapter<Buffer>;
+//context can contain multiple types
+//it would make more sense to define separate structure for context, but for sake of this example make it more complex
+//in serialization function we can cast it like this:
+//  s.template context<int>();
+//if we want to get whole tuple, just call s.context() without template paramter.
+//this templated version also works if our context is the same as cast:
+//  struct MyContext {...};
+//  ...
+//  s.template context<MyContext>();
+using Context = std::tuple<int, std::pair<uint32_t, uint32_t>>;
+
+int main() {
+
+    MyTypes::GameState data{};
+    data.monsters.push_back({"weaksy", 100, 200});
+    data.monsters.push_back({"bigsy", 500, 1000});
+    data.monsters.push_back({"tootoo", 350, 750});
+
+    //set context
+    Context ctx{};
+    //max monsters
+    std::get<0>(ctx) = 4;
+    //damage range
+    std::get<1>(ctx).first = 100;
+    std::get<1>(ctx).second = 1000;
+
+
+    //create buffer to store data to
+    Buffer buffer{};
+    //pass game mode object to serializer as context
+    BasicSerializer<AdapterWriter<OutputAdapter, bitsery::DefaultConfig>, Context> ser{buffer, &ctx};
+    ser.object(data);
+
+    auto& w = AdapterAccess::getWriter(ser);
+    w.flush();
+    auto writtenSize = w.writtenBytesCount();
+
+    MyTypes::GameState res{};
+    BasicDeserializer <AdapterReader<InputAdapter, bitsery::DefaultConfig>, Context> des { InputAdapter{buffer.begin(), writtenSize}, &ctx};
+    des.object(res);
+    auto& r = AdapterAccess::getReader(des);
+
+    assert(r.error() == ReaderError::NoError && r.isCompletedSuccessfully());
+}

examples/file_stream.cpp

@@ -17,13 +17,12 @@ void serialize(S& s, MyStruct& o) {
     s.value4b(o.i);
     s.value2b(o.e);
     s.value8b(o.f);
-};
+}
 
 using namespace bitsery;
 
 //some helper types
 using Stream = std::fstream;
-using IOAdapter = IOStreamAdapter;
 
 int main() {
     //set some random data
@@ -37,10 +36,12 @@ int main() {
         std::cout << "cannot open " << fileName << " for writing\n";
         return 0;
     }
-    //use same quick serialization function
-    //streams do not return written size
-    quickSerialization<IOAdapter>(s, data);
-
+    //we cannot use quick serialization function, because streams cannot use writtenBytesCount method
+    //for serialization we can use buffered stream adapter, it can greatly improve performance for some streams
+    Serializer<OutputBufferedStreamAdapter> ser{s};
+    ser.object(data);
+    //flush to writer
+    AdapterAccess::getWriter(ser).flush();
     s.close();
     //reopen for reading
 
@@ -52,7 +53,7 @@ int main() {
 
     //same as serialization, but returns deserialization state as a pair
     //first = error code, second = is buffer was successfully read from begin to the end.
-    auto state = quickDeserialization<IOAdapter>(s, res);
+    auto state = quickDeserialization<InputStreamAdapter>(s, res);
 
     assert(state.first == ReaderError::NoError && state.second);
     assert(data.f == res.f && data.i == res.i && data.e == res.e);

examples/flexible_assert_linux_x64.cpp

@@ -15,7 +15,7 @@ struct MyStruct {
         //now we can use flexible syntax with
         //member function has same name as parameter
         s.archive(this->s, i, vl, ll);
-    };
+    }
 
 };
 

examples/flexible_syntax.cpp

@@ -19,7 +19,7 @@ struct MyStruct {
     void serialize(S& s) {
         //now we can use flexible syntax with
         s.archive(i, e, fs);
-    };
+    }
 
 };
 

examples/forward_backward_compatibility.cpp

@@ -15,8 +15,10 @@ namespace MyTypes {
     struct Vec3 { float x, y, z; };
 
     struct Weapon {
-        std::string name;
-        int16_t damage;
+        std::string name{};
+        int16_t damage{};
+        Weapon() = default;
+        Weapon(const std::string& _name, int16_t dmg):name{_name}, damage{dmg} {}
     private:
         //define serialize function as private, and give access to bitsery
         friend bitsery::Access;

examples/inheritance.cpp

@@ -0,0 +1,117 @@
+//
+//this example coverls all the corner cases that can happen using inherintace
+//in reality virtual inherintance is usually avoided, so your code would look much simpler.
+//
+
+#include <bitsery/bitsery.h>
+#include <bitsery/adapter/buffer.h>
+#include <bitsery/traits/vector.h>
+
+//include inheritance extension
+//this header contains two extensions, that specifies inheritance type of base class
+//  BaseClass - normal inheritance
+//  VirtualBaseClass - when virtual inheritance is used
+//in order for virtual inheritance to work, InheritanceContext is required.
+//it can be created either internally (via configuration) or externally (pointer to context).
+#include <bitsery/ext/inheritance.h>
+
+using bitsery::ext::BaseClass;
+using bitsery::ext::VirtualBaseClass;
+
+struct Base {
+    uint8_t x{};
+    //Base doesn't have to be polymorphic class, inheritance works at compile-time.
+};
+template <typename S>
+void serialize(S& s, Base& o) {
+    s.value1b(o.x);
+}
+
+struct Derive1:virtual Base {// virtually inherits from base
+    uint8_t y1{};
+};
+template <typename S>
+void serialize(S& s, Derive1& o) {
+    //define virtual inheritance, it will not compile if InheritanceContext is not defined in serializer/deserialzer
+    s.ext(o, VirtualBaseClass<Base>{});
+    s.value1b(o.y1);
+}
+
+//to make it more interesting, serialize private member
+struct Derived2:virtual Base {
+    explicit Derived2(uint8_t y):y2{y} {}
+
+    uint8_t getY2() const {
+        return y2;
+    };
+private:
+    friend bitsery::Access;
+    uint8_t y2{};
+    template <typename S>
+    void serialize(S& s) {
+        //notice virtual inheritance
+        s.ext(*this, VirtualBaseClass<Base>{});
+        s.value1b(y2);
+    }
+};
+
+struct MultipleInheritance: Derive1, Derived2 {
+    explicit MultipleInheritance(uint8_t y2):Derived2{y2} {}
+    uint8_t z{};
+};
+template <typename S>
+void serialize(S& s, MultipleInheritance& o) {
+    //has two bases, serialize them separately
+    s.ext(o, BaseClass<Derive1>{});
+    s.ext(o, BaseClass<Derived2>{});
+    s.value1b(o.z);
+}
+
+namespace bitsery {
+    // call to serialize function with Derived2 and MultipleInheritance is ambiguous,
+    // it matches two serialize functions: Base classes non-member fnc and Derived2 member fnc
+    // we need explicitly select which function to use
+    template <>
+    struct SelectSerializeFnc<Derived2>:UseMemberFnc {};
+
+    //multiple inheritance has non-member serialize function defined
+    template <>
+    struct SelectSerializeFnc<MultipleInheritance>:UseNonMemberFnc {};
+}
+
+using namespace bitsery;
+
+// since in this example we're using virtual inheritance we need InheritanceContext as well.
+// InheritanceContext is default constructable and has no useful information outside of serializer/deserializer
+// lets create it internally, via configuration
+struct ConfigWithContext:DefaultConfig {
+    //always add internal contexts to tuple
+    using InternalContext = std::tuple<ext::InheritanceContext>;
+};
+
+//some helper types
+using Buffer = std::vector<uint8_t>;
+using Writer = AdapterWriter<OutputBufferAdapter<Buffer>, ConfigWithContext>;
+using Reader = AdapterReader<InputBufferAdapter<Buffer>, ConfigWithContext>;
+
+int main() {
+
+    MultipleInheritance data{98};
+    data.x = 254;
+    data.y1 = 47;
+    data.z = 1;
+
+    Buffer buf{};
+
+    BasicSerializer<Writer> ser{OutputBufferAdapter<Buffer>{buf}, nullptr};
+    ser.object(data);
+    auto writtenSize = AdapterAccess::getWriter(ser).writtenBytesCount();
+
+    MultipleInheritance res{0};
+    BasicDeserializer<Reader> des{InputBufferAdapter<Buffer>{buf.begin(), writtenSize}};
+    des.object(res);
+    assert(AdapterAccess::getReader(des).error() == ReaderError::NoError && AdapterAccess::getReader(des).isCompletedSuccessfully());
+
+    assert(data.x == res.x && data.y1 == res.y1 && data.getY2() == res.getY2() && data.z == res.z);
+    assert(writtenSize == 4);//base is serialized once, because it is inherited virtually
+}

examples/raw_pointers.cpp

@@ -0,0 +1,160 @@
+#include <bitsery/bitsery.h>
+#include <bitsery/adapter/buffer.h>
+#include <bitsery/traits/vector.h>
+
+//include pointers extension
+//this header contains multiple extensions for different pointer types and pointer linking context,
+//that validates pointer ownership and checks if there are and no dangling pointers after serialization/deserialization.
+//dangling pointer in this context means, that non-owning pointer points to data, that was not serialized.
+#include <bitsery/ext/pointer.h>
+
+using bitsery::ext::ReferencedByPointer;
+using bitsery::ext::PointerObserver;
+using bitsery::ext::PointerOwner;
+using bitsery::ext::PointerType ;
+
+enum class MyEnum:uint16_t { V1,V2,V3 };
+struct MyStruct {
+    MyStruct(uint32_t i_, MyEnum e_, std::vector<float> fs_)
+            :i{i_},
+             e{e_},
+             fs{fs_} {}
+    MyStruct():MyStruct{0, MyEnum::V1, {}} {}
+    uint32_t i;
+    MyEnum e;
+    std::vector<float> fs;
+};
+
+template <typename S>
+void serialize(S& s, MyStruct& o) {
+    s.value4b(o.i);
+    s.value2b(o.e);
+    s.container4b(o.fs, 10);
+}
+
+//our test data
+struct Test1Data {
+    //regular data, nothing fancy here
+    MyStruct o1;
+    int32_t i1;
+    //these container elements can be referenced by pointers
+    std::vector<MyStruct> vdata;
+    //container that holds non owning pointers (observers),
+    std::vector<MyStruct*> vptr;
+    //treat it as is observer
+    MyStruct* po1;
+    //we treat this as owner (responsible for allocation/deallocation
+    int32_t* pi1;
+
+private:
+    friend bitsery::Access;
+
+    template <typename S>
+    void serialize(S& s) {
+        //just a regular fields
+        s.object(o1);
+        s.value4b(i1);
+
+        //set container elements to be candidates for non-owning pointers
+        s.container(vdata, 100, [&s](MyStruct& d){
+            s.ext(d, ReferencedByPointer{});
+        });
+        //contains non owning pointers
+        //
+        //IMPORTANT !!!
+        //ALWAYS ACCEPT BY REFERENCE like this: T* (&obj)
+        //if using c++14, then auto& always works.
+        //
+        //you can also serialize non owning pointers first, pointer linking context will keep track on them
+        //and as soon as pointer owner data is deserialized, all non-owning pointers will be updated
+        s.container(vptr, 100, [&s](MyStruct* (&d)){
+            s.ext(d, PointerObserver{});
+        });
+        //observer
+        s.ext(po1, PointerObserver{});
+        //owner, mark it as not null
+        s.ext4b(pi1, PointerOwner{PointerType::NotNull});
+
+    }
+};
+
+using namespace bitsery;
+
+//some helper types
+using Buffer = std::vector<uint8_t>;
+using OutputAdapter = OutputBufferAdapter<Buffer>;
+using InputAdapter = InputBufferAdapter<Buffer>;
+
+//we will need PointerLinkingContext to work with pointers
+//so lets define our serializer/deserializer
+//if we need context for our own custom flow, we can define it as tuple like this:
+//  std::tuple<MyContext,ext::PointerLinkingContext>
+//and other code will work as expected as long as it cast to proper type.
+//see context_usage.cpp for usage example
+using MySerializer = BasicSerializer<AdapterWriter<OutputAdapter, DefaultConfig>, ext::PointerLinkingContext>;
+using MyDeserializer = BasicDeserializer<AdapterReader<InputAdapter, DefaultConfig>, ext::PointerLinkingContext>;
+
+int main() {
+    //set some random data
+    Test1Data data{};
+    data.vdata.emplace_back(8941, MyEnum::V1, std::vector<float>{4.4f});
+    data.vdata.emplace_back(15478, MyEnum::V2, std::vector<float>{15.0f});
+    data.vdata.emplace_back(59, MyEnum::V3, std::vector<float>{-8.5f, 0.045f});
+    //container of non owning pointers (observers)
+    data.vptr.emplace_back(nullptr);
+    data.vptr.emplace_back(std::addressof(data.vdata[0]));
+    data.vptr.emplace_back(std::addressof(data.vdata[2]));
+    //regular fields
+    data.o1 = MyStruct{4, MyEnum::V2, {57.078f}};
+    data.i1 = 9455;
+    //observer
+    data.po1 = std::addressof(data.vdata[1]);
+    //owning pointer
+    data.pi1 = new int32_t{};
+
+    //create buffer to store data
+    Buffer buffer{};
+    size_t writtenSize{};
+    //in order to use pointers, we need to pass pointer linking context to serializer/deserializer
+    {
+        ext::PointerLinkingContext ctx{};
+        //pass lining context to serializer, by pointer
+        MySerializer ser{OutputAdapter{buffer}, &ctx};
+        //serialize our data
+        ser.object(data);
+        auto& w = AdapterAccess::getWriter(ser);
+        w.flush();
+        writtenSize = w.writtenBytesCount();
+
+        //make sure that pointer linking context is valid
+        //this ensures that all non-owning pointers points to data that has been serialized,
+        //so we can successfully reconstruct pointers after deserialization
+        assert(ctx.isValid());
+    }
+
+    Test1Data res{};
+    {
+        ext::PointerLinkingContext ctx{};
+        //pass lining context to deserializer, by pointer
+        MyDeserializer des{InputAdapter{buffer.begin(), writtenSize}, &ctx};
+        //deserialize our data
+        des.object(res);
+        auto& r = AdapterAccess::getReader(des);
+        //check if everything went find
+        assert(r.error() == ReaderError::NoError && r.isCompletedSuccessfully());
+        //also check for dangling pointers, after deserialization
+        assert(ctx.isValid());
+    }
+    //owning pointers owns data
+    assert(*res.pi1 == *data.pi1);
+    assert(res.pi1 != data.pi1);
+    //observers, points to other data
+    assert(res.vptr[0] == nullptr);
+    assert(res.vptr[1] == std::addressof(res.vdata[0]));
+    assert(res.vptr[2] == std::addressof(res.vdata[2]));
+    assert(res.po1 == std::addressof(res.vdata[1]));
+
+    //delete raw owning pointers
+    delete data.pi1;
+    delete res.pi1;
+}

ext/LinkTestLib.cmake

@@ -1,7 +1,6 @@
 function(LinkTestLib TargetName)
 
     add_dependencies(${TargetName} googletest)
-
     if(NOT WIN32 OR MINGW)
         FOREACH(LibName ${GTestLinkLibNames})
             target_link_libraries(${TargetName} ${GTestLibsDir}/lib${LibName}.a )
@@ -9,7 +8,7 @@ function(LinkTestLib TargetName)
     else()
         FOREACH(LibName ${GTestLinkLibNames})
             target_link_libraries(${TargetName}
-                    debug ${GTestLibsDir}/DebugLibs/${CMAKE_FIND_LIBRARY_PREFIXES}${LibName}${CMAKE_FIND_LIBRARY_SUFFIXES}
+                    debug ${GTestLibsDir}/DebugLibs/${CMAKE_FIND_LIBRARY_PREFIXES}${LibName}d${CMAKE_FIND_LIBRARY_SUFFIXES}
                     optimized ${GTestLibsDir}/ReleaseLibs/${CMAKE_FIND_LIBRARY_PREFIXES}${LibName}${CMAKE_FIND_LIBRARY_SUFFIXES})
         ENDFOREACH()
     endif()

include/bitsery/adapter/buffer.h

@@ -21,8 +21,8 @@
 //SOFTWARE.
 
 
-#ifndef BITSERY_ADAPTERS_INPUT_BUFFER_ADAPTER_H
-#define BITSERY_ADAPTERS_INPUT_BUFFER_ADAPTER_H
+#ifndef BITSERY_ADAPTER_BUFFER_H
+#define BITSERY_ADAPTER_BUFFER_H
 
 #include "../details/adapter_common.h"
 #include "../traits/core/traits.h"
@@ -55,6 +55,7 @@ namespace bitsery {
         using TIterator = typename BufferIterators<Buffer>::TIterator;
         using TValue = typename traits::BufferAdapterTraits<Buffer>::TValue;
         static_assert(details::IsDefined<TValue>::value, "Please define BufferAdapterTraits or include from <bitsery/traits/...>");
+        static_assert(traits::ContainerTraits<Buffer>::isContiguous, "BufferAdapter only works with contiguous containers");
 
         InputBufferAdapter(TIterator begin, TIterator end): BufferIterators<Buffer>(begin, end)
         {
@@ -102,17 +103,18 @@ namespace bitsery {
     };
 
 
-    template<typename Container>
+    template<typename Buffer>
     class OutputBufferAdapter {
     public:
 
-        using TIterator = typename traits::BufferAdapterTraits<Container>::TIterator;
-        using TValue = typename traits::BufferAdapterTraits<Container>::TValue;
+        using TIterator = typename traits::BufferAdapterTraits<Buffer>::TIterator;
+        using TValue = typename traits::BufferAdapterTraits<Buffer>::TValue;
 
         static_assert(details::IsDefined<TValue>::value, "Please define BufferAdapterTraits or include from <bitsery/traits/...>");
+        static_assert(traits::ContainerTraits<Buffer>::isContiguous, "BufferAdapter only works with contiguous containers");
 
-        OutputBufferAdapter(Container &buffer)
-                : _buffer{buffer}
+        OutputBufferAdapter(Buffer &buffer)
+                : _buffer{std::addressof(buffer)}
         {
 
             init(TResizable{});
@@ -128,15 +130,15 @@ namespace bitsery {
         }
 
         size_t writtenBytesCount() const {
-            return static_cast<size_t>(std::distance(std::begin(_buffer), _outIt));
+            return static_cast<size_t>(std::distance(std::begin(*_buffer), _outIt));
         }
 
     private:
-        using TResizable = std::integral_constant<bool, traits::ContainerTraits<Container>::isResizable>;
+        using TResizable = std::integral_constant<bool, traits::ContainerTraits<Buffer>::isResizable>;
 
-        Container &_buffer;
-        TIterator _outIt;
-        TIterator _end;
+        Buffer* _buffer;
+        TIterator _outIt{};
+        TIterator _end{};
 
         /*
          * resizable buffer
@@ -144,28 +146,39 @@ namespace bitsery {
 
         void init(std::true_type) {
             //resize buffer immediately, because we need output iterator at valid position
-            if (traits::ContainerTraits<Container>::size(_buffer) == 0u) {
-                traits::BufferAdapterTraits<Container>::increaseBufferSize(_buffer);
+            if (traits::ContainerTraits<Buffer>::size(*_buffer) == 0u) {
+                traits::BufferAdapterTraits<Buffer>::increaseBufferSize(*_buffer);
             }
-            _end = std::end(_buffer);
-            _outIt = std::begin(_buffer);
+            _end = std::end(*_buffer);
+            _outIt = std::begin(*_buffer);
         }
 
         void writeInternal(const TValue *data, const size_t size, std::true_type) {
             //optimization
+#if defined(_MSC_VER) && (_ITERATOR_DEBUG_LEVEL > 0)
+            using TDistance = typename std::iterator_traits<TIterator>::difference_type;
+            if (std::distance(_outIt , _end) >= static_cast<TDistance>(size)) {
+                std::memcpy(std::addressof(*_outIt), data, size);
+                _outIt += size;
+#else
             auto tmp = _outIt;
             _outIt += size;
             if (std::distance(_outIt , _end) >= 0) {
                 std::memcpy(std::addressof(*tmp), data, size);
+#endif
             } else {
+#if defined(_MSC_VER) && (_ITERATOR_DEBUG_LEVEL > 0)
+
+#else
                 _outIt -= size;
+#endif
                 //get current position before invalidating iterators
-                const auto pos = std::distance(std::begin(_buffer), _outIt);
+                const auto pos = std::distance(std::begin(*_buffer), _outIt);
                 //increase container size
-                traits::BufferAdapterTraits<Container>::increaseBufferSize(_buffer);
+                traits::BufferAdapterTraits<Buffer>::increaseBufferSize(*_buffer);
                 //restore iterators
-                _end = std::end(_buffer);
-                _outIt = std::next(std::begin(_buffer), pos);
+                _end = std::end(*_buffer);
+                _outIt = std::next(std::begin(*_buffer), pos);
 
                 writeInternal(data, size, std::true_type{});
             }
@@ -175,8 +188,8 @@ namespace bitsery {
          * non resizable buffer
          */
         void init(std::false_type) {
-            _outIt = std::begin(_buffer);
-            _end = std::end(_buffer);
+            _outIt = std::begin(*_buffer);
+            _end = std::end(*_buffer);
         }
 
         void writeInternal(const TValue *data, size_t size, std::false_type) {
@@ -191,4 +204,4 @@ namespace bitsery {
 
 }
 
-#endif //BITSERY_ADAPTERS_INPUT_BUFFER_ADAPTER_H
+#endif //BITSERY_ADAPTER_BUFFER_H

include/bitsery/adapter/stream.h

@@ -21,11 +21,11 @@
 //SOFTWARE.
 
 
-#ifndef BITSERY_ADAPTERS_DYNAMIC_STREAM_H
-#define BITSERY_ADAPTERS_DYNAMIC_STREAM_H
+#ifndef BITSERY_ADAPTER_STREAM_H
+#define BITSERY_ADAPTER_STREAM_H
 
 #include "../details/adapter_common.h"
-#include "../traits/core/traits.h"
+#include "../traits/array.h"
 #include <ios>
 
 
@@ -38,32 +38,37 @@ namespace bitsery {
         using TIterator = void;//TIterator is used with sessions, but streams cannot be used with sessions
 
         BasicInputStreamAdapter(std::basic_ios<TChar, CharTraits>& istream)
-                :_ios{istream} {}
+                :_ios{std::addressof(istream)} {}
 
         void read(TValue* data, size_t size) {
-            if (static_cast<size_t>(_ios.rdbuf()->sgetn( data , size )) != size)
+            if (static_cast<size_t>(_ios->rdbuf()->sgetn( data , size )) != size) {
                 *data = {};
+                //check state, if not set by stream, set it manually
+                if (_ios->good())
+                    _ios->setstate(std::ios_base::eofbit);
+            }
+
         }
 
         ReaderError error() const {
-            if (_ios.good())
+            if (_ios->good())
                 return ReaderError::NoError;
-            return _ios.eof()
+            return _ios->eof()
                    ? ReaderError::DataOverflow
                    : ReaderError::ReadingError;
         }
         bool isCompletedSuccessfully() const {
             if (error() == ReaderError::NoError) {
-                return _ios.rdbuf()->sgetc() == CharTraits::eof();
+                return _ios->rdbuf()->sgetc() == CharTraits::eof();
             }
             return false;
         }
-        void setError(ReaderError error) {
+        void setError(ReaderError ) {
             //has no effect when using
         }
 
     private:
-        std::basic_ios<TChar, CharTraits>& _ios;
+        std::basic_ios<TChar, CharTraits>* _ios;
     };
 
     template <typename TChar, typename CharTraits>
@@ -72,30 +77,129 @@ namespace bitsery {
         using TValue = TChar;
         using TIterator = void;//TIterator is used with sessions, but streams cannot be used with sessions
 
-        BasicOutputStreamAdapter(std::basic_ios<TChar, CharTraits>& ostream):_ios{ostream} {}
+        BasicOutputStreamAdapter(std::basic_ios<TChar, CharTraits>& ostream)
+                :_ios{std::addressof(ostream)} {}
 
         void write(const TValue* data, size_t size) {
             //for optimization
-            _ios.rdbuf()->sputn( data , size );
+            _ios->rdbuf()->sputn( data , size );
         }
 
         void flush() {
-            if (auto ostream = dynamic_cast<std::basic_ostream<TChar, CharTraits>*>(&_ios))
+            if (auto ostream = dynamic_cast<std::basic_ostream<TChar, CharTraits>*>(_ios))
                 ostream->flush();
         }
 
         size_t writtenBytesCount() const {
+            static_assert(std::is_void<TChar>::value, "`writtenBytesCount` cannot be used with stream adapter");
             //streaming doesn't return written bytes
-            return 0;
+            return 0u;
         }
 
         //this method is only for stream writing
         bool isValidState() const {
-            return !_ios.bad();
+            return !_ios->bad();
         }
 
     private:
-        std::basic_ios<TChar, CharTraits>& _ios;
+        std::basic_ios<TChar, CharTraits>* _ios;
+    };
+
+    template <typename TChar, typename CharTraits, typename TBuffer = std::array<TChar, 256>>
+    class BasicBufferedOutputStreamAdapter {
+    public:
+        using Buffer = TBuffer;
+        using BufferIt = typename traits::BufferAdapterTraits<TBuffer>::TIterator;
+        static_assert(details::IsDefined<BufferIt>::value, "Please define BufferAdapterTraits or include from <bitsery/traits/...> to use as buffer for BasicBufferedOutputStreamAdapter");
+        static_assert(traits::ContainerTraits<Buffer>::isContiguous, "BasicBufferedOutputStreamAdapter only works with contiguous containers");
+        using TValue = TChar;
+        using TIterator = void;//TIterator is used with sessions, but streams cannot be used with sessions
+
+        //bufferSize is used when buffer is dynamically allocated
+        BasicBufferedOutputStreamAdapter(std::basic_ios<TChar, CharTraits>& ostream, size_t bufferSize = 256)
+                :_adapter(ostream),
+                 _buf{},
+                 _outIt{}
+        {
+            init(bufferSize, TResizable{});
+        }
+
+        //we need to explicitly declare move logic, in case buffer is static, because after move it will be invalidated
+        BasicBufferedOutputStreamAdapter(const BasicBufferedOutputStreamAdapter&) = delete;
+        BasicBufferedOutputStreamAdapter& operator = (const BasicBufferedOutputStreamAdapter&) = delete;
+
+        BasicBufferedOutputStreamAdapter(BasicBufferedOutputStreamAdapter&& rhs)
+                : _adapter{std::move(rhs._adapter)},
+                  _buf{},
+                  _outIt{}
+        {
+            auto size = std::distance(std::begin(rhs._buf), rhs._outIt);
+            _buf = std::move(rhs._buf);
+            _outIt = std::next(std::begin(_buf), size);
+        };
+
+        BasicBufferedOutputStreamAdapter& operator = (BasicBufferedOutputStreamAdapter&& rhs) {
+            _adapter = std::move(rhs._adapter);
+            //get current written size, before move
+            auto size = std::distance(std::begin(rhs._buf), rhs._outIt);
+            _buf = std::move(rhs._buf);
+            _outIt = std::next(std::begin(_buf), size);
+            return *this;
+        };
+
+        ~BasicBufferedOutputStreamAdapter() = default;
+
+        void write(const TValue* data, size_t size) {
+            auto tmp = _outIt;
+
+#if defined(_MSC_VER) && (_ITERATOR_DEBUG_LEVEL > 0)
+            using TDistance = typename std::iterator_traits<BufferIt>::difference_type;
+            if (std::distance(_outIt , std::end(_buf)) >= static_cast<TDistance>(size)) {
+                std::memcpy(std::addressof(*_outIt), data, size);
+                _outIt += size;
+#else
+            _outIt += size;
+            if (std::distance(_outIt , std::end(_buf)) >= 0) {
+                std::memcpy(std::addressof(*tmp), data, size);
+#endif
+            } else {
+                //when buffer is full write out to stream
+                _outIt = std::begin(_buf);
+                _adapter.write(std::addressof(*_outIt), static_cast<size_t>(std::distance(_outIt, tmp)));
+                _adapter.write(data, size);
+            }
+        }
+
+        void flush() {
+            auto begin = std::begin(_buf);
+            _adapter.write(std::addressof(*begin), static_cast<size_t>(std::distance(begin, _outIt)));
+            _outIt = begin;
+            _adapter.flush();
+        }
+
+        size_t writtenBytesCount() const {
+            return _adapter.writtenBytesCount();
+        }
+
+        //this method is only for stream writing
+        bool isValidState() const {
+            return _adapter.isValidState();
+        }
+
+    private:
+        using TResizable = std::integral_constant<bool, traits::ContainerTraits<TBuffer>::isResizable>;
+
+        void init (size_t bufferSize, std::true_type) {
+            _buf.resize(bufferSize);
+            _outIt = std::begin(_buf);
+        }
+        void init (size_t, std::false_type) {
+            _outIt = std::begin(_buf);
+        }
+
+        BasicOutputStreamAdapter<TChar, CharTraits> _adapter;
+        TBuffer _buf;
+        BufferIt _outIt;
     };
 
     template <typename TChar, typename CharTraits>
@@ -112,11 +216,12 @@ namespace bitsery {
         }
     };
 
-
     //helper types for most common implementations for std streams
     using OutputStreamAdapter = BasicOutputStreamAdapter<char, std::char_traits<char>>;
     using InputStreamAdapter = BasicInputStreamAdapter<char, std::char_traits<char>>;
     using IOStreamAdapter = BasicIOStreamAdapter<char, std::char_traits<char>>;
+
+    using OutputBufferedStreamAdapter = BasicBufferedOutputStreamAdapter<char, std::char_traits<char>>;
 }
 
-#endif //BITSERY_ADAPTERS_DYNAMIC_STREAM_H
+#endif //BITSERY_ADAPTER_STREAM_H

include/bitsery/adapter_reader.h

@@ -22,8 +22,8 @@
 
 
 
-#ifndef BITSERY_BASIC_READER_H
-#define BITSERY_BASIC_READER_H
+#ifndef BITSERY_ADAPTER_READER_H
+#define BITSERY_ADAPTER_READER_H
 
 #include "details/sessions.h"
 #include <algorithm>
@@ -39,7 +39,7 @@ namespace bitsery {
     struct AdapterReader {
         //this is required by deserializer
         static constexpr bool BitPackingEnabled = false;
-
+        using TConfig = Config;
         using TValue = typename InputAdapter::TValue;
 
         static_assert(details::IsDefined<TValue>::value, "Please define adapter traits or include from <bitsery/traits/...>");
@@ -99,7 +99,8 @@ namespace bitsery {
         }
 
         void setError(ReaderError error) {
-            return _inputAdapter.setError(error);
+            if (this->error() == ReaderError::NoError)
+                _inputAdapter.setError(error);
         }
 
         void beginSession() {
@@ -142,16 +143,18 @@ namespace bitsery {
         }
 
         template<typename T>
-        void _swapDataBits(T *v, size_t count, std::false_type) {
+        void _swapDataBits(T *, size_t , std::false_type) {
             //empty function because no swap is required
         }
 
     };
 
     template<typename TReader>
-    struct AdapterReaderBitPackingWrapper {
+    class AdapterReaderBitPackingWrapper {
+    public:
         //this is required by deserializer
         static constexpr bool BitPackingEnabled = true;
+        using TConfig = typename TReader::TConfig;
         //make TValue unsigned for bitpacking
         using UnsignedValue = typename std::make_unsigned<typename TReader::TValue>::type;
         using ScratchType = typename details::ScratchType<UnsignedValue>::type;
@@ -266,4 +269,4 @@ namespace bitsery {
     };
 }
 
-#endif //BITSERY_BUFFER_READER_H
+#endif //BITSERY_ADAPTER_READER_H

include/bitsery/adapter_writer.h

@@ -22,8 +22,8 @@
 
 
 
-#ifndef BITSERY_BASIC_WRITER_H
-#define BITSERY_BASIC_WRITER_H
+#ifndef BITSERY_ADAPTER_WRITER_H
+#define BITSERY_ADAPTER_WRITER_H
 
 #include "details/sessions.h"
 
@@ -33,10 +33,12 @@
 
 namespace bitsery {
 
-    struct MeasureSize {
+    template <typename Config>
+    struct BasicMeasureSize {
         //measure class is bit-packing enabled, no need to create wrapper for it
         static constexpr bool BitPackingEnabled = true;
 
+        using TConfig = Config;
         template<size_t SIZE, typename T>
         void writeBytes(const T &) {
             static_assert(std::is_integral<T>(), "");
@@ -95,6 +97,9 @@ namespace bitsery {
         size_t _sessionsBytesCount{};
     };
 
+    //helper type for default config
+    using MeasureSize = BasicMeasureSize<DefaultConfig>;
+
 
     template <typename TWriter>
     class AdapterWriterBitPackingWrapper;
@@ -103,7 +108,7 @@ namespace bitsery {
     struct AdapterWriter {
         //this is required by serializer
         static constexpr bool BitPackingEnabled = false;
-
+        using TConfig = Config;
         using TValue = typename OutputAdapter::TValue;
 
         static_assert(details::IsDefined<TValue>::value, "Please define adapter traits or include from <bitsery/traits/...>");
@@ -207,6 +212,7 @@ namespace bitsery {
     public:
         //this is required by serializer
         static constexpr bool BitPackingEnabled = true;
+        using TConfig = typename TWriter::TConfig;
 
         //make TValue unsigned for bit packing
         using UnsignedType = typename std::make_unsigned<typename TWriter::TValue>::type;
@@ -334,4 +340,4 @@ namespace bitsery {
     };
 }
 
-#endif //BITSERY_BASIC_WRITER_H
+#endif //BITSERY_ADAPTER_WRITER_H

include/bitsery/bitsery.h

@@ -25,7 +25,7 @@
 #define BITSERY_BITSERY_H
 
 #define BITSERY_MAJOR_VERSION 4
-#define BITSERY_MINOR_VERSION 0
+#define BITSERY_MINOR_VERSION 2
 #define BITSERY_PATCH_VERSION 0
 
 #define BITSERY_QUOTE_MACRO(name) #name

include/bitsery/common.h

@@ -24,6 +24,8 @@
 #ifndef BITSERY_COMMON_H
 #define BITSERY_COMMON_H
 
+#include <tuple>
+
 namespace bitsery {
 
 /*
@@ -41,7 +43,10 @@ namespace bitsery {
         //this functionality allows to support backward/forward compatibility
         //however reading from streams is not supported, because this functionality requires random access to buffer.
         static constexpr bool BufferSessionsEnabled = false;
-
+        //list of contexts that will be instanciated internally within serializer/deserializer.
+        //contexts must be default constructable.
+        //internal context has priority, if external context with the same type exists.
+        using InternalContext = std::tuple<>;
     };
 
 }

include/bitsery/deserializer.h

@@ -31,22 +31,25 @@
 namespace bitsery {
 
 
-    template<typename TAdapterReader>
+    template<typename TAdapterReader, typename TContext = void>
     class BasicDeserializer {
     public:
         //this is used by AdapterAccess class
         using TReader = TAdapterReader;
         //helper type, that always returns bit-packing enabled type, useful inside serialize function when enabling bitpacking
         using BPEnabledType = BasicDeserializer<typename std::conditional<TAdapterReader::BitPackingEnabled,
-                TAdapterReader, AdapterReaderBitPackingWrapper<TAdapterReader>>::type>;
+                TAdapterReader, AdapterReaderBitPackingWrapper<TAdapterReader>>::type, TContext>;
 
+        static_assert(details::IsSpecializationOf<typename TReader::TConfig::InternalContext, std::tuple>::value,
+                      "Config::InternalContext must be std::tuple");
 
         template <typename ReaderParam>
-        explicit BasicDeserializer(ReaderParam&& r, void* context = nullptr)
+        explicit BasicDeserializer(ReaderParam&& r, TContext* context = nullptr)
                 : _reader{std::forward<ReaderParam>(r)},
-                  _context{context}
+                  _context{context},
+                  _internalContext{}
         {
-        };
+        }
 
         //copying disabled
         BasicDeserializer(const BasicDeserializer&) = delete;
@@ -60,10 +63,20 @@ namespace bitsery {
          * get serialization context.
          * this is optional, but might be required for some specific deserialization flows.
          */
-        void* context() {
+        TContext* context() {
             return _context;
         }
 
+        template <typename T>
+        T* context(){
+            return details::getContext<T>(_context, _internalContext);
+        }
+
+        template <typename T>
+        T* contextOrNull(){
+            return details::getContextIfTypeExists<T>(_context, _internalContext);
+        }
+
         /*
          * object function
          */
@@ -76,7 +89,7 @@ namespace bitsery {
         template<typename T, typename Fnc>
         void object(T &&obj, Fnc &&fnc) {
             fnc(std::forward<T>(obj));
-        };
+        }
 
         /*
          * functionality, that enables simpler serialization syntax, by including additional header
@@ -117,7 +130,7 @@ namespace bitsery {
             static_assert(traits::ExtensionTraits<Ext,T>::SupportLambdaOverload,
                           "extension doesn't support overload with lambda");
             extension.deserialize(*this, _reader, obj, std::forward<Fnc>(fnc));
-        };
+        }
 
         template<size_t VSIZE, typename T, typename Ext>
         void ext(T &obj, const Ext &extension) {
@@ -127,7 +140,7 @@ namespace bitsery {
             using ExtVType = typename traits::ExtensionTraits<Ext, T>::TValue;
             using VType = typename std::conditional<std::is_void<ExtVType>::value, details::DummyType, ExtVType>::type;
             extension.deserialize(*this, _reader, obj, [this](VType &v) { value<VSIZE>(v);});
-        };
+        }
 
         template<typename T, typename Ext>
         void ext(T &obj, const Ext &extension) {
@@ -137,7 +150,7 @@ namespace bitsery {
             using ExtVType = typename traits::ExtensionTraits<Ext, T>::TValue;
             using VType = typename std::conditional<std::is_void<ExtVType>::value, details::DummyType, ExtVType>::type;
             extension.deserialize(*this, _reader, obj, [this](VType &v) { object(v); });
-        };
+        }
 
         /*
          * boolValue
@@ -263,16 +276,16 @@ namespace bitsery {
         void value8b(T &&v) { value<8>(std::forward<T>(v)); }
 
         template<typename T, typename Ext>
-        void ext1b(T &v, Ext &&extension) { ext<1, T, Ext>(v, std::forward<Ext>(extension)); };
+        void ext1b(T &v, Ext &&extension) { ext<1, T, Ext>(v, std::forward<Ext>(extension)); }
 
         template<typename T, typename Ext>
-        void ext2b(T &v, Ext &&extension) { ext<2, T, Ext>(v, std::forward<Ext>(extension)); };
+        void ext2b(T &v, Ext &&extension) { ext<2, T, Ext>(v, std::forward<Ext>(extension)); }
 
         template<typename T, typename Ext>
-        void ext4b(T &v, Ext &&extension) { ext<4, T, Ext>(v, std::forward<Ext>(extension)); };
+        void ext4b(T &v, Ext &&extension) { ext<4, T, Ext>(v, std::forward<Ext>(extension)); }
 
         template<typename T, typename Ext>
-        void ext8b(T &v, Ext &&extension) { ext<8, T, Ext>(v, std::forward<Ext>(extension)); };
+        void ext8b(T &v, Ext &&extension) { ext<8, T, Ext>(v, std::forward<Ext>(extension)); }
 
         template<typename T>
         void text1b(T &str, size_t maxSize) { text<1>(str, maxSize); }
@@ -320,7 +333,9 @@ namespace bitsery {
         friend AdapterAccess;
 
         TAdapterReader _reader;
-        void* _context;
+        TContext* _context;
+        typename TReader::TConfig::InternalContext _internalContext;
+
 
         //process value types
         //false_type means that we must process all elements individually
@@ -328,7 +343,7 @@ namespace bitsery {
         void procContainer(It first, It last, std::false_type) {
             for (; first != last; ++first)
                 value<VSIZE>(*first);
-        };
+        }
 
         //process value types
         //true_type means, that we can copy whole buffer
@@ -338,21 +353,21 @@ namespace bitsery {
             using TIntegral = typename details::IntegralFromFundamental<TValue>::TValue;
             if (first != last)
                 _reader.template readBuffer<VSIZE>(reinterpret_cast<TIntegral*>(&(*first)), std::distance(first, last));
-        };
+        }
 
         //process by calling functions
         template<typename It, typename Fnc>
         void procContainer(It first, It last, Fnc fnc) {
             for (; first != last; ++first)
                 fnc(*first);
-        };
+        }
 
         //process object types
         template<typename It>
         void procContainer(It first, It last) {
             for (; first != last; ++first)
                 object(*first);
-        };
+        }
 
         template <size_t VSIZE, typename T>
         void procText(T& str, size_t length) {
@@ -390,7 +405,7 @@ namespace bitsery {
         template <typename Fnc>
         void procEnableBitPacking(const Fnc& fnc, std::false_type) {
             //create serializer using bitpacking wrapper
-            BasicDeserializer<AdapterReaderBitPackingWrapper<TAdapterReader>> tmp(_reader, _context);
+            BPEnabledType tmp(_reader, _context);
             fnc(tmp);
         }
 
@@ -421,7 +436,7 @@ namespace bitsery {
         des.object(value);
         auto& r = AdapterAccess::getReader(des);
         return {r.error(), r.isCompletedSuccessfully()};
-    };
+    }
 
 }
 

include/bitsery/details/adapter_common.h

@@ -20,8 +20,8 @@
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
 
-#ifndef BITSERY_DETAILS_BUFFER_COMMON_H
-#define BITSERY_DETAILS_BUFFER_COMMON_H
+#ifndef BITSERY_DETAILS_ADAPTER_COMMON_H
+#define BITSERY_DETAILS_ADAPTER_COMMON_H
 
 #include <algorithm>
 #include <utility>
@@ -124,4 +124,4 @@ namespace bitsery {
 }
 
 
-#endif //BITSERY_DETAILS_BUFFER_COMMON_H
+#endif //BITSERY_DETAILS_ADAPTER_COMMON_H

include/bitsery/details/adapter_utils.h

@@ -20,8 +20,8 @@
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
 
-#ifndef BITSERY_DETAILS_BOTH_COMMON_H
-#define BITSERY_DETAILS_BOTH_COMMON_H
+#ifndef BITSERY_DETAILS_ADAPTER_UTILS_H
+#define BITSERY_DETAILS_ADAPTER_UTILS_H
 
 #include <cassert>
 #include <cstdint>
@@ -33,7 +33,8 @@ namespace bitsery {
         NoError,
         ReadingError, // this might be used with stream adapter
         DataOverflow,
-        InvalidData
+        InvalidData,
+        InvalidPointer
     };
 
     namespace details {
@@ -83,4 +84,4 @@ namespace bitsery {
     }
 }
 
-#endif //BITSERY_DETAILS_BOTH_COMMON_H
+#endif //BITSERY_DETAILS_ADAPTER_UTILS_H

include/bitsery/details/flexible_common.h

@@ -117,31 +117,31 @@ namespace bitsery {
         template<typename S, typename T>
         void processMaxSize(S &s, T& data, size_t maxSize, std::true_type) {
             processContainer(s, data, maxSize);
-        };
+        }
 
         //overload for const T&
         template<typename S, typename T>
         void processMaxSize(S &s, const T& data, size_t maxSize, std::true_type) {
             processContainer(s, const_cast<T&>(data), maxSize);
-        };
+        }
 
 
         //try to call serialize overload with maxsize, extensions use this technique
         template<typename S, typename T>
         void processMaxSize(S &s, T& data, size_t maxSize, std::false_type) {
             serialize(s, data, maxSize);
-        };
+        }
 
         //overload for const T&
         template<typename S, typename T>
         void processMaxSize(S &s, const T& data, size_t maxSize, std::false_type) {
             serialize(s, const_cast<T&>(data), maxSize);
-        };
+        }
 
         template<typename S, typename T>
         void serialize(S &s, const MaxSize<T> &ms) {
             processMaxSize(s, ms.data, ms.maxSize, details::IsContainerTraitsDefined<typename std::decay<T>::type>{});
-        };
+        }
 
     }
 }

include/bitsery/details/not_defined_type.h

@@ -21,8 +21,8 @@
 //SOFTWARE.
 
 
-#ifndef BITSERY_TRAITS_CORE_NOT_DEFINED_TYPE_H
-#define BITSERY_TRAITS_CORE_NOT_DEFINED_TYPE_H
+#ifndef BITSERY_DETAILS_NOT_DEFINED_TYPE_H
+#define BITSERY_DETAILS_NOT_DEFINED_TYPE_H
 
 #include <iterator>
 
@@ -32,7 +32,7 @@ namespace bitsery {
         struct NotDefinedType {
             //just swallow anything that is passed during creating
             template <typename ... T>
-            NotDefinedType(T&& ...){};
+            NotDefinedType(T&& ...){}
             NotDefinedType() = default;
             //define operators so that we also swallow deeper errors, to reduce error stack
             //this time will be used as iterator, so define all operators nessesarry to work with iterators
@@ -52,6 +52,7 @@ namespace bitsery {
             friend int operator - (const NotDefinedType&, const NotDefinedType&) {
                 return 0;
             }
+
             int& operator*() {
                 return data;
             }
@@ -75,4 +76,4 @@ namespace std {
         using iterator_category = std::random_access_iterator_tag;
     };
 }
-#endif //BITSERY_TRAITS_CORE_NOT_DEFINED_TYPE_H
+#endif //BITSERY_DETAILS_NOT_DEFINED_TYPE_H

include/bitsery/details/serialization_common.h

@@ -25,9 +25,11 @@
 
 #include <type_traits>
 #include <utility>
+#include <tuple>
 #include "adapter_utils.h"
 #include "../traits/core/traits.h"
 
+
 namespace bitsery {
 
     //this allows to call private serialize method for the class
@@ -39,18 +41,33 @@ namespace bitsery {
         }
     };
 
+    //when call to serialize function is ambiguous (member and non-member serialize function exists for a type)
+    //specialize this class, by inheriting from either UseNonMemberFnc or UseMemberFnc
+    //e.g.
+    //template <> struct SelectSerializeFnc<MyDerivedClass>:UseMemberFnc {};
+    template<typename T>
+    struct SelectSerializeFnc : std::integral_constant<int, 0> {
+    };
+
+    //types you need to inherit from when specializing SelectSerializeFnc class
+    struct UseNonMemberFnc : std::integral_constant<int, 1> {
+    };
+    struct UseMemberFnc : std::integral_constant<int, 2> {
+    };
+
+
     //serializer/deserializer, does not public interface to get underlying writer/reader
     //to prevent users from using writer/reader directly, because they have different interface
     //and they cannot be used describing serialization flows.: use extensions for this reason.
     //this class allows to get underlying adapter writer/reader, and only should be used outside serialization functions.
     struct AdapterAccess {
-        template <typename Serializer>
-        static typename Serializer::TWriter& getWriter(Serializer& s) {
+        template<typename Serializer>
+        static typename Serializer::TWriter &getWriter(Serializer &s) {
             return s._writer;
         }
 
-        template <typename Deserializer>
-        static typename Deserializer::TReader& getReader(Deserializer& s) {
+        template<typename Deserializer>
+        static typename Deserializer::TReader &getReader(Deserializer &s) {
             return s._reader;
         }
     };
@@ -58,18 +75,62 @@ namespace bitsery {
     namespace details {
 
         //helper types for error handling
-        template <typename T>
-        struct IsContainerTraitsDefined:public IsDefined<typename traits::ContainerTraits<T>::TValue> {
+        template<typename T>
+        struct IsContainerTraitsDefined : public IsDefined<typename traits::ContainerTraits<T>::TValue> {
         };
 
-        template <typename T>
-        struct IsTextTraitsDefined:public IsDefined<typename traits::TextTraits<T>::TValue> {
+        template<typename T>
+        struct IsTextTraitsDefined : public IsDefined<typename traits::TextTraits<T>::TValue> {
         };
 
-        template <typename Ext, typename T>
-        struct IsExtensionTraitsDefined:public IsDefined<typename traits::ExtensionTraits<Ext, T>::TValue> {
+        template<typename Ext, typename T>
+        struct IsExtensionTraitsDefined : public IsDefined<typename traits::ExtensionTraits<Ext, T>::TValue> {
         };
 
+#ifdef _MSC_VER
+        //helper types for HasSerializeFunction
+        template <typename S, typename T>
+        using TrySerializeFunction = decltype(serialize(std::declval<S &>(), std::declval<T &>()));
+
+        template <typename S, typename T>
+        struct HasSerializeFunctionHelper {
+            template <typename Q, typename R, typename = TrySerializeFunction<Q, R>>
+            static std::true_type tester(Q&&, R&&);
+            static std::false_type tester(...);
+            using type = decltype(tester(std::declval<S>(), std::declval<T>()));
+        };
+        template <typename S, typename T>
+        struct HasSerializeFunction :HasSerializeFunctionHelper<S, T>::type {};
+
+        //helper types for HasSerializeMethod
+        template <typename S, typename T>
+        using TrySerializeMethod = decltype(Access::serialize(std::declval<S &>(), std::declval<T &>()));
+
+        template <typename S, typename T>
+        struct HasSerializeMethodHelper {
+            template <typename Q, typename R, typename = TrySerializeMethod<Q, R>>
+            static std::true_type tester(Q&&, R&&);
+            static std::false_type tester(...);
+            using type = decltype(tester(std::declval<S>(), std::declval<T>()));
+        };
+        template <typename S, typename T>
+        struct HasSerializeMethod :HasSerializeMethodHelper<S, T>::type {};
+
+        //helper types for IsFlexibleIncluded
+        template <typename S, typename T>
+        using TryArchiveProcess = decltype(archiveProcess(std::declval<S &>(), std::declval<T &&>()));
+
+        template <typename S, typename T>
+        struct IsFlexibleIncludedHelper {
+            template <typename Q, typename R, typename = TryArchiveProcess<Q, R>>
+            static std::true_type tester(Q&&, R&&);
+            static std::false_type tester(...);
+            using type = decltype(tester(std::declval<S>(), std::declval<T>()));
+        };
+
+        template <typename S, typename T>
+        struct IsFlexibleIncluded :IsFlexibleIncludedHelper<S, T>::type {};
+#else
         //helper metafunction, that is added to c++17
         template<typename... Ts>
         struct make_void {
@@ -78,30 +139,39 @@ namespace bitsery {
         template<typename... Ts>
         using void_t = typename make_void<Ts...>::type;
 
-        template <typename, typename, typename = void>
-        struct HasSerializeFunction:std::false_type {};
+        template<typename, typename, typename = void>
+        struct HasSerializeFunction : std::false_type {
+        };
 
-        template <typename S, typename T>
-        struct HasSerializeFunction<S,T,
+        template<typename S, typename T>
+        struct HasSerializeFunction<S, T,
                 void_t<decltype(serialize(std::declval<S &>(), std::declval<T &>()))>
-        > : std::true_type {};
+        > : std::true_type {
+        };
 
 
-        template <typename, typename, typename = void>
-        struct HasSerializeMethod:std::false_type {};
+        template<typename, typename, typename = void>
+        struct HasSerializeMethod : std::false_type {
+        };
 
-        template <typename S, typename T>
-        struct HasSerializeMethod<S,T,
+        template<typename S, typename T>
+        struct HasSerializeMethod<S, T,
                 void_t<decltype(Access::serialize(std::declval<S &>(), std::declval<T &>()))>
-        > : std::true_type {};
+        > : std::true_type {
+        };
 
-        template <typename, typename, typename = void>
-        struct IsFlexibleIncluded:std::false_type {};
+        //this solution doesn't work with visual studio, but is more elegant
+        template<typename, typename, typename = void>
+        struct IsFlexibleIncluded : std::false_type {
+        };
 
-        template <typename S, typename T>
-        struct IsFlexibleIncluded<S,T,
+        template<typename S, typename T>
+        struct IsFlexibleIncluded<S, T,
                 void_t<decltype(archiveProcess(std::declval<S &>(), std::declval<T &&>()))>
-        > : std::true_type {};
+        > : std::true_type {
+        };
+#endif
+
 
         //used for extensions, when extension TValue = void
         struct DummyType {
@@ -149,23 +219,34 @@ namespace bitsery {
         struct SerializeFunction {
 
             static void invoke(S &s, T &v) {
-                static_assert(HasSerializeFunction<S,T>::value || HasSerializeMethod<S,T>::value,
+                static_assert(HasSerializeFunction<S, T>::value || HasSerializeMethod<S, T>::value,
                               "\nPlease define 'serialize' function for your type (inside or outside of class):\n"
                                       "  template<typename S>\n"
                                       "  void serialize(S& s)\n"
                                       "  {\n"
                                       "    ...\n"
                                       "  }\n");
-                static_assert(!(HasSerializeFunction<S,T>::value && HasSerializeMethod<S,T>::value),
-                              "\nPlease define only one 'serialize' function (member OR free), not both.");
-                internalInvoke(s,v, HasSerializeMethod<S,T>{});
+                using TDecayed = typename std::decay<T>::type;
+                selectSerializeFnc(s, v, SelectSerializeFnc<TDecayed>{});
             }
+
         private:
-            static void internalInvoke(S& s, T& v,std::true_type) {
-                Access::serialize(s,v);
+            static void selectSerializeFnc(S &s, T &v, std::integral_constant<int, 0>) {
+                static_assert(!(HasSerializeFunction<S, T>::value && HasSerializeMethod<S, T>::value),
+                              "\nPlease define only one 'serialize' function (member OR free).\n"
+                                      "If serialization function is inherited from base class, then explicitly select correct function for your type e.g.:\n"
+                                      "  template <>\n"
+                                      "  struct SelectSerializeFnc<DerivedClass>:UseMemberFnc {};\n");
+                selectSerializeFnc(s, v, std::integral_constant<int,
+                        HasSerializeFunction<S, T>::value ? 1 : 2>{});
             }
-            static void internalInvoke(S& s, T& v,std::false_type) {
-                serialize(s,v);
+
+            static void selectSerializeFnc(S &s, T &v, std::integral_constant<int, 1>) {
+                serialize(s, v);
+            }
+
+            static void selectSerializeFnc(S &s, T &v, std::integral_constant<int, 2>) {
+                Access::serialize(s, v);
             }
         };
 
@@ -176,18 +257,145 @@ namespace bitsery {
         template<typename S, typename T, typename Enabled = void>
         struct ArchiveFunction {
 
-            static void invoke(S &s, T&& obj) {
-                static_assert(IsFlexibleIncluded<S,T>::value,
+            static void invoke(S &s, T &&obj) {
+                static_assert(IsFlexibleIncluded<S, T>::value,
                               "\nPlease include '<bitsery/flexible.h>' to use 'archive' function:\n");
-//                static_assert(HasSerializeFunction<S,T>::value || HasSerializeMethod<S,T>::value,
-//                              "\nPlease define 'serialize' function or include '<bitsery/flexible/...>' to use with 'archive'\n");
 
                 archiveProcess(s, std::forward<T>(obj));
             }
         };
 
-    }
+        /*
+         * helper function for getting context from serializer/deserializer
+         */
 
+        template<typename T, template<typename...> class Template>
+        struct IsSpecializationOf : std::false_type {
+        };
+
+        template<template<typename...> class Template, typename... Args>
+        struct IsSpecializationOf<Template<Args...>, Template> : std::true_type {
+        };
+
+        //helper types for better error messages
+        template<typename Find, typename ... TList>
+        struct GetTypeIndex : std::integral_constant<size_t, 0> {
+        };
+
+        //found it
+        template<typename Find, typename ... Tail>
+        struct GetTypeIndex<Find, Find, Tail...> : std::integral_constant<size_t, 0> {
+        };
+
+        //iteratates over types
+        template<typename Find, typename Head, typename ... Tail>
+        struct GetTypeIndex<Find, Head, Tail...> : std::integral_constant<size_t,
+                1 + GetTypeIndex<Find, Tail...>::value> {
+        };
+
+        template<typename Find, typename ... TList>
+        struct HasType : std::integral_constant<bool, (GetTypeIndex<Find, TList...>::value<(sizeof ... (TList)))> {
+        };
+
+        template<typename TCast, typename Tuple>
+        struct HasContext : std::is_same<TCast, Tuple> {
+        };
+
+        template<typename TCast, typename ... Args>
+        struct HasContext<TCast, std::tuple<Args...>> : HasType<TCast, Args...> {
+        };
+
+        /*
+         * get context, and static assert if type doesn't exists
+         */
+
+        template<typename TCast, typename ... Args>
+        TCast *getContextImpl(std::tuple<Args...> *ctx, std::true_type) {
+            using TCastIndex = GetTypeIndex<TCast, Args...>;
+            static_assert(HasType<TCast, Args...>::value, "Invalid context cast. Type doesn't exists.");
+            return std::addressof(std::get<TCastIndex::value>(*ctx));
+        }
+
+        template<typename TCast, typename TContext>
+        TCast *getContextImpl(TContext *ctx, std::false_type) {
+            static_assert(std::is_convertible<TContext *, TCast *>::value, "Invalid context cast. Type doesn't exists.");
+            return static_cast<TCast *>(ctx);
+        }
+
+        //get local ctx
+        template<typename TCast, typename TContext, typename TInternalContext>
+        TCast *chooseInternalOrExternalContext(TContext *, TInternalContext &internalCtx, std::true_type) {
+            return getContextImpl<TCast>(&internalCtx, std::true_type{});
+        }
+
+        //get external ctx
+        template<typename TCast, typename TContext, typename TInternalContext>
+        TCast *chooseInternalOrExternalContext(TContext *ctx, TInternalContext &, std::false_type) {
+            return ctx
+                   ? getContextImpl<TCast>(ctx, IsSpecializationOf<TContext, std::tuple>{})
+                   : nullptr;
+        }
+
+        template<typename TCast, typename TContext, typename TInternalContext>
+        TCast *getContext(TContext *ctx, TInternalContext &internalCtx) {
+            return chooseInternalOrExternalContext<TCast>(ctx, internalCtx, HasContext<TCast, TInternalContext>{});
+        }
+
+        /*
+         * get context, if type doesn't exists then do not static_assert but return null instead
+         */
+
+        template<typename TCast, typename TContext>
+        TCast *getContextFromTypeIfExists(TContext *ctx, std::true_type) {
+            return static_cast<TCast *>(ctx);
+        }
+
+        template<typename TCast, typename TContext>
+        TCast *getContextFromTypeIfExists(TContext *, std::false_type) {
+            return nullptr;
+        }
+
+        template<typename TCast, typename TContext>
+        TCast *getContextImplIfExists(TContext *ctx, std::false_type) {
+            return getContextFromTypeIfExists<TCast>(ctx, std::is_convertible<TContext *, TCast *>{});
+        }
+
+        template<typename TCast, typename TContext>
+        TCast *getContextFromTupleIfExists(TContext *ctx, std::true_type tmp) {
+            return getContextImpl<TCast>(ctx, tmp);
+        }
+
+        template<typename TCast, typename TContext>
+        TCast *getContextFromTupleIfExists(TContext *, std::false_type) {
+            return nullptr;
+        }
+
+        template<typename TCast, typename TContext>
+        TCast *getContextImplIfExists(TContext *ctx, std::true_type) {
+            return getContextFromTupleIfExists<TCast>(ctx, HasContext<TCast, TContext>{});
+        }
+
+        //get local ctx
+        template<typename TCast, typename TContext, typename TInternalContext>
+        TCast *chooseInternalOrExternalContextIfExists(TContext *, TInternalContext &internalCtx, std::true_type) {
+            return getContextImplIfExists<TCast>(&internalCtx, std::true_type{});
+        }
+
+        //get external ctx
+        template<typename TCast, typename TContext, typename TInternalContext>
+        TCast *chooseInternalOrExternalContextIfExists(TContext *ctx, TInternalContext &, std::false_type) {
+            return ctx
+                   ? getContextImplIfExists<TCast>(ctx, IsSpecializationOf<TContext, std::tuple>{})
+                   : nullptr;
+        }
+
+        template<typename TCast, typename TContext, typename TInternalContext>
+        TCast *getContextIfTypeExists(TContext *ctx, TInternalContext &internalCtx) {
+            return chooseInternalOrExternalContextIfExists<TCast>(ctx, internalCtx, HasContext<TCast, TInternalContext>{});
+        }
+
+    }
 }
 
 #endif //BITSERY_DETAILS_SERIALIZATION_COMMON_H
+

include/bitsery/details/sessions.h

@@ -2,8 +2,8 @@
 // Created by fraillt on 17.10.5.
 //
 
-#ifndef BITSERY_BUFFER_SESSIONS_H
-#define BITSERY_BUFFER_SESSIONS_H
+#ifndef BITSERY_DETAILS_SESSIONS_H
+#define BITSERY_DETAILS_SESSIONS_H
 
 #include <vector>
 #include <stack>
@@ -54,6 +54,13 @@ namespace bitsery {
         class SessionsWriter {
         public:
 
+            SessionsWriter() = default;
+            SessionsWriter(const SessionsWriter&) = delete;
+            SessionsWriter& operator = (const SessionsWriter& ) = delete;
+
+            SessionsWriter(SessionsWriter&&) = default;
+            SessionsWriter& operator = (SessionsWriter&& ) = default;
+
             void begin(TWriter& ) {
                 //write position
                 _sessionIndex.push(_sessions.size());
@@ -65,7 +72,9 @@ namespace bitsery {
                 //change position to session end
                 auto sessionIt = std::next(std::begin(_sessions), _sessionIndex.top());
                 _sessionIndex.pop();
-                *sessionIt = writer.writtenBytesCount();
+                auto sessionSize = writer.writtenBytesCount();
+                assert(sessionSize > 0);
+                *sessionIt = sessionSize;
             }
 
             void flushSessions(TWriter& writer) {
@@ -85,7 +94,7 @@ namespace bitsery {
             }
         private:
             std::vector<size_t> _sessions{};
-            std::stack<size_t> _sessionIndex;
+            std::stack<size_t> _sessionIndex{};
         };
 
         template <typename TReader>
@@ -100,6 +109,13 @@ namespace bitsery {
                      _endItRef{details::SessionAccess::endIteratorRef<InputAdapter, TIterator>(adapter)}
             {
             }
+
+            SessionsReader(const SessionsReader&) = delete;
+            SessionsReader& operator = (const SessionsReader& ) = delete;
+
+            SessionsReader(SessionsReader&&) = default;
+            SessionsReader& operator = (SessionsReader&& ) = default;
+
             void begin() {
                 if (_sessions.empty()) {
                     if (!initializeSessions())
@@ -125,7 +141,7 @@ namespace bitsery {
                 } else {
                     //there is no data to read anymore
                     //pos == end or buffer overflow while session is active
-                    if (!(_posItRef == _endItRef || _reader.error() == ReaderError::NoError)) {
+                    if (!(_posItRef == _endItRef || _reader.error() == ReaderError::NoError) || !(_sessionsStack.size() > 1)) {
                         _reader.setError(ReaderError::InvalidData);
                     }
                 }
@@ -147,9 +163,12 @@ namespace bitsery {
                                 break;
                         }
                     }
-                    _posItRef = _endItRef;
-                    //restore end position
-                    _endItRef = _sessionsStack.top();
+                    //modify pointers only if no error or buffer overflow
+                    if (_reader.error() == ReaderError::NoError || _reader.error() == ReaderError::DataOverflow) {
+                        _posItRef = _endItRef;
+                        //restore end position
+                        _endItRef = _sessionsStack.top();
+                    }
                     _sessionsStack.pop();
                 }
             }
@@ -206,4 +225,4 @@ namespace bitsery {
     }
 }
 
-#endif //BITSERY_BUFFER_SESSIONS_H
+#endif //BITSERY_DETAILS_SESSIONS_H

include/bitsery/ext/entropy.h

@@ -37,7 +37,7 @@ namespace bitsery {
                 ++index;
             }
             return 0u;
-        };
+        }
     }
 
     namespace ext {
@@ -57,7 +57,7 @@ namespace bitsery {
             };
 
             template<typename Ser, typename Writer, typename T, typename Fnc>
-            void serialize(Ser &s, Writer &writer, const T &obj, Fnc &&fnc) const {
+            void serialize(Ser &s, Writer &, const T &obj, Fnc &&fnc) const {
                 assert(traits::ContainerTraits<TContainer>::size(_values) > 0);
                 auto index = details::findEntropyIndex(obj, _values);
                 s.ext(index, ext::ValueRange<size_t>{0u, traits::ContainerTraits<TContainer>::size(_values)});
@@ -68,7 +68,7 @@ namespace bitsery {
             }
 
             template<typename Des, typename Reader, typename T, typename Fnc>
-            void deserialize(Des &d, Reader &reader, T &obj, Fnc &&fnc) const {
+            void deserialize(Des &d, Reader &, T &obj, Fnc &&fnc) const {
                 assert(traits::ContainerTraits<TContainer>::size(_values) > 0);
                 size_t index{};
                 d.ext(index, ext::ValueRange<size_t>{0u, traits::ContainerTraits<TContainer>::size(_values)});

include/bitsery/ext/growable.h

@@ -23,6 +23,8 @@
 #ifndef BITSERY_EXT_GROWABLE_H
 #define BITSERY_EXT_GROWABLE_H
 
+#include "../traits/core/traits.h"
+
 namespace bitsery {
 
     namespace ext {
@@ -34,14 +36,14 @@ namespace bitsery {
         public:
 
             template<typename Ser, typename Writer, typename T, typename Fnc>
-            void serialize(Ser &s, Writer &writer, const T &obj, Fnc &&fnc) const {
+            void serialize(Ser &, Writer &writer, const T &obj, Fnc &&fnc) const {
                 writer.beginSession();
                 fnc(const_cast<T&>(obj));
                 writer.endSession();
             }
 
             template<typename Des, typename Reader, typename T, typename Fnc>
-            void deserialize(Des &d, Reader &reader, T &obj, Fnc &&fnc) const {
+            void deserialize(Des &, Reader &reader, T &obj, Fnc &&fnc) const {
                 reader.beginSession();
                 fnc(obj);
                 reader.endSession();

include/bitsery/ext/inheritance.h

@@ -0,0 +1,156 @@
+//MIT License
+//
+//Copyright (c) 2017 Mindaugas Vinkelis
+//
+//Permission is hereby granted, free of charge, to any person obtaining a copy
+//of this software and associated documentation files (the "Software"), to deal
+//in the Software without restriction, including without limitation the rights
+//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//copies of the Software, and to permit persons to whom the Software is
+//furnished to do so, subject to the following conditions:
+//
+//The above copyright notice and this permission notice shall be included in all
+//copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//SOFTWARE.
+
+#ifndef BITSERY_EXT_INHERITANCE_H
+#define BITSERY_EXT_INHERITANCE_H
+
+#include <unordered_set>
+#include "../traits/core/traits.h"
+
+namespace bitsery {
+
+    namespace ext {
+
+        //required when virtual inheritance (ext::VirtualBaseClass) exists in serialization flow.
+        //for standard inheritance (ext::BaseClass) it is optional.
+        class InheritanceContext {
+        public:
+            InheritanceContext() = default;
+            InheritanceContext(const InheritanceContext&) = delete;
+            InheritanceContext&operator = (const InheritanceContext&) = delete;
+            InheritanceContext(InheritanceContext&&) = default;
+            InheritanceContext& operator = (InheritanceContext&&) = default;
+
+            template <typename TDerived, typename TBase>
+            void beginBase(const TDerived &derived, const TBase &) {
+                if (_depth == 0) {
+                    const void* ptr = std::addressof(derived);
+                    if ( _parentPtr != ptr)
+                        _virtualBases.clear();
+                    _parentPtr = ptr;
+                }
+                ++_depth;
+            }
+
+            template <typename TDerived, typename TBase>
+            bool beginVirtualBase(const TDerived &derived, const TBase &base) {
+                beginBase(derived, base);
+                return _virtualBases.emplace(std::addressof(base)).second;
+            }
+
+            void end() {
+                --_depth;
+            }
+
+        private:
+            //these members are required to know when we can clear _virtualBases
+            size_t _depth{};
+            const void* _parentPtr{};
+            //add virtual bases to the list, as long as we're on the same parent
+            std::unordered_set<const void*> _virtualBases{};
+        };
+
+        template <typename TBase>
+        class BaseClass {
+        public:
+
+            template<typename Ser, typename Writer, typename T, typename Fnc>
+            void serialize(Ser &ser, Writer &, const T &obj, Fnc &&fnc) const {
+                auto& resObj = static_cast<const TBase&>(obj);
+                if (auto ctx = ser.template contextOrNull<InheritanceContext>()) {
+                    ctx->beginBase(obj, resObj);
+                    fnc(const_cast<TBase&>(resObj));
+                    ctx->end();
+                } else {
+                    fnc(const_cast<TBase&>(resObj));
+                }
+            }
+
+            template<typename Des, typename Reader, typename T, typename Fnc>
+            void deserialize(Des &des, Reader &, T &obj, Fnc &&fnc) const {
+                auto& resObj = static_cast<TBase&>(obj);
+                if (auto ctx = des.template contextOrNull<InheritanceContext>()) {
+                    ctx->beginBase(obj, resObj);
+                    fnc(resObj);
+                    ctx->end();
+                } else {
+                    fnc(resObj);
+                }
+            }
+
+        };
+
+        //requires InheritanceContext
+        template <typename TBase>
+        class VirtualBaseClass {
+        public:
+
+            template<typename Ser, typename Writer, typename T, typename Fnc>
+            void serialize(Ser &ser, Writer &, const T &obj, Fnc &&fnc) const {
+                auto ctx = ser.template context<InheritanceContext>();
+                auto& resObj = static_cast<const TBase&>(obj);
+                if (ctx->beginVirtualBase(obj, resObj))
+                    fnc(const_cast<TBase&>(resObj));
+                ctx->end();
+            }
+
+            template<typename Des, typename Reader, typename T, typename Fnc>
+            void deserialize(Des &des, Reader &, T &obj, Fnc &&fnc) const {
+                auto ctx = des.template context<InheritanceContext>();
+                auto& resObj = static_cast<TBase&>(obj);
+                if (ctx->beginVirtualBase(obj, resObj))
+                    fnc(resObj);
+                ctx->end();
+            }
+
+        };
+
+    }
+
+    namespace traits {
+        template<typename TBase, typename T>
+        struct ExtensionTraits<ext::BaseClass<TBase>, T> {
+            static_assert(std::is_base_of<TBase, T>::value, "Invalid base class");
+
+            using TValue = TBase;
+            static constexpr bool SupportValueOverload = false;
+            static constexpr bool SupportObjectOverload = true;
+            static constexpr bool SupportLambdaOverload = true;
+        };
+
+        template<typename TBase, typename T>
+        struct ExtensionTraits<ext::VirtualBaseClass<TBase>, T> {
+            static_assert(std::is_base_of<TBase, T>::value, "Invalid base class");
+
+            using TValue = TBase;
+            static constexpr bool SupportValueOverload = false;
+            static constexpr bool SupportObjectOverload = true;
+            //disable lambda overload, when serializing virtually inherited base class.
+            //Only one instance of virtual base will be serialized, when using multiple inheritance
+            //and it will be undefined behaviour if derived classes would have different virtual base class serialization flow.
+            static constexpr bool SupportLambdaOverload = false;
+        };
+    }
+}
+
+
+#endif //BITSERY_EXT_INHERITANCE_H

include/bitsery/ext/pointer.h

@@ -0,0 +1,416 @@
+//MIT License
+//
+//Copyright (c) 2017 Mindaugas Vinkelis
+//
+//Permission is hereby granted, free of charge, to any person obtaining a copy
+//of this software and associated documentation files (the "Software"), to deal
+//in the Software without restriction, including without limitation the rights
+//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//copies of the Software, and to permit persons to whom the Software is
+//furnished to do so, subject to the following conditions:
+//
+//The above copyright notice and this permission notice shall be included in all
+//copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//SOFTWARE.
+
+#ifndef BITSERY_EXT_POINTER_H
+#define BITSERY_EXT_POINTER_H
+
+#include "../traits/core/traits.h"
+
+#include <unordered_map>
+#include <vector>
+#include <memory>
+
+namespace bitsery {
+
+    namespace ext {
+
+        //forward declare
+        class PointerLinkingContext;
+
+        enum class PointerType {
+            Nullable,
+            NotNull
+        };
+
+        enum class PointerOwnershipType:uint8_t {
+            //is not responsible for pointer lifetime management.
+                    Observer,
+            //only ONE owner is responsible for this pointers creation/destruction
+                    Owner,
+            //MANY shared owners is responsible for pointer creation/destruction
+            //requires additional context to manage shared owners themselves.
+                    Shared
+        };
+
+        namespace details_pointer {
+
+            //helper functions that creates or destroys pointers
+            //useful, because can be specialized
+            template <typename T>
+            void destroyObject(T &ptr) {
+                if (ptr) {
+                    delete ptr;
+                }
+                ptr = nullptr;
+            }
+
+            template <typename T>
+            void createObject(T &ptr) {
+                using TNonPtr = typename std::remove_pointer<T>::type;
+                if (ptr == nullptr)
+                    ptr = new TNonPtr{};
+            }
+
+
+            template <typename S, typename TPtr>
+            void serializeObject(S &s, const TPtr &obj) {
+                using TNonPtr = typename std::remove_pointer<TPtr>::type;
+                static_assert(!std::is_polymorphic<TNonPtr>::value, "Polymorphic types are not supported");
+                serializeImpl(s, *obj, details::IsFundamentalType<TNonPtr>{});
+            }
+
+            template <typename S, typename T>
+            void serializeImpl(S& s, const T& obj, std::true_type) {
+                s.template value<sizeof(T)>(obj);
+            }
+
+            template <typename S, typename T>
+            void serializeImpl(S& s, const T& obj, std::false_type) {
+                s.object(obj);
+            }
+
+            template <typename S, typename TPtr>
+            void deserializeObject(S &s, TPtr &obj) {
+                using TNonPtr = typename std::remove_pointer<TPtr>::type;
+                static_assert(!std::is_polymorphic<TNonPtr>::value, "Polymorphic types are not supported");
+                deserializeImpl(s, *obj, details::IsFundamentalType<TNonPtr>{});
+            }
+
+            template <typename S, typename T>
+            void deserializeImpl(S& s, T& obj, std::true_type) {
+                s.template value<sizeof(T)>(obj);
+            }
+
+            template <typename S, typename T>
+            void deserializeImpl(S& s, T& obj, std::false_type) {
+                s.object(obj);
+            }
+
+            class RawPointerManager {
+            public:
+                template <typename Writer, typename Ser, typename T>
+                static void serializeObject(Writer& , Ser& ser, const T& obj) {
+
+                    details_pointer::serializeObject(ser, obj);
+                }
+
+                template <typename Reader, typename Des, typename T>
+                static void deserializeObject(Reader& , Des& des, T& obj) {
+                    details_pointer::createObject(obj);
+                    details_pointer::deserializeObject(des, obj);
+                }
+
+                template <typename T>
+                static void destroyObject(T& obj) {
+                    details_pointer::destroyObject(obj);
+                }
+            };
+
+            class PointerLinkingContextSerialization {
+            public:
+                explicit PointerLinkingContextSerialization()
+                        :_currId{0},
+                         _ptrMap{}
+                {}
+
+                PointerLinkingContextSerialization(const PointerLinkingContextSerialization&) = delete;
+                PointerLinkingContextSerialization& operator = (const PointerLinkingContextSerialization&) = delete;
+
+                PointerLinkingContextSerialization(PointerLinkingContextSerialization&&) = default;
+                PointerLinkingContextSerialization& operator = (PointerLinkingContextSerialization&&) = default;
+                ~PointerLinkingContextSerialization() = default;
+
+                struct PointerInfo {
+                    PointerInfo(size_t id_, PointerOwnershipType ownershipType_)
+                            :id{id_},
+                             ownershipType{ownershipType_},
+                             sharedCount{0}
+                    {};
+                    size_t id;
+                    PointerOwnershipType ownershipType;
+                    size_t sharedCount;
+                };
+
+                const PointerInfo& getInfoByPtr(const void *ptr, PointerOwnershipType ptrType) {
+                    auto res = _ptrMap.emplace(ptr, PointerInfo{_currId + 1u, ptrType});
+                    auto& ptrInfo = res.first->second;
+                    if (res.second) {
+                        ++_currId;
+                        return ptrInfo;
+                    }
+                    //ptr already exists
+                    //for observer return success
+                    if (ptrType == PointerOwnershipType::Observer)
+                        return ptrInfo;
+                    //set owner and return success
+                    if (ptrInfo.ownershipType == PointerOwnershipType::Observer) {
+                        ptrInfo.ownershipType = ptrType;
+                        return ptrInfo;
+                    }
+                    //only shared ownership can get here multiple times
+                    assert(ptrType == PointerOwnershipType::Shared);
+                    ptrInfo.sharedCount++;
+                    return ptrInfo;
+                }
+
+                //valid, when all pointers have owners.
+                //we cannot serialize pointers, if we haven't serialized objects themselves
+                bool isPointerSerializationValid() const {
+                    return std::all_of(_ptrMap.begin(), _ptrMap.end(), [](const std::pair<const void*, PointerInfo>& p) {
+                        return p.second.ownershipType != PointerOwnershipType::Observer;
+                    });
+                }
+
+            private:
+                size_t _currId;
+                std::unordered_map<const void*, PointerInfo> _ptrMap;
+
+            };
+
+            //this class is used to store context for shared ptr owners
+            struct SharedContextBase {
+                virtual ~SharedContextBase() = default;
+            };
+
+            class PointerLinkingContextDeserialization {
+            public:
+                explicit PointerLinkingContextDeserialization()
+                        : _idMap{}
+                {}
+
+                PointerLinkingContextDeserialization(const PointerLinkingContextDeserialization&) = delete;
+                PointerLinkingContextDeserialization& operator = (const PointerLinkingContextDeserialization&) = delete;
+
+                PointerLinkingContextDeserialization(PointerLinkingContextDeserialization&&) = default;
+                PointerLinkingContextDeserialization& operator = (PointerLinkingContextDeserialization&&) = default;
+                ~PointerLinkingContextDeserialization() = default;
+
+
+                struct PointerInfo {
+                    PointerInfo(size_t id_, void* ptr, PointerOwnershipType ownershipType_)
+                            :id{id_},
+                             ownershipType{ownershipType_},
+                             ownerPtr{ptr},
+                             observersList{},
+                             sharedContext{}
+                    {};
+                    PointerInfo(const PointerInfo&) = delete;
+                    PointerInfo& operator = (const PointerInfo&) = delete;
+                    PointerInfo(PointerInfo&&) = default;
+                    PointerInfo&operator = (PointerInfo&&) = default;
+                    ~PointerInfo() = default;
+
+                    void processOwner(void* ptr) {
+                        ownerPtr = ptr;
+                        assert(ownershipType != PointerOwnershipType::Observer);
+                        for (auto& o:observersList)
+                            o.get() = ptr;
+                        observersList.clear();
+                        observersList.shrink_to_fit();
+                    }
+                    void processObserver(void* (&ptr)) {
+                        if (ownerPtr) {
+                            ptr = ownerPtr;
+                        } else {
+                            observersList.push_back(ptr);
+                        }
+                    }
+                    size_t id;
+                    PointerOwnershipType ownershipType;
+                    void* ownerPtr;
+                    std::vector<std::reference_wrapper<void*>> observersList;
+                    std::unique_ptr<SharedContextBase> sharedContext;
+                };
+
+                PointerInfo& getInfoById(size_t id, PointerOwnershipType ptrType) {
+                    auto res = _idMap.emplace(id, PointerInfo{id, nullptr, ptrType});
+                    auto& ptrInfo = res.first->second;
+                    if (!res.second) {
+                        assert(ptrType != PointerOwnershipType::Owner || ptrInfo.ownershipType == PointerOwnershipType::Observer);
+                        if (ptrInfo.ownershipType == PointerOwnershipType::Observer)
+                            ptrInfo.ownershipType = ptrType;
+                    }
+                    return ptrInfo;
+                }
+
+                //valid, when all pointers has owners
+                bool isPointerDeserializationValid() const {
+                    return std::all_of(_idMap.begin(), _idMap.end(), [](const std::pair<const size_t, PointerInfo>& p) {
+                        return p.second.ownershipType != PointerOwnershipType::Observer;
+                    });
+                }
+
+            private:
+                std::unordered_map<size_t, PointerInfo> _idMap;
+            };
+
+            template <typename S>
+            PointerLinkingContext& getLinkingContext(S& s) {
+                auto res = s.template context<PointerLinkingContext>();
+                assert(res != nullptr);
+                return *res;
+            }
+        }
+
+        //this class is for convenience
+        class PointerLinkingContext:
+                public details_pointer::PointerLinkingContextSerialization,
+                public details_pointer::PointerLinkingContextDeserialization {
+        public:
+            bool isValid() {
+                return isPointerSerializationValid() && isPointerDeserializationValid();
+            }
+        };
+
+        class PointerOwner {
+        public:
+            explicit PointerOwner(PointerType ptrType = PointerType::Nullable):_ptrType{ptrType} {}
+
+            template<typename Ser, typename Writer, typename T, typename Fnc>
+            void serialize(Ser &ser, Writer &w, const T &obj, Fnc &&) const {
+                auto& ctx = details_pointer::getLinkingContext(ser);
+                if (obj) {
+                    auto& ptrInfo = ctx.getInfoByPtr(obj, PointerOwnershipType::Owner);
+                    details::writeSize(w, ptrInfo.id);
+                    details_pointer::RawPointerManager::serializeObject(w, ser, obj);
+                } else {
+                    assert(_ptrType == PointerType::Nullable);
+                    details::writeSize(w, 0);
+                }
+            }
+
+            template<typename Des, typename Reader, typename T, typename Fnc>
+            void deserialize(Des &des, Reader &r, T &obj, Fnc &&) const {
+                details_pointer::getLinkingContext(des);
+                size_t id{};
+                details::readSize(r, id, std::numeric_limits<size_t>::max());
+                if (id) {
+                    auto& ctx = details_pointer::getLinkingContext(des);
+                    auto& ptrInfo = ctx.getInfoById(id, PointerOwnershipType::Owner);
+                    details_pointer::RawPointerManager::deserializeObject(r, des, obj);
+                    ptrInfo.processOwner(obj);
+                } else {
+                    if (_ptrType == PointerType::Nullable)
+                        details_pointer::RawPointerManager::destroyObject(obj);
+                    else
+                        r.setError(ReaderError::InvalidPointer);
+                }
+            }
+        private:
+            PointerType _ptrType;
+        };
+
+        class PointerObserver {
+        public:
+
+            explicit PointerObserver(PointerType ptrType = PointerType::Nullable):_ptrType{ptrType} {}
+
+            template<typename Ser, typename Writer, typename T, typename Fnc>
+            void serialize(Ser &ser, Writer &w, const T &obj, Fnc &&) const {
+                auto& ctx = details_pointer::getLinkingContext(ser);
+                if (obj) {
+                    details::writeSize(w, ctx.getInfoByPtr(obj, PointerOwnershipType::Observer).id);
+                } else {
+                    assert(_ptrType == PointerType::Nullable);
+                    details::writeSize(w, 0);
+                }
+            }
+
+            template<typename Des, typename Reader, typename T, typename Fnc>
+            void deserialize(Des &des, Reader &r, T &obj, Fnc &&) const {
+                size_t id{};
+                details::readSize(r, id, std::numeric_limits<size_t>::max());
+                if (id) {
+                    auto& ctx = details_pointer::getLinkingContext(des);
+                    ctx.getInfoById(id, PointerOwnershipType::Observer).processObserver(reinterpret_cast<void*&>(obj));
+                } else {
+                    if (_ptrType == PointerType::Nullable)
+                        obj = nullptr;
+                    else
+                        r.setError(ReaderError::InvalidPointer);
+                }
+            }
+        private:
+            PointerType _ptrType;
+        };
+
+        class ReferencedByPointer {
+        public:
+            template<typename Ser, typename Writer, typename T, typename Fnc>
+            void serialize(Ser &ser, Writer &w, const T &obj, Fnc && fnc) const {
+                auto& ctx = details_pointer::getLinkingContext(ser);
+                details::writeSize(w, ctx.getInfoByPtr(&obj, PointerOwnershipType::Owner).id);
+                fnc(const_cast<T&>(obj));
+            }
+
+            template<typename Des, typename Reader, typename T, typename Fnc>
+            void deserialize(Des &des, Reader &r, T &obj, Fnc && fnc) const {
+                size_t id{};
+                details::readSize(r, id, std::numeric_limits<size_t>::max());
+                if (id) {
+                    auto& ctx = details_pointer::getLinkingContext(des);
+                    fnc(obj);
+                    ctx.getInfoById(id, PointerOwnershipType::Owner).processOwner(&obj);
+                } else {
+                    //cannot be null for references
+                    r.setError(ReaderError::InvalidPointer);
+                }
+            }
+        };
+
+    }
+
+    namespace traits {
+
+        template<typename T>
+        struct ExtensionTraits<ext::PointerOwner, T*> {
+            using TValue = T;
+            static constexpr bool SupportValueOverload = true;
+            static constexpr bool SupportObjectOverload = true;
+            //pointers cannot have lamba overload, when polymorphism support will be added
+            static constexpr bool SupportLambdaOverload = false;
+        };
+
+        template<typename T>
+        struct ExtensionTraits<ext::PointerObserver, T*> {
+            //although pointer observer doesn't serialize anything, but we still add value overload support to be consistent with pointer owners
+            using TValue = T;
+            static constexpr bool SupportValueOverload = true;
+            static constexpr bool SupportObjectOverload = true;
+            //pointers cannot have lamba overload, when polymorphism support will be added
+            static constexpr bool SupportLambdaOverload = false;
+        };
+
+        template<typename T>
+        struct ExtensionTraits<ext::ReferencedByPointer, T> {
+            //allow everything, because it is serialized as regular type, except it also creates pointerId that is required by NonOwningPointer to work
+            using TValue = T;
+            static constexpr bool SupportValueOverload = true;
+            static constexpr bool SupportObjectOverload = true;
+            static constexpr bool SupportLambdaOverload = true;
+        };
+    }
+
+}
+
+
+#endif //BITSERY_EXT_POINTER_H

include/bitsery/ext/std_map.h

@@ -23,6 +23,7 @@
 #ifndef BITSERY_EXT_STD_MAP_H
 #define BITSERY_EXT_STD_MAP_H
 
+#include "../traits/core/traits.h"
 #include "../details/adapter_utils.h"
 
 namespace bitsery {

include/bitsery/ext/std_optional.h

@@ -33,6 +33,7 @@
 //    using optional = experimental::optional<T>;
 //}
 #include <type_traits>
+#include "../traits/core/traits.h"
 
 namespace bitsery {
     namespace ext {

include/bitsery/ext/std_set.h

@@ -27,6 +27,7 @@
 #include "../details/adapter_utils.h"
 //we need this, so we could
 #include <unordered_set>
+#include "../traits/core/traits.h"
 
 namespace bitsery {
     namespace ext {
@@ -74,7 +75,7 @@ namespace bitsery {
                 obj.reserve(size);
             }
             template <typename T>
-            void reserve(T obj, size_t size) const {
+            void reserve(T& , size_t ) const {
                 //for ordered container do nothing
             }
             size_t _maxSize;

include/bitsery/ext/value_range.h

@@ -108,13 +108,13 @@ namespace bitsery {
         template<typename T, typename std::enable_if<std::is_integral<T>::value>::type * = nullptr>
         details::SameSizeUnsigned<T> getRangeValue(const T &v, const RangeSpec<T> &r) {
             return static_cast<details::SameSizeUnsigned<T>>(v - r.min);
-        };
+        }
 
         template<typename T, typename std::enable_if<std::is_enum<T>::value>::type * = nullptr>
         details::SameSizeUnsigned<T> getRangeValue(const T &v, const RangeSpec<T> &r) {
             using VT = details::SameSizeUnsigned<T>;
             return static_cast<VT>(static_cast<VT>(v) - static_cast<VT>(r.min));
-        };
+        }
 
         template<typename T, typename std::enable_if<std::is_floating_point<T>::value>::type * = nullptr>
         details::SameSizeUnsigned<T> getRangeValue(const T &v, const RangeSpec<T> &r) {
@@ -122,18 +122,18 @@ namespace bitsery {
             const VT maxUint = (static_cast<VT>(1) << r.bitsRequired) - 1;
             const auto ratio = (v - r.min) / (r.max - r.min);
             return static_cast<VT>(ratio * maxUint);
-        };
+        }
 
         template<typename T, typename std::enable_if<std::is_integral<T>::value>::type * = nullptr>
         void setRangeValue(T &v, const RangeSpec<T> &r) {
             v += r.min;
-        };
+        }
 
         template<typename T, typename std::enable_if<std::is_enum<T>::value>::type * = nullptr>
         void setRangeValue(T &v, const RangeSpec<T> &r) {
             using VT = typename std::underlying_type<T>::type;
             reinterpret_cast<VT &>(v) += static_cast<VT>(r.min);
-        };
+        }
 
         template<typename T, typename std::enable_if<std::is_floating_point<T>::value>::type * = nullptr>
         void setRangeValue(T &v, const RangeSpec<T> &r) {
@@ -141,7 +141,7 @@ namespace bitsery {
             const auto intRep = reinterpret_cast<UIT &>(v);
             const UIT maxUint = (static_cast<UIT>(1) << r.bitsRequired) - 1;
             v = r.min + (static_cast<T>(intRep) / maxUint) * (r.max - r.min);
-        };
+        }
 
         template<typename T, typename std::enable_if<std::is_arithmetic<T>::value>::type * = nullptr>
         bool isRangeValid(const T &v, const RangeSpec<T> &r) {
@@ -163,7 +163,7 @@ namespace bitsery {
         public:
 
             template<typename ... Args>
-            explicit constexpr ValueRange(Args &&... args):_range{std::forward<Args>(args)...} {};
+            explicit constexpr ValueRange(Args &&... args):_range{std::forward<Args>(args)...} {}
 
             template<typename Ser, typename Writer, typename T, typename Fnc>
             void serialize(Ser &, Writer &writer, const T &v, Fnc &&) const {

include/bitsery/flexible.h

@@ -35,7 +35,7 @@ namespace bitsery {
         template<typename S, typename T>
         void archiveProcessImpl(S &s, T &&head, std::true_type) {
             s.object(std::forward<T>(head));
-        };
+        }
 
         //overload when T is rvalue type, only allowable for behaviour modifying functions for deserializer
         template<typename S, typename T>
@@ -43,7 +43,7 @@ namespace bitsery {
             static_assert(std::is_base_of<ArchiveWrapperFnc, T>::value,
                           "\nOnly archive behaviour modifying functions can be passed by rvalue to deserializer\n");
             serialize(s, head);
-        };
+        }
 
     }
 
@@ -57,12 +57,12 @@ namespace bitsery {
     template<typename T, size_t N>
     flexible::CArray<T, N, true> asText(T (&str)[N]) {
         return {str};
-    };
+    }
 
     template<typename T, size_t N>
     flexible::CArray<T, N, false> asContainer(T (&obj)[N]) {
         return {obj};
-    };
+    }
 
     template <typename T>
     flexible::MaxSize<T> maxSize(T& obj, size_t max) {
@@ -78,21 +78,21 @@ namespace bitsery {
     template<typename S, typename T, typename std::enable_if<details::IsFundamentalType<T>::value>::type * = nullptr>
     void serialize(S &s, T &v) {
         s.template value<sizeof(T)>(v);
-    };
+    }
 
 //define serialization for c-style container
 
     //if array is integral type, specify explicitly how to process: as text or container
     template<typename S, typename T, size_t N, typename std::enable_if<std::is_integral<T>::value>::type * = nullptr>
-    void serialize(S &s, T (&obj)[N]) {
+    void serialize(S &, T (&)[N]) {
         static_assert(N == 0,
                       "\nPlease use 'asText(obj)' or 'asContainer(obj)' when using c-style array with integral types\n");
-    };
+    }
 
     template<typename S, typename T, size_t N, typename std::enable_if<!std::is_integral<T>::value>::type * = nullptr>
     void serialize(S &s, T (&obj)[N]) {
         flexible::processContainer(s, obj);
-    };
+    }
 
     //this is a helper class that enforce fundamental type sizes, when used on multiple platforms
     template <size_t TShort, size_t TInt, size_t TLong, size_t TLongLong>
@@ -103,7 +103,7 @@ namespace bitsery {
         static_assert(sizeof(long) == TLong, "");
         static_assert(sizeof(long long) == TLongLong, "");
         //for completion we also need pointer type size, but serializer doesn't support pointer serialization.
-    };
+    }
 
 }
 

include/bitsery/serializer.h

@@ -30,21 +30,25 @@
 
 namespace bitsery {
 
-    template<typename TAdapterWriter>
+    template<typename TAdapterWriter, typename TContext = void>
     class BasicSerializer {
     public:
         //this is used by AdapterAccess class
         using TWriter = TAdapterWriter;
         //helper type, that always returns bit-packing enabled type, useful inside serialize function when enabling bitpacking
         using BPEnabledType = BasicSerializer<typename std::conditional<TAdapterWriter::BitPackingEnabled,
-                TAdapterWriter, AdapterWriterBitPackingWrapper<TAdapterWriter>>::type>;
+                TAdapterWriter, AdapterWriterBitPackingWrapper<TAdapterWriter>>::type, TContext>;
+
+        static_assert(details::IsSpecializationOf<typename TWriter::TConfig::InternalContext, std::tuple>::value,
+                      "Config::InternalContext must be std::tuple");
 
         template <typename WriterParam>
-        explicit BasicSerializer(WriterParam&& w, void* context = nullptr)
+        explicit BasicSerializer(WriterParam&& w, TContext* context = nullptr)
                 : _writer{std::forward<WriterParam>(w)},
-                  _context{context}
+                  _context{context},
+                  _internalContext{}
         {
-        };
+        }
 
         //copying disabled
         BasicSerializer(const BasicSerializer&) = delete;
@@ -58,10 +62,20 @@ namespace bitsery {
          * get serialization context.
          * this is optional, but might be required for some specific serialization flows.
          */
-        void* context() {
+        TContext* context() {
             return _context;
         }
 
+        template <typename T>
+        T* context() {
+            return details::getContext<T>(_context, _internalContext);
+        }
+
+        template <typename T>
+        T* contextOrNull() {
+            return details::getContextIfTypeExists<T>(_context, _internalContext);
+        }
+
         /*
          * object function
          */
@@ -73,7 +87,7 @@ namespace bitsery {
         template<typename T, typename Fnc>
         void object(const T &obj, Fnc &&fnc) {
             fnc(const_cast<T& >(obj));
-        };
+        }
 
         /*
          * functionality, that enables simpler serialization syntax, by including additional header
@@ -114,7 +128,7 @@ namespace bitsery {
             static_assert(traits::ExtensionTraits<Ext,T>::SupportLambdaOverload,
                           "extension doesn't support overload with lambda");
             extension.serialize(*this, _writer, obj, std::forward<Fnc>(fnc));
-        };
+        }
 
         template<size_t VSIZE, typename T, typename Ext>
         void ext(const T &obj, const Ext &extension) {
@@ -124,7 +138,7 @@ namespace bitsery {
             using ExtVType = typename traits::ExtensionTraits<Ext, T>::TValue;
             using VType = typename std::conditional<std::is_void<ExtVType>::value, details::DummyType, ExtVType>::type;
             extension.serialize(*this, _writer, obj, [this](VType &v) { value<VSIZE>(v); });
-        };
+        }
 
         template<typename T, typename Ext>
         void ext(const T &obj, const Ext &extension) {
@@ -134,7 +148,7 @@ namespace bitsery {
             using ExtVType = typename traits::ExtensionTraits<Ext, T>::TValue;
             using VType = typename std::conditional<std::is_void<ExtVType>::value, details::DummyType, ExtVType>::type;
             extension.serialize(*this, _writer, obj, [this](VType &v) { object(v); });
-        };
+        }
 
         /*
          * boolValue
@@ -259,16 +273,16 @@ namespace bitsery {
         void value8b(T &&v) { value<8>(std::forward<T>(v)); }
 
         template<typename T, typename Ext>
-        void ext1b(const T &v, Ext &&extension) { ext<1, T, Ext>(v, std::forward<Ext>(extension)); };
+        void ext1b(const T &v, Ext &&extension) { ext<1, T, Ext>(v, std::forward<Ext>(extension)); }
 
         template<typename T, typename Ext>
-        void ext2b(const T &v, Ext &&extension) { ext<2, T, Ext>(v, std::forward<Ext>(extension)); };
+        void ext2b(const T &v, Ext &&extension) { ext<2, T, Ext>(v, std::forward<Ext>(extension)); }
 
         template<typename T, typename Ext>
-        void ext4b(const T &v, Ext &&extension) { ext<4, T, Ext>(v, std::forward<Ext>(extension)); };
+        void ext4b(const T &v, Ext &&extension) { ext<4, T, Ext>(v, std::forward<Ext>(extension)); }
 
         template<typename T, typename Ext>
-        void ext8b(const T &v, Ext &&extension) { ext<8, T, Ext>(v, std::forward<Ext>(extension)); };
+        void ext8b(const T &v, Ext &&extension) { ext<8, T, Ext>(v, std::forward<Ext>(extension)); }
 
         template<typename T>
         void text1b(const T &str, size_t maxSize) { text<1>(str, maxSize); }
@@ -316,7 +330,8 @@ namespace bitsery {
         friend AdapterAccess;
 
         TAdapterWriter _writer;
-        void* _context;
+        TContext* _context;
+        typename TWriter::TConfig::InternalContext _internalContext;
 
         //process value types
         //false_type means that we must process all elements individually
@@ -324,7 +339,7 @@ namespace bitsery {
         void procContainer(It first, It last, std::false_type) {
             for (; first != last; ++first)
                 value<VSIZE>(*first);
-        };
+        }
 
         //process value types
         //true_type means, that we can copy whole buffer
@@ -335,7 +350,7 @@ namespace bitsery {
 			if (first != last)
 				_writer.template writeBuffer<VSIZE>(reinterpret_cast<const TIntegral*>(&(*first)),
                                                     static_cast<size_t>(std::distance(first, last)));
-        };
+        }
 
         //process by calling functions
         template<typename It, typename Fnc>
@@ -344,7 +359,7 @@ namespace bitsery {
             for (; first != last; ++first) {
                 fnc(const_cast<TValue&>(*first));
             }
-        };
+        }
 
         //process text,
         template<size_t VSIZE, typename T>
@@ -354,14 +369,14 @@ namespace bitsery {
             details::writeSize(_writer, length);
             auto begin = std::begin(str);
             procContainer<VSIZE>(begin, std::next(begin, length), std::integral_constant<bool, traits::ContainerTraits<T>::isContiguous>{});
-        };
+        }
 
         //process object types
         template<typename It>
         void procContainer(It first, It last) {
             for (; first != last; ++first)
                 object(*first);
-        };
+        }
 
         //proc bool writing bit or byte, depending on if BitPackingEnabled or not
         void procBoolValue(bool v, std::true_type) {
@@ -381,7 +396,7 @@ namespace bitsery {
         template <typename Fnc>
         void procEnableBitPacking(const Fnc& fnc, std::false_type) {
             //create serializer using bitpacking wrapper
-            BasicSerializer<AdapterWriterBitPackingWrapper<TAdapterWriter>> tmp(_writer, _context);
+            BPEnabledType tmp(_writer, _context);
             fnc(tmp);
         }
 
@@ -413,7 +428,7 @@ namespace bitsery {
         auto& w = AdapterAccess::getWriter(ser);
         w.flush();
         return w.writtenBytesCount();
-    };
+    }
 
     template <typename T>
     size_t quickMeasureSize(const T& value) {

include/bitsery/traits/core/std_defaults.h

@@ -20,8 +20,8 @@
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
 
-#ifndef BITSERY_TRAITS_HELPER_STD_DEFAULTS_H
-#define BITSERY_TRAITS_HELPER_STD_DEFAULTS_H
+#ifndef BITSERY_TRAITS_CORE_STD_DEFAULTS_H
+#define BITSERY_TRAITS_CORE_STD_DEFAULTS_H
 
 #include "traits.h"
 #include <iostream>
@@ -82,4 +82,4 @@ namespace bitsery {
     }
 }
 
-#endif //BITSERY_TRAITS_HELPER_STD_DEFAULTS_H
+#endif //BITSERY_TRAITS_CORE_STD_DEFAULTS_H

include/bitsery/traits/core/traits.h

@@ -62,12 +62,12 @@ namespace bitsery {
             //contiguous hopefully will be available in c++20
             static constexpr bool isContiguous = false;
             //resize function, called only if container is resizable
-            static void resize(T& container, size_t size) {
+            static void resize(T& , size_t ) {
                 static_assert(std::is_void<T>::value,
                               "Define ContainerTraits or include from <bitsery/traits/...> to use as container");
             }
             //get container size
-            static size_t size(const T& container) {
+            static size_t size(const T& ) {
                 static_assert(std::is_void<T>::value,
                               "Define ContainerTraits or include from <bitsery/traits/...> to use as container");
                 return 0u;
@@ -80,12 +80,13 @@ namespace bitsery {
             using TValue = T;
             static constexpr bool isResizable = false;
             static constexpr bool isContiguous = true;
-            static size_t size(const T (&container)[N]) {
+            static size_t size(const T (&)[N]) {
                 return N;
             }
         };
 
-        //specialization for initializer list, even though it cannot be deserialized to.
+        //specialization for initializer list.
+        //only serializer can use it
         template<typename T>
         struct ContainerTraits<std::initializer_list<T>> {
             using TValue = T;
@@ -96,6 +97,30 @@ namespace bitsery {
             }
         };
 
+        //specialization for pointer type buffer
+        //only deserializer can use it
+        template <typename T>
+        struct ContainerTraits<const T*> {
+            using TValue = T;
+            static constexpr bool isResizable = false;
+            static constexpr bool isContiguous = true;
+            static size_t size(const T* ) {
+                static_assert(std::is_void<T>::value, "cannot get size for container of type T*");
+                return 0u;
+            }
+        };
+
+        template <typename T>
+        struct ContainerTraits<T*> {
+            using TValue = T;
+            static constexpr bool isResizable = false;
+            static constexpr bool isContiguous = true;
+            static size_t size(const T* ) {
+                static_assert(std::is_void<T>::value, "cannot get size for container of type T*");
+                return 0u;
+            }
+        };
+
 
 
         //traits for text, default adds null-terminated character at the end
@@ -106,7 +131,7 @@ namespace bitsery {
             static constexpr bool addNUL = true;
 
             //get length of null terminated container
-            static size_t length(const T& container) {
+            static size_t length(const T& ) {
                 static_assert(std::is_void<T>::value,
                               "Define TextTraits or include from <bitsery/traits/...> to use as text");
                 return 0u;
@@ -124,7 +149,7 @@ namespace bitsery {
             //instead of using back_insert_iterator to append each byte to buffer.
             //thats why Writer return range iterators
 
-            static void increaseBufferSize(T& container) {
+            static void increaseBufferSize(T& ) {
                 static_assert(std::is_void<T>::value,
                               "Define BufferAdapterTraits or include from <bitsery/traits/...> to use as buffer adapter container");
             }

tests/adapter_stream.cpp

@@ -24,6 +24,9 @@
 #include <bitsery/adapter/stream.h>
 #include <bitsery/adapter_writer.h>
 #include <bitsery/adapter_reader.h>
+#include <bitsery/traits/vector.h>
+#include <bitsery/traits/array.h>
+#include <bitsery/traits/string.h>
 #include <sstream>
 
 //some helper types
@@ -33,21 +36,13 @@ using InputAdapter = bitsery::InputStreamAdapter ;
 using Writer = bitsery::AdapterWriter<bitsery::OutputStreamAdapter, bitsery::DefaultConfig>;
 using Reader = bitsery::AdapterReader<bitsery::InputStreamAdapter, bitsery::DefaultConfig>;
 
+static constexpr size_t InternalBufferSize = 128;
+using BufferedAdapterInternalBuffer = std::array<char, InternalBufferSize>;
+using OutputBufferedAdapter = bitsery::BasicBufferedOutputStreamAdapter<char, std::char_traits<char>, BufferedAdapterInternalBuffer>;
+using BufferedWriter = bitsery::AdapterWriter<OutputBufferedAdapter, bitsery::DefaultConfig>;
+
 using testing::Eq;
 
-TEST(AdapterIOStream, WrittenBytesCountReturns0) {
-    //setup data
-    uint8_t t1 = 111;
-
-    Stream buf{};
-    Writer w{{buf}};
-    w.writeBytes<1>(t1);
-    w.flush();
-
-    EXPECT_THAT(buf.str().size(), Eq(1));
-    EXPECT_THAT(w.writtenBytesCount(), Eq(0));
-}
-
 TEST(AdapterIOStream, CorrectlyReturnsIsCompletedSuccessfully) {
     //setup data
     uint8_t t1 = 111;
@@ -84,7 +79,7 @@ TEST(AdapterIOStream, ReadingMoreThanAvailableReturnsZero) {
 }
 
 //this is strange, but probably stringstream doesnt use any of the base methods that sets io_base::iostate flags
-TEST(AdapterIOStream, WhenReadingStringStreamThenErrorCodeAlwaysReturnsNoError) {
+TEST(AdapterIOStream, WhenReadingMoreThanAvailableThenDataOverflow) {
     //setup data
     uint8_t t1 = 111;
 
@@ -103,7 +98,64 @@ TEST(AdapterIOStream, WhenReadingStringStreamThenErrorCodeAlwaysReturnsNoError)
     EXPECT_THAT(r.error(), Eq(bitsery::ReaderError::NoError));
     EXPECT_THAT(r1, Eq(t1));
     r.readBytes<1>(r1);
+    r.readBytes<1>(r1);
     EXPECT_THAT(r1, Eq(0));
-    //should by overflow error, but it all iostate flags are set to false...
-    EXPECT_THAT(r.error(), Eq(bitsery::ReaderError::NoError));
+    EXPECT_THAT(r.isCompletedSuccessfully(), Eq(false));
+    EXPECT_THAT(r.error(), Eq(bitsery::ReaderError::DataOverflow));
+
+}
+
+
+template<typename T>
+class AdapterBufferedOutputStream : public testing::Test {
+public:
+    using Buffer = T;
+    using Adapter = bitsery::BasicBufferedOutputStreamAdapter<char, std::char_traits<char>, Buffer>;
+    using Writer = bitsery::AdapterWriter<Adapter, bitsery::DefaultConfig>;
+
+    static constexpr size_t InternalBufferSize = 128;
+
+    Stream stream{};
+
+    Writer writer{{stream, 128}};
+};
+
+using BufferedAdapterInternalBufferTypes = ::testing::Types<
+        std::vector<char>,
+        std::array<char, 128>,
+        std::string
+>;
+
+TYPED_TEST_CASE(AdapterBufferedOutputStream, BufferedAdapterInternalBufferTypes);
+
+TYPED_TEST(AdapterBufferedOutputStream, WhenBufferOverflowThenWriteBufferAndRemainingDataToStream) {
+    uint8_t x{};
+    for (auto i = 0u; i < TestFixture::InternalBufferSize; ++i)
+        this->writer.template writeBytes<1>(x);
+    EXPECT_TRUE(this->stream.str().empty());
+    this->writer.template writeBytes<1>(x);
+    EXPECT_THAT(this->stream.str().size(), Eq(TestFixture::InternalBufferSize + 1));
+}
+
+TYPED_TEST(AdapterBufferedOutputStream, WhenFlushThenWriteImmediately) {
+    uint8_t x{};
+    this->writer.template writeBytes<1>(x);
+    EXPECT_THAT(this->stream.str().size(), Eq(0));
+    this->writer.flush();
+    EXPECT_THAT(this->stream.str().size(), Eq(1));
+    this->writer.flush();
+    EXPECT_THAT(this->stream.str().size(), Eq(1));
+}
+
+TYPED_TEST(AdapterBufferedOutputStream, WhenBufferIsStackAllocatedThenBufferSizeViaCtorHasNoEffect) {
+
+    //create writer with half the internal buffer size
+    //for std::vector it should overflow, and for std::array it should have no effect
+    typename TestFixture::Writer w{{this->stream, TestFixture::InternalBufferSize / 2}};
+
+    uint8_t x{};
+    for (auto i = 0u; i < TestFixture::InternalBufferSize; ++i)
+        w.template writeBytes<1>(x);
+    static constexpr bool ShouldWriteToStream = bitsery::traits::ContainerTraits<typename TestFixture::Buffer>::isResizable;
+    EXPECT_THAT(this->stream.str().empty(), ::testing::Ne(ShouldWriteToStream));
 }

tests/data_endianness.cpp

@@ -56,19 +56,19 @@ using InverseReader = bitsery::AdapterReader<InputAdapter, InverseEndiannessConf
 TEST(DataEndianness, WhenWriteBytesThenBytesAreSwapped) {
     //fill initial values
     IntegralTypes src{};
-    src.a = 0x1122334455667788;
+    src.a = static_cast<int64_t>(0x1122334455667788);
     src.b = 0xBBCCDDEE;
-    src.c = 0xCCDD;
-    src.d = 0xDD;
-    src.e = 0xEE;
+    src.c = static_cast<int16_t>(0xCCDD);
+    src.d = static_cast<uint8_t>(0xDD);
+    src.e = static_cast<int8_t>(0xEE);
 
     //fill expected result after swap
     IntegralTypes resInv{};
-    resInv.a = 0x8877665544332211;
+    resInv.a = static_cast<int64_t>(0x8877665544332211);
     resInv.b = 0xEEDDCCBB;
-    resInv.c = 0xDDCC;
-    resInv.d = 0xDD;
-    resInv.e = 0xEE;
+    resInv.c = static_cast<int16_t>(0xDDCC);
+    resInv.d = static_cast<uint8_t>(0xDD);
+    resInv.e = static_cast<int8_t>(0xEE);
 
     //create and write to buffer
     Buffer buf{};
@@ -136,7 +136,7 @@ TEST(DataEndianness, WhenWriteMoreThan1ByteValuesThenValuesAreSwapped) {
 template <typename T>
 constexpr size_t getBits(T v) {
     return bitsery::details::calcRequiredBits<T>({}, v);
-};
+}
 
 struct IntegralUnsignedTypes {
     uint64_t a;

tests/data_operations.cpp

@@ -43,7 +43,7 @@ struct IntegralUnsignedTypes {
 template <typename T>
 constexpr size_t getBits(T v) {
     return bitsery::details::calcRequiredBits<T>({}, v);
-};
+}
 
 // *** bits operations
 
@@ -285,6 +285,53 @@ TEST(DataBitsAndBytesOperations, WriteAndReadBytes) {
 
 }
 
+TEST(DataBitsAndBytesOperations, WriteAndReadBytesWithBitPackingWrapper) {
+    //setup data
+    IntegralTypes data;
+    data.a = -4894541654564;
+    data.b = 94545646;
+    data.c = -8778;
+    data.d = 200;
+    data.e = -98;
+    data.f[0] = 43;
+    data.f[1] = -45;
+
+    //create and write to buffer
+    Buffer buf{};
+    Writer bw{buf};
+    AdapterBitPackingWriter bpw{bw};
+    bpw.writeBytes<4>(data.b);
+    bpw.writeBytes<2>(data.c);
+    bpw.writeBytes<1>(data.d);
+    bpw.writeBytes<8>(data.a);
+    bpw.writeBytes<1>(data.e);
+    bpw.writeBuffer<1>(data.f, 2);
+    bpw.flush();
+    auto writtenSize = bpw.writtenBytesCount();
+
+    EXPECT_THAT(writtenSize, Eq(18));
+    //read from buffer
+    Reader br{InputAdapter{buf.begin(), writtenSize}};
+    AdapterBitPackingReader bpr{br};
+    IntegralTypes res{};
+    bpr.readBytes<4>(res.b);
+    bpr.readBytes<2>(res.c);
+    bpr.readBytes<1>(res.d);
+    bpr.readBytes<8>(res.a);
+    bpr.readBytes<1>(res.e);
+    bpr.readBuffer<1>(res.f, 2);
+    EXPECT_THAT(bpr.error(), Eq(bitsery::ReaderError::NoError));
+    //assert results
+
+    EXPECT_THAT(data.a, Eq(res.a));
+    EXPECT_THAT(data.b, Eq(res.b));
+    EXPECT_THAT(data.c, Eq(res.c));
+    EXPECT_THAT(data.d, Eq(res.d));
+    EXPECT_THAT(data.e, Eq(res.e));
+    EXPECT_THAT(data.f, ContainerEq(res.f));
+
+}
+
 TEST(DataBitsAndBytesOperations, ReadWriteFncCanAcceptSignedData) {
     //setup data
     constexpr size_t DATA_SIZE = 3;

tests/data_reading_errors.cpp

@@ -114,8 +114,22 @@ TEST(DataReadingErrors, WhenInitializingSessionsWhereSessionsDataOffsetIsCorrupt
     SessionsEnabledWriter bw{buf};
     bw.writeBytes<1>(uint8_t{1});
     bw.writeBytes<1>(uint8_t{1});
-    bw.writeBytes<2>(uint16_t{10});
+    bw.writeBytes<4>(uint32_t{10});
     SessionsEnabledReader br{InputAdapter{buf.begin(), bw.writtenBytesCount()}};
     br.beginSession();
     EXPECT_THAT(br.error(), Eq(bitsery::ReaderError::InvalidData));
 }
+
+TEST(DataReadingErrors, WhenReadingNewSessionOutsideSessionThenInvalidData) {
+    Buffer buf{};
+    SessionsEnabledWriter bw{buf};
+    bw.beginSession();
+    bw.writeBytes<1>(uint8_t{1});
+    bw.endSession();
+    bw.flush();
+    SessionsEnabledReader br{InputAdapter{buf.begin(), bw.writtenBytesCount()}};
+    br.beginSession();
+    br.endSession();
+    br.beginSession();
+    EXPECT_THAT(br.error(), Eq(bitsery::ReaderError::InvalidData));
+}

tests/flexible_syntax.cpp

@@ -46,7 +46,7 @@ TEST(FlexibleSyntax, FundamentalTypesAndBool) {
     float tf = 485.042f;
     double_t td = -454184.48445;
     bool tb=true;
-    SerializationContext ctx;
+    SerializationContext ctx{};
     ctx.createSerializer().archive(ti,te,tf,td,tb);
 
     //result

tests/serialization_bool.cpp

@@ -33,7 +33,7 @@ using Deserializer = bitsery::BasicDeserializer<bitsery::AdapterReaderBitPacking
 
 TEST(SerializeBooleans, BoolAsBit) {
 
-    SerializationContext ctx;
+    SerializationContext ctx{};
     bool t1{true};
     bool t2{false};
     bool res1;

tests/serialization_container.cpp

@@ -163,7 +163,7 @@ TYPED_TEST(SerializeContainerDynamicSizeCompositeTypes, CustomFunctionThatDoNoth
     SerializationContext ctx{};
     using TValue = typename TestFixture::TValue;
 
-    auto emptyFnc = [](TValue &v) {};
+    auto emptyFnc = [](TValue &) {};
     ctx.createSerializer().container(this->src, 1000, emptyFnc);
     ctx.createDeserializer().container(this->res, 1000, emptyFnc);
 
@@ -217,7 +217,7 @@ TYPED_TEST(SerializeContainerFixedSizeCompositeTypes, DefaultSerializationFuncti
     Container src{MyStruct1{0, 1}, MyStruct1{8, 9}, MyStruct1{11, 34}, MyStruct1{5134, 1532}};
     Container res{};
 
-    SerializationContext ctx;
+    SerializationContext ctx{};
     ctx.createSerializer().container(src);
     ctx.createDeserializer().container(res);
 
@@ -232,7 +232,7 @@ TYPED_TEST(SerializeContainerFixedSizeCompositeTypes, CustomFunctionThatSerializ
 
     using TValue = decltype(*std::begin(res));
 
-    SerializationContext ctx;
+    SerializationContext ctx{};
     auto& ser = ctx.createSerializer();
     ser.container(src, [&ser](TValue &v) {
         char tmp{};

tests/serialization_context.cpp

@@ -0,0 +1,133 @@
+//MIT License
+//
+//Copyright (c) 2017 Mindaugas Vinkelis
+//
+//Permission is hereby granted, free of charge, to any person obtaining a copy
+//of this software and associated documentation files (the "Software"), to deal
+//in the Software without restriction, including without limitation the rights
+//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//copies of the Software, and to permit persons to whom the Software is
+//furnished to do so, subject to the following conditions:
+//
+//The above copyright notice and this permission notice shall be included in all
+//copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//SOFTWARE.
+
+
+#include <gmock/gmock.h>
+#include "serialization_test_utils.h"
+
+using testing::Eq;
+
+template <typename ... Args>
+struct ConfigWithContext: bitsery::DefaultConfig {
+    using InternalContext = std::tuple<Args...>;
+};
+
+template <typename Context, typename ... Args>
+using SerializerConfigWithContext = bitsery::BasicSerializer<
+        bitsery::AdapterWriter<bitsery::OutputBufferAdapter<Buffer>, ConfigWithContext<Args...>>, Context>;
+
+template <typename Context, typename ... Args>
+using DeserializerConfigWithContext = bitsery::BasicDeserializer<
+        bitsery::AdapterReader<bitsery::InputBufferAdapter<Buffer>, ConfigWithContext<Args...>>, Context>;
+
+template <typename Context>
+using MySerializer = bitsery::BasicSerializer<Writer, Context>;
+
+template <typename Context>
+using MyDeserializer = bitsery::BasicDeserializer<Reader, Context>;
+
+using SingleTypeContext = int;
+using MultipleTypesContext = std::tuple<int, float, char>;
+
+TEST(SerializationContext, WhenUsingContextThenReturnsUnderlyingPointerOrNull) {
+    Buffer buf{};
+    MySerializer<SingleTypeContext> ser1{buf, nullptr};
+    EXPECT_THAT(ser1.context(), ::testing::IsNull());
+
+    MySerializer<MultipleTypesContext> ser2{buf, nullptr};
+    EXPECT_THAT(ser2.context(), ::testing::IsNull());
+
+    SingleTypeContext sctx{};
+    MyDeserializer<SingleTypeContext> des1{InputAdapter{buf.begin(), 1}, &sctx};
+    EXPECT_THAT(des1.context(), Eq(&sctx));
+
+    MultipleTypesContext mctx{};
+    MyDeserializer<MultipleTypesContext> des2{InputAdapter{buf.begin(), 1}, &mctx};
+    EXPECT_THAT(des2.context(), Eq(&mctx));
+
+}
+
+TEST(SerializationContext, WhenContextIsTupleThenContextCastOverloadCastsToIndividualTupleTypes) {
+    Buffer buf{};
+    MySerializer<MultipleTypesContext> ser1{buf, nullptr};
+    EXPECT_THAT(ser1.context<int>(), ::testing::IsNull());
+    EXPECT_THAT(ser1.context<float>(), ::testing::IsNull());
+    EXPECT_THAT(ser1.context<char>(), ::testing::IsNull());
+}
+
+TEST(SerializationContext, WhenContextIsNotTupleThenContextCastOverloadReturnSameType) {
+    Buffer buf{};
+    SingleTypeContext ctx{};
+    MySerializer<SingleTypeContext> ser1{buf, &ctx};
+    EXPECT_THAT(ser1.context<SingleTypeContext>(), Eq(&ctx));
+}
+
+TEST(SerializationContext, SerializerDeserializerCanHaveInternalContextViaConfig) {
+    Buffer buf{};
+    SerializerConfigWithContext<void, float, int> ser{buf};
+    EXPECT_THAT(ser.context<int>(), ::testing::NotNull());
+    EXPECT_THAT(*ser.context<int>(), Eq(0));
+    *ser.context<int>() = 10;
+    EXPECT_THAT(*ser.context<int>(), Eq(10));
+
+    DeserializerConfigWithContext<void, char> des{InputAdapter{buf.begin(), 1}};
+    EXPECT_THAT(des.context<char>(), ::testing::NotNull());
+    EXPECT_THAT(*des.context<char>(), Eq(0));
+    *des.context<char>() = 10;
+    EXPECT_THAT(*des.context<char>(), Eq(10));
+
+    //new instance has new context
+    SerializerConfigWithContext<void, float, int> ser2{buf};
+    EXPECT_THAT(ser2.context<int>(), ::testing::NotNull());
+    EXPECT_THAT(*ser2.context<int>(), Eq(0));
+}
+
+TEST(SerializationContext, WhenInternalAndExternalContextIsTheSamePriorityGoesToInternalContext) {
+    Buffer buf{};
+    int externalCtx = 5;
+
+    SerializerConfigWithContext<int, float, int> ser{buf, &externalCtx};
+    EXPECT_THAT(ser.context<int>(), ::testing::NotNull());
+    EXPECT_THAT(*ser.context<int>(), Eq(0));
+    *ser.context<int>() = 2;
+
+    DeserializerConfigWithContext<int, int, char> des{InputAdapter{buf.begin(), 1}, &externalCtx};
+    EXPECT_THAT(des.context<char>(), ::testing::NotNull());
+    EXPECT_THAT(*des.context<char>(), Eq(0));
+    *des.context<int>() = 3;
+
+    EXPECT_THAT(externalCtx, Eq(5));
+}
+
+TEST(SerializationContext, ContextIfExistsReturnsNullWhenTypeDoesntExists) {
+    Buffer buf{};
+    std::tuple<double, short> extCtx1{};
+
+    SerializerConfigWithContext<std::tuple<double, short>, float, int> ser{buf, &extCtx1};
+    EXPECT_THAT(ser.contextOrNull<int>(), ::testing::NotNull());
+    EXPECT_THAT(ser.contextOrNull<char>(), ::testing::IsNull());
+
+    double extCtx2{};
+    DeserializerConfigWithContext<double, int, char> des{InputAdapter{buf.begin(), 1}, &extCtx2};
+    EXPECT_THAT(des.contextOrNull<double>(), ::testing::NotNull());
+    EXPECT_THAT(des.contextOrNull<float>(), ::testing::IsNull());
+}

tests/serialization_ext_entropy.cpp

@@ -37,9 +37,8 @@ using BPDes = bitsery::BasicDeserializer<bitsery::AdapterReaderBitPackingWrapper
 TEST(SerializeExtensionEntropy, WhenEntropyEncodedThenOnlyWriteIndexUsingMinRequiredBits) {
     int32_t v = 4849;
     int32_t res;
-    constexpr size_t N = 3;
     int32_t values[3] = {485,4849,89};
-    SerializationContext ctx;
+    SerializationContext ctx{};
     ctx.createSerializer().enableBitPacking([&v, &values](BPSer& ser) {
         ser.ext4b(v, Entropy<int32_t[3]>{values});
     });
@@ -50,12 +49,12 @@ TEST(SerializeExtensionEntropy, WhenEntropyEncodedThenOnlyWriteIndexUsingMinRequ
     EXPECT_THAT(res, Eq(v));
     EXPECT_THAT(ctx.getBufferSize(), Eq(1));
 
-    SerializationContext ctx1;
+    SerializationContext ctx1{};
     ctx1.createSerializer().enableBitPacking([&v, &values](BPSer& ser) {
         ser.ext4b(v, Entropy<int32_t[3]>{values});
     });
     ctx1.createDeserializer().enableBitPacking([&res](BPDes& des) {
-       des.ext(res, bitsery::ext::ValueRange<int32_t>{0, static_cast<int32_t>(N + 1)});
+       des.ext(res, bitsery::ext::ValueRange<int32_t>{0, static_cast<int32_t>(3 + 1)});
     });
     EXPECT_THAT(res, Eq(2));
 }
@@ -64,7 +63,7 @@ TEST(SerializeExtensionEntropy, WhenNoEntropyEncodedThenWriteZeroBitsAndValueOrO
     int16_t v = 8945;
     int16_t res;
     std::initializer_list<int> values{485,4849,89};
-    SerializationContext ctx;
+    SerializationContext ctx{};
     ctx.createSerializer().enableBitPacking([&v, &values](BPSer& ser) {
         ser.ext2b(v, Entropy<std::initializer_list<int>>{values});
     });
@@ -84,12 +83,12 @@ TEST(SerializeExtensionEntropy, CustomTypeEntropyEncoded) {
     MyStruct1 values[N]{
                     MyStruct1{12, 10}, MyStruct1{485, 454},
                     MyStruct1{4849, 89}, MyStruct1{0, 1}};
-    SerializationContext ctx;
+    SerializationContext ctx{};
     ctx.createSerializer().enableBitPacking([&v, &values](BPSer& ser) {
-        ser.ext(v, Entropy<MyStruct1[N]>{values});
+        ser.ext(v, Entropy<MyStruct1[4]>{values});
     });
     ctx.createDeserializer().enableBitPacking([&res, &values](BPDes& des) {
-        des.ext(res, Entropy<MyStruct1[N]>{values});
+        des.ext(res, Entropy<MyStruct1[4]>{values});
     });
     EXPECT_THAT(res, Eq(v));
     EXPECT_THAT(ctx.getBufferSize(), Eq(1));
@@ -102,7 +101,7 @@ TEST(SerializeExtensionEntropy, CustomTypeNotEntropyEncoded) {
     std::initializer_list<MyStruct1> values {
             MyStruct1{12,10}, MyStruct1{485, 454},
             MyStruct1{4849,89}, MyStruct1{0,1}};
-    SerializationContext ctx;
+    SerializationContext ctx{};
     ctx.createSerializer().enableBitPacking([&v, &values](BPSer& ser) {
         ser.ext(v, Entropy<std::initializer_list<MyStruct1>>{values});
     });

tests/serialization_ext_growable.cpp

@@ -45,16 +45,21 @@ struct DataV3 {
 
 
 TEST(SerializeExtensionGrowable, WriteSessionsDataAtBufferEndAfterFlush) {
-    BasicSerializationContext<SessionsEnabledConfig> ctx;
-    ctx.createSerializer().ext(int8_t{}, Growable{}, [] (int8_t& v) { });
-    EXPECT_THAT(ctx.getBufferSize(), Eq(0));
+    BasicSerializationContext<SessionsEnabledConfig, void> ctx;
+    auto& ser = ctx.createSerializer();
+    //session cannot be empty
+    ser.ext(int8_t{}, Growable{}, [&ser] (int8_t& v) {
+        ser.value1b(v);
+    });
+
+    EXPECT_THAT(ctx.getBufferSize(), Eq(1));
     ctx.bw->flush();
-    EXPECT_THAT(ctx.getBufferSize(), Gt(0));
+    EXPECT_THAT(ctx.getBufferSize(), Gt(1));
 }
 
 
 TEST(SerializeExtensionGrowable, SessionDataConsistOfSessionsEndPosAnd4BytesSessionsDataOffset) {
-    BasicSerializationContext<SessionsEnabledConfig> ctx;
+    BasicSerializationContext<SessionsEnabledConfig, void> ctx;
 
 
     constexpr size_t DATA_SIZE = 4;
@@ -84,7 +89,7 @@ TEST(SerializeExtensionGrowable, SessionDataConsistOfSessionsEndPosAnd4BytesSess
 }
 
 TEST(SerializeExtensionGrowable, WhenNestedSessionsThenStoreEachDepthAndSize) {
-    BasicSerializationContext<SessionsEnabledConfig> ctx;
+    BasicSerializationContext<SessionsEnabledConfig, void> ctx;
     DataV3 data{19457,846, 498418};
     ctx.createSerializer();
     ctx.bw->beginSession();
@@ -116,7 +121,7 @@ TEST(SerializeExtensionGrowable, WhenNestedSessionsThenStoreEachDepthAndSize) {
 }
 
 TEST(SerializeExtensionGrowable, MultipleSessionsReadSameVersionData) {
-    BasicSerializationContext<SessionsEnabledConfig> ctx;
+    BasicSerializationContext<SessionsEnabledConfig, void> ctx;
     DataV2 data{8454,987451};
     ctx.createSerializer();
     auto& bw = (*ctx.bw);
@@ -142,7 +147,7 @@ TEST(SerializeExtensionGrowable, MultipleSessionsReadSameVersionData) {
 }
 
 TEST(SerializeExtensionGrowable, MultipleSessionsReadNewerVersionData) {
-    BasicSerializationContext<SessionsEnabledConfig> ctx;
+    BasicSerializationContext<SessionsEnabledConfig, void> ctx;
     DataV3 data{8454,987451,54};
     ctx.createSerializer();
     auto& bw = (*ctx.bw);
@@ -169,7 +174,7 @@ TEST(SerializeExtensionGrowable, MultipleSessionsReadNewerVersionData) {
 }
 
 TEST(SerializeExtensionGrowable, MultipleSessionsReadOlderVersionData) {
-    BasicSerializationContext<SessionsEnabledConfig> ctx;
+    BasicSerializationContext<SessionsEnabledConfig, void> ctx;
     DataV2 data{8454,987451};
     ctx.createSerializer();
     auto& bw = (*ctx.bw);
@@ -197,7 +202,7 @@ TEST(SerializeExtensionGrowable, MultipleSessionsReadOlderVersionData) {
 }
 
 TEST(SerializeExtensionGrowable, MultipleNestedSessionsReadSameVersionData) {
-    BasicSerializationContext<SessionsEnabledConfig> ctx;
+    BasicSerializationContext<SessionsEnabledConfig, void> ctx;
     DataV2 data{8454,987451};
     ctx.createSerializer();
     auto& bw = (*ctx.bw);
@@ -233,7 +238,7 @@ TEST(SerializeExtensionGrowable, MultipleNestedSessionsReadSameVersionData) {
 }
 
 TEST(SerializeExtensionGrowable, MultipleNestedSessionsReadOlderVersionData) {
-    BasicSerializationContext<SessionsEnabledConfig> ctx;
+    BasicSerializationContext<SessionsEnabledConfig, void> ctx;
     DataV2 data{8454,987451};
     ctx.createSerializer();
     auto& bw = (*ctx.bw);
@@ -273,7 +278,7 @@ TEST(SerializeExtensionGrowable, MultipleNestedSessionsReadOlderVersionData) {
 }
 
 TEST(SerializeExtensionGrowable, MultipleNestedSessionsReadNewerVersionData1) {
-    BasicSerializationContext<SessionsEnabledConfig> ctx;
+    BasicSerializationContext<SessionsEnabledConfig, void> ctx;
     DataV3 data{8454,987451,54};
     ctx.createSerializer();
     auto& bw = (*ctx.bw);
@@ -329,7 +334,7 @@ TEST(SerializeExtensionGrowable, MultipleNestedSessionsReadNewerVersionData1) {
 }
 
 TEST(SerializeExtensionGrowable, MultipleNestedSessionsReadNewerVersionData2) {
-    BasicSerializationContext<SessionsEnabledConfig> ctx;
+    BasicSerializationContext<SessionsEnabledConfig, void> ctx;
     DataV3 data{8454,987451,54};
     ctx.createSerializer();
     auto& bw = (*ctx.bw);
@@ -391,7 +396,7 @@ TEST(SerializeExtensionGrowable, MultipleNestedSessionsReadNewerVersionData2) {
 }
 
 TEST(SerializeExtensionGrowable, SessionsStartsAtEndOfSerialization) {
-    BasicSerializationContext<SessionsEnabledConfig> ctx;
+    BasicSerializationContext<SessionsEnabledConfig, void> ctx;
     DataV2 data{8454,987451};
     ctx.createSerializer();
     auto& bw = (*ctx.bw);

tests/serialization_ext_inheritance.cpp

@@ -0,0 +1,354 @@
+//MIT License
+//
+//Copyright (c) 2017 Mindaugas Vinkelis
+//
+//Permission is hereby granted, free of charge, to any person obtaining a copy
+//of this software and associated documentation files (the "Software"), to deal
+//in the Software without restriction, including without limitation the rights
+//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//copies of the Software, and to permit persons to whom the Software is
+//furnished to do so, subject to the following conditions:
+//
+//The above copyright notice and this permission notice shall be included in all
+//copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//SOFTWARE.
+
+#include <gmock/gmock.h>
+#include "serialization_test_utils.h"
+#include <bitsery/ext/inheritance.h>
+
+using bitsery::ext::BaseClass;
+using bitsery::ext::VirtualBaseClass;
+
+struct ConfigWithInheritanceCtx:bitsery::DefaultConfig {
+    using InternalContext = std::tuple<bitsery::ext::InheritanceContext>;
+};
+
+using SerContext = BasicSerializationContext<ConfigWithInheritanceCtx, void>;
+
+using testing::Eq;
+
+/*
+ * base class
+ */
+struct Base {
+    uint8_t x{};
+    virtual ~Base() = default;
+};
+
+template <typename S>
+void serialize(S& s, Base& o) {
+    s.value1b(o.x);
+}
+
+/*
+ * non virtual inheritance from base
+ */
+struct Derive1NonVirtually:Base {
+    uint8_t y1{};
+};
+
+template <typename S>
+void serialize(S& s, Derive1NonVirtually& o) {
+    s.ext(o, BaseClass<Base>{});
+    s.value1b(o.y1);
+}
+
+struct Derive2NonVirtually:Base {
+    uint8_t y2{};
+};
+
+template <typename S>
+void serialize(S& s, Derive2NonVirtually& o) {
+    //use lambda to serialize base
+    s.ext(o, BaseClass<Base>{}, [&s](Base& b) {
+        s.object(b);
+    });
+    s.value1b(o.y2);
+}
+
+struct MultipleInheritanceNonVirtualBase: Derive1NonVirtually, Derive2NonVirtually {
+    uint8_t z{};
+};
+
+template <typename S>
+void serialize(S& s, MultipleInheritanceNonVirtualBase& o) {
+    s.ext(o, BaseClass<Derive1NonVirtually>{});
+    s.ext(o, BaseClass<Derive2NonVirtually>{});
+    s.value1b(o.z);
+}
+
+/*
+ * virtual inheritance from base
+ */
+struct Derive1Virtually:virtual Base {
+    uint8_t y1{};
+};
+
+template <typename S>
+void serialize(S& s, Derive1Virtually& o) {
+    s.ext(o, VirtualBaseClass<Base>{});
+    s.value1b(o.y1);
+}
+
+struct Derive2Virtually:virtual Base {
+    uint8_t y2{};
+};
+
+template <typename S>
+void serialize(S& s, Derive2Virtually& o) {
+    s.ext(o, VirtualBaseClass<Base>{});
+    s.value1b(o.y2);
+}
+
+struct MultipleInheritanceVirtualBase: Derive1Virtually, Derive2Virtually {
+    uint8_t z{};
+    MultipleInheritanceVirtualBase() = default;
+
+    MultipleInheritanceVirtualBase(uint8_t x_, uint8_t y1_, uint8_t y2_, uint8_t z_) {
+        x = x_;
+        y1 = y1_;
+        y2 = y2_;
+        z = z_;
+    }
+
+    template <typename S>
+    void serialize(S& s) {
+        s.ext(*this, BaseClass<Derive1Virtually>{});
+        s.ext(*this, BaseClass<Derive2Virtually>{});
+        s.value1b(z);
+    }
+
+};
+
+bool operator == (const MultipleInheritanceVirtualBase& lhs, const MultipleInheritanceVirtualBase& rhs) {
+    return std::tie(lhs.x, lhs.y1, lhs.y2, lhs.z) == std::tie(rhs.x, rhs.y1, rhs.y2, rhs.z);
+}
+
+TEST(SerializeExtensionInheritance, BaseClass) {
+
+    Derive1NonVirtually d1{};
+    d1.x = 187;
+    d1.y1 = 74;
+    Derive1NonVirtually rd1{};
+
+    SerContext ctx{};
+    ctx.createSerializer().object(d1);
+    ctx.createDeserializer().object(rd1);
+
+    EXPECT_THAT(rd1.x, Eq(d1.x));
+    EXPECT_THAT(rd1.y1, Eq(d1.y1));
+    EXPECT_THAT(ctx.getBufferSize(), Eq(2));
+}
+
+TEST(SerializeExtensionInheritance, VirtualBaseClass) {
+    Derive1Virtually d1{};
+    d1.x = 15;
+    d1.y1 = 87;
+    Derive1Virtually rd1{};
+
+    SerContext ctx{};
+    ctx.createSerializer().object(d1);
+    ctx.createDeserializer().object(rd1);
+
+    EXPECT_THAT(rd1.x, Eq(d1.x));
+    EXPECT_THAT(rd1.y1, Eq(d1.y1));
+    EXPECT_THAT(ctx.getBufferSize(), Eq(2));
+}
+
+TEST(SerializeExtensionInheritance, MultipleBasesWithoutVirtualInheritance) {
+    MultipleInheritanceNonVirtualBase md{};
+    //x is ambiguous because we don't derive virtually
+    static_cast<Derive1NonVirtually&>(md).x = 1;
+    static_cast<Derive2NonVirtually&>(md).x = 2;
+    md.y1 = 4;
+    md.z = 5;
+    md.y2 = 6;
+    MultipleInheritanceNonVirtualBase res{};
+
+    SerContext ctx{};
+    ctx.createSerializer().object(md);
+    ctx.createDeserializer().object(res);
+
+    EXPECT_THAT(static_cast<Derive1NonVirtually&>(res).x, Eq(static_cast<Derive1NonVirtually&>(md).x));
+    EXPECT_THAT(static_cast<Derive2NonVirtually&>(res).x, Eq(static_cast<Derive2NonVirtually&>(md).x));
+    EXPECT_THAT(res.y1, Eq(md.y1));
+    EXPECT_THAT(res.y2, Eq(md.y2));
+    EXPECT_THAT(res.z, Eq(md.z));
+    EXPECT_THAT(ctx.getBufferSize(), Eq(5)); //5 because two bases
+
+}
+
+TEST(SerializeExtensionInheritance, WhenNoVirtualInheritanceExistsThenInheritanceContextIsNotRequired) {
+    MultipleInheritanceNonVirtualBase md{};
+    //x is ambiguous because we don't derive virtually
+    static_cast<Derive1NonVirtually&>(md).x = 1;
+    static_cast<Derive2NonVirtually&>(md).x = 2;
+    md.y1 = 4;
+    md.z = 5;
+    md.y2 = 6;
+    MultipleInheritanceNonVirtualBase res{};
+
+    //without InheritanceContext
+    SerializationContext ctx{};
+    ctx.createSerializer().object(md);
+    ctx.createDeserializer().object(res);
+
+    EXPECT_THAT(static_cast<Derive1NonVirtually&>(res).x, Eq(static_cast<Derive1NonVirtually&>(md).x));
+    EXPECT_THAT(static_cast<Derive2NonVirtually&>(res).x, Eq(static_cast<Derive2NonVirtually&>(md).x));
+    EXPECT_THAT(res.y1, Eq(md.y1));
+    EXPECT_THAT(res.y2, Eq(md.y2));
+    EXPECT_THAT(res.z, Eq(md.z));
+    EXPECT_THAT(ctx.getBufferSize(), Eq(5)); //5 because two bases
+
+}
+
+
+
+TEST(SerializeExtensionInheritance, MultipleBasesWithVirtualInheritance) {
+    MultipleInheritanceVirtualBase md{3,7,5,15};
+    MultipleInheritanceVirtualBase res{};
+
+    SerContext ctx{};
+    ctx.createSerializer().object(md);
+    ctx.createDeserializer().object(res);
+    EXPECT_THAT(res, Eq(md));
+    EXPECT_THAT(ctx.getBufferSize(), Eq(4)); //4 because virtual base
+}
+
+TEST(SerializeExtensionInheritance, MultipleBasesWithVirtualInheritanceMultipleObjects) {
+    std::vector<MultipleInheritanceVirtualBase> data;
+    data.emplace_back(4,8,7,9);
+    data.emplace_back(1,2,3,4);
+    data.emplace_back(8,7,15,97);
+    data.emplace_back(54,132,45,84);
+    data.emplace_back(27,85,41,2);
+    std::vector<MultipleInheritanceVirtualBase> res{};
+
+    SerContext ctx{};
+    ctx.createSerializer().container(data, 10);
+    ctx.createDeserializer().container(res, 10);
+    EXPECT_THAT(res, ::testing::ContainerEq(data));
+    EXPECT_THAT(ctx.getBufferSize(), Eq(1 + 4 * data.size())); //1 container size + 4 because virtual base * elements
+}
+
+//
+class BasePrivateSerialize {
+public:
+    explicit BasePrivateSerialize(uint8_t v):_v{v} {}
+    uint8_t getX() const { return _v; }
+private:
+    uint8_t _v;
+
+    friend bitsery::Access;
+    template <typename S>
+    void serialize(S& s) {
+        s.value1b(_v);
+    }
+
+};
+
+class DerivedPrivateBase: public BasePrivateSerialize {
+public:
+    explicit DerivedPrivateBase(uint8_t v) : BasePrivateSerialize(v) {}
+    uint8_t z{};
+};
+
+template <typename S>
+void serialize(S& s, DerivedPrivateBase& o) {
+    //use lambda for base serialization
+    s.ext(o, BaseClass<BasePrivateSerialize>{}, [&s](BasePrivateSerialize& b) {
+        s.object(b);
+    });
+    s.value1b(o.z);
+}
+
+struct BaseNonMemberSerialize {
+    uint8_t x{};
+};
+
+template <typename S>
+void serialize(S& s, BaseNonMemberSerialize& o) {
+    s.value1b(o.x);
+}
+
+
+struct DerivedMemberSerialize: public BaseNonMemberSerialize {
+    uint8_t z{};
+    template <typename S>
+    void serialize(S& s) {
+        s.ext(*this, BaseClass<BaseNonMemberSerialize>{});
+        s.value1b(z);
+    }
+};
+
+//explicitly select serialize functions, for types that has ambiguous serialize functions
+namespace bitsery {
+    template <>
+    struct SelectSerializeFnc<DerivedPrivateBase>:UseNonMemberFnc {};
+
+    template <>
+    struct SelectSerializeFnc<DerivedMemberSerialize>:UseMemberFnc {};
+}
+
+
+TEST(SerializeExtensionInheritance, WhenDerivedClassHasAmbiguousSerializeFunctionThenExplicitlySelectSpecialization) {
+    DerivedPrivateBase data1{43};
+    data1.z = 87;
+    DerivedMemberSerialize data2{};
+    data2.x = 71;
+    data2.z = 22;
+    DerivedPrivateBase res1{0};
+    DerivedMemberSerialize res2{};
+
+    SerContext ctx{};
+    ctx.createSerializer().object(data1);
+    ctx.createSerializer().object(data2);
+    ctx.createDeserializer().object(res1);
+    ctx.createDeserializer().object(res2);
+    EXPECT_THAT(res1.getX(), Eq(data1.getX()));
+    EXPECT_THAT(res1.z, Eq(data1.z));
+    EXPECT_THAT(res2.x, Eq(data2.x));
+    EXPECT_THAT(res2.z, Eq(data2.z));
+}
+
+struct AbstractBase {
+    uint8_t x{};
+    virtual void exec() = 0;
+    virtual ~AbstractBase() = default;
+
+    template <typename S>
+    void serialize(S& s) {
+        s.value1b(x);
+    }
+};
+
+struct ImplementedBase:AbstractBase {
+    uint8_t y{};
+    void exec() override {}
+
+    template <typename S>
+    void serialize(S& s) {
+        s.ext(*this, BaseClass<AbstractBase>{});
+        s.value1b(y);
+    }
+};
+
+TEST(SerializeExtensionInheritance, CanSerializeAbstractClass) {
+    ImplementedBase data{};
+    data.x = 4;
+    data.y = 2;
+    ImplementedBase res{};
+    SerContext ctx{};
+    ctx.createSerializer().object(data);
+    ctx.createDeserializer().object(res);
+    EXPECT_THAT(res.x, Eq(data.x));
+    EXPECT_THAT(res.y, Eq(data.y));
+}

tests/serialization_ext_pointer.cpp

@@ -0,0 +1,450 @@
+//MIT License
+//
+//Copyright (c) 2017 Mindaugas Vinkelis
+//
+//Permission is hereby granted, free of charge, to any person obtaining a copy
+//of this software and associated documentation files (the "Software"), to deal
+//in the Software without restriction, including without limitation the rights
+//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//copies of the Software, and to permit persons to whom the Software is
+//furnished to do so, subject to the following conditions:
+//
+//The above copyright notice and this permission notice shall be included in all
+//copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//SOFTWARE.
+
+#include <gmock/gmock.h>
+#include "serialization_test_utils.h"
+#include <bitsery/ext/pointer.h>
+
+using bitsery::ext::PointerOwner;
+using bitsery::ext::PointerObserver;
+using bitsery::ext::ReferencedByPointer;
+using bitsery::ext::PointerLinkingContext;
+using bitsery::ext::PointerType;
+
+using testing::Eq;
+
+using SerContext = BasicSerializationContext<bitsery::DefaultConfig, PointerLinkingContext>;
+
+class SerializeExtensionPointerSerialization: public testing::Test {
+public:
+    //data used for serialization
+    int16_t d1{1597};
+    int16_t* pd1 = &d1;
+    MyEnumClass d2{MyEnumClass::E2};
+    MyEnumClass* pd2 = &d2;
+    MyStruct1 d3{184, 897};
+    MyStruct1* pd3 = &d3;
+
+    //data used for deserialization
+    int16_t r1{-84};
+    int16_t* pr1 = &r1;
+    MyEnumClass r2{MyEnumClass::E4};
+    MyEnumClass* pr2 = &r2;
+    MyStruct1 r3{-4984, -14597};
+    MyStruct1* pr3 = &r3;
+
+    //null pointers
+    int16_t* p1null = nullptr;
+    MyEnumClass* p2null = nullptr;
+    MyStruct1* p3null = nullptr;
+
+
+    PointerLinkingContext plctx1{};
+    SerContext sctx1{};
+
+    typename SerContext::TSerializer& createSerializer() {
+        return sctx1.createSerializer(&plctx1);
+    }
+
+    bool isPointerContextValid() {
+        return plctx1.isValid();
+    }
+};
+
+TEST(SerializeExtensionPointer, RequiresPointerLinkingContext) {
+    MyStruct1* data = nullptr;
+    //linking context
+    PointerLinkingContext plctx1{};
+    SerContext sctx1;
+    sctx1.createSerializer(&plctx1).ext(data, PointerOwner{});
+    sctx1.createDeserializer(&plctx1).ext(data, PointerOwner{});
+
+    //linking context in tuple
+    using ContextInTuple = std::tuple<int, PointerLinkingContext, float, char>;
+    ContextInTuple plctx2(0, PointerLinkingContext{}, 0.0f, 'a');
+    BasicSerializationContext<SessionsEnabledConfig, ContextInTuple> sctx2;
+    sctx2.createSerializer(&plctx2).ext(data, PointerObserver{});
+    sctx2.createDeserializer(&plctx2).ext(data, PointerObserver{});
+}
+
+TEST(SerializeExtensionPointer, PointerLinkingContextAcceptsMultipleSharedOwnersAndReturnSameId) {
+    MyStruct1 data{};
+    //pretend that this is shared ptr
+    MyStruct1* sharedPtr = &data;
+    //linking context
+    PointerLinkingContext plctx1{};
+    EXPECT_THAT(plctx1.getInfoByPtr(sharedPtr, bitsery::ext::PointerOwnershipType::Shared).id, Eq(1));
+    EXPECT_THAT(plctx1.getInfoByPtr(sharedPtr, bitsery::ext::PointerOwnershipType::Shared).id, Eq(1));
+    EXPECT_THAT(plctx1.getInfoByPtr(sharedPtr, bitsery::ext::PointerOwnershipType::Shared).id, Eq(1));
+}
+
+TEST_F(SerializeExtensionPointerSerialization, WhenPointersAreNullThenIsValid) {
+
+    auto& ser = createSerializer();
+    ser.ext2b(p1null, PointerOwner{});
+    ser.ext2b(p1null, PointerObserver{});
+    ser.ext(p3null, PointerOwner{});
+    ser.ext(p3null, PointerObserver{});
+    sctx1.createDeserializer();
+    EXPECT_THAT(sctx1.bw->writtenBytesCount(), Eq(4));
+
+    EXPECT_THAT(plctx1.isValid(), Eq(true));
+}
+#ifndef NDEBUG
+
+TEST(SerializeExtensionPointer, WhenPointerLinkingContextIsNullThenAssert) {
+    MyStruct1* data = nullptr;
+    //linking context
+    PointerLinkingContext plctx1{};
+    SerContext sctx1;
+    EXPECT_DEATH(sctx1.createSerializer(nullptr).ext(data, PointerOwner{}), "");
+    EXPECT_DEATH(sctx1.createDeserializer(nullptr).ext(data, PointerObserver{}), "");
+}
+
+TEST_F(SerializeExtensionPointerSerialization, WhenPointerOwnerIsNotUniqueThenAssert) {
+
+    auto& ser = createSerializer();
+    ser.ext2b(p1null, PointerOwner{});
+    ser.ext2b(pd1, PointerOwner{});
+    ser.ext4b(pd2, PointerOwner{});
+    ser.ext2b(p1null, PointerOwner{});
+    //dublicating pointer
+    EXPECT_DEATH(ser.ext2b(pd1, PointerOwner{}), "");
+}
+
+TEST_F(SerializeExtensionPointerSerialization, WhenRererencedByPointerIsSameAsPointerOwnerThenAssert1) {
+    auto& ser1 = createSerializer();
+    ser1.ext4b(pd2, PointerOwner{});
+    ser1.ext(d3, ReferencedByPointer{});
+
+    EXPECT_DEATH(ser1.ext(pd3, PointerOwner{}), "");
+}
+
+TEST_F(SerializeExtensionPointerSerialization, WhenRererencedByPointerIsSameAsPointerOwnerThenAssert2) {
+    auto& ser1 = createSerializer();
+    ser1.ext2b(pd1, PointerOwner{});
+    ser1.ext4b(d2, ReferencedByPointer{});
+    EXPECT_DEATH(ser1.ext2b(d1, ReferencedByPointer{}), "");
+}
+
+TEST_F(SerializeExtensionPointerSerialization, WhenNonNullPointerIsNullThenAssert) {
+    auto& ser1 = createSerializer();
+    EXPECT_DEATH(ser1.ext2b(p1null, PointerOwner{PointerType::NotNull}), "");
+    EXPECT_DEATH(ser1.ext2b(p1null, PointerObserver{PointerType::NotNull}), "");
+}
+
+#endif
+
+TEST_F(SerializeExtensionPointerSerialization, WhenPointerObserverPointsToOwnerThenIsValid) {
+    auto& ser1 = createSerializer();
+    ser1.ext2b(pd1, PointerOwner{});
+    ser1.ext2b(p1null, PointerObserver{});
+    EXPECT_THAT(plctx1.isValid(), Eq(true));
+    ser1.ext4b(pd2, PointerObserver{});//points to d2, and d2 is not still marked as owner
+    EXPECT_THAT(plctx1.isValid(), Eq(false));
+    ser1.ext4b(pd2, PointerOwner{});//now d2 is owning pointer
+    ser1.ext4b(pd2, PointerObserver{});//points to d2, but this time d2 has owner
+    ser1.ext2b(p1null, PointerObserver{});
+    EXPECT_THAT(plctx1.isValid(), Eq(true));
+}
+
+TEST_F(SerializeExtensionPointerSerialization, ReferenceTypeCanAlsoBeReferencedByPointerObservers) {
+    auto& ser1 = createSerializer();
+    ser1.ext2b(p1null, PointerObserver{});
+    EXPECT_THAT(plctx1.isValid(), Eq(true));
+    ser1.ext4b(pd2, PointerObserver{});//points to d2, and d2 is not still marked as owner
+    EXPECT_THAT(plctx1.isValid(), Eq(false));
+    ser1.ext4b(d2, ReferencedByPointer{});//now d2 is marked by marked as owning pointer
+    ser1.ext4b(pd2, PointerObserver{});//points to d2, but this time d2 has owner
+    ser1.ext(p3null, PointerObserver{});
+    EXPECT_THAT(plctx1.isValid(), Eq(true));
+}
+
+TEST_F(SerializeExtensionPointerSerialization, WhenPointerIsNullThenPointerIdIsZero) {
+    auto& ser1 = createSerializer();
+    ser1.ext(p3null, PointerOwner{});
+    ser1.ext2b(p1null, PointerObserver{});
+    sctx1.createDeserializer();
+    EXPECT_THAT(sctx1.bw->writtenBytesCount(), Eq(2));
+    size_t res;
+    bitsery::details::readSize(*sctx1.br, res, 10000u);
+    EXPECT_THAT(res, Eq(0));
+    bitsery::details::readSize(*sctx1.br, res, 10000u);
+    EXPECT_THAT(res, Eq(0));
+}
+
+TEST_F(SerializeExtensionPointerSerialization, PointerIdsStartsFromOne) {
+    auto& ser1 = createSerializer();
+    ser1.ext2b(pd1, PointerObserver{});
+    ser1.ext4b(pd2, PointerObserver{});
+    ser1.ext4b(pd2, PointerObserver{});
+    ser1.ext2b(p1null, PointerObserver{});
+    sctx1.createDeserializer();
+    EXPECT_THAT(sctx1.bw->writtenBytesCount(), Eq(4));
+    size_t res;
+    bitsery::details::readSize(*sctx1.br, res, 10000u);
+    EXPECT_THAT(res, Eq(1));
+    bitsery::details::readSize(*sctx1.br, res, 10000u);
+    EXPECT_THAT(res, Eq(2));
+    bitsery::details::readSize(*sctx1.br, res, 10000u);
+    EXPECT_THAT(res, Eq(2));
+    bitsery::details::readSize(*sctx1.br, res, 10000u);
+    EXPECT_THAT(res, Eq(0));
+}
+
+TEST_F(SerializeExtensionPointerSerialization, PointerObserversDoesntSerializeObject) {
+    auto& ser1 = createSerializer();
+    ser1.ext2b(pd1, PointerObserver{});
+    ser1.ext4b(pd2, PointerObserver{});
+    ser1.ext4b(pd2, PointerObserver{});
+    sctx1.createDeserializer();
+    EXPECT_THAT(sctx1.bw->writtenBytesCount(), Eq(3));
+}
+
+TEST_F(SerializeExtensionPointerSerialization, ReferencedByPointerSerializesIdAndObject) {
+    auto& ser1 = createSerializer();
+    ser1.ext2b(d1, ReferencedByPointer{});
+    ser1.ext4b(d2, ReferencedByPointer{});
+    ser1.ext4b(pd2, PointerObserver{});
+    auto& des = sctx1.createDeserializer();
+    EXPECT_THAT(sctx1.bw->writtenBytesCount(), Eq(3+6));
+    size_t id{};
+    bitsery::details::readSize(*sctx1.br, id, 10000u);
+    EXPECT_THAT(id, Eq(1));
+    des.value2b(r1);
+    EXPECT_THAT(r1, Eq(d1));
+    bitsery::details::readSize(*sctx1.br, id, 10000u);
+    EXPECT_THAT(id, Eq(2));
+    des.value4b(r2);
+    EXPECT_THAT(r2, Eq(d2));
+    bitsery::details::readSize(*sctx1.br, id, 10000u);
+    EXPECT_THAT(id, Eq(2));
+}
+
+TEST_F(SerializeExtensionPointerSerialization, PointerOwnerSerializesIdAndObject) {
+    auto& ser1 = createSerializer();
+    ser1.ext4b(pd2, PointerOwner{});
+    ser1.ext(pd3, PointerOwner{});
+    auto& des1 = sctx1.createDeserializer();
+    //2x ids + int32_t + MyStruct1
+    EXPECT_THAT(sctx1.bw->writtenBytesCount(), Eq(2 + 4 + MyStruct1::SIZE ));
+    size_t id;
+    bitsery::details::readSize(*sctx1.br, id, 10000u);
+    des1.value4b(r2);
+    EXPECT_THAT(r2, Eq(*pd2));
+    bitsery::details::readSize(*sctx1.br, id, 10000u);
+    des1.object(r3);
+    EXPECT_THAT(r3, Eq(*pd3));
+}
+
+class SerializeExtensionPointerDeserialization: public SerializeExtensionPointerSerialization {
+public:
+
+    typename SerContext::TSerializer& createSerializer() {
+        return sctx1.createSerializer(&plctx1);
+    }
+
+    typename SerContext::TDeserializer& createDeserializer() {
+        return sctx1.createDeserializer(&plctx1);
+    }
+
+};
+
+TEST_F(SerializeExtensionPointerDeserialization, ReferencedByPointer) {
+    auto& ser = createSerializer();
+    ser.ext2b(d1, ReferencedByPointer{});
+    ser.ext4b(d2, ReferencedByPointer{});
+    ser.ext(d3, ReferencedByPointer{});
+    auto& des = createDeserializer();
+    des.ext2b(r1, ReferencedByPointer{});
+    des.ext4b(r2, ReferencedByPointer{});
+    des.ext(r3, ReferencedByPointer{});
+
+    EXPECT_THAT(r1, Eq(d1));
+    EXPECT_THAT(r2, Eq(d2));
+    EXPECT_THAT(r3, Eq(d3));
+}
+
+TEST_F(SerializeExtensionPointerDeserialization, WhenReferencedByPointerReadsNullPointerThenInvalidPointerError) {
+    auto& ser = createSerializer();
+    bitsery::details::writeSize(*sctx1.bw, 0u);
+    ser.ext2b(d1, ReferencedByPointer{});
+    auto& des = createDeserializer();
+    des.ext2b(r1, ReferencedByPointer{});
+    EXPECT_THAT(sctx1.br->error(), Eq(bitsery::ReaderError::InvalidPointer));
+}
+
+TEST_F(SerializeExtensionPointerDeserialization, WhenNonNullPointerIsNullThenInvalidPointerError) {
+    createSerializer();
+    bitsery::details::writeSize(*sctx1.bw, 0u);
+    auto& des1 = createDeserializer();
+    des1.ext2b(p1null, PointerOwner{PointerType::NotNull});
+    EXPECT_THAT(sctx1.br->error(), Eq(bitsery::ReaderError::InvalidPointer));
+
+    auto& des2 = createDeserializer();
+    des2.ext2b(p1null, PointerObserver{PointerType::NotNull});
+    EXPECT_THAT(sctx1.br->error(), Eq(bitsery::ReaderError::InvalidPointer));
+}
+
+TEST_F(SerializeExtensionPointerDeserialization, PointerOwnerCreatesObjects) {
+    auto& ser = createSerializer();
+    ser.ext2b(pd1, PointerOwner{});
+    ser.ext4b(pd2, PointerOwner{});
+    ser.ext(pd3, PointerOwner{});
+    auto& des = createDeserializer();
+    des.ext2b(p1null, PointerOwner{});
+    des.ext4b(p2null, PointerOwner{});
+    des.ext(p3null, PointerOwner{});
+
+    EXPECT_THAT(isPointerContextValid(), Eq(true));
+    EXPECT_THAT(p1null, ::testing::NotNull());
+    EXPECT_THAT(p2null, ::testing::NotNull());
+    EXPECT_THAT(p3null, ::testing::NotNull());
+    EXPECT_THAT(*p1null, Eq(*pd1));
+    EXPECT_THAT(*p2null, Eq(*pd2));
+    EXPECT_THAT(*p3null, Eq(*pd3));
+}
+
+TEST_F(SerializeExtensionPointerDeserialization, PointerOwnerDestroysObjects) {
+    auto& ser = createSerializer();
+    ser.ext2b(p1null, PointerOwner{});
+    ser.ext4b(p2null, PointerOwner{});
+    ser.ext(p3null, PointerOwner{});
+    auto& des = createDeserializer();
+    //pr cannot link to local variables, need to allocate them separately
+    pr1 = new int16_t{};
+    pr2 = new MyEnumClass{};
+    pr3 = new MyStruct1{3,4};
+    des.ext2b(pr1, PointerOwner{});
+    des.ext4b(pr2, PointerOwner{});
+    des.ext(pr3, PointerOwner{});
+
+    EXPECT_THAT(isPointerContextValid(), Eq(true));
+    EXPECT_THAT(pr1, ::testing::IsNull());
+    EXPECT_THAT(pr2, ::testing::IsNull());
+    EXPECT_THAT(pr3, ::testing::IsNull());
+}
+
+TEST_F(SerializeExtensionPointerDeserialization, PointerObserver) {
+    auto& ser = createSerializer();
+    //first owner, than observer
+    ser.ext4b(d2, ReferencedByPointer{});
+    ser.ext2b(p1null, PointerObserver{});
+    ser.ext4b(pd2, PointerObserver{});
+    //first observer, than owner
+    ser.ext(pd3, PointerObserver{});
+    ser.ext(pd3, PointerOwner{});
+    auto& des = createDeserializer();
+    des.ext4b(r2, ReferencedByPointer{});
+    des.ext2b(pr1, PointerObserver{});
+    des.ext4b(p2null, PointerObserver{});
+    des.ext(pr3, PointerObserver{});
+    des.ext(pr3, PointerOwner{});
+
+    EXPECT_THAT(isPointerContextValid(), Eq(true));
+    //serialize null, override non-null
+    EXPECT_THAT(pr1, Eq(p1null));
+    //serialize non-null, override null
+    EXPECT_THAT(*p2null, Eq(*pd2));
+    EXPECT_THAT(p2null, Eq(&r2));
+    //serialize non-null override non-null
+    EXPECT_THAT(*pr3, Eq(*pd3));
+    EXPECT_THAT(pr3, Eq(&r3));
+}
+
+
+struct Test1Data {
+    std::vector<MyStruct1> vdata;
+    std::vector<MyStruct1*> vptr;
+    MyStruct1 o1;
+    MyStruct1* po1;
+    int32_t i1;
+    int32_t* pi1;
+    template <typename S>
+    void serialize(S& s) {
+        //set container elements to be candidates for non-owning pointers
+        s.container(vdata, 100, [&s](MyStruct1& d){
+            s.ext(d, ReferencedByPointer{});
+        });
+        //contains non owning pointers
+        //
+        //IMPORTANT !!!
+        // ALWAYS ACCEPT BY REFERENCE like this: T* (&obj)
+        //
+        s.container(vptr, 100, [&s](MyStruct1* (&d)){
+            s.ext(d, PointerObserver{});
+        });
+        //just a regular fields
+        s.object(o1);
+        s.value4b(i1);
+        //observer
+        s.ext(po1, PointerObserver{});
+        //owner
+        s.ext4b(pi1, PointerOwner{});
+
+    }
+};
+
+TEST(SerializeExtensionPointer, IntegrationTest) {
+
+    Test1Data data{};
+    data.vdata.push_back({165,-45});
+    data.vdata.push_back({7895,-1576});
+    data.vdata.push_back({5987,-798});
+    //container of non owning pointers (observers)
+    data.vptr.push_back(nullptr);
+    data.vptr.push_back(std::addressof(data.vdata[0]));
+    data.vptr.push_back(std::addressof(data.vdata[2]));
+    //regular fields
+    data.o1 = MyStruct1{145,948};
+    data.i1 = 945415;
+    //observer
+    data.po1 = std::addressof(data.vdata[1]);
+    //owning pointer
+    data.pi1 = new int32_t{};
+
+    Test1Data res{};
+
+    PointerLinkingContext plctx1{};
+    SerContext sctx1;
+    sctx1.createSerializer(&plctx1).object(data);
+    sctx1.createDeserializer(&plctx1).object(res);
+
+    EXPECT_THAT(plctx1.isValid(), Eq(true));
+    //check regular fields
+    EXPECT_THAT(res.i1, Eq(data.i1));
+    EXPECT_THAT(res.o1, Eq(data.o1));
+    //check data container
+    EXPECT_THAT(res.vdata, ::testing::ContainerEq(data.vdata));
+    //check owning pointers
+    EXPECT_THAT(*res.pi1, Eq(*data.pi1));
+    EXPECT_THAT(res.pi1, ::testing::Ne(data.pi1));
+    //check if observers points to correct data
+    EXPECT_THAT(res.po1, Eq(std::addressof(res.vdata[1])));
+    EXPECT_THAT(res.vptr[0], ::testing::IsNull());
+    EXPECT_THAT(res.vptr[1], Eq(std::addressof(res.vdata[0])));
+    EXPECT_THAT(res.vptr[2], Eq(std::addressof(res.vdata[2])));
+
+    //free owning raw pointers
+    delete data.pi1;
+    delete res.pi1;
+}

tests/serialization_ext_std_queue.cpp

@@ -56,7 +56,7 @@ TEST(SerializeExtensionStdQueue, QueueDefaultContainer) {
     t1.push(-4854);
     std::queue<int32_t> r1{};
 
-    SerializationContext ctx1;
+    SerializationContext ctx1{};
     test(ctx1,t1, r1);
     EXPECT_THAT(t1, Eq(r1));
 }
@@ -67,7 +67,7 @@ TEST(SerializeExtensionStdQueue, QueueVectorContainer) {
     t1.push(-4854);
     std::queue<int32_t, std::vector<int32_t>> r1{};
 
-    SerializationContext ctx1;
+    SerializationContext ctx1{};
     test(ctx1,t1, r1);
     EXPECT_THAT(t1, Eq(r1));
 }
@@ -78,7 +78,7 @@ TEST(SerializeExtensionStdQueue, PriorityQueueDefaultContainer) {
     t1.push(-4854);
     std::priority_queue<int32_t> r1{};
 
-    SerializationContext ctx1;
+    SerializationContext ctx1{};
     test(ctx1,t1, r1);
     auto & ct1 = PriorityQueueCnt<int32_t, std::vector<int32_t>>::getContainer(t1);
     auto & cr1 = PriorityQueueCnt<int32_t, std::vector<int32_t>>::getContainer(r1);
@@ -91,7 +91,7 @@ TEST(SerializeExtensionStdQueue, PriorityQueueDequeContainer) {
     t1.push(-44);
     std::priority_queue<int32_t, std::deque<int32_t>> r1{};
 
-    SerializationContext ctx1;
+    SerializationContext ctx1{};
     test(ctx1,t1, r1);
     auto & ct1 = PriorityQueueCnt<int32_t, std::deque<int32_t>>::getContainer(t1);
     auto & cr1 = PriorityQueueCnt<int32_t, std::deque<int32_t>>::getContainer(r1);

tests/serialization_objects.cpp

@@ -43,10 +43,10 @@ struct X {
 
 struct Y {
 	int y{};
-	int carr[3];
-	std::array<int, 3> arr;
-	std::vector<X> vx;
-	std::string s;
+	int carr[3]{};
+	std::array<int, 3> arr{};
+	std::vector<X> vx{};
+	std::string s{};
 };
 struct Z { X x{}; Y y{}; };
 

tests/serialization_size.cpp

@@ -35,7 +35,7 @@ bool SerializeDeserializeContainerSize(SerializationContext& ctx, const size_t s
 }
 
 TEST(SerializeSize, WhenLengthLessThan128Then1Byte) {
-    SerializationContext ctx1;
+    SerializationContext ctx1{};
     EXPECT_TRUE(SerializeDeserializeContainerSize(ctx1, 127));
     EXPECT_THAT(ctx1.getBufferSize(), Eq(1));
     SerializationContext ctx2;

tests/serialization_test_utils.h

@@ -38,8 +38,8 @@ struct MyStruct1 {
 
     MyStruct1() : MyStruct1{0, 0} {}
 
-    int i1;
-    int i2;
+    int32_t i1;
+    int32_t i2;
 
     bool operator==(const MyStruct1 &rhs) const {
         return i1 == rhs.i1 && i2 == rhs.i2;
@@ -97,30 +97,33 @@ using Writer = bitsery::AdapterWriter<OutputAdapter, bitsery::DefaultConfig>;
 using Reader = bitsery::AdapterReader<InputAdapter, bitsery::DefaultConfig>;
 
 
-template <typename Config = bitsery::DefaultConfig>
+template <typename Config, typename Context>
 class BasicSerializationContext {
 public:
-    Buffer buf;
     using TWriter = bitsery::AdapterWriter<OutputAdapter, Config>;
     using TReader = bitsery::AdapterReader<InputAdapter, Config>;
-    std::unique_ptr<bitsery::BasicSerializer<TWriter>> ser;
-    std::unique_ptr<bitsery::BasicDeserializer<TReader>> des;
-    TWriter* bw;
-    TReader* br;
+    using TSerializer = bitsery::BasicSerializer<TWriter, Context>;
+    using TDeserializer = bitsery::BasicDeserializer<TReader, Context>;
 
-    bitsery::BasicSerializer<TWriter>& createSerializer() {
+    Buffer buf{};
+    std::unique_ptr<TSerializer> ser{};
+    std::unique_ptr<bitsery::BasicDeserializer<TReader, Context>> des{};
+    TWriter* bw{};
+    TReader* br{};
+
+    TSerializer& createSerializer(Context* ctx = nullptr) {
         if (!ser) {
-            ser = std::unique_ptr<bitsery::BasicSerializer<TWriter>>(new bitsery::BasicSerializer<TWriter>(OutputAdapter{buf}));
+            ser = std::unique_ptr<TSerializer>(new TSerializer(OutputAdapter{buf}, ctx));
             bw = &bitsery::AdapterAccess::getWriter(*ser);
         }
         return *ser;
     };
 
-    bitsery::BasicDeserializer<bitsery::AdapterReader<InputAdapter, Config>>& createDeserializer() {
+    TDeserializer & createDeserializer(Context* ctx = nullptr) {
         bw->flush();
         if (!des) {
-            des = std::unique_ptr<bitsery::BasicDeserializer<TReader>>(
-                    new bitsery::BasicDeserializer<TReader>(InputAdapter{buf.begin(), bw->writtenBytesCount()}));
+            des = std::unique_ptr<TDeserializer>(
+                    new TDeserializer(InputAdapter{buf.begin(), bw->writtenBytesCount()}, ctx));
             br = &bitsery::AdapterAccess::getReader(*des);
         }
         return *des;
@@ -143,6 +146,6 @@ public:
 };
 
 //helper type
-using SerializationContext = BasicSerializationContext<bitsery::DefaultConfig>;
+using SerializationContext = BasicSerializationContext<bitsery::DefaultConfig, void>;
 
 #endif //BITSERY_SERIALIZER_TEST_UTILS_H

tests/serialization_text.cpp

@@ -110,10 +110,12 @@ TEST(SerializeText, CArraySerializesTextLength) {
     EXPECT_THAT(r1, ContainerEq(t1));
 }
 
+#ifndef NDEBUG
 TEST(SerializeText, WhenCArrayNotNullterminatedThenAssert) {
     SerializationContext ctx;
     char16_t t1[CARR_LENGTH]{u"some text"};
     //make last character not nullterminated
     t1[CARR_LENGTH-1] = 'x';
     EXPECT_DEATH(ctx.createSerializer().text<2>(t1), "");
-}
+}
+#endif