input buffer adapter accepts const buffer

on clang, and is not standard compliant

.gitignore

@@ -1,3 +1,5 @@
 .idea/
+.vs/
 build/
 cmake-build-debug/
+CTestConfig.cmake

.travis.yml

@@ -9,15 +9,22 @@ before_install:
   - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
   - sudo apt-get update -qq
 
-install: 
+install:
   - sudo apt-get install -qq g++-5 lcov
   - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 90
   - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 90
+  - wget https://github.com/google/googletest/archive/release-1.8.0.tar.gz
+  - tar xf release-1.8.0.tar.gz
+  - cd googletest-release-1.8.0
+  - cmake -DBUILD_SHARED_LIBS=ON .
+  - make
+  - sudo make install
+  - cd ..
 
 before_script:
   - mkdir build
   - cd build
-  - cmake ..
+  - cmake -DBITSERY_BUILD_TESTS=ON ..
 
-script: make && make test
+script: make && (cd tests && ctest)
 

CHANGELOG.md

@@ -1,9 +1,192 @@
+# [4.5.0](https://github.com/fraillt/bitsery/compare/v4.4.0...v4.5.0) (2019-01-10)
+
+### Features
+* ability to create non default constructible objects, by defining private default constructor and making `friend class bitsery::Access;` to access it.
+It is not necessary to enforce class invariant immediately, because internal object representation will be overriden anyway.
+
+### Improvements
+* `StdSmartPtr` supports `std::unique_ptr` with custom deleter.
+* `*InputBufferAdapter`(all) can also accept const buffer;
+
+### Bug fixes
+* fixed deserialization in `bitsery/ext/std_map{set}` when target container is not empty.
+* added missing template parameters for specializations on `std` containers in multiple files in `bitsery/ext/*`.
+
+# [4.4.0](https://github.com/fraillt/bitsery/compare/v4.3.0...v4.4.0) (2019-01-08)
+
+### Features
+* new extensions **CompactValue** and **CompactValueAsObject**, stores integral values in less space if possible. This is useful when you're working with mostly small values, that in rare cases can be large.
+E.g. `int64_t money = 8000;` will only use 2 bytes, instead of 8. **CompactValueAsObject** allows to use `ext()` overload, without specifying size of underlying type and sets BUFFER_OVERFLOW error if value doesn't fit in underlying type during deserialization.
+
+### Improvements
+* improved **PolymorphicContext**, allows to extend already registered hierarchy in one translation unit, using different type other than `PolymorphicBaseClass` to avoid symbol collision between translation units or libraries.
+`registerBasesList` was modified, so that it could accept user defined type (instead of `PolymorphicBaseClass`) that is used to declare hierarchy, by default it is `PolymorphicBaseClass`.
+This introduced breaking change, for those who used this syntax (`registerBasesList<MySerializer, Shape>({})`) during registration.
+It is encouraged to define helper type, that could be used for registering hierarchy for serialization and deserialization [example](examples/smart_pointers_with_polymorphism.cpp).
+`This is only relevant then you want to use **PolymorphicContext** between different translation units or libraries`.
+```cpp
+//libA
+namespace bitsery {
+    namespace ext {
+        template<>
+        struct PolymorphicBaseClass<Shape> : PolymorphicDerivedClasses<Circle, Rectangle> {};
+    }
+}
+using MyPolymorphicClassesForRegistering = bitsery::ext::PolymorphicClassesList<Shape>;
+...
+    ctx.registerBasesList<MySerializer>(MyPolymorphicClassesForRegistering{}).
+
+//otherLib
+struct MySquare: Shape {...}
+//now it must define different type (exactly the same as PolymorphicBaseClass) to declare hierarchy
+template<typename TBase>
+struct MyHierarchy {
+    using Childs = PolymorphicClassesList<>;
+};
+
+template <>
+struct MyHierarchy<Shape>: bitsery::ext::bitsery::ext::PolymorphicClassesList<MySquare> {};
+...
+//notice that we pass MyHierarchy as second argument
+    ctx.registerBasesList<MySerializer, MyHierarchy>(MyPolymorphicClassesForRegistering{}).
+```
+* **PolymorphicContext** also get optional method `registerSingleBaseBranch`, that allows manually register hierarchies, this might be more convenient when using you need to register in different translation units (or libraries), but it is error-prone.
+
+# [4.3.0](https://github.com/fraillt/bitsery/compare/v4.2.1...v4.3.0) (2018-08-23)
+
+### Features
+
+* added runtime polymorphism support for pointer like types (raw and smart pointers).
+In order to enable polymorphism new **PolymorphicContext** was created. It provides capability to register classes with serializer/deserializer.
+  * runtime polymorphism can be customized, by replacing **StandardRTTI** from <bitsery/ext/utils/rtti_utils.h> header.
+* added smart pointers support for std::unique_ptr, std::shared_ptr and std::weak_ptr via **StdSmartPtr** extension.
+* new **UnsafeInputBufferAdapter** doesn't check for buffer size on deserialization, on some compilers can improve deserialization performance up to ~40%.
+
+### Improvements
+* creatly improved interface for extending/implementing support for pointer like types. Now all pointer like types extends from **PointerObjectExtensionBase** and implements/configures required details.
+* reimplemented **PointerOwner**, **PointerObserver**, **ReferencedByPointer**.
+* reimplemented **PointerLinkingContext** to properly support shared objects and runtime polymorphism, pointer ownership for shared objects now has two states: SharedOwner e.g. std::shared_ptr and SharedObserver std::weak_ptr.
+
+### Other notes
+There is one *minor?* issue/limitation for pointer like types that uses virtual inheritance. When several pointers points to same object through different static type. it will not work correctly e.g.:
+```cpp
+struct Derived: virtual Base {...};
+struct MyData {
+    std::shared_ptr<Derived> sptr;
+    std::weak_ptr<Base> wptddr;
+}
+```
+In this example wptr and sptr have different static type, and *Derived* is virtually inherited from *Base*, so I get different pointer address for different types.
+
+# [4.2.1](https://github.com/fraillt/bitsery/compare/v4.2.0...v4.2.1) (2018-03-09)
+
+### Improvements
+* changed CMake structure, to follow **Modern CMake** principles.
+  * bitsery now has *install* target and **find_package(Bitsery)** exports **Bitsery::bitsery** target.
+  * *GTest* no longer downloads as external application, but tries to find via *find_package*.
+  * removed *ext* folder, and instead added *scripts* folder that contains few helper scripts for development, currently tested on Ubuntu.
+* fixed/added few tests cases.
+
+### Other notes
+* some work was done on polymorphism support, but current solution, although working, but has many design and performance issues, and interfaces for extensibility might change drastically.
+
+# [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.
+Most changes was made to improve performance or/and make library usage easier.
+
+### Features
+
+* new **flexible** syntax similar to *cereal* library.
+This syntax no longer requires to specify explicit fundamental type sizes and container maxsize (container max size can be enforced by special function *maxSize*).
+Be careful when using deserializing untrusted data and make sure to enforce fundamental type sizes when using on multiple platforms.
+(use helper function *assertFundamentalTypeSizes* to enforce type sizes for multiple platforms)
+* added streaming support, by introducing new **adapter** concept. Two adapter implementations is available: stream adapter, or buffer adapter.
+* added missing std containers support: forward_list, deque, stack, queue, priority_queue, set, multiset, unordered_set, unordered_multiset.
+
+### Breaking changes
+
+* a lot of classes and files were renamed.
+* improved error messages.
+* traits reworked:
+  * ContainerTraits get **isContiguous**.
+  * TextTraits is separate from ContainerTraits, only has **length**, and **addNUL**.
+  * buffer traits renamed to **BufferAdapterTraits** and removed difference type.
+  * added **TValue** to all trait types, this is used to diagnose better errors.
+* BasicBufferReader/Writer is split in two different types: **AdapterReader/Writer** and separate type that enables bit-packing operations  **AdapterBitPacking(Reader/Writer)Wrapper**.
+* Serializer/Deserializer reworked
+  * No longer copyable, because it stores adapter writer/reader.
+  * Removed boolByte, boolBit, and added **boolValue** and it writes bit or byte, depeding on if bit-packing is enabled or not.
+  * Bit-packing is enabled by calling **enableBitPacking**, if bitpacking is already enabled, this method will return same instance.
+* changed defaults for *DefaultConfig*, BufferSessionsEnabled is false by default, because it doesn't work with input streams.
+* serialization config no longer needs typedef *Buffer*.
+
 # [3.0.0](https://github.com/fraillt/bitsery/compare/v2.0.1...v3.0.0) (2017-09-21)
 
 ### Features
 
 * refactored interface, now works with C++11 compiler.
-* new new extension **Growable**, that allows to have forward/backward compatability within this functions serialization flow. It only allows to append new data at the end of to existing flow without breaking old consumers.
+* new extension **Growable**, that allows to have forward/backward compatability within this functions serialization flow. It only allows to append new data at the end of to existing flow without breaking old consumers.
   * old consumer: correctly read old interfce and ignore new data.
   * new consumer: get defaults (zero values) for new fields, when reading old data.
 * added new extension for associative *map* containers **ContainerMap**.
@@ -51,7 +234,7 @@
 
 ### Features
 
-* Endianness support, default network configuration is *little endian*
+* endianness support, default network configuration is *little endian*
 * added user extensible function **ext**, to work with objects that require different serialization/deserialization path (e.g. pointers)
 * **optional** extension (for *ext* function), to work with *std::optional* types
 

CMakeLists.txt

@@ -1,12 +1,57 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.1)
+project(bitsery
+        LANGUAGES CXX
+        VERSION 4.5.0)
 
-project(bitsery)
+#======== build options ===================================
+option(BITSERY_BUILD_EXAMPLES "Build examples" OFF)
+option(BITSERY_BUILD_TESTS "Build tests" OFF)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+#============= setup target ======================
+add_library(bitsery INTERFACE)
+# create alias, so that user could always write target_link_libraries(... Bitsery::bitsery)
+# despite of bitsery target is imported or not
+add_library(Bitsery::bitsery ALIAS bitsery)
 
-add_subdirectory(examples)
+include(GNUInstallDirs)
+target_include_directories(bitsery INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+target_compile_features(bitsery INTERFACE
+        cxx_auto_type
+        cxx_constexpr
+        cxx_lambdas
+        cxx_nullptr
+        cxx_variadic_templates)
 
-enable_testing()
-add_subdirectory(tests)
+#=============== setup installation =======================
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/BitseryConfigVersion.cmake
+        COMPATIBILITY SameMajorVersion)
+install(TARGETS bitsery
+        EXPORT bitseryTargets
+        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(EXPORT bitseryTargets
+        FILE "BitseryConfig.cmake"
+        NAMESPACE Bitsery::
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/bitsery)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/BitseryConfigVersion.cmake
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/bitsery)
+install(DIRECTORY include/bitsery
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+#================ handle sub-projects =====================
+
+if (BITSERY_BUILD_EXAMPLES)
+    message("build bitsery examples")
+    add_subdirectory(examples)
+else()
+    message("skip bitsery examples")
+endif()
+
+if (BITSERY_BUILD_TESTS)
+    message("build bitsery tests")
+    add_subdirectory(tests)
+else()
+    message("skip bitsery tests")
+endif()

CONTRIBUTING.md

@@ -8,15 +8,19 @@ you contribute:
 1. Fork the repository.
 2. Create new branch based on the *master* branch (`git checkout -b your_branch master`). If your contribution is a bug fix, you should name your branch `bugfix/xxx`; for a feature, it should be `feature/xxx`. Otherwise, just use your good judgment. Consistent naming of branches is appreciated since it makes the output of `git branch` easier to understand with a single glance.
 3. Do your modifications on that branch. Except for special cases, your contribution should include proper unit tests and documentation.
-4. Make sure your modifications did not break anything by building, running tests and checking code coverage (test coverage should not be less than 100%):
+4. Make sure your modifications did not break anything by building, running tests:
   ```shell
   mkdir build
   cd build
-  cmake ..
+  cmake -DBITSERY_BUILD_TESTS=ON ..
   make
-  ctest
-  make tests_coverage
-  x-www-browser ./coverage/index.html
+  (cd tests; ctest)
+  ```
+  or run CTest scripts and view code coverage (scripts tested on ubuntu, requires lcov for coverage):
+  ```shell
+  cd scripts
+  ctest -S build.bitsery.cmake
+  ./show_coverage.sh build
   ```
 5. Commit your changes, and push to your fork (`git push origin your_branch`). Commit message should be one line short description. When applicable, please squash adjacent *wip* commits into a single *logical* commit.
 6. Open a pull request against Bitsery *master* branch. Currently ongoing development is on *master*. At some point an integration branch will be set-up, and pull-requests should target that, but for now its all against master. You may see feature branches come and go, too.

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Mindaugas Vinkelis
+Copyright (c) 2018 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

README.md

@@ -16,63 +16,74 @@ All cross-platform requirements are enforced at compile time, so serialized data
 * Optimized for speed and space.
 * 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.
-* Easily extendable.
+* 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.
+  * smart and raw pointers with customizable runtime polymorphism support.
+  * 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.
 
 ## Why to use bitsery
 
-Look at the numbers and features list, and decide yourself. *(benchmarked on Ubuntu with GCC 7.1)*
+Look at the numbers and features list, and decide yourself.
 
-|                                                           | serialize | deserialize | data size   | executable size |
-|-----------------------------------------------------------|-----------|-------------|-------------|-----------------|
-| flatbuffers                                               | 1852 ms.  | 777 ms.     | 27252 bytes | 74544 bytes     |
-| cereal                                                    | 1069 ms.  | 1385 ms.    | 20208 bytes | 72336 bytes     |
-| bitsery                                                   | 808 ms.   | 737 ms.     | 14803 bytes | 69784 bytes     |
-| bitsery fixed-size buffer                                 | 297 ms.   | 738 ms.     | 14803 bytes | 69928 bytes     |
-| bitsery optimized  serialization  flow                    | 686 ms.   | 997 ms.     | 6601 bytes  | 69320 bytes     |
-| bitsery optimized serialization flow  + fixed-size buffer | 446 ms.   | 996 ms.     | 6601 bytes  | 69464 bytes     |
+|                              | binary size | data size | serialize   | deserialize |
+|------------------------------|-------------|-----------|-------------|-------------|
+| **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)*
 
 If still not convinced read more in library [motivation](doc/design/README.md) section.
 
 ## Usage example
 ```cpp
 #include <bitsery/bitsery.h>
+#include <bitsery/adapter/buffer.h>
+#include <bitsery/traits/vector.h>
 
-using namespace bitsery;
-
+enum class MyEnum:uint16_t { V1,V2,V3 };
 struct MyStruct {
     uint32_t i;
-    char str[6];
+    MyEnum e;
     std::vector<float> fs;
 };
 
 template <typename S>
 void serialize(S& s, MyStruct& o) {
     s.value4b(o.i);
-    s.text1b(o.str);
-    s.container4b(o.fs, 100);
+    s.value2b(o.e);
+    s.container4b(o.fs, 10);
 };
 
+using namespace bitsery;
+
+using Buffer = std::vector<uint8_t>;
+using OutputAdapter = OutputBufferAdapter<Buffer>;
+using InputAdapter = InputBufferAdapter<Buffer>;
+
 int main() {
-    std::vector<uint8_t> buffer;
-    BufferWriter bw{buffer};
-    Serializer ser{bw};
-
-    MyStruct data{8941, "hello", {15.0f, -8.5f, 0.045f}};
-    ser.object(data); // serializes data
-
-    BufferReader br{bw.getWrittenRange()};
-    Deserializer des{br};
-
+    MyStruct data{8941, MyEnum::V2, {15.0f, -8.5f, 0.045f}};
     MyStruct res{};
-    des.object(res); //deserializes data
+
+    Buffer buffer;
+
+    auto writtenSize = quickSerialization<OutputAdapter>(buffer, data);
+
+    auto state = quickDeserialization<InputAdapter>({buffer.begin(), writtenSize}, res);
+
+    assert(state.first == ReaderError::NoError && state.second);
+    assert(data.fs == res.fs && data.i == res.i && data.e == res.e);
 }
 ```
-For more details go directly to [Quick start](doc/tutorial/hello_world.md) tutorial.
+For more details go directly to [quick start](doc/tutorial/hello_world.md) tutorial.
 
 ## How to use it
 This documentation comprises these parts:
@@ -94,4 +105,4 @@ This library was tested on
 
 ## License
 
-**bitsery** is licensed under the [MIT license](LICENSE).
+**bitsery** is licensed under the [MIT license](LICENSE).

doc/README.md

@@ -2,51 +2,75 @@ To get the most out of **Bitsery**, start with the [tutorial](tutorial/README.md
 Once you're familiar with the library consider the following reference material.
 
 Library design:
-* `valueNb instead of value`
 * `fundamental types`
+* `valueNb instead of value`
+* `flexible syntax`
 * `serializer/deserializer functions overloads`
 * `extending library functionality`
 * `errors handling`
 * `forward/backward compatibility via Growable extension`
+* `pointers`
+* `inheritance`
+* `polymorphism`
+
 
 Core Serializer/Deserializer functions (alphabetical order):
-* `align`
-* `boolByte`
-* `boolBit`
-* `container`
-* `extend`
-* `getContext`
-* `object`
-* `text`
-* `value`
+* `align` (1.0.0)
+* `boolValue` (4.0.0)
+* `container` (1.0.0)
+* `ext` (2.0.0)
+* `context` (3.0.0)
+* `context<T>` (4.1.0)
+* `contextOrNull<T>` (4.2.0)
+* `object` (1.0.0)
+* `text` (1.0.0)
+* `value` (1.0.0)
 
-Serializer/Deserializer extensions via `extend` method (alphabetical order):
-* `ContainerMap`
-* `Entropy`
-* `Growable`
-* `Optional`
-* `ValueRange`
+Serializer/Deserializer extensions via `ext` method (alphabetical order):
+* `BaseClass` (4.2.0)
+* `CompactValue` (4.4.0)
+* `CompactValueAsObject` (4.4.0)
+* `Entropy` (3.0.0)
+* `Growable` (3.0.0)
+* `PointerOwner` (4.1.0)
+* `PointerObserver` (4.1.0)
+* `ReferencedByPointer` (4.1.0)
+* `StdMap` (3.0.0)
+* `StdOptional` (2.0.0)
+* `StdQueue` (4.0.0)
+* `StdSet` (4.0.0)
+* `StdSmartPrt` (4.3.0)
+* `StdStack` (4.0.0)
+* `ValueRange` (3.0.0)
+* `VirtualBaseClass` (4.2.0)
 
-BasicBufferWriter/Reader functions:
+AdapterWriter/Reader functions:
 * `writeBits/readBits`
 * `writeBytes/readBytes`
 * `writeBuffer/readBuffer`
 * `align`
 * `beginSession/endSession`
 * `flush (writer only)`
+* `writtenBytesCount (writer only)`
 * `setError (reader only)`
 * `getError (reader only)`
 * `isCompletedSuccessfully (reader 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.
+Input adapters (buffer and stream) functions:
+* `read`
+* `error`
+* `setError`
+* `isCompletedSuccessfully`
 
-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).
-* when using **Growable** extension, serialized buffer size in bytes, cannot be greater than 2^(n-2) (where n = sizeof(std::size_t) * 8).
+Output adapters (buffer and stream) functions:
+* `write`
+* `flush`
+* `writtenBytesCount` (buffer adapter only)
+
+
+Tips and tricks:
+* if you're getting static assert "please define 'serialize' function", please define **serialize** function in same namespace as object, or in **bitsery** namespace, for more info [ADL](https://en.cppreference.com/w/cpp/language/adl).
 
 Other:
 * [Contributing](../CONTRIBUTING.md)
 * [Change log](../CHANGELOG.md)
-
-

doc/design/README.md

@@ -11,7 +11,7 @@ Most well-known serialization libraries sacrifice memory and speed efficiency by
 ## A word about JSON
 
 Often times people use C++ because they want speed and memory efficiency, and JSON is not on the list of efficient serialization format.
-Although JSON is very readable and very convenient when used together with dynamically typed languages (such as JavaScript).
+Although JSON is very readable and very convenient when used together with dynamically typed languages such as JavaScript.
 When serializing data from statically typed languages, however, JSON not only has the obvious drawback of runtime inefficiency, but also forces you to write more code to access data (counterintuitively) due to its dynamic-typing serialization system.
 
 Adding optional support for JSON doesn't come for free either.
@@ -34,18 +34,19 @@ Now let's review features in more detail.
 * **Cross-platform compatible.** if same code compiles on Android, PS3 console, and your PC either x64 or x86 architecture, you are 100% sure it works.
 To achieve this, bitsery specifically defines size of underlying data, hence syntax is *value\<2\>* (alias function *value2b*)  instead or *value*, or *container2b* for element type of 16bits, eg int16_t.
 Bitsery also applies endianess transformation if nessesarry.
-**If** however, you don't like this verbose syntax, you can just write *serialize* functions for fundamental types, and forget about *value\<N\>*, *container\<N\>*, etc.
-But do it on your own risk, or write static asserts.
+* **Flexible syntax.** if you don't like like writing code with explicitly specifying underlying type size, like *container2b* or *value8b* you can use flexible syntax.
+Just include <bitsery/flexible.h> and can write like in [cereal](http://uscilab.github.io/cereal/).
+But do it on your own risk, and static assert using *assertFundamentalTypeSizes* function if you're planing to use it accross multiple platforms.
 * **Optimized for speed and space.** library itself doesn't do any allocations (except if you use backward/forward compatibility) so data writing/reading is fast as memcpy to/from your buffer.
 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 will not 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.
+* **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 *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*, *save* functions, but Bitsery explicitly doesn't support it, to avoid any serialization deserialization path differences, because it is very hard to catch an errors if you make a bug in one of these functions.
+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.
 The only way around this through extensions, write your custom flow once, and reuse where you need them.
 * **Allows fine-grained serialization control** this is a feature that no other libraries provides.
 Bitsery allows to use bit-level operations and has two extensions that use them:
@@ -53,18 +54,16 @@ Bitsery allows to use bit-level operations and has two extensions that use them:
   * *Entropy*,- full term is *entropy encoding*, which means that when you have most common value, or multiple values, it will write just few bits instead of full object.
 
     Eg.: imagine that you have a struct Person{ int32_t Id; string Profession; }.
-    You know that mostly there are young persons, so the most common value will be equal to: "Student", "Child", "NoProfession", in this case you'll pay 2bits for each record, but write no data if string matches.
+    You might know that mostly there are young persons, so the most common value will be equal to: "Student", "Child", "NoProfession", in this case you'll pay 2bits for each record, but write no data if string matches.
 
   Using these bit-level operations and extensions you can compose your own extensions for vectors, matrices or any other types.
   Further more, all other operations will not align data automatically for you, so data will be compressed as much as possible.
 
-  One more advanced and dangerous feature, is ability to have serialization context, so you can control your serialization flow at runtime, but make sure that these contexts are in sync between serializer and deserializer.
-  One possible use case for serialization context is to pass min/max ranges for *ValueRange* when your information changes at runtime.
+  * One more advanced and dangerous feature, is ability to have serialization context, so you can control your serialization flow at runtime, but make sure that these contexts are in sync between serializer and deserializer.
+    One possible use case for serialization context is to pass min/max ranges for *ValueRange* when your information changes at runtime.
 * **Easily extendable** library is designed to be easily extendable for any type and flow.
 You want to support your custom container, its fine there is *ContainerTraits* for this, only few methods required to implement.
-To use same container for buffer writing/reading add specialization to *BufferContainerTraits*.
+To use same container for buffer writing/reading add specialization to *BufferAdapterTraits*.
 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.*

doc/design/errors.md

@@ -1 +1,2 @@
 errors handling design
+usage of NotDefinedType, and how it helps to reduce error stack

doc/reference/buf_get_error.md

@@ -1,5 +1,5 @@
 *document in progress*
-* NO_ERROR,
+* NoError,
 * BUFFER_OVERFLOW,
 * INVALID_BUFFER_DATA
 * write what happens when data is corrupted

doc/tutorial/hello_world.md

@@ -10,7 +10,30 @@ bitsery can be directly included in your project or installed anywhere you can a
 Grab the latest version, and include directory `bitsery_base_dir/include/` to your project.
 There's nothing to build or make - **bitsery** is header only.
 
-## Add serialization methods for your types
+## Include required headers and define some helper types
+
+```cpp
+#include <bitsery/bitsery.h>
+#include <bitsery/adapter/buffer.h>
+#include <bitsery/traits/vector.h>
+#include <bitsery/traits/string.h>
+
+using namespace bitsery;
+
+using Buffer = std::vector<uint8_t>;
+using OutputAdapter = OutputBufferAdapter<Buffer>;
+using InputAdapter = InputBufferAdapter<Buffer>;
+
+```
+
+**bitsery** is very lightweight, so we need to explicitly include what we need.
+* `<bitsery/bitsery.h>` is a core header, that includes our Serializer and Deserializer
+* `<bitsery/adapter/buffer.h>` in order to write/read data we need specific adapter, depending on what underlying buffer will be. In this example we'll be using std::vector as our buffer, so we include buffer adapter.
+* <bitsery/traits/...> traits tells library how efficiently serialize particular container.
+
+create alias types for *InputAdapter* and *OutputAdapter* using our vector as buffer.
+
+## Add serialization method for your type
 
 **bitsery** needs to know which data members to serialize in your classes.
 Let it know by implementing a serialize method for your type:
@@ -30,11 +53,11 @@ void serialize(S& s, MyStruct& o) {
 };
 ```
 
-**bitsery** also can serialize private class members, just move *serialize* function inside structure, and make it *friend* (*fiend void serialize(.....)*).
+**bitsery** also allows to define serialize function in side your class, and can also serialize private class members, just make *friend bitsery::Access;*
 
-**bitsery** has verbose syntax, because it is cross-platform compatible by default and has full control over how to serialize data (read more about it in [motivation](../design/README.md))
+**bitsery** supports two ways how to describe your serialization flow: *verbose syntax* (as in example) or *flexible syntax*, similar to *cereal* library, just include `<bitsery/flexible.h>` to use it.
 
-This example contains core functionality that you'll use all the time, so lets get through it:
+This example we choosed probably unfamiliar verbose syntax, so lets explain core functionality that you'll use all the time:
 * **s.value4b(o.i);** serialize fundamental types (ints, floats, enums) value**4b** means, that data type is 4 bytes. If you use same code on different machines, if it compiles it means it is compatible.
 * **s.text1b(o.str);** serialize text (null-terminated) of char type, if you use *wchar* then you would write *text2b*.
 * **s.container4b(o.fs, 100);** serializes any container of fundamental types of size 4bytes, **100** is max size of container.
@@ -45,57 +68,35 @@ External serialization functions should be placed either in the same namespace a
 
 ## Serialization and deserialization
 
-### Create serializer
-Create a serializer and send the data you want to serialize to it.
+Create buffer and use helper functions for serialization and deserialization.
 
 ```cpp
-std::vector<uint8_t> buffer;
-BufferWriter bw{buffer};
-Serializer ser{bw};
+Buffer buffer;
+
+auto writtenSize = quickSerialization<OutputAdapter>(buffer, data);
+
+auto state = quickDeserialization<InputAdapter>({buffer.begin(), writtenSize}, res);
 ```
 
-Serialization process consists of three independant parts.
-* **std::vector<uint8_t> buffer;** core object, that will store the data for serialization and deserialization.
-* **BufferWriter bw{buffer};** writer knows how to write bytes to buffer, and how to resize buffer, or how to use fixed-size buffer. It also applies endianess transformations if nesessary.
-* **Serializer ser{bw};** serializer is a high level wrapper that knows how to convert object to stream of bytes, and write then to buffer.
-
-Serializer doesn't store any state, it only has reference to buffer, so it is safe to create many of those if nesessary.
-
-BufferWriter also doesn't own buffer, but it stores state about writing position and container size.
-
-One important note that when using bit-level operations, dont forget to flush buffer writer **bw.flush()** otherwise, some data might not be written to buffer.
-
-
-### Serialize object
-
-```cpp
-MyStruct data{8941, "hello", {15.0f, -8.5f, 0.045f}};
-ser.object(data); // serializes data
-```
-
-**ser.object(data)** is a final core function along with **value, text, container**.
-
-This function is actually equivalent to calling *serialize(ser, data)* directly, but it displays friendly static assert message if it cannot find *serialize* function for your type.
-
-### Deserialize object
-
-```cpp
-BufferReader br{bw.getWrittenRange()};
-Deserializer des{br};
-
-MyStruct res{};
-des.object(res); //deserializes data
-```
-
-Deserialization process is equivalent to serialization, except that *BufferReader* reader has getError() method that returns deserialization state.
+These helper functions use default configuration *bitsery::DefaultConfig*
+* **quickSerialization** create serializer using output adapter, serializes data and returns written size.
+* **quickDeserialization** create deserializer using input adapter, deserializes to object, and returns deserialization state.
+deserialization state has two properties, error code and bool that indicates if buffer was fully read and there is no errors.
 
 ## Full example code
 
 ```cpp
 #include <bitsery/bitsery.h>
+#include <bitsery/adapter/buffer.h>
+#include <bitsery/traits/vector.h>
+#include <bitsery/traits/string.h>
 
 using namespace bitsery;
 
+using Buffer = std::vector<uint8_t>;
+using OutputAdapter = OutputBufferAdapter<Buffer>;
+using InputAdapter = InputBufferAdapter<Buffer>;
+
 struct MyStruct {
     uint32_t i;
     char str[6];
@@ -110,18 +111,16 @@ void serialize(S& s, MyStruct& o) {
 };
 
 int main() {
-    std::vector<uint8_t> buffer;
-    BufferWriter bw{buffer};
-    Serializer ser{bw};
-
     MyStruct data{8941, "hello", {15.0f, -8.5f, 0.045f}};
-    ser.object(data); // serializes data
-
-    BufferReader br{bw.getWrittenRange()};
-    Deserializer des{br};
-
     MyStruct res{};
-    des.object(res); //deserializes data
+
+    Buffer buffer;
+    auto writtenSize = quickSerialization<OutputAdapter>(buffer, data);
+
+    auto state = quickDeserialization<InputAdapter>({buffer.begin(), writtenSize}, res);
+
+    assert(state.first == ReaderError::NoError && state.second);
+    assert(data.fs == res.fs && data.i == res.i && std::strcmp(data.str, res.str) == 0);
 }
 ```
 

examples/CMakeLists.txt

@@ -20,16 +20,26 @@
 #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 #SOFTWARE.
 
+cmake_minimum_required(VERSION 3.1)
+project(bitsery_examples CXX)
 
-cmake_minimum_required(VERSION 3.2)
-
-include_directories(${CMAKE_SOURCE_DIR}/include)
+if (NOT TARGET Bitsery::bitsery)
+    message(FATAL_ERROR "Bitsery::bitsery alias not set. Please generate CMake from bitsery root directory.")
+endif()
 
 file(GLOB ExampleFiles ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
-FOREACH(ExampleFile ${ExampleFiles})
+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})
-
-ENDFOREACH()
+    add_executable(bitsery.example.${ExampleName} ${ExampleFile})
+    target_link_libraries(bitsery.example.${ExampleName} PRIVATE Bitsery::bitsery)
+    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+        target_compile_options(bitsery.example.${ExampleName} PRIVATE -Wextra -Wno-missing-braces -Wpedantic -Weffc++)
+    endif()
+endforeach()
 

examples/basic_usage.cpp

@@ -1,4 +1,11 @@
+//include bitsery.h to get serialization and deserialization classes
 #include <bitsery/bitsery.h>
+//in ordered to serialize/deserialize data to buffer, include buffer adapter
+#include <bitsery/adapter/buffer.h>
+//bitsery itself doesn't is lightweight, and doesnt include any unnessessary files,
+//traits helps library to know how to use types correctly,
+//in this case we'll be using vector both, to serialize/deserialize data and to store use as a buffer.
+#include <bitsery/traits/vector.h>
 
 enum class MyEnum:uint16_t { V1,V2,V3 };
 struct MyStruct {
@@ -10,39 +17,34 @@ struct MyStruct {
 //define how object should be serialized/deserialized
 template <typename S>
 void serialize(S& s, MyStruct& o) {
-    s.value4b(o.i);
+    s.value4b(o.i);//fundamental types (ints, floats, enums) of size 4b
     s.value2b(o.e);
-    s.container4b(o.fs, 10);
-};
+    s.container4b(o.fs, 10);//resizable containers also requires maxSize, to make it safe from buffer-overflow attacks
+}
 
 using namespace bitsery;
 
+//some helper types
+using Buffer = std::vector<uint8_t>;
+using OutputAdapter = OutputBufferAdapter<Buffer>;
+using InputAdapter = InputBufferAdapter<Buffer>;
+
 int main() {
     //set some random data
     MyStruct data{8941, MyEnum::V2, {15.0f, -8.5f, 0.045f}};
     MyStruct res{};
 
-    //create serializer
-    //1) create buffer to store data
-    std::vector<uint8_t> buffer;
-    //2) create buffer writer that is able to write bytes or bits to buffer
-    BufferWriter bw{buffer};
-    //3) create serializer
-    Serializer ser{bw};
+    //create buffer to store data
+    Buffer buffer;
+    //use quick serialization function,
+    //it will use default configuration to setup all the nesessary steps
+    //and serialize data to container
+    auto writtenSize = quickSerialization<OutputAdapter>(buffer, data);
 
-    //serialize object, can also be invoked like this: serialize(ser, data)
-    ser.object(data);
+    //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<InputAdapter>({buffer.begin(), writtenSize}, res);
 
-    //flush to buffer, before creating buffer reader
-    bw.flush();
-
-    //create deserializer
-    //1) create buffer reader
-    BufferReader br{bw.getWrittenRange()};
-    //2) create deserializer
-    Deserializer des{br};
-
-    //deserialize same object, can also be invoked like this: serialize(des, data)
-    des.object(res);
+    assert(state.first == ReaderError::NoError && state.second);
     assert(data.fs == res.fs && data.i == res.i && data.e == res.e);
 }

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,109 @@
+#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>>;
+
+//NOTE:
+// if your context has no additional usage outside of serialization flow,
+// then you can create it internally via configuration (see inheritance.cpp)
+
+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

@@ -0,0 +1,60 @@
+#include <bitsery/bitsery.h>
+//in order to work with streams include stream adapter
+#include <bitsery/adapter/stream.h>
+#include <fstream>
+#include <iostream>
+
+enum class MyEnum:uint16_t { V1,V2,V3 };
+struct MyStruct {
+    uint32_t i;
+    MyEnum e;
+    double f;
+};
+
+//define how object should be serialized/deserialized
+template <typename S>
+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;
+
+int main() {
+    //set some random data
+    MyStruct data{8941, MyEnum::V2, 0.045};
+    MyStruct res{};
+
+    //open file stream for writing and reading
+    auto fileName = "test_file.bin";
+    Stream s{fileName, s.binary | s.trunc | s.out};
+    if (!s.is_open()) {
+        std::cout << "cannot open " << fileName << " for writing\n";
+        return 0;
+    }
+    //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
+
+    s.open(fileName, s.binary | s.in);
+    if (!s.is_open()) {
+        std::cout << "cannot open " << fileName << " for reading\n";
+        return 0;
+    }
+
+    //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<InputStreamAdapter>(s, res);
+
+    assert(state.first == ReaderError::NoError && state.second);
+    assert(data.f == res.f && data.i == res.i && data.e == res.e);
+}

examples/flatbuffers_tutorial_data.cpp

@@ -1,101 +0,0 @@
-#include <bitsery/bitsery.h>
-#include <bitsery/ext/growable.h>
-#include <array>
-
-namespace MyTypes {
-
-    //define data
-    enum Color:uint8_t { Red, Green, Blue };
-
-    struct Vec3 { float x, y, z; };
-
-    struct Weapon {
-        std::string name;
-        int16_t damage;
-    };
-
-    struct Monster {
-        Vec3 pos;
-        int16_t mana;
-        int16_t hp;
-        std::string name;
-        std::vector<uint8_t> inventory;
-        Color color;
-        std::vector<Weapon> weapons;
-        Weapon equipped;
-        std::vector<Vec3> path;
-    };
-
-    template <typename S>
-    void serialize(S& s, Vec3& o) {
-        s.value4b(o.x);
-        s.value4b(o.y);
-        s.value4b(o.z);
-    }
-
-    //define serialization functions
-    template <typename S>
-    void serialize (S& s, Weapon& o) {
-        //forward/backward compatibility for monsters
-        s.ext(o, bitsery::ext::Growable{}, [&s](Weapon& o1) {
-            s.text1b(o1.name, 20);
-            s.value2b(o1.damage);
-        });
-    }
-
-    template <typename S>
-    void serialize (S& s, Monster& o) {
-        //forward/backward compatibility for monsters
-        s.ext(o, bitsery::ext::Growable{}, [&s](Monster& o1) {
-            s.value1b(o1.color);
-            s.value2b(o1.mana);
-            s.value2b(o1.hp);
-            s.object(o1.equipped);
-            s.object(o1.pos);
-            s.container(o1.path, 1000);
-            s.container(o1.weapons, 100);
-            s.container1b(o1.inventory, 50);
-            s.text1b(o1.name, 20);
-        });
-    }
-}
-
-using namespace bitsery;
-
-//change configuration
-struct NonDefaultConfig: public bitsery::DefaultConfig {
-    //change underlying buffer
-    using BufferType = std::array<uint8_t, 1000000>;
-};
-
-
-int main() {
-    //set some random data
-    MyTypes::Monster data{};
-    data.name = "lew";
-
-    //create serializer
-    //1) create buffer to store data
-    std::array<uint8_t, 1000000> buffer{};
-    //2) create buffer writer that is able to write bytes or bits to buffer
-    BasicBufferWriter<NonDefaultConfig> bw{buffer};
-    //3) create serializer
-    BasicSerializer<NonDefaultConfig> ser{bw};
-
-    //serialize object, can also be invoked like this: serialize(ser, data)
-    ser.object(data);
-
-    //flush to buffer, before creating buffer reader, this will always write sessions data for forward/backward compatibility
-    bw.flush();
-
-    //create deserializer
-    //1) create buffer reader
-    BasicBufferReader<NonDefaultConfig> br{bw.getWrittenRange()};
-    //2) create deserializer
-    BasicDeserializer<NonDefaultConfig> des{br};
-
-    //deserialize same object, can also be invoked like this: serialize(des, data)
-    MyTypes::Monster res{};
-    des.object(res);
-
-}

examples/flexible_assert_linux_x64.cpp

@@ -0,0 +1,45 @@
+#include <bitsery/bitsery.h>
+#include <bitsery/adapter/buffer.h>
+#include <bitsery/flexible.h>
+#include <bitsery/flexible/vector.h>
+
+
+struct MyStruct {
+    int i;
+    unsigned short s;
+    std::vector<long> vl;
+    long long ll;
+
+    template <typename S>
+    void serialize(S& s) {
+        //now we can use flexible syntax with
+        //member function has same name as parameter
+        s.archive(this->s, i, vl, ll);
+    }
+
+};
+
+
+using namespace bitsery;
+
+//some helper types
+using Buffer = std::vector<uint8_t>;
+using OutputAdapter = OutputBufferAdapter<Buffer>;
+using InputAdapter = InputBufferAdapter<Buffer>;
+
+int main() {
+    //this will only work on linux or mac x64
+    bitsery::assertFundamentalTypeSizes<2,4,8,8>();
+    //set some random data
+    MyStruct data{8941, 3, {15l, -8l, 045l}, 8459845ll};
+    MyStruct res{};
+
+    //serialization, deserialization flow is unchanged as in basic usage
+    Buffer buffer;
+    auto writtenSize = quickSerialization<OutputAdapter>(buffer, data);
+
+    auto state = quickDeserialization<InputAdapter>({buffer.begin(), writtenSize}, res);
+
+    assert(state.first == ReaderError::NoError && state.second);
+    assert(data.vl == res.vl && data.s == res.s && data.i == res.i && data.ll == res.ll);
+}

examples/flexible_syntax.cpp

@@ -0,0 +1,47 @@
+#include <bitsery/bitsery.h>
+#include <bitsery/adapter/buffer.h>
+//include flexible header, to use flexible syntax
+#include <bitsery/flexible.h>
+//we also need additional traits to work with container types,
+//instead of including <bitsery/traits/vector.h> for vector traits, now we also need traits to work with flexible types.
+//so include everything from <bitsery/flexible/...> instead of <bitsery/traits/...>
+//otherwise we'll get static assert error, saying to define serialize function.
+#include <bitsery/flexible/vector.h>
+
+enum class MyEnum:uint16_t { V1,V2,V3 };
+struct MyStruct {
+    uint32_t i;
+    MyEnum e;
+    std::vector<float> fs;
+
+    //define serialize function as usual
+    template <typename S>
+    void serialize(S& s) {
+        //now we can use flexible syntax with
+        s.archive(i, e, fs);
+    }
+
+};
+
+
+using namespace bitsery;
+
+//some helper types
+using Buffer = std::vector<uint8_t>;
+using OutputAdapter = OutputBufferAdapter<Buffer>;
+using InputAdapter = InputBufferAdapter<Buffer>;
+
+int main() {
+    //set some random data
+    MyStruct data{8941, MyEnum::V2, {15.0f, -8.5f, 0.045f}};
+    MyStruct res{};
+
+    //serialization, deserialization flow is unchanged as in basic usage
+    Buffer buffer;
+    auto writtenSize = quickSerialization<OutputAdapter>(buffer, data);
+
+    auto state = quickDeserialization<InputAdapter>({buffer.begin(), writtenSize}, res);
+
+    assert(state.first == ReaderError::NoError && state.second);
+    assert(data.fs == res.fs && data.i == res.i && data.e == res.e);
+}

examples/forward_backward_compatibility.cpp

@@ -0,0 +1,105 @@
+#include <bitsery/bitsery.h>
+#include <bitsery/adapter/buffer.h>
+//include traits for types, that we'll be using
+#include <bitsery/traits/string.h>
+#include <bitsery/traits/array.h>
+#include <bitsery/traits/vector.h>
+//include extension that will allow to have backward/forward compatibility
+#include <bitsery/ext/growable.h>
+
+namespace MyTypes {
+
+    //define data
+    enum Color:uint8_t { Red, Green, Blue };
+
+    struct Vec3 { float x, y, z; };
+
+    struct Weapon {
+        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;
+        template <typename S>
+        void serialize (S& s) {
+            //forward/backward compatibility for monsters
+            s.ext(*this, bitsery::ext::Growable{}, [&s](Weapon& o1) {
+                s.text1b(o1.name, 20);
+                s.value2b(o1.damage);
+            });
+        }
+    };
+
+    struct Monster {
+        Vec3 pos;
+        int16_t mana;
+        int16_t hp;
+        std::string name;
+        std::vector<uint8_t> inventory;
+        Color color;
+        std::vector<Weapon> weapons;
+        Weapon equipped;
+        std::vector<Vec3> path;
+    };
+
+    template <typename S>
+    void serialize(S& s, Vec3& o) {
+        s.value4b(o.x);
+        s.value4b(o.y);
+        s.value4b(o.z);
+    }
+
+    template <typename S>
+    void serialize (S& s, Monster& o) {
+        //forward/backward compatibility for monsters
+        s.ext(o, bitsery::ext::Growable{}, [&s](Monster& o1) {
+            s.value1b(o1.color);
+            s.value2b(o1.mana);
+            s.value2b(o1.hp);
+            s.object(o1.equipped);
+            s.object(o1.pos);
+            s.container(o1.path, 1000);
+            s.container(o1.weapons, 100);
+            s.container1b(o1.inventory, 50);
+            s.text1b(o1.name, 20);
+        });
+    }
+}
+
+using namespace bitsery;
+
+//use fixed-size buffer
+using Buffer = std::array<uint8_t, 10000>;
+using OutputAdapter = OutputBufferAdapter<Buffer>;
+using InputAdapter = InputBufferAdapter<Buffer>;
+
+//create configuration that enables session support, to work with "growable" extension
+struct SessionsEnabled:public DefaultConfig {
+    static constexpr bool BufferSessionsEnabled = true;
+};
+
+int main() {
+    //set some random data
+    MyTypes::Monster data{};
+    data.name = "lew";
+    data.weapons.push_back(MyTypes::Weapon{"GoodWeapon", 100});
+
+    //create buffer to store data to
+    Buffer buffer{};
+    //since we're using different configuration, we cannot use quickSerialization function.
+    BasicSerializer<AdapterWriter<OutputAdapter, SessionsEnabled>> ser{OutputAdapter{buffer}};
+    ser.object(data);
+    auto& w = AdapterAccess::getWriter(ser);
+    w.flush();
+    auto writtenSize = w.writtenBytesCount();
+
+
+    MyTypes::Monster res{};
+    //deserialize
+    BasicDeserializer<AdapterReader<InputAdapter, SessionsEnabled>> des{InputAdapter{buffer.begin(), writtenSize}};
+    des.object(res);
+    auto& r = AdapterAccess::getReader(des);
+    assert(r.error() == ReaderError::NoError && r.isCompletedSuccessfully());
+}

examples/inheritance.cpp

@@ -0,0 +1,117 @@
+//
+//this example covers all the corner cases that can happen using inheritance
+//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. for normal inheritance it is not 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/non_default_constructible.cpp

@@ -0,0 +1,65 @@
+//
+// example of how to deserialize non default constructible objects
+//
+
+#include <bitsery/bitsery.h>
+#include <bitsery/adapter/buffer.h>
+#include <bitsery/traits/vector.h>
+
+class MyData {
+    //define your private data
+    float _x{0};
+    float _y{0};
+    //make bitsery:Access friend
+    friend class bitsery::Access;
+    //create default constructor, don't worry about class invariant, it will be restored in deserialization
+    MyData() = default;
+    //define serialize function
+
+    template <typename S>
+    void serialize(S& s) {
+        s.value4b(_x);
+        s.value4b(_y);
+    }
+public:
+    //define non default public constructor
+    MyData(float x, float y):_x{x}, _y{y} {}
+    //this is for convenience
+    bool operator ==(const MyData&rhs) const {
+        return _x == rhs._x && _y == rhs._y;
+    }
+};
+
+using namespace bitsery;
+
+//some helper types
+using Buffer = std::vector<uint8_t>;
+using OutputAdapter = OutputBufferAdapter<Buffer>;
+using InputAdapter = InputBufferAdapter<Buffer>;
+
+int main() {
+
+    //initialize our data
+    std::vector<MyData> data{};
+    data.emplace_back(145.4f, 84.48f);
+    std::vector<MyData> res{};
+
+    //we cant use quick (de)serialization helper methods, because we ant to serialize container directly
+    //create buffer
+    Buffer buffer{};
+
+    //create and serialize container, and get written bytes count
+    Serializer<OutputAdapter> ser{OutputAdapter{buffer}};
+    ser.container(data, 10);
+    auto writtenBytes = AdapterAccess::getWriter(ser).writtenBytesCount();
+
+    //create and deserialize container
+    Deserializer<InputAdapter> des{InputAdapter{buffer.begin(), writtenBytes}};
+    des.container(res, 10);
+
+    //check if everything went ok
+    auto& reader = AdapterAccess::getReader(des);
+    assert(reader.error() == ReaderError::NoError && reader.isCompletedSuccessfully());
+    assert(res == data);
+}
+

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;
+}

examples/smart_pointers_with_polymorphism.cpp

@@ -0,0 +1,273 @@
+//
+// Created by fraillt on 18.4.26.
+//
+#include <cassert>
+#include <memory>
+#include <bitsery/bitsery.h>
+#include <bitsery/traits/vector.h>
+#include <bitsery/adapter/buffer.h>
+#include <bitsery/ext/pointer.h>
+#include <bitsery/ext/inheritance.h>
+#include <bitsery/ext/std_smart_ptr.h>
+
+//in order to work with polymorphic types, we need to describe few steps:
+// 1) describe relationships between base and derived types
+// this will allow to know what are possible types reachable from base class
+// 2) bind serializer to base class
+// this will allow to iterate through all types, and add serialization functions,
+// without this step compiler would simply remove functions that are not bound at compile-time even it we use type at runtime.
+
+using bitsery::ext::BaseClass;
+
+using bitsery::ext::PointerObserver;
+using bitsery::ext::StdSmartPtr;
+
+//define our data structures
+struct Color {
+    float r{}, g{}, b{};
+    bool operator == (const Color& o) const {
+        return std::tie(r, g, b) ==
+               std::tie(o.r, o.g, o.b);
+    }
+
+};
+
+struct Shape {
+    Color clr{};
+    virtual ~Shape() = 0;
+};
+
+Shape::~Shape() = default;
+
+struct Circle : Shape {
+    int32_t radius{};
+    bool operator == (const Circle& o) const {
+        return std::tie(radius, clr) ==
+               std::tie(o.radius, o.clr);
+    }
+
+};
+
+struct Rectangle : Shape {
+    int32_t width{};
+    int32_t height{};
+    bool operator == (const Rectangle& o) const {
+        return std::tie(width, height, clr) ==
+               std::tie(o.width, o.height, o.clr);
+    }
+};
+
+struct RoundedRectangle : Rectangle {
+    int32_t radius{};
+    bool operator == (const RoundedRectangle& o) const {
+        return std::tie(radius, static_cast<const Rectangle&>(*this)) ==
+               std::tie(o.radius, static_cast<const Rectangle&>(o));
+    }
+};
+
+//define serialization functions
+template<typename S>
+void serialize(S &s, Color &o) {
+    //in real world scenario, it might be possible to serialize this using ValueRange, to map values in smaller space
+    //but for the sake of this example keep it simple
+    s.value4b(o.r);
+    s.value4b(o.g);
+    s.value4b(o.b);
+}
+
+template<typename S>
+void serialize(S &s, Shape &o) {
+    s.object(o.clr);
+}
+
+template<typename S>
+void serialize(S &s, Circle &o) {
+    s.ext(o, bitsery::ext::BaseClass<Shape>{});
+    s.value4b(o.radius);
+}
+
+template<typename S>
+void serialize(S &s, Rectangle &o) {
+    s.ext(o, bitsery::ext::BaseClass<Shape>{});
+    s.value4b(o.width);
+    s.value4b(o.height);
+}
+
+template<typename S>
+void serialize(S &s, RoundedRectangle &o) {
+    s.ext(o, bitsery::ext::BaseClass<Rectangle>{});
+    s.value4b(o.radius);
+}
+
+//define our test structure
+struct SomeShapes {
+    std::vector<std::shared_ptr<Shape>> sharedList;
+    std::unique_ptr<Shape> uniquePtr;
+    //weak ptr and refPtr will point to sharedList
+    std::weak_ptr<Shape> weakPtr;
+    Shape* refPtr;
+};
+
+//creates object, and populates some data
+SomeShapes createData() {
+    SomeShapes data{};
+    {
+        auto tmp = new RoundedRectangle{};
+        tmp->height = 151572;
+        tmp->width = 488795;
+        tmp->radius = 898;
+        tmp->clr.r = 0.5f;
+        tmp->clr.g = 1.0f;
+        tmp->clr.b = 1.0f;
+        data.uniquePtr.reset(tmp);
+    }
+    {
+        auto tmp = new Circle{};
+        tmp->radius = 75987;
+        tmp->clr.r = 0.5f;
+        tmp->clr.g = 0.0f;
+        tmp->clr.b = 1.0f;
+        data.sharedList.emplace_back(tmp);
+    }
+    {
+        auto tmp = new Rectangle{};
+        tmp->height = 15157;
+        tmp->width = 48879;
+        tmp->clr.r = 1.0f;
+        tmp->clr.g = 0.0f;
+        tmp->clr.b = 0.0f;
+        data.sharedList.emplace_back(tmp);
+    }
+    data.weakPtr = data.sharedList[0];
+    data.refPtr = data.sharedList[1].get();
+
+    return data;
+}
+
+
+template<typename S>
+void serialize(S &s, SomeShapes &o) {
+    s.ext(o.uniquePtr, StdSmartPtr{});
+    // to make things more interesting first serialize weakPtr and refPtr,
+    // even though objects that weakPtr and refPtr is serialized later,
+    // bitsery will work regardless
+    s.ext(o.weakPtr, StdSmartPtr{});
+    s.ext(o.refPtr, PointerObserver{});
+    s.container(o.sharedList, 100, [&s](std::shared_ptr<Shape> &item) {
+        s.ext(item, StdSmartPtr{});
+    });
+}
+
+// STEP 1
+// define relationships between base and derived classes
+
+namespace bitsery {
+    namespace ext {
+
+        //for each base class define DIRECTLY derived classes
+        //e.g. PolymorphicBaseClass<Shape> : PolymorphicDerivedClasses<Circle, Rectangle, RoundedRectangle>
+        // is incorrect, because RoundedRectangle does not directly derive from Shape
+        template<>
+        struct PolymorphicBaseClass<Shape> : PolymorphicDerivedClasses<Circle, Rectangle> {
+        };
+
+        template<>
+        struct PolymorphicBaseClass<Rectangle> : PolymorphicDerivedClasses<RoundedRectangle> {
+        };
+    }
+}
+
+// convenient type that stores all our types, so that we could easily register and
+// also it automatically ensures, that classes is registered in the same order for serialization and deserialization
+using MyPolymorphicClassesForRegistering = bitsery::ext::PolymorphicClassesList<Shape>;
+
+
+//use bitsery namespace for convenience
+using namespace bitsery;
+
+//some helper types
+using Buffer = std::vector<uint8_t>;
+using OutputAdapter = OutputBufferAdapter<Buffer>;
+using InputAdapter = InputBufferAdapter<Buffer>;
+
+//we need to define few things in order to work with polymorphism
+//1) we need pointer linking context to work with pointers
+//2) we need polymorphic context to be able to work with polymorphic types
+using TContext = std::tuple<ext::PointerLinkingContext, ext::PolymorphicContext<ext::StandardRTTI>>;
+//NOTE:
+// RTTI can be customizable, if you can't use dynamic_cast and typeid, and have 'custom' solution
+
+using MySerializer = BasicSerializer<AdapterWriter<OutputAdapter, DefaultConfig>, TContext>;
+using MyDeserializer = BasicDeserializer<AdapterReader<InputAdapter, DefaultConfig>, TContext>;
+
+
+//checks if deserialized data is equal
+void assertSameShapes(const SomeShapes &data, const SomeShapes &res) {
+    {
+        auto d = dynamic_cast<RoundedRectangle *>(data.uniquePtr.get());
+        auto r = dynamic_cast<RoundedRectangle *>(res.uniquePtr.get());
+        assert(r != nullptr);
+        assert(*d == *r);
+    }
+    {
+        auto d = dynamic_cast<Circle *>(data.sharedList[0].get());
+        auto r = dynamic_cast<Circle *>(res.sharedList[0].get());
+        assert(r != nullptr);
+        assert(*d == *r);
+    }
+    {
+        auto d = dynamic_cast<Rectangle *>(data.sharedList[1].get());
+        auto r = dynamic_cast<Rectangle *>(res.sharedList[1].get());
+        assert(r != nullptr);
+        assert(*d == *r);
+    }
+    assert(res.weakPtr.lock().get() == res.sharedList[0].get());
+    assert(res.refPtr == res.sharedList[1].get());
+}
+
+int main() {
+
+    auto data = createData();
+
+    //create buffer to store data
+    Buffer buffer{};
+    size_t writtenSize{};
+    {
+        //STEP 2
+        //bind serializer with base polymorphic types, it will go through all reachable classes that is defined in first step.
+        //so you dont need to add Rectangle to reach for RoundedRectangle
+        TContext ctx{};
+        std::get<1>(ctx).registerBasesList<MySerializer>(MyPolymorphicClassesForRegistering{});
+        //serialize our data
+        MySerializer ser{OutputAdapter{buffer}, &ctx};
+        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(std::get<0>(ctx).isValid());
+    }
+    SomeShapes res{};
+    {
+        TContext ctx{};
+        std::get<1>(ctx).registerBasesList<MyDeserializer>(MyPolymorphicClassesForRegistering{});
+        //serialize our data
+        MyDeserializer des{InputAdapter{buffer.begin(), writtenSize}, &ctx};
+        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(std::get<0>(ctx).isValid());
+        // clear shared state from pointer linking context,
+        // it is only required if there are any pointers that manage shared state, e.g. std::shared_ptr
+        assert(res.weakPtr.use_count() == 2);//one in sharedList and one in pointer linking context
+        std::get<0>(ctx).clearSharedState();
+        assert(res.weakPtr.use_count() == 1);
+    }
+    assertSameShapes(data, res);
+    return 0;
+}

ext/CodeCoverage.cmake

@@ -1,198 +0,0 @@
-# Copyright (c) 2012 - 2015, Lars Bilke
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors
-#    may be used to endorse or promote products derived from this software without
-#    specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#
-#
-# 2012-01-31, Lars Bilke
-# - Enable Code Coverage
-#
-# 2013-09-17, Joakim Söderberg
-# - Added support for Clang.
-# - Some additional usage instructions.
-#
-# USAGE:
-
-# 0. (Mac only) If you use Xcode 5.1 make sure to patch geninfo as described here:
-#      http://stackoverflow.com/a/22404544/80480
-#
-# 1. Copy this file into your cmake modules path.
-#
-# 2. Add the following line to your CMakeLists.txt:
-#      INCLUDE(CodeCoverage)
-#
-# 3. Set compiler flags to turn off optimization and enable coverage:
-#    SET(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
-#	 SET(CMAKE_C_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
-#
-# 3. Use the function SETUP_TARGET_FOR_COVERAGE to create a custom make target
-#    which runs your test executable and produces a lcov code coverage report:
-#    Example:
-#	 SETUP_TARGET_FOR_COVERAGE(
-#				my_coverage_target  # Name for custom target.
-#				test_driver         # Name of the test driver executable that runs the tests.
-#									# NOTE! This should always have a ZERO as exit code
-#									# otherwise the coverage generation will not complete.
-#				coverage            # Name of output directory.
-#				)
-#
-# 4. Build a Debug build:
-#	 cmake -DCMAKE_BUILD_TYPE=Debug ..
-#	 make
-#	 make my_coverage_target
-#
-#
-
-# Check prereqs
-FIND_PROGRAM( GCOV_PATH gcov )
-FIND_PROGRAM( LCOV_PATH lcov )
-FIND_PROGRAM( GENHTML_PATH genhtml )
-FIND_PROGRAM( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/tests)
-
-IF(NOT GCOV_PATH)
-	MESSAGE(FATAL_ERROR "gcov not found! Aborting...")
-ENDIF() # NOT GCOV_PATH
-
-IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")
-	IF("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 3)
-		MESSAGE(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...")
-	ENDIF()
-ELSEIF(NOT CMAKE_COMPILER_IS_GNUCXX)
-	MESSAGE(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
-ENDIF() # CHECK VALID COMPILER
-
-SET(CMAKE_CXX_FLAGS_COVERAGE
-    "-g -O0 --coverage -fprofile-arcs -ftest-coverage"
-    CACHE STRING "Flags used by the C++ compiler during coverage builds."
-    FORCE )
-SET(CMAKE_C_FLAGS_COVERAGE
-    "-g -O0 --coverage -fprofile-arcs -ftest-coverage"
-    CACHE STRING "Flags used by the C compiler during coverage builds."
-    FORCE )
-SET(CMAKE_EXE_LINKER_FLAGS_COVERAGE
-    ""
-    CACHE STRING "Flags used for linking binaries during coverage builds."
-    FORCE )
-SET(CMAKE_SHARED_LINKER_FLAGS_COVERAGE
-    ""
-    CACHE STRING "Flags used by the shared libraries linker during coverage builds."
-    FORCE )
-MARK_AS_ADVANCED(
-    CMAKE_CXX_FLAGS_COVERAGE
-    CMAKE_C_FLAGS_COVERAGE
-    CMAKE_EXE_LINKER_FLAGS_COVERAGE
-    CMAKE_SHARED_LINKER_FLAGS_COVERAGE )
-
-IF ( NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "Coverage"))
-  MESSAGE( WARNING "Code coverage results with an optimized (non-Debug) build may be misleading" )
-ENDIF() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug"
-
-
-# Param _targetname     The name of new the custom make target
-# Param _testrunner     The name of the target which runs the tests.
-#						MUST return ZERO always, even on errors.
-#						If not, no coverage report will be created!
-# Param _outputname     lcov output is generated as _outputname.info
-#                       HTML report is generated in _outputname/index.html
-# Optional fourth parameter is passed as arguments to _testrunner
-#   Pass them in list form, e.g.: "-j;2" for -j 2
-FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
-
-	IF(NOT LCOV_PATH)
-		MESSAGE(FATAL_ERROR "lcov not found! Aborting...")
-	ENDIF() # NOT LCOV_PATH
-
-	IF(NOT GENHTML_PATH)
-		MESSAGE(FATAL_ERROR "genhtml not found! Aborting...")
-	ENDIF() # NOT GENHTML_PATH
-
-	SET(coverage_info "${CMAKE_BINARY_DIR}/${_outputname}.info")
-	SET(coverage_cleaned "${coverage_info}.cleaned")
-
-	SEPARATE_ARGUMENTS(test_command UNIX_COMMAND "${_testrunner}")
-
-	# Setup target
-	ADD_CUSTOM_TARGET(${_targetname}
-
-		# Cleanup lcov
-		${LCOV_PATH} --directory . --zerocounters
-
-		# Run tests
-		COMMAND ${test_command} ${ARGV3}
-
-		# Capturing lcov counters and generating report
-		COMMAND ${LCOV_PATH} --directory . --capture --output-file ${coverage_info}
-			#extract only /include/bitsery directory
-		COMMAND ${LCOV_PATH} --extract ${coverage_info} '*include/bitsery*' --output-file ${coverage_cleaned}
-		COMMAND ${GENHTML_PATH} -o ${_outputname} ${coverage_cleaned}
-		COMMAND ${CMAKE_COMMAND} -E remove ${coverage_info} ${coverage_cleaned}
-
-		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-		COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
-	)
-
-	# Show info where to find the report
-	ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
-		COMMAND ;
-		COMMENT "Open ./${_outputname}/index.html in your browser to view the coverage report."
-	)
-
-ENDFUNCTION() # SETUP_TARGET_FOR_COVERAGE
-
-# Param _targetname     The name of new the custom make target
-# Param _testrunner     The name of the target which runs the tests
-# Param _outputname     cobertura output is generated as _outputname.xml
-# Optional fourth parameter is passed as arguments to _testrunner
-#   Pass them in list form, e.g.: "-j;2" for -j 2
-FUNCTION(SETUP_TARGET_FOR_COVERAGE_COBERTURA _targetname _testrunner _outputname)
-
-	IF(NOT PYTHON_EXECUTABLE)
-		MESSAGE(FATAL_ERROR "Python not found! Aborting...")
-	ENDIF() # NOT PYTHON_EXECUTABLE
-
-	IF(NOT GCOVR_PATH)
-		MESSAGE(FATAL_ERROR "gcovr not found! Aborting...")
-	ENDIF() # NOT GCOVR_PATH
-
-	ADD_CUSTOM_TARGET(${_targetname}
-
-		# Run tests
-		${_testrunner} ${ARGV3}
-
-		# Running gcovr
-		COMMAND ${GCOVR_PATH} -x -r ${CMAKE_SOURCE_DIR} -e '${CMAKE_SOURCE_DIR}/tests/'  -o ${_outputname}.xml
-		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-		COMMENT "Running gcovr to produce Cobertura code coverage report."
-	)
-
-	# Show info where to find the report
-	ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
-		COMMAND ;
-		COMMENT "Cobertura code coverage report saved in ${_outputname}.xml."
-	)
-
-ENDFUNCTION() # SETUP_TARGET_FOR_COVERAGE_COBERTURA

ext/LinkTestLib.cmake

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

ext/gtest/CMakeLists.txt

@@ -1,79 +0,0 @@
-#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.
-
-cmake_minimum_required(VERSION 3.2)
-project(gtest_builder C CXX)
-include(ExternalProject)
-
-set(ForceSharedCrt ON)
-set(DisablePThreads OFF)
-
-if(MINGW)
-    set(DisablePThreads ON)
-endif()
-
-if (${UseGMock})
-    message("use gmock")
-    set(BuildArgs -DBUILD_GTEST=OFF -DBUILD_GMOCK=ON)
-else ()
-    message("use gtest only")
-    set(BuildArgs -DBUILD_GTEST=ON -DBUILD_GMOCK=OFF)
-endif()
-
-if (WIN32 AND NOT MINGW)
-    set(BuildArgs ${BuildArgs}
-            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=DebugLibs
-            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=ReleaseLibs)
-endif()
-
-ExternalProject_Add(googletest
-        GIT_REPOSITORY https://github.com/google/googletest.git
-        CMAKE_ARGS ${BuildArgs}
-        -Dgtest_force_shared_crt=${ForceSharedCrt}
-        -Dgtest_disable_pthreads=${DisablePThreads}
-        PREFIX "${CMAKE_CURRENT_BINARY_DIR}"
-        # disable update command
-        UPDATE_COMMAND ""
-        # disable install step
-        INSTALL_COMMAND ""
-        )
-
-#export variables
-ExternalProject_Get_Property(googletest source_dir)
-ExternalProject_Get_Property(googletest binary_dir)
-if (${UseGMock})
-    # need to include both googletest and googlemock
-    set(GTestIncludeDirs ${source_dir}/googlemock/include ${source_dir}/googletest/include PARENT_SCOPE)
-    set(GTestLibsDir ${binary_dir}/googlemock PARENT_SCOPE)
-    set(GTestLibName gmock PARENT_SCOPE)
-    set(GTestMainLibName gmock_main PARENT_SCOPE)
-    set(GTestLinkLibNames gmock_main PARENT_SCOPE)
-else()
-    set(GTestIncludeDirs ${source_dir}/googletest/include PARENT_SCOPE)
-    set(GTestLibsDir ${binary_dir}/googletest PARENT_SCOPE)
-    set(GTestLibName gtest PARENT_SCOPE)
-    set(GTestMainLibName gtest_main PARENT_SCOPE)
-    # need to include both libs gtest and gtest_main
-    set(GTestLinkLibNames gtest gtest_main PARENT_SCOPE)
-endif()
-
-

include/bitsery/adapter/buffer.h

@@ -0,0 +1,250 @@
+//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_ADAPTER_BUFFER_H
+#define BITSERY_ADAPTER_BUFFER_H
+
+#include "../details/adapter_common.h"
+#include "../traits/core/traits.h"
+
+namespace bitsery {
+
+    //base class that stores container iterators, and is required for session support (for reading sessions data)
+    template<typename Buffer>
+    class BufferIterators {
+        static constexpr bool isConstBuffer = std::is_const<Buffer>::value;
+        using BuffNonConst = typename std::remove_const<Buffer>::type;
+
+    protected:
+
+        using TIterator = typename std::conditional<isConstBuffer,
+                typename traits::BufferAdapterTraits<BuffNonConst>::TConstIterator,
+                typename traits::BufferAdapterTraits<BuffNonConst>::TIterator>::type;
+        static_assert(details::IsDefined<TIterator>::value,
+                      "Please define BufferAdapterTraits or include from <bitsery/traits/...>");
+        BufferIterators(TIterator begin, TIterator end)
+                : posIt{begin},
+                  endIt{end} {
+        }
+
+        friend details::SessionAccess;
+
+        TIterator posIt;
+        TIterator endIt;
+    };
+
+    template<typename Buffer>
+    class InputBufferAdapter : public BufferIterators<Buffer> {
+    public:
+        using TIterator = typename BufferIterators<Buffer>::TIterator;
+        using TValue = typename traits::BufferAdapterTraits<typename std::remove_const<Buffer>::type>::TValue;
+        static_assert(details::IsDefined<TValue>::value,
+                      "Please define BufferAdapterTraits or include from <bitsery/traits/...>");
+        static_assert(traits::ContainerTraits<typename std::remove_const<Buffer>::type>::isContiguous,
+                      "BufferAdapter only works with contiguous containers");
+
+        InputBufferAdapter(TIterator begin, TIterator endIt)
+                : BufferIterators<Buffer>(begin, endIt) {
+        }
+
+        InputBufferAdapter(TIterator begin, size_t size)
+                : BufferIterators<Buffer>(begin, std::next(begin, size)) {
+        }
+
+        void read(TValue *data, size_t size) {
+            //for optimization
+            auto tmp = this->posIt;
+            this->posIt += size;
+            if (std::distance(this->posIt, this->endIt) >= 0) {
+                std::memcpy(data, std::addressof(*tmp), size);
+            } else {
+                this->posIt -= size;
+                //set everything to zeros
+                std::memset(data, 0, size);
+                if (error() == ReaderError::NoError)
+                    setError(ReaderError::DataOverflow);
+            }
+        }
+
+        ReaderError error() const {
+            auto res = std::distance(this->endIt, this->posIt);
+            if (res > 0) {
+                auto err = static_cast<ReaderError>(res);
+                return err;
+            }
+            return ReaderError::NoError;
+        }
+
+        void setError(ReaderError error) {
+            this->endIt = this->posIt;
+            //to avoid creating temporary for error state, mark an error by passing posIt after the endIt
+            std::advance(this->posIt, static_cast<size_t>(error));
+        }
+
+        bool isCompletedSuccessfully() const {
+            return this->posIt == this->endIt;
+        }
+    };
+
+    template<typename Buffer>
+    class UnsafeInputBufferAdapter : public BufferIterators<Buffer> {
+    public:
+
+        using TIterator = typename BufferIterators<Buffer>::TIterator;
+        using TValue = typename traits::BufferAdapterTraits<typename std::remove_const<Buffer>::type>::TValue;
+        static_assert(details::IsDefined<TValue>::value,
+                      "Please define BufferAdapterTraits or include from <bitsery/traits/...>");
+        static_assert(traits::ContainerTraits<typename std::remove_const<Buffer>::type>::isContiguous,
+                      "BufferAdapter only works with contiguous containers");
+
+        UnsafeInputBufferAdapter(TIterator beginIt, TIterator endIt) : BufferIterators<Buffer>(beginIt, endIt) {
+        }
+
+        UnsafeInputBufferAdapter(TIterator begin, size_t size)
+                : BufferIterators<Buffer>(begin, std::next(begin, size)) {
+        }
+
+        void read(TValue *data, size_t size) {
+            //for optimization
+            auto tmp = this->posIt;
+            this->posIt += size;
+            assert(std::distance(this->posIt, this->endIt) >= 0);
+            std::memcpy(data, std::addressof(*tmp), size);
+        }
+
+        ReaderError error() const {
+            return err;
+        }
+
+        void setError(ReaderError error) {
+            err = error;
+        }
+
+        bool isCompletedSuccessfully() const {
+            return this->posIt == this->endIt;
+        }
+
+    private:
+        ReaderError err = ReaderError::NoError;
+    };
+
+    template<typename Buffer>
+    class OutputBufferAdapter {
+    public:
+
+        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(Buffer &buffer)
+                : _buffer{std::addressof(buffer)} {
+
+            init(TResizable{});
+        }
+
+        void write(const TValue *data, size_t size) {
+            writeInternal(data, size, TResizable{});
+        }
+
+        void flush() {
+            //this function might be useful for stream adapters
+        }
+
+        size_t writtenBytesCount() const {
+            return static_cast<size_t>(std::distance(std::begin(*_buffer), _outIt));
+        }
+
+    private:
+        using TResizable = std::integral_constant<bool, traits::ContainerTraits<Buffer>::isResizable>;
+
+        Buffer *_buffer;
+        TIterator _outIt{};
+        TIterator _end{};
+
+        /*
+         * resizable buffer
+         */
+
+        void init(std::true_type) {
+            //resize buffer immediately, because we need output iterator at valid position
+            if (traits::ContainerTraits<Buffer>::size(*_buffer) == 0u) {
+                traits::BufferAdapterTraits<Buffer>::increaseBufferSize(*_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);
+                //increase container size
+                traits::BufferAdapterTraits<Buffer>::increaseBufferSize(*_buffer);
+                //restore iterators
+                _end = std::end(*_buffer);
+                _outIt = std::next(std::begin(*_buffer), pos);
+
+                writeInternal(data, size, std::true_type{});
+            }
+        }
+
+        /*
+         * non resizable buffer
+         */
+        void init(std::false_type) {
+            _outIt = std::begin(*_buffer);
+            _end = std::end(*_buffer);
+        }
+
+        void writeInternal(const TValue *data, size_t size, std::false_type) {
+            //optimization
+            auto tmp = _outIt;
+            _outIt += size;
+            assert(std::distance(_outIt, _end) >= 0);
+            memcpy(std::addressof(*tmp), data, size);
+        }
+    };
+
+}
+
+#endif //BITSERY_ADAPTER_BUFFER_H

include/bitsery/adapter/stream.h

@@ -0,0 +1,225 @@
+//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_ADAPTER_STREAM_H
+#define BITSERY_ADAPTER_STREAM_H
+
+#include "../details/adapter_common.h"
+#include "../traits/array.h"
+#include <ios>
+
+namespace bitsery {
+
+    template <typename TChar, typename CharTraits>
+    class BasicInputStreamAdapter {
+    public:
+        using TValue = TChar;
+        using TIterator = void;//TIterator is used with sessions, but streams cannot be used with sessions
+
+        BasicInputStreamAdapter(std::basic_ios<TChar, CharTraits>& istream)
+                :_ios{std::addressof(istream)} {}
+
+        void read(TValue* data, size_t 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())
+                return ReaderError::NoError;
+            return _ios->eof()
+                   ? ReaderError::DataOverflow
+                   : ReaderError::ReadingError;
+        }
+        bool isCompletedSuccessfully() const {
+            if (error() == ReaderError::NoError) {
+                return _ios->rdbuf()->sgetc() == CharTraits::eof();
+            }
+            return false;
+        }
+        void setError(ReaderError ) {
+            //has no effect when using
+        }
+
+    private:
+        std::basic_ios<TChar, CharTraits>* _ios;
+    };
+
+    template <typename TChar, typename CharTraits>
+    class BasicOutputStreamAdapter {
+    public:
+        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{std::addressof(ostream)} {}
+
+        void write(const TValue* data, size_t size) {
+            //for optimization
+            _ios->rdbuf()->sputn( data , size );
+        }
+
+        void flush() {
+            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 0u;
+        }
+
+        //this method is only for stream writing
+        bool isValidState() const {
+            return !_ios->bad();
+        }
+
+    private:
+        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>
+    class BasicIOStreamAdapter:public BasicInputStreamAdapter<TChar, CharTraits>, public BasicOutputStreamAdapter<TChar, CharTraits> {
+    public:
+        using TValue = TChar;
+        using TIterator = void;//TIterator is used with sessions, but streams cannot be used with sessions
+
+        //both bases contain reference to same iostream, so no need to do anything
+        BasicIOStreamAdapter(std::basic_ios<TChar, CharTraits>& iostream)
+                :BasicInputStreamAdapter<TChar, CharTraits>{iostream},
+                 BasicOutputStreamAdapter<TChar, CharTraits>{iostream} {
+
+        }
+    };
+
+    //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_ADAPTER_STREAM_H

include/bitsery/adapter_reader.h

@@ -0,0 +1,263 @@
+//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_ADAPTER_READER_H
+#define BITSERY_ADAPTER_READER_H
+
+#include "details/sessions.h"
+#include <algorithm>
+#include <cstring>
+
+namespace bitsery {
+
+    template <typename TReader>
+    class AdapterReaderBitPackingWrapper;
+
+    template<typename InputAdapter, typename Config>
+    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/...>");
+
+        using TIterator = typename InputAdapter::TIterator;// used by session reader
+
+        explicit AdapterReader(InputAdapter&& adapter)
+                : _inputAdapter{std::move(adapter)},
+                  _session{*this, _inputAdapter}
+        {
+        }
+
+        AdapterReader(const AdapterReader &) = delete;
+
+        AdapterReader &operator=(const AdapterReader &) = delete;
+
+        //todo add conditional noexcept
+        AdapterReader(AdapterReader &&) = default;
+
+        AdapterReader &operator=(AdapterReader &&) = default;
+
+        ~AdapterReader() noexcept = default;
+
+        template<size_t SIZE, typename T>
+        void readBytes(T &v) {
+            static_assert(std::is_integral<T>(), "");
+            static_assert(sizeof(T) == SIZE, "");
+            directRead(&v, 1);
+        }
+
+        template<size_t SIZE, typename T>
+        void readBuffer(T *buf, size_t count) {
+            static_assert(std::is_integral<T>(), "");
+            static_assert(sizeof(T) == SIZE, "");
+            directRead(buf, count);
+        }
+
+        template<typename T>
+        void readBits(T &, size_t ) {
+            static_assert(std::is_void<T>::value,
+                          "Bit-packing is not enabled.\nEnable by call to `enableBitPacking`) or create Deserializer with bit packing enabled.");
+        }
+
+        void align() {
+        }
+
+        bool isCompletedSuccessfully() const {
+            return _inputAdapter.isCompletedSuccessfully() && !_session.hasActiveSessions();
+        }
+
+        ReaderError error() const {
+            auto err = _inputAdapter.error();
+            if (err == ReaderError::DataOverflow && _session.hasActiveSessions())
+                return ReaderError::NoError;
+            return err;
+        }
+
+        void setError(ReaderError error) {
+            if (this->error() == ReaderError::NoError)
+                _inputAdapter.setError(error);
+        }
+
+        void beginSession() {
+            if (error() == ReaderError::NoError) {
+                _session.begin();
+            }
+        }
+
+        void endSession() {
+            if (error() == ReaderError::NoError) {
+                _session.end();
+            }
+        }
+
+    private:
+        friend class AdapterReaderBitPackingWrapper<AdapterReader<InputAdapter, Config>>;
+
+        InputAdapter _inputAdapter;
+        typename std::conditional<Config::BufferSessionsEnabled,
+                session::SessionsReader<AdapterReader<InputAdapter, Config>>,
+        session::DisabledSessionsReader<AdapterReader<InputAdapter, Config>>>::type
+                _session;
+
+        template<typename T>
+        void directRead(T *v, size_t count) {
+            static_assert(!std::is_const<T>::value, "");
+            _inputAdapter.read(reinterpret_cast<TValue *>(v), sizeof(T) * count);
+            //swap each byte if nessesarry
+            _swapDataBits(v, count, std::integral_constant<bool,
+                    Config::NetworkEndianness != details::getSystemEndianness()>{});
+        }
+
+        template<typename T>
+        void _swapDataBits(T *v, size_t count, std::true_type) {
+            std::for_each(v, std::next(v, count), [this](T &x) { x = details::swap(x); });
+        }
+
+        template<typename T>
+        void _swapDataBits(T *, size_t , std::false_type) {
+            //empty function because no swap is required
+        }
+
+    };
+
+    template<typename TReader>
+    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;
+        static_assert(details::IsDefined<ScratchType>::value, "Underlying adapter value type is not supported");
+
+        explicit AdapterReaderBitPackingWrapper(TReader& reader):_reader{reader}
+        {
+        }
+
+        AdapterReaderBitPackingWrapper(const AdapterReaderBitPackingWrapper&) = delete;
+        AdapterReaderBitPackingWrapper& operator = (const AdapterReaderBitPackingWrapper&) = delete;
+
+        AdapterReaderBitPackingWrapper(AdapterReaderBitPackingWrapper&& ) noexcept = default;
+        AdapterReaderBitPackingWrapper& operator = (AdapterReaderBitPackingWrapper&& ) noexcept = default;
+
+        ~AdapterReaderBitPackingWrapper() {
+            align();
+        }
+
+        template<size_t SIZE, typename T>
+        void readBytes(T &v) {
+            static_assert(std::is_integral<T>(), "");
+            static_assert(sizeof(T) == SIZE, "");
+            using UT = typename std::make_unsigned<T>::type;
+            if (!m_scratchBits)
+                _reader.template readBytes<SIZE,T>(v);
+            else
+                readBits(reinterpret_cast<UT &>(v), details::BitsSize<T>::value);
+        }
+
+        template<size_t SIZE, typename T>
+        void readBuffer(T *buf, size_t count) {
+            static_assert(std::is_integral<T>(), "");
+            static_assert(sizeof(T) == SIZE, "");
+
+            if (!m_scratchBits) {
+                _reader.template readBuffer<SIZE,T>(buf, count);
+            } else {
+                using UT = typename std::make_unsigned<T>::type;
+                //todo improve implementation
+                const auto end = buf + count;
+                for (auto it = buf; it != end; ++it)
+                    readBits(reinterpret_cast<UT &>(*it), details::BitsSize<T>::value);
+            }
+        }
+
+        template<typename T>
+        void readBits(T &v, size_t bitsCount) {
+            static_assert(std::is_integral<T>() && std::is_unsigned<T>(), "");
+            readBitsInternal(v, bitsCount);
+        }
+
+        void align() {
+            if (m_scratchBits) {
+                ScratchType tmp{};
+                readBitsInternal(tmp, m_scratchBits);
+                if (tmp)
+                    setError(ReaderError::InvalidData);
+            }
+        }
+
+        bool isCompletedSuccessfully() const {
+            return _reader.isCompletedSuccessfully();
+        }
+
+        ReaderError error() const {
+            return _reader.error();
+        }
+
+        void setError(ReaderError error) {
+            _reader.setError(error);
+        }
+
+        void beginSession() {
+            align();
+            _reader.beginSession();
+        }
+
+        void endSession() {
+            align();
+            _reader.endSession();
+        }
+
+    private:
+        TReader& _reader;
+        ScratchType m_scratch{};
+        size_t m_scratchBits{};
+
+        template<typename T>
+        void readBitsInternal(T &v, size_t size) {
+            auto bitsLeft = size;
+            T res{};
+            while (bitsLeft > 0) {
+                auto bits = (std::min)(bitsLeft, details::BitsSize<UnsignedValue>::value);
+                if (m_scratchBits < bits) {
+                    UnsignedValue tmp;
+                    _reader.template readBytes<sizeof(UnsignedValue), UnsignedValue>(tmp);
+                    m_scratch |= static_cast<ScratchType>(tmp) << m_scratchBits;
+                    m_scratchBits += details::BitsSize<UnsignedValue>::value;
+                }
+                auto shiftedRes =
+                        static_cast<T>(m_scratch & ((static_cast<ScratchType>(1) << bits) - 1)) << (size - bitsLeft);
+                res |= shiftedRes;
+                m_scratch >>= bits;
+                m_scratchBits -= bits;
+                bitsLeft -= bits;
+            }
+            v = res;
+        }
+
+    };
+}
+
+#endif //BITSERY_ADAPTER_READER_H

include/bitsery/adapter_writer.h

@@ -0,0 +1,335 @@
+//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_ADAPTER_WRITER_H
+#define BITSERY_ADAPTER_WRITER_H
+
+#include "details/sessions.h"
+
+#include <cassert>
+#include <utility>
+
+namespace bitsery {
+
+    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>(), "");
+            static_assert(sizeof(T) == SIZE, "");
+            _bitsCount += details::BitsSize<T>::value;
+        }
+
+        template<typename T>
+        void writeBits(const T &, size_t bitsCount) {
+            static_assert(std::is_integral<T>() && std::is_unsigned<T>(), "");
+            assert(bitsCount <= details::BitsSize<T>::value);
+            _bitsCount += bitsCount;
+        }
+
+        template<size_t SIZE, typename T>
+        void writeBuffer(const T *, size_t count) {
+            static_assert(std::is_integral<T>(), "");
+            static_assert(sizeof(T) == SIZE, "");
+            _bitsCount += details::BitsSize<T>::value * count;
+        }
+
+        void align() {
+            auto _scratch = (_bitsCount % 8);
+            _bitsCount += (8 - _scratch) % 8;
+        }
+
+        void flush() {
+            align();
+            //flush sessions count
+            if (_sessionsBytesCount > 0) {
+                _bitsCount += (_sessionsBytesCount + 4) * 8;
+                _sessionsBytesCount = 0;
+            }
+        }
+
+        void beginSession() {
+
+        }
+
+        void endSession() {
+            auto endPos = writtenBytesCount();
+            details::writeSize(*this, endPos);
+            auto sessionEndBytesCount = writtenBytesCount() - endPos;
+            //remove written bytes, because we'll write them at the end
+            _bitsCount -= sessionEndBytesCount * 8;
+            _sessionsBytesCount += sessionEndBytesCount;
+        }
+
+        //get size in bytes
+        size_t writtenBytesCount() const {
+            return _bitsCount / 8;
+        }
+
+    private:
+        size_t _bitsCount{};
+        size_t _sessionsBytesCount{};
+    };
+
+    //helper type for default config
+    using MeasureSize = BasicMeasureSize<DefaultConfig>;
+
+    template <typename TWriter>
+    class AdapterWriterBitPackingWrapper;
+
+    template<typename OutputAdapter, typename Config>
+    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/...>");
+
+        explicit AdapterWriter(OutputAdapter&& adapter)
+                : _outputAdapter{std::move(adapter)}
+        {
+        }
+
+        AdapterWriter(const AdapterWriter &) = delete;
+
+        AdapterWriter &operator=(const AdapterWriter &) = delete;
+
+        //todo add conditional noexcept
+        AdapterWriter(AdapterWriter &&) = default;
+
+        AdapterWriter &operator=(AdapterWriter &&) = default;
+
+        ~AdapterWriter() {
+            flush();
+        }
+
+        template<size_t SIZE, typename T>
+        void writeBytes(const T &v) {
+            static_assert(std::is_integral<T>(), "");
+            static_assert(sizeof(T) == SIZE, "");
+            directWrite(&v, 1);
+
+        }
+
+        template<size_t SIZE, typename T>
+        void writeBuffer(const T *buf, size_t count) {
+            static_assert(std::is_integral<T>(), "");
+            static_assert(sizeof(T) == SIZE, "");
+            directWrite(buf, count);
+        }
+
+        template<typename T>
+        void writeBits(const T &, size_t ) {
+            static_assert(std::is_void<T>::value,
+                          "Bit-packing is not enabled.\nEnable by call to `enableBitPacking`) or create Serializer with bit packing enabled.");
+        }
+
+        //to have the same interface as bitpackingwriter
+        void align() {
+
+        }
+
+        void flush() {
+            _session.flushSessions(*this);
+            _outputAdapter.flush();
+        }
+
+        size_t writtenBytesCount() const {
+            return _outputAdapter.writtenBytesCount();
+        }
+
+        void beginSession() {
+            _session.begin(*this);
+        }
+
+        void endSession() {
+            _session.end(*this);
+        }
+
+    private:
+        friend class AdapterWriterBitPackingWrapper<AdapterWriter<OutputAdapter, Config>>;
+        template<typename T>
+        void directWrite(T &&v, size_t count) {
+            _directWriteSwapTag(std::forward<T>(v), count, std::integral_constant<bool,
+                    Config::NetworkEndianness != details::getSystemEndianness()>{});
+        }
+
+        template<typename T>
+        void _directWriteSwapTag(const T *v, size_t count, std::true_type) {
+            std::for_each(v, std::next(v, count), [this](const T &v) {
+                const auto res = details::swap(v);
+                _outputAdapter.write(reinterpret_cast<const TValue *>(&res), sizeof(T));
+            });
+        }
+
+        template<typename T>
+        void _directWriteSwapTag(const T *v, size_t count, std::false_type) {
+            _outputAdapter.write(reinterpret_cast<const TValue *>(v), count * sizeof(T));
+        }
+
+        OutputAdapter _outputAdapter;
+        typename std::conditional<Config::BufferSessionsEnabled,
+                session::SessionsWriter<AdapterWriter<OutputAdapter, Config >>,
+                session::DisabledSessionsWriter<AdapterWriter<OutputAdapter, Config>>>::type
+                _session{};
+    };
+
+    //this class is used as wrapper for real AdapterWriter, it doesn't store writer itself just a reference
+    template<typename TWriter>
+    class AdapterWriterBitPackingWrapper {
+    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;
+        using ScratchType = typename details::ScratchType<UnsignedType>::type;
+        static_assert(details::IsDefined<ScratchType>::value, "Underlying adapter value type is not supported");
+
+        explicit AdapterWriterBitPackingWrapper(TWriter &writer)
+                : _writer{writer}
+        {
+        }
+
+        AdapterWriterBitPackingWrapper(const AdapterWriterBitPackingWrapper&) = delete;
+        AdapterWriterBitPackingWrapper& operator = (const AdapterWriterBitPackingWrapper&) = delete;
+
+        AdapterWriterBitPackingWrapper(AdapterWriterBitPackingWrapper&& ) noexcept = default;
+        AdapterWriterBitPackingWrapper& operator = (AdapterWriterBitPackingWrapper&& ) noexcept = default;
+
+        ~AdapterWriterBitPackingWrapper() {
+            align();
+        }
+
+        template<size_t SIZE, typename T>
+        void writeBytes(const T &v) {
+            static_assert(std::is_integral<T>(), "");
+            static_assert(sizeof(T) == SIZE, "");
+
+            if (!_scratchBits) {
+                _writer.template writeBytes<SIZE,T>(v);
+            } else {
+                using UT = typename std::make_unsigned<T>::type;
+                writeBitsInternal(reinterpret_cast<const UT &>(v), details::BitsSize<T>::value);
+            }
+        }
+
+        template<size_t SIZE, typename T>
+        void writeBuffer(const T *buf, size_t count) {
+            static_assert(std::is_integral<T>(), "");
+            static_assert(sizeof(T) == SIZE, "");
+            if (!_scratchBits) {
+                _writer.template writeBuffer<SIZE,T>(buf, count);
+            } else {
+                using UT = typename std::make_unsigned<T>::type;
+                //todo improve implementation
+                const auto end = buf + count;
+                for (auto it = buf; it != end; ++it)
+                    writeBitsInternal(reinterpret_cast<const UT &>(*it), details::BitsSize<T>::value);
+            }
+        }
+
+        template<typename T>
+        void writeBits(const T &v, size_t bitsCount) {
+            static_assert(std::is_integral<T>() && std::is_unsigned<T>(), "");
+            assert(0 < bitsCount && bitsCount <= details::BitsSize<T>::value);
+            assert(v <= (bitsCount < 64
+                         ? (1ULL << bitsCount) - 1
+                         : (1ULL << (bitsCount-1)) + ((1ULL << (bitsCount-1)) -1)));
+            writeBitsInternal(v, bitsCount);
+        }
+
+        void align() {
+            writeBitsInternal(UnsignedType{}, (details::BitsSize<UnsignedType>::value - _scratchBits) % 8);
+        }
+
+        void flush() {
+            align();
+            _writer._session.flushSessions(_writer);
+        }
+
+        size_t writtenBytesCount() const {
+            return _writer.writtenBytesCount();
+        }
+
+        void beginSession() {
+            align();
+            _writer._session.begin(_writer);
+        }
+
+        void endSession() {
+            align();
+            _writer._session.end(_writer);
+        }
+
+    private:
+
+        template<typename T>
+        void writeBitsInternal(const T &v, size_t size) {
+            constexpr size_t valueSize = details::BitsSize<UnsignedType>::value;
+            auto value = v;
+            auto bitsLeft = size;
+            while (bitsLeft > 0) {
+                auto bits = (std::min)(bitsLeft, valueSize);
+                _scratch |= static_cast<ScratchType>( value ) << _scratchBits;
+                _scratchBits += bits;
+                if (_scratchBits >= valueSize) {
+                    auto tmp = static_cast<UnsignedType>(_scratch & _MASK);
+                    _writer.template writeBytes<sizeof(UnsignedType), UnsignedType >(tmp);
+                    _scratch >>= valueSize;
+                    _scratchBits -= valueSize;
+
+                    value >>= valueSize;
+                }
+                bitsLeft -= bits;
+            }
+        }
+
+        //overload for TValue, for better performance
+        void writeBitsInternal(const UnsignedType &v, size_t size) {
+            if (size > 0) {
+                _scratch |= static_cast<ScratchType>( v ) << _scratchBits;
+                _scratchBits += size;
+                if (_scratchBits >= details::BitsSize<UnsignedType>::value) {
+                    auto tmp = static_cast<UnsignedType>(_scratch & _MASK);
+                    _writer.template writeBytes<sizeof(UnsignedType), UnsignedType>(tmp);
+                    _scratch >>= details::BitsSize<UnsignedType>::value;
+                    _scratchBits -= details::BitsSize<UnsignedType>::value;
+                }
+            }
+        }
+
+        const UnsignedType _MASK = (std::numeric_limits<UnsignedType>::max)();
+        ScratchType _scratch{};
+        size_t _scratchBits{};
+        TWriter& _writer;
+
+    };
+}
+
+#endif //BITSERY_ADAPTER_WRITER_H

include/bitsery/bitsery.h

@@ -24,8 +24,8 @@
 #ifndef BITSERY_BITSERY_H
 #define BITSERY_BITSERY_H
 
-#define BITSERY_MAJOR_VERSION 3
-#define BITSERY_MINOR_VERSION 0
+#define BITSERY_MAJOR_VERSION 4
+#define BITSERY_MINOR_VERSION 5
 #define BITSERY_PATCH_VERSION 0
 
 #define BITSERY_QUOTE_MACRO(name) #name
@@ -37,9 +37,6 @@ BITSERY_QUOTE_MACRO(patch)
 #define BITSERY_VERSION \
 BITSERY_BUILD_VERSION_STR(BITSERY_MAJOR_VERSION, BITSERY_MINOR_VERSION, BITSERY_PATCH_VERSION)
 
-
-#include "buffer_writer.h"
-#include "buffer_reader.h"
 #include "serializer.h"
 #include "deserializer.h"
 

include/bitsery/buffer_reader.h

@@ -1,220 +0,0 @@
-//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_BUFFER_READER_H
-#define BITSERY_BUFFER_READER_H
-
-#include "details/buffer_common.h"
-#include <algorithm>
-#include <cstring>
-
-namespace bitsery {
-
-    template<typename Config>
-    struct BasicBufferReader {
-
-        using BufferType = typename Config::BufferType;
-        using ValueType = typename details::BufferContainerTraits<BufferType>::TValue;
-        using BufferIteratorType = typename details::BufferContainerTraits<BufferType>::TIterator;
-        using ScratchType = typename details::SCRATCH_TYPE<ValueType>::type;
-
-        BasicBufferReader(ValueType* begin, ValueType* end)
-                :_pos{begin},
-                 _end{end},
-                 _session{*this, _pos, _end}
-        {
-            static_assert(std::is_unsigned<ValueType>(), "Config::BufferValueType must be unsigned");
-            static_assert(std::is_unsigned<ScratchType>(), "Config::BufferScrathType must be unsigned");
-            static_assert(sizeof(ValueType) * 2 == sizeof(ScratchType),
-                          "ScratchType must be 2x bigger than value type");
-            static_assert(sizeof(ValueType) == 1, "currently only supported BufferValueType is 1 byte");
-        }
-
-        BasicBufferReader(BufferRange<BufferIteratorType> range)
-                :BasicBufferReader(std::addressof(*range.begin()), std::addressof(*range.end())) {
-            static_assert(std::is_same<
-                                  typename std::iterator_traits<BufferIteratorType>::iterator_category,
-                                  std::random_access_iterator_tag>::value,
-            "BufferReader only accepts random access iterators");
-        }
-
-        BasicBufferReader(const BasicBufferReader &) = delete;
-
-        BasicBufferReader &operator=(const BasicBufferReader &) = delete;
-
-        BasicBufferReader(BasicBufferReader &&) noexcept = default;
-
-        BasicBufferReader &operator=(BasicBufferReader &&) noexcept = default;
-
-        ~BasicBufferReader() noexcept = default;
-
-
-        template<size_t SIZE, typename T>
-        void readBytes(T &v) {
-            static_assert(std::is_integral<T>(), "");
-            static_assert(sizeof(T) == SIZE, "");
-            using UT = typename std::make_unsigned<T>::type;
-            if (!m_scratchBits)
-                directRead(&v, 1);
-            else
-                readBits(reinterpret_cast<UT &>(v), details::BITS_SIZE<T>::value);
-        }
-
-        template<size_t SIZE, typename T>
-        void readBuffer(T *buf, size_t count) {
-            static_assert(std::is_integral<T>(), "");
-            static_assert(sizeof(T) == SIZE, "");
-
-            if (!m_scratchBits) {
-                directRead(buf, count);
-            } else {
-                using UT = typename std::make_unsigned<T>::type;
-                //todo improve implementation
-                const auto end = buf + count;
-                for (auto it = buf; it != end; ++it)
-                    readBits(reinterpret_cast<UT &>(*it), details::BITS_SIZE<T>::value);
-            }
-        }
-
-
-        template<typename T>
-        void readBits(T &v, size_t bitsCount) {
-            static_assert(std::is_integral<T>() && std::is_unsigned<T>(), "");
-            readBitsInternal(v, bitsCount);
-        }
-
-        void align() {
-            if (m_scratchBits) {
-                ScratchType tmp{};
-                readBitsInternal(tmp, m_scratchBits);
-                if (tmp)
-                    setError(BufferReaderError::INVALID_BUFFER_DATA);
-            }
-        }
-
-        bool isCompletedSuccessfully() const {
-            return _pos == _end && !_session.hasActiveSessions();
-        }
-
-        BufferReaderError getError() const {
-            auto res = std::distance(_end, _pos);
-            if (res > 0) {
-                auto err = static_cast<BufferReaderError>(res);
-                if (_session.hasActiveSessions() && err == BufferReaderError::BUFFER_OVERFLOW)
-                    return BufferReaderError::NO_ERROR;
-                return err;
-            }
-            return BufferReaderError::NO_ERROR;
-        }
-
-        void setError(BufferReaderError error) {
-            _end = _pos;
-            //to avoid creating temporary for error state, mark an error by passing _pos after the _end
-            std::advance(_pos, static_cast<size_t>(error));
-        }
-
-        void beginSession() {
-            align();
-            if (getError() != BufferReaderError::INVALID_BUFFER_DATA) {
-                _session.begin();
-            }
-        }
-
-        void endSession() {
-            align();
-            if (getError() != BufferReaderError::INVALID_BUFFER_DATA) {
-                _session.end();
-            }
-        }
-
-    private:
-        ValueType* _pos;
-        ValueType* _end;
-        ScratchType m_scratch{};
-        size_t m_scratchBits{};
-        typename std::conditional<Config::BufferSessionsEnabled,
-                details::BufferSessionsReader<BasicBufferReader<Config>, ValueType*>,
-                details::DisabledBufferSessionsReader<Config>>::type
-                _session;
-
-        template<typename T>
-        void directRead(T *v, size_t count) {
-            static_assert(!std::is_const<T>::value, "");
-            const auto bytesCount = sizeof(T) * count;
-
-            if (std::distance(_pos, _end) >= static_cast<typename details::BufferContainerTraits<BufferType>::TDifference>(bytesCount)) {
-
-                std::memcpy(reinterpret_cast<ValueType *>(v), _pos, bytesCount);
-                _pos += bytesCount;
-
-                //swap each byte if nessesarry
-                _swapDataBits(v, count, std::integral_constant<bool,
-                        Config::NetworkEndianness != details::getSystemEndianness()>{});
-            } else {
-                //set everything to zeros
-                std::memset(v, 0, bytesCount);
-
-                if (getError() == BufferReaderError::NO_ERROR)
-                    setError(BufferReaderError::BUFFER_OVERFLOW);
-            }
-        }
-
-        template<typename T>
-        void _swapDataBits(T *v, size_t count, std::true_type) {
-            std::for_each(v, std::next(v, count), [this](T &x) { x = details::swap(x); });
-        }
-
-        template<typename T>
-        void _swapDataBits(T *v, size_t count, std::false_type) {
-            //empty function because no swap is required
-        }
-
-        template<typename T>
-        void readBitsInternal(T &v, size_t size) {
-            auto bitsLeft = size;
-            T res{};
-            while (bitsLeft > 0) {
-                auto bits = std::min(bitsLeft, details::BITS_SIZE<ValueType>::value);
-                if (m_scratchBits < bits) {
-                    ValueType tmp;
-                    directRead(&tmp, 1);
-                    m_scratch |= static_cast<ScratchType>(tmp) << m_scratchBits;
-                    m_scratchBits += details::BITS_SIZE<ValueType>::value;
-                }
-                auto shiftedRes =
-                        static_cast<T>(m_scratch & ((static_cast<ScratchType>(1) << bits) - 1)) << (size - bitsLeft);
-                res |= shiftedRes;
-                m_scratch >>= bits;
-                m_scratchBits -= bits;
-                bitsLeft -= bits;
-            }
-            v = res;
-        }
-
-    };
-    //helper type
-    using BufferReader = BasicBufferReader<DefaultConfig>;
-}
-
-#endif //BITSERY_BUFFER_READER_H

include/bitsery/buffer_writer.h

@@ -1,253 +0,0 @@
-//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_BUFFER_WRITER_H
-#define BITSERY_BUFFER_WRITER_H
-
-#include "details/buffer_common.h"
-#include <cassert>
-#include <utility>
-
-namespace bitsery {
-
-    struct MeasureSize {
-
-        template<size_t SIZE, typename T>
-        void writeBytes(const T &) {
-            static_assert(std::is_integral<T>(), "");
-            static_assert(sizeof(T) == SIZE, "");
-            _bitsCount += details::BITS_SIZE<T>::value;
-        }
-
-        template<typename T>
-        void writeBits(const T &, size_t bitsCount) {
-            static_assert(std::is_integral<T>() && std::is_unsigned<T>(), "");
-            assert(bitsCount <= details::BITS_SIZE<T>::value);
-            _bitsCount += bitsCount;
-        }
-
-        template<size_t SIZE, typename T>
-        void writeBuffer(const T *, size_t count) {
-            static_assert(std::is_integral<T>(), "");
-            static_assert(sizeof(T) == SIZE, "");
-            _bitsCount += details::BITS_SIZE<T>::value * count;
-        }
-
-        void align() {
-            auto _scratch = (_bitsCount % 8);
-            _bitsCount += (8 - _scratch) % 8;
-        }
-
-        void flush() {
-            align();
-            //flush sessions count
-            if (_sessionsBytesCount > 0) {
-                auto sessionsDataSizeBytesCount = (_sessionsBytesCount < 0x8000u ? 2 : 4);
-                _bitsCount += (_sessionsBytesCount + sessionsDataSizeBytesCount) * 8;
-                _sessionsBytesCount = 0;
-            }
-        }
-
-        void beginSession() {
-
-        }
-
-        void endSession() {
-            auto endPos = getWrittenBytesCount();
-            details::writeSize(*this, endPos);
-            auto sessionEndBytesCount = getWrittenBytesCount() - endPos;
-            //remove written bytes, because we'll write them at the end
-            _bitsCount -= sessionEndBytesCount * 8;
-            _sessionsBytesCount += sessionEndBytesCount;
-        }
-
-        //get size in bytes
-        size_t getWrittenBytesCount() const {
-            return _bitsCount / 8;
-        }
-
-    private:
-        size_t _bitsCount{};
-        size_t _sessionsBytesCount{};
-    };
-
-    template<typename Config>
-    struct BasicBufferWriter {
-        using BufferType = typename Config::BufferType;
-        using ValueType = typename details::BufferContainerTraits<BufferType>::TValue;
-        using ScratchType = typename details::SCRATCH_TYPE<ValueType>::type;
-        using BufferContext = details::WriteBufferContext<BufferType, details::BufferContainerTraits<BufferType>::isResizable>;
-
-        explicit BasicBufferWriter(BufferType &buffer)
-                : _bufferContext{buffer}
-        {
-            static_assert(std::is_unsigned<ValueType>(), "Config::BufferType value type must be unsigned");
-            static_assert(sizeof(ValueType) * 2 == sizeof(ScratchType),
-                          "ScratchType must be 2x bigger than value type");
-            static_assert(sizeof(ValueType) == 1, "currently only supported BufferValueType is 1 byte");
-        }
-
-        BasicBufferWriter(const BasicBufferWriter &) = delete;
-
-        BasicBufferWriter &operator=(const BasicBufferWriter &) = delete;
-
-        BasicBufferWriter(BasicBufferWriter &&) noexcept = default;
-
-        BasicBufferWriter &operator=(BasicBufferWriter &&) noexcept = default;
-
-        ~BasicBufferWriter() noexcept = default;
-
-        template<size_t SIZE, typename T>
-        void writeBytes(const T &v) {
-            static_assert(std::is_integral<T>(), "");
-            static_assert(sizeof(T) == SIZE, "");
-
-            if (!_scratchBits) {
-                directWrite(&v, 1);
-            } else {
-                using UT = typename std::make_unsigned<T>::type;
-                writeBits(reinterpret_cast<const UT &>(v), details::BITS_SIZE<T>::value);
-            }
-        }
-
-        template<size_t SIZE, typename T>
-        void writeBuffer(const T *buf, size_t count) {
-            static_assert(std::is_integral<T>(), "");
-            static_assert(sizeof(T) == SIZE, "");
-            if (!_scratchBits) {
-                directWrite(buf, count);
-            } else {
-                using UT = typename std::make_unsigned<T>::type;
-                //todo improve implementation
-                const auto end = buf + count;
-                for (auto it = buf; it != end; ++it)
-                    writeBits(reinterpret_cast<const UT &>(*it), details::BITS_SIZE<T>::value);
-            }
-        }
-
-        template<typename T>
-        void writeBits(const T &v, size_t bitsCount) {
-            static_assert(std::is_integral<T>() && std::is_unsigned<T>(), "");
-            assert(0 < bitsCount && bitsCount <= details::BITS_SIZE<T>::value);
-            assert(v <= (bitsCount < 64
-                         ? (1ULL << bitsCount) - 1
-                         : (1ULL << (bitsCount-1)) + ((1ULL << (bitsCount-1)) -1)));
-            writeBitsInternal(v, bitsCount);
-        }
-
-        void align() {
-            writeBitsInternal(ValueType{}, (details::BITS_SIZE<ValueType>::value - _scratchBits) % 8);
-        }
-
-        void flush() {
-            align();
-            _session.flushSessions(*this);
-        }
-
-        BufferRange<typename details::BufferContainerTraits<BufferType>::TIterator> getWrittenRange() const {
-            return _bufferContext.getWrittenRange();
-        }
-
-        void beginSession() {
-            align();
-            _session.begin(*this);
-        }
-
-        void endSession() {
-            align();
-            _session.end(*this);
-        }
-
-    private:
-
-        template<typename T>
-        void directWrite(T &&v, size_t count) {
-            _directWriteSwapTag(std::forward<T>(v), count, std::integral_constant<bool,
-                    Config::NetworkEndianness != details::getSystemEndianness()>{});
-        }
-
-        template<typename T>
-        void _directWriteSwapTag(const T *v, size_t count, std::true_type) {
-            std::for_each(v, std::next(v, count), [this](const T &v) {
-                const auto res = details::swap(v);
-                _bufferContext.write(reinterpret_cast<const ValueType *>(&res), sizeof(T));
-            });
-        }
-
-        template<typename T>
-        void _directWriteSwapTag(const T *v, size_t count, std::false_type) {
-            _bufferContext.write(reinterpret_cast<const ValueType *>(v), count * sizeof(T));
-        }
-
-        template<typename T>
-        void writeBitsInternal(const T &v, size_t size) {
-            constexpr size_t valueSize = details::BITS_SIZE<ValueType>::value;
-            auto value = v;
-            auto bitsLeft = size;
-            while (bitsLeft > 0) {
-                auto bits = std::min(bitsLeft, valueSize);
-                _scratch |= static_cast<ScratchType>( value ) << _scratchBits;
-                _scratchBits += bits;
-                if (_scratchBits >= valueSize) {
-                    auto tmp = static_cast<ValueType>(_scratch & _MASK);
-                    directWrite(&tmp, 1);
-                    _scratch >>= valueSize;
-                    _scratchBits -= valueSize;
-
-                    value >>= valueSize;
-                }
-                bitsLeft -= bits;
-            }
-        }
-
-        //overload for ValueType, for better performance
-        void writeBitsInternal(const ValueType &v, size_t size) {
-            if (size > 0) {
-                _scratch |= static_cast<ScratchType>( v ) << _scratchBits;
-                _scratchBits += size;
-                if (_scratchBits >= details::BITS_SIZE<ValueType>::value) {
-                    auto tmp = static_cast<ValueType>(_scratch & _MASK);
-                    directWrite(&tmp, 1);
-                    _scratch >>= details::BITS_SIZE<ValueType>::value;
-                    _scratchBits -= details::BITS_SIZE<ValueType>::value;
-                }
-            }
-        }
-
-
-        const ValueType _MASK = std::numeric_limits<ValueType>::max();
-        BufferContext _bufferContext;
-        ScratchType _scratch{};
-        size_t _scratchBits{};
-        typename std::conditional<Config::BufferSessionsEnabled,
-                details::BufferSessionsWriter<BasicBufferWriter<Config>>,
-                details::DisabledBufferSessionsWriter<Config>>::type
-                _session{};
-    };
-
-    //helper type
-    using BufferWriter = BasicBufferWriter<DefaultConfig>;
-}
-
-#endif //BITSERY_BUFFER_WRITER_H

include/bitsery/common.h

@@ -24,7 +24,7 @@
 #ifndef BITSERY_COMMON_H
 #define BITSERY_COMMON_H
 
-#include <vector>
+#include <tuple>
 
 namespace bitsery {
 
@@ -38,14 +38,15 @@ namespace bitsery {
 
     //default configuration for buffer writing/reading operations
     struct DefaultConfig {
+        //data will be stored in little endian, independant of host.
         static constexpr EndiannessType NetworkEndianness = EndiannessType::LittleEndian;
-        //this functionality allows to support backward/forward compatibility for any type
-        //disabling it, saves 100+bytes per BufferReader/Writer and also reduces executable size
-        static constexpr bool BufferSessionsEnabled = true;
-        //buffer value type must be unsigned, currently only uint8_t supported
-        //fixed size buffer type also supported, for faster serialization performance
-        using BufferType = std::vector<uint8_t>;
-
+        //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

@@ -24,26 +24,59 @@
 #ifndef BITSERY_DESERIALIZER_H
 #define BITSERY_DESERIALIZER_H
 
-#include "common.h"
 #include "details/serialization_common.h"
+#include "adapter_reader.h"
 #include <utility>
 
 namespace bitsery {
 
 
-    template<typename Config>
+    template<typename TAdapterReader, typename TContext = void>
     class BasicDeserializer {
     public:
-        explicit BasicDeserializer(BasicBufferReader<Config> &r, void* context = nullptr) : _reader{r}, _context{context} {};
+        //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, 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, TContext* context = nullptr)
+                : _reader{std::forward<ReaderParam>(r)},
+                  _context{context},
+                  _internalContext{}
+        {
+        }
+
+        //copying disabled
+        BasicDeserializer(const BasicDeserializer&) = delete;
+        BasicDeserializer& operator = (const BasicDeserializer&) = delete;
+
+        //move enabled
+        BasicDeserializer(BasicDeserializer&& ) = default;
+        BasicDeserializer& operator = (BasicDeserializer&& ) = default;
 
         /*
          * get serialization context.
          * this is optional, but might be required for some specific deserialization flows.
          */
-        void* getContext() {
+        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
          */
@@ -56,27 +89,35 @@ namespace bitsery {
         template<typename T, typename Fnc>
         void object(T &&obj, Fnc &&fnc) {
             fnc(std::forward<T>(obj));
-        };
+        }
 
         /*
-         * value overloads
+         * functionality, that enables simpler serialization syntax, by including additional header
+         */
+        template<typename T, typename ... TArgs>
+        void archive(T &&head, TArgs &&... tail) {
+            //serialize object
+            details::ArchiveFunction<BasicDeserializer, T>::invoke(*this, std::forward<T>(head));
+            //expand other elements
+            archive(std::forward<TArgs>(tail)...);
+        }
+
+        /*
+         * value
          */
 
-        template<size_t VSIZE, typename T, typename std::enable_if<std::is_floating_point<T>::value>::type * = nullptr>
+        template<size_t VSIZE, typename T, typename std::enable_if<details::IsFundamentalType<T>::value>::type * = nullptr>
         void value(T &v) {
-            static_assert(std::numeric_limits<T>::is_iec559, "");
-            _reader.template readBytes<VSIZE>(reinterpret_cast<details::SAME_SIZE_UNSIGNED<T> &>(v));
+            using TValue = typename details::IntegralFromFundamental<T>::TValue;
+            _reader.template readBytes<VSIZE>(reinterpret_cast<TValue &>(v));
         }
 
-        template<size_t VSIZE, typename T, typename std::enable_if<std::is_enum<T>::value>::type * = nullptr>
-        void value(T &v) {
-            using UT = typename std::underlying_type<T>::type;
-            _reader.template readBytes<VSIZE>(reinterpret_cast<UT &>(v));
-        }
-
-        template<size_t VSIZE, typename T, typename std::enable_if<std::is_integral<T>::value>::type * = nullptr>
-        void value(T &v) {
-            _reader.template readBytes<VSIZE>(v);
+        /*
+         * enable bit-packing
+         */
+        template <typename Fnc>
+        void enableBitPacking(Fnc&& fnc) {
+            procEnableBitPacking(std::forward<Fnc>(fnc), std::integral_constant<bool, TAdapterReader::BitPackingEnabled>{});
         }
 
         /*
@@ -84,49 +125,38 @@ namespace bitsery {
          */
 
         template<typename T, typename Ext, typename Fnc>
-        void ext(T &obj, Ext &&extension, Fnc &&fnc) {
-            using ExtType = typename std::decay<Ext>::type;
-            static_assert(details::ExtensionTraits<ExtType,T>::SupportLambdaOverload,
+        void ext(T &obj, const Ext &extension, Fnc &&fnc) {
+            static_assert(details::IsExtensionTraitsDefined<Ext, T>::value, "Please define ExtensionTraits");
+            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, Ext &&extension) {
-            using ExtType = typename std::decay<Ext>::type;
-            static_assert(details::ExtensionTraits<ExtType,T>::SupportValueOverload,
-                          "extension doesn't support overload with `value<N>`");
-            using ExtVType = typename details::ExtensionTraits<ExtType, 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, Ext &&extension) {
-            using ExtType = typename std::decay<Ext>::type;
-            static_assert(details::ExtensionTraits<ExtType,T>::SupportObjectOverload,
-                          "extension doesn't support overload with `object`");
-            using ExtVType = typename details::ExtensionTraits<ExtType, 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); });
-        };
-
-        /*
-         * bool
-         */
-
-        void boolBit(bool &v) {
-            uint8_t tmp{};
-            _reader.readBits(tmp, 1);
-            v = tmp == 1;
         }
 
-        void boolByte(bool &v) {
-            unsigned char tmp;
-            _reader.template readBytes<1>(tmp);
-            if (tmp > 1)
-                _reader.setError(BufferReaderError::INVALID_BUFFER_DATA);
-            v = tmp == 1;
+        template<size_t VSIZE, typename T, typename Ext>
+        void ext(T &obj, const Ext &extension) {
+            static_assert(details::IsExtensionTraitsDefined<Ext, T>::value, "Please define ExtensionTraits");
+            static_assert(traits::ExtensionTraits<Ext,T>::SupportValueOverload,
+                          "extension doesn't support overload with `value<N>`");
+            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) {
+            static_assert(details::IsExtensionTraitsDefined<Ext, T>::value, "Please define ExtensionTraits");
+            static_assert(traits::ExtensionTraits<Ext,T>::SupportObjectOverload,
+                          "extension doesn't support overload with `object`");
+            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
+         */
+        void boolValue(bool &v) {
+            procBoolValue(v, std::integral_constant<bool, TAdapterReader::BitPackingEnabled>{});
         }
 
         /*
@@ -135,42 +165,25 @@ namespace bitsery {
 
         template<size_t VSIZE, typename T>
         void text(T &str, size_t maxSize) {
-            static_assert(details::TextTraits<T>::isResizable,
+            static_assert(details::IsTextTraitsDefined<T>::value,
+                          "Please define TextTraits or include from <bitsery/traits/...>");
+            static_assert(traits::ContainerTraits<T>::isResizable,
                           "use text(T&) overload without `maxSize` for static containers");
-            size_t size;
-            details::readSize(_reader, size, maxSize);
-            details::TextTraits<T>::resize(str, size);
-            auto begin = std::begin(str);
-            auto end = std::next(begin, size);
-            procContainer<VSIZE>(begin, end, std::true_type{});
-            //null terminated character at the end
-            *end = {};
+            size_t length;
+            details::readSize(_reader, length, maxSize);
+            traits::ContainerTraits<T>::resize(str, length + (traits::TextTraits<T>::addNUL ? 1u : 0u));
+            procText<VSIZE>(str, length);
         }
 
         template<size_t VSIZE, typename T>
         void text(T &str) {
-            static_assert(!details::TextTraits<T>::isResizable,
+            static_assert(details::IsTextTraitsDefined<T>::value,
+                          "Please define TextTraits or include from <bitsery/traits/...>");
+            static_assert(!traits::ContainerTraits<T>::isResizable,
                           "use text(T&, size_t) overload with `maxSize` for dynamic containers");
-            size_t size;
-            auto begin = std::begin(str);
-            auto containerEnd = std::end(str);
-            assert(begin != containerEnd);
-            details::readSize(_reader, size, static_cast<size_t>(std::distance(begin, containerEnd) - 1));
-            //end of string, not en
-            auto end = std::next(begin, size);
-            procContainer<VSIZE>(std::begin(str), std::end(str), std::true_type{});
-            //null terminated character at the end
-            *end = {};
-        }
-
-        template<size_t VSIZE, typename T, size_t N>
-        void text(T (&str)[N]) {
-            size_t size;
-            details::readSize(_reader, size, N - 1);
-            auto first = std::begin(str);
-            procContainer<VSIZE>(first, std::next(first, size), std::true_type{});
-            //null-terminated string
-            str[size] = {};
+            size_t length;
+            details::readSize(_reader, length, traits::ContainerTraits<T>::size(str));
+            procText<VSIZE>(str, length);
         }
 
         /*
@@ -181,75 +194,69 @@ namespace bitsery {
 
         template<typename T, typename Fnc>
         void container(T &obj, size_t maxSize, Fnc &&fnc) {
-
-            static_assert(details::ContainerTraits<T>::isResizable,
+            static_assert(details::IsContainerTraitsDefined<T>::value,
+                          "Please define ContainerTraits or include from <bitsery/traits/...>");
+            static_assert(traits::ContainerTraits<T>::isResizable,
                           "use container(T&) overload without `maxSize` for static containers");
             size_t size{};
             details::readSize(_reader, size, maxSize);
-            details::ContainerTraits<T>::resize(obj, size);
+            traits::ContainerTraits<T>::resize(obj, size);
             procContainer(std::begin(obj), std::end(obj), std::forward<Fnc>(fnc));
         }
 
         template<size_t VSIZE, typename T>
         void container(T &obj, size_t maxSize) {
-            static_assert(details::ContainerTraits<T>::isResizable,
+            static_assert(details::IsContainerTraitsDefined<T>::value,
+                          "Please define ContainerTraits or include from <bitsery/traits/...>");
+            static_assert(traits::ContainerTraits<T>::isResizable,
                           "use container(T&) overload without `maxSize` for static containers");
             size_t size{};
             details::readSize(_reader, size, maxSize);
-            details::ContainerTraits<T>::resize(obj, size);
-            procContainer<VSIZE>(std::begin(obj), std::end(obj), std::false_type{});
+            traits::ContainerTraits<T>::resize(obj, size);
+            procContainer<VSIZE>(std::begin(obj), std::end(obj), std::integral_constant<bool, traits::ContainerTraits<T>::isContiguous>{});
         }
 
         template<typename T>
         void container(T &obj, size_t maxSize) {
-            static_assert(details::ContainerTraits<T>::isResizable,
+            static_assert(details::IsContainerTraitsDefined<T>::value,
+                          "Please define ContainerTraits or include from <bitsery/traits/...>");
+            static_assert(traits::ContainerTraits<T>::isResizable,
                           "use container(T&) overload without `maxSize` for static containers");
             size_t size{};
             details::readSize(_reader, size, maxSize);
-            details::ContainerTraits<T>::resize(obj, size);
+            traits::ContainerTraits<T>::resize(obj, size);
             procContainer(std::begin(obj), std::end(obj));
         }
         //fixed size containers
 
         template<typename T, typename Fnc, typename std::enable_if<!std::is_integral<Fnc>::value>::type * = nullptr>
         void container(T &obj, Fnc &&fnc) {
-            static_assert(!details::ContainerTraits<T>::isResizable,
+            static_assert(details::IsContainerTraitsDefined<T>::value,
+                          "Please define ContainerTraits or include from <bitsery/traits/...>");
+            static_assert(!traits::ContainerTraits<T>::isResizable,
                           "use container(T&, size_t, Fnc) overload with `maxSize` for dynamic containers");
             procContainer(std::begin(obj), std::end(obj), std::forward<Fnc>(fnc));
         }
 
         template<size_t VSIZE, typename T>
         void container(T &obj) {
-            static_assert(!details::ContainerTraits<T>::isResizable,
+            static_assert(details::IsContainerTraitsDefined<T>::value,
+                          "Please define ContainerTraits or include from <bitsery/traits/...>");
+            static_assert(!traits::ContainerTraits<T>::isResizable,
                           "use container(T&, size_t) overload with `maxSize` for dynamic containers");
             static_assert(VSIZE > 0, "");
-            procContainer<VSIZE>(std::begin(obj), std::end(obj), std::false_type{});
+            procContainer<VSIZE>(std::begin(obj), std::end(obj), std::integral_constant<bool, traits::ContainerTraits<T>::isContiguous>{});
         }
 
         template<typename T>
         void container(T &obj) {
-            static_assert(!details::ContainerTraits<T>::isResizable,
+            static_assert(details::IsContainerTraitsDefined<T>::value,
+                          "Please define ContainerTraits or include from <bitsery/traits/...>");
+            static_assert(!traits::ContainerTraits<T>::isResizable,
                           "use container(T&, size_t) overload with `maxSize` for dynamic containers");
             procContainer(std::begin(obj), std::end(obj));
         }
 
-        //c-style array overloads
-
-        template<typename T, size_t N, typename Fnc>
-        void container(T (&arr)[N], Fnc &&fnc) {
-            procContainer(std::begin(arr), std::end(arr), std::forward<Fnc>(fnc));
-        }
-
-        template<size_t VSIZE, typename T, size_t N>
-        void container(T (&arr)[N]) {
-            procContainer<VSIZE>(std::begin(arr), std::end(arr), std::true_type{});
-        }
-
-        template<typename T, size_t N>
-        void container(T (&arr)[N]) {
-            procContainer(std::begin(arr), std::end(arr));
-        }
-
         void align() {
             _reader.align();
         }
@@ -269,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); }
@@ -289,14 +296,14 @@ namespace bitsery {
         template<typename T>
         void text4b(T &str, size_t maxSize) { text<4>(str, maxSize); }
 
-        template<typename T, size_t N>
-        void text1b(T (&str)[N]) { text<1>(str); }
+        template<typename T>
+        void text1b(T &str) { text<1>(str); }
 
-        template<typename T, size_t N>
-        void text2b(T (&str)[N]) { text<2>(str); }
+        template<typename T>
+        void text2b(T &str) { text<2>(str); }
 
-        template<typename T, size_t N>
-        void text4b(T (&str)[N]) { text<4>(str); }
+        template<typename T>
+        void text4b(T &str) { text<4>(str); }
 
         template<typename T>
         void container1b(T &&obj, size_t maxSize) { container<1>(std::forward<T>(obj), maxSize); }
@@ -322,22 +329,13 @@ namespace bitsery {
         template<typename T>
         void container8b(T &&obj) { container<8>(std::forward<T>(obj)); }
 
-
-        template<typename T, size_t N>
-        void container1b(T (&arr)[N]) { container<1>(arr); }
-
-        template<typename T, size_t N>
-        void container2b(T (&arr)[N]) { container<2>(arr); }
-
-        template<typename T, size_t N>
-        void container4b(T (&arr)[N]) { container<4>(arr); }
-
-        template<typename T, size_t N>
-        void container8b(T (&arr)[N]) { container<8>(arr); }
-
     private:
-        BasicBufferReader<Config> &_reader;
-        void* _context;
+        friend AdapterAccess;
+
+        TAdapterReader _reader;
+        TContext* _context;
+        typename TReader::TConfig::InternalContext _internalContext;
+
 
         //process value types
         //false_type means that we must process all elements individually
@@ -345,29 +343,71 @@ 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
         template<size_t VSIZE, typename It>
         void procContainer(It first, It last, std::true_type) {
+            using TValue = typename std::decay<decltype(*first)>::type;
+            using TIntegral = typename details::IntegralFromFundamental<TValue>::TValue;
             if (first != last)
-                _reader.template readBuffer<VSIZE>(&(*first), std::distance(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) {
+            auto begin = std::begin(str);
+            //end of string, not end of container
+            auto end = std::next(begin, length);
+            procContainer<VSIZE>(begin, end, std::integral_constant<bool, traits::ContainerTraits<T>::isContiguous>{});
+            //null terminated character at the end
+            if (traits::TextTraits<T>::addNUL)
+                *end = {};
+        }
+
+        //proc bool writing bit or byte, depending on if BitPackingEnabled or not
+        void procBoolValue(bool &v, std::true_type) {
+            uint8_t tmp{};
+            _reader.readBits(tmp, 1);
+            v = tmp == 1;
+        }
+
+        void procBoolValue(bool &v, std::false_type) {
+            unsigned char tmp;
+            _reader.template readBytes<1>(tmp);
+            if (tmp > 1)
+                _reader.setError(ReaderError::InvalidData);
+            v = tmp == 1;
+        }
+
+
+        //enable bit-packing or do nothing if it is already enabled
+        template <typename Fnc>
+        void procEnableBitPacking(const Fnc& fnc, std::true_type) {
+            fnc(*this);
+        }
+
+        template <typename Fnc>
+        void procEnableBitPacking(const Fnc& fnc, std::false_type) {
+            //create serializer using bitpacking wrapper
+            BPEnabledType tmp(_reader, _context);
+            fnc(tmp);
+        }
 
         //these are dummy functions for extensions that have TValue = void
         void object(details::DummyType&) {
@@ -379,10 +419,24 @@ namespace bitsery {
 
         }
 
+        //dummy function, that stops archive variadic arguments expansion
+        void archive() {
+        }
+
     };
 
     //helper type
-    using Deserializer = BasicDeserializer<DefaultConfig>;
+    template <typename Adapter>
+    using Deserializer = BasicDeserializer<AdapterReader<Adapter, DefaultConfig>>;
+
+    //helper function that set ups all the basic steps and after deserialziation returns status
+    template <typename Adapter, typename T>
+    std::pair<ReaderError, bool> quickDeserialization(Adapter adapter, T& value) {
+        Deserializer<Adapter> des{std::move(adapter)};
+        des.object(value);
+        auto& r = AdapterAccess::getReader(des);
+        return {r.error(), r.isCompletedSuccessfully()};
+    }
 
 }
 

include/bitsery/details/adapter_common.h

@@ -0,0 +1,128 @@
+//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_DETAILS_ADAPTER_COMMON_H
+#define BITSERY_DETAILS_ADAPTER_COMMON_H
+
+#include <algorithm>
+#include <utility>
+#include <cassert>
+#include <vector>
+#include <stack>
+#include <cstring>
+#include <climits>
+#include "adapter_utils.h"
+#include "not_defined_type.h"
+
+#include "../common.h"
+
+namespace bitsery {
+
+    namespace details {
+
+        template<typename T>
+        struct BitsSize:public std::integral_constant<size_t, sizeof(T) * 8> {
+            static_assert(CHAR_BIT == 8, "only support systems with byte size of 8 bits");
+        };
+
+        //add swap functions to class, to avoid compilation warning about unused functions
+        struct SwapImpl {
+            static uint64_t exec(uint64_t value) {
+#ifdef __GNUC__
+                return __builtin_bswap64(value);
+#else
+                value = ( value & 0x00000000FFFFFFFF ) << 32 | ( value & 0xFFFFFFFF00000000 ) >> 32;
+            value = ( value & 0x0000FFFF0000FFFF ) << 16 | ( value & 0xFFFF0000FFFF0000 ) >> 16;
+            value = ( value & 0x00FF00FF00FF00FF ) << 8  | ( value & 0xFF00FF00FF00FF00 ) >> 8;
+            return value;
+#endif
+            }
+
+            static uint32_t exec(uint32_t value) {
+#ifdef __GNUC__
+                return __builtin_bswap32(value);
+#else
+                return ( value & 0x000000ff ) << 24 | ( value & 0x0000ff00 ) << 8 | ( value & 0x00ff0000 ) >> 8 | ( value & 0xff000000 ) >> 24;
+#endif
+            }
+
+            static uint16_t exec(uint16_t value) {
+                return (value & 0x00ff) << 8 | (value & 0xff00) >> 8;
+            }
+
+            static uint8_t exec(uint8_t value) {
+                return value;
+            }
+        };
+
+        template<typename TValue>
+        TValue swap(TValue value) {
+            constexpr size_t TSize = sizeof(TValue);
+            using UT = typename std::conditional<TSize == 1, uint8_t,
+                    typename std::conditional<TSize == 2, uint16_t,
+                            typename std::conditional<TSize == 4, uint32_t, uint64_t>::type>::type>::type;
+            return SwapImpl::exec(static_cast<UT>(value));
+        }
+
+        //add test data in separate struct, because some compilers only support constexpr functions with return-only body
+        struct EndiannessTestData {
+            static constexpr uint32_t _sample4Bytes = 0x01020304;
+            static constexpr uint8_t _sample1stByte = (const uint8_t &) _sample4Bytes;
+        };
+
+        constexpr EndiannessType getSystemEndianness() {
+            static_assert(EndiannessTestData::_sample1stByte == 0x04 || EndiannessTestData::_sample1stByte == 0x01,
+                          "system must be either little or big endian");
+            return EndiannessTestData::_sample1stByte == 0x04 ? EndiannessType::LittleEndian
+                                                              : EndiannessType::BigEndian;
+        }
+
+
+        template<typename T>
+        struct ScratchType {
+            using type = NotDefinedType;
+        };
+
+        template<>
+        struct ScratchType<uint8_t> {
+            using type = uint16_t;
+        };
+
+        /*
+         * class used by session reader, to access underlying iterators of buffer
+         */
+        struct SessionAccess {
+            template <typename TReader, typename Iterator>
+            static Iterator& posIteratorRef(TReader& r) {
+                return r.posIt;
+            }
+            template <typename TReader, typename Iterator>
+            static Iterator& endIteratorRef(TReader& r) {
+                return r.endIt;
+            }
+        };
+
+    }
+}
+
+
+#endif //BITSERY_DETAILS_ADAPTER_COMMON_H

include/bitsery/details/adapter_utils.h

@@ -20,18 +20,21 @@
 //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>
 #include <cstddef>
 
 namespace bitsery {
 
-    enum class BufferReaderError {
-        NO_ERROR,
-        BUFFER_OVERFLOW,
-        INVALID_BUFFER_DATA
+    enum class ReaderError {
+        NoError,
+        ReadingError, // this might be used with stream adapter
+        DataOverflow,
+        InvalidData,
+        InvalidPointer
     };
 
     namespace details {
@@ -56,7 +59,7 @@ namespace bitsery {
                 }
             }
             if (size > maxSize) {
-                r.setError(BufferReaderError::INVALID_BUFFER_DATA);
+                r.setError(ReaderError::InvalidData);
                 size = {};
             }
         }
@@ -81,4 +84,4 @@ namespace bitsery {
     }
 }
 
-#endif //BITSERY_DETAILS_BOTH_COMMON_H
+#endif //BITSERY_DETAILS_ADAPTER_UTILS_H

include/bitsery/details/buffer_common.h

@@ -1,424 +0,0 @@
-//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_DETAILS_BUFFER_COMMON_H
-#define BITSERY_DETAILS_BUFFER_COMMON_H
-
-#include <algorithm>
-#include <utility>
-#include <cassert>
-#include <vector>
-#include <stack>
-#include <cstring>
-#include "both_common.h"
-#include "traits.h"
-
-#include "../common.h"
-
-namespace bitsery {
-
-    template<typename I>
-    struct BufferRange : std::pair<I, I> {
-        using std::pair<I, I>::pair;
-        I begin() const { return this->first; }
-        I end() const { return this->second; }
-    };
-
-    namespace details {
-
-        template<typename T>
-        struct BITS_SIZE:public std::integral_constant<size_t, sizeof(T) << 3> {
-
-        };
-
-        //add swap functions to class, to avoid compilation warning about unused functions
-        struct SwapImpl {
-            static uint64_t exec(uint64_t value) {
-#ifdef __GNUC__
-                return __builtin_bswap64(value);
-#else
-                value = ( value & 0x00000000FFFFFFFF ) << 32 | ( value & 0xFFFFFFFF00000000 ) >> 32;
-            value = ( value & 0x0000FFFF0000FFFF ) << 16 | ( value & 0xFFFF0000FFFF0000 ) >> 16;
-            value = ( value & 0x00FF00FF00FF00FF ) << 8  | ( value & 0xFF00FF00FF00FF00 ) >> 8;
-            return value;
-#endif
-            }
-
-            static uint32_t exec(uint32_t value) {
-#ifdef __GNUC__
-                return __builtin_bswap32(value);
-#else
-                return ( value & 0x000000ff ) << 24 | ( value & 0x0000ff00 ) << 8 | ( value & 0x00ff0000 ) >> 8 | ( value & 0xff000000 ) >> 24;
-#endif
-            }
-
-            static uint16_t exec(uint16_t value) {
-                return (value & 0x00ff) << 8 | (value & 0xff00) >> 8;
-            }
-
-            static uint8_t exec(uint8_t value) {
-                return value;
-            }
-        };
-
-        template<typename TValue>
-        TValue swap(TValue value) {
-            constexpr size_t TSize = sizeof(TValue);
-            using UT = typename std::conditional<TSize == 1, uint8_t,
-                    typename std::conditional<TSize == 2, uint16_t,
-                            typename std::conditional<TSize == 4, uint32_t, uint64_t>::type>::type>::type;
-            return SwapImpl::exec(static_cast<UT>(value));
-        }
-
-        //add test data in separate struct, because some compilers only support constexpr functions with return-only body
-        struct EndiannessTestData {
-            static constexpr uint32_t _sample4Bytes = 0x01020304;
-            static constexpr uint8_t _sample1stByte = (const uint8_t &) _sample4Bytes;
-        };
-
-        constexpr EndiannessType getSystemEndianness() {
-            static_assert(EndiannessTestData::_sample1stByte == 0x04 || EndiannessTestData::_sample1stByte == 0x01,
-                          "system must be either little or big endian");
-            return EndiannessTestData::_sample1stByte == 0x04 ? EndiannessType::LittleEndian
-                                                              : EndiannessType::BigEndian;
-        }
-
-
-        template<typename T>
-        struct SCRATCH_TYPE {
-        };
-
-        template<>
-        struct SCRATCH_TYPE<uint8_t> {
-            using type = uint16_t;
-        };
-
-        template<>
-        struct SCRATCH_TYPE<uint16_t> {
-            using type = uint32_t;
-        };
-
-        template<>
-        struct SCRATCH_TYPE<uint32_t> {
-            using type = uint64_t;
-        };
-
-        template <typename Config>
-        struct DisabledBufferSessionsWriter {
-            template <typename TWriter>
-            void begin(TWriter& ) {
-                static_assert(Config::BufferSessionsEnabled, "Buffer sessions is disabled, enable it via configuration");
-            }
-            template <typename TWriter>
-            void end(TWriter& ) {
-                static_assert(Config::BufferSessionsEnabled, "Buffer sessions is disabled, enable it via configuration");
-            }
-            template <typename TWriter>
-            void flushSessions(TWriter& ) {
-            }
-        };
-
-
-        template <typename Config>
-        struct DisabledBufferSessionsReader {
-            template <typename TReader, typename TIterator>
-            DisabledBufferSessionsReader(TReader& , TIterator& , TIterator& ) {
-            }
-
-            void begin() {
-                static_assert(Config::BufferSessionsEnabled, "Buffer sessions is disabled, enable it via configuration");
-            }
-
-            void end() {
-                static_assert(Config::BufferSessionsEnabled, "Buffer sessions is disabled, enable it via configuration");
-            }
-
-            bool hasActiveSessions() const {
-                return false;
-            }
-        };
-
-        template <typename TWriter>
-        class BufferSessionsWriter {
-        public:
-
-            void begin(TWriter& ) {
-                //write position
-                _sessionIndex.push(_sessions.size());
-                _sessions.emplace_back(0);
-            }
-
-            void end(TWriter& writer) {
-                assert(!_sessionIndex.empty());
-                //change position to session end
-                auto sessionIt = std::next(std::begin(_sessions), _sessionIndex.top());
-                _sessionIndex.pop();
-                auto range = writer.getWrittenRange();
-                *sessionIt = static_cast<size_t>(std::distance(range.begin(), range.end()));
-            }
-
-            void flushSessions(TWriter& writer) {
-                if (_sessions.size()) {
-                    assert(_sessionIndex.empty());
-                    auto range = writer.getWrittenRange();
-                    auto dataSize = static_cast<size_t>(std::distance(range.begin(), range.end()));
-                    for(auto& s:_sessions) {
-                        details::writeSize(writer, s);
-                    }
-                    _sessions.clear();
-
-                    range = writer.getWrittenRange();
-                    auto totalSize = static_cast<size_t>(std::distance(range.begin(), range.end()));
-                    //write offset where actual data ends
-                    auto sessionsOffset = totalSize - dataSize + 2;//2 bytes for offset data
-                    if (sessionsOffset < 0x8000u) {
-                        writer.template writeBytes<2>(static_cast<uint16_t>(sessionsOffset));
-                    } else {
-                        //size doesnt fit in 2 bytes, write 4 bytes instead
-                        sessionsOffset+=2;
-                        uint16_t low = static_cast<uint16_t>(sessionsOffset);
-                        //mark most significant bit, that size is 4 bytes
-                        uint16_t high = static_cast<uint16_t>(0x8000u | (sessionsOffset >> 16));
-                        writer.template writeBytes<2>(low);
-                        writer.template writeBytes<2>(high);
-                    }
-                }
-            }
-        private:
-            std::vector<size_t> _sessions{};
-            std::stack<size_t> _sessionIndex;
-        };
-
-        template <typename TReader, typename TIterator>
-        struct BufferSessionsReader {
-            BufferSessionsReader(TReader& r, TIterator& begin, TIterator& end)
-                    :_reader{r},
-                     _begin{begin},
-                     _pos{begin},
-                     _end{end}
-            {
-            }
-            void begin() {
-                if (_sessions.empty())
-                    initializeSessions();
-                //save end position for current session
-                _sessionsStack.push(_end);
-                if (_nextSessionIt != std::end(_sessions)) {
-                    if (std::distance(_pos, _end) > 0) {
-                        //set end position for new session
-                        auto newEnd = std::next(_begin, *_nextSessionIt);
-                        if (std::distance(newEnd, _end) < 0)
-                        {
-                            //new session cannot end further than current end
-                            _reader.setError(BufferReaderError::INVALID_BUFFER_DATA);
-                            return;
-                        }
-                        _end = newEnd;
-                        ++_nextSessionIt;
-                    }
-                    //if we reached the end, means that there is no more data to read, hence there is no more sessions to advance to
-                } else {
-                    //there is no data to read anymore
-                    //pos == end or buffer overflow while session is active
-                    if (!(_pos == _end || _reader.getError() == BufferReaderError::NO_ERROR)) {
-                        _reader.setError(BufferReaderError::INVALID_BUFFER_DATA);
-                    }
-                }
-            }
-
-            void end() {
-                if (!_sessionsStack.empty()) {
-                    //move position to the end of session
-                    //can additionaly be checked for session data versioning
-                    //_pos == _end : same versions
-                    //distance(_pos,_end) > 0: reading newer version
-                    //getError() == BUFFER_OVERFLOW: reading older version
-                    auto dist = std::distance(_pos, _end);
-                    if (dist > 0) {
-                        //newer version might have some inner sessions, try to find the one after current ends
-                        auto currPos = static_cast<size_t>(std::distance(_begin, _end));
-                        for (; _nextSessionIt != std::end(_sessions); ++_nextSessionIt) {
-                            if (*_nextSessionIt > currPos)
-                                break;
-                        }
-                    }
-                    _pos = _end;
-                    //restore end position
-                    _end = _sessionsStack.top();
-                    _sessionsStack.pop();
-                }
-            }
-
-            bool hasActiveSessions() const {
-                return _sessionsStack.size() > 0;
-            }
-
-        private:
-            TReader& _reader;
-            TIterator _begin;
-            TIterator& _pos;
-            TIterator& _end;
-
-            std::vector<size_t> _sessions{};
-            std::vector<size_t>::iterator _nextSessionIt{};
-            std::stack<TIterator> _sessionsStack{};
-
-            void initializeSessions() {
-                //save current position
-                auto currPos = _pos;
-                //read size
-                if (std::distance(_pos, _end) < 2) {
-                    _reader.setError(BufferReaderError::INVALID_BUFFER_DATA);
-                    return;
-                }
-                auto endSessionsSizesIt = std::next(_end, -2);
-                _pos = endSessionsSizesIt;
-                size_t sessionsOffset{};
-                uint16_t high;
-                _reader.template readBytes<2>(high);
-
-
-                if (high >= 0x8000u) {
-                    endSessionsSizesIt = std::next(endSessionsSizesIt, -2);
-                    _pos = endSessionsSizesIt;
-                    if (std::distance(_begin, _pos) < 0) {
-                        _reader.setError(BufferReaderError::INVALID_BUFFER_DATA);
-                        return;
-                    }
-                    uint16_t low;
-                    _reader.template readBytes<2>(low);
-                    //mask out last bit
-                    high &= 0x7FFFu;
-                    sessionsOffset = static_cast<size_t>((high << 16) | low);
-
-                } else
-                    sessionsOffset = high;
-
-                auto bufferSize = std::distance(_begin, _end);
-                if (static_cast<size_t>(bufferSize) < sessionsOffset) {
-                    _reader.setError(BufferReaderError::INVALID_BUFFER_DATA);
-                    return;
-                }
-                //we can initialy resizes to this value, and we'll shrink it after reading
-                //read session sizes
-                auto sessionsIt = std::back_inserter(_sessions);
-                _pos = std::next(_end, -sessionsOffset);
-                while (std::distance(_pos, endSessionsSizesIt) > 0) {
-                    size_t size;
-                    details::readSize(_reader, size, bufferSize);
-                    *sessionsIt++ = size;
-                }
-                _sessions.shrink_to_fit();
-                //set iterators to data
-                _pos = currPos;
-                _end = std::next(_end, -sessionsOffset);
-                _nextSessionIt = std::begin(_sessions);//set before first session;
-            }
-        };
-
-        //this class writes bytes and bits to underlying buffer, it has specializations for resizable and non-resizable buffers
-        template<typename Buffer, bool isResizable>
-        class WriteBufferContext {
-
-        };
-
-        template<typename Buffer>
-        class WriteBufferContext<Buffer, false> {
-        public:
-            using TValue = typename BufferContainerTraits<Buffer>::TValue;
-            using TIterator = typename BufferContainerTraits<Buffer>::TIterator;
-            using TDifference = typename BufferContainerTraits<Buffer>::TDifference;
-
-
-            explicit WriteBufferContext(Buffer &buffer)
-                    : _buffer{buffer},
-                      _outIt{std::addressof(*std::begin(buffer))},
-                      _end{std::addressof(*std::end(buffer))}
-            {
-            }
-
-            void write(const TValue *data, size_t size) {
-                assert(std::distance(_outIt, _end) >= static_cast<TDifference>(size));
-                memcpy(_outIt, data, size);
-                _outIt += size;
-            }
-
-            BufferRange<TIterator> getWrittenRange() const {
-                auto begin = std::begin(_buffer);
-                return BufferRange<TIterator>{begin, std::next(begin, _outIt - std::addressof(*begin))};
-            }
-
-        private:
-            Buffer &_buffer;
-            TValue* _outIt;
-            TValue* _end;
-        };
-
-        template<typename Buffer>
-        class WriteBufferContext<Buffer, true> {
-        public:
-            using TValue = typename BufferContainerTraits<Buffer>::TValue;
-            using TIterator = typename BufferContainerTraits<Buffer>::TIterator;
-            using TDifference = typename BufferContainerTraits<Buffer>::TDifference;
-
-            explicit WriteBufferContext(Buffer &buffer)
-                    : _buffer{buffer}
-            {
-                getIterators(0);
-            }
-
-            void write(const TValue *data, size_t size) {
-                if ((_end - _outIt) >= static_cast< TDifference >(size)) {
-                    std::memcpy(_outIt, data, size);
-                    _outIt += size;
-                } else {
-                    //get current position before invalidating iterators
-                    auto pos = std::distance(std::addressof(*std::begin(_buffer)), _outIt);
-                    //increase container size
-                    BufferContainerTraits<Buffer>::increaseBufferSize(_buffer);
-                    //restore iterators
-                    getIterators(pos);
-                    write(data, size);
-                }
-            }
-
-            BufferRange<TIterator> getWrittenRange() const {
-                auto begin = std::begin(_buffer);
-                return BufferRange<TIterator>{begin, std::next(begin, _outIt - std::addressof(*begin))};
-            }
-
-        private:
-
-            void getIterators(TDifference  writePos) {
-                _end = std::addressof(*std::end(_buffer));
-                _outIt = std::addressof(*std::next(std::begin(_buffer), writePos));
-            }
-            Buffer &_buffer;
-            TValue* _outIt;
-            TValue* _end;
-        };
-
-    }
-}
-
-
-#endif //BITSERY_DETAILS_BUFFER_COMMON_H

include/bitsery/details/flexible_common.h

@@ -0,0 +1,149 @@
+//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_DETAILS_FLEXIBLE_COMMON_H
+#define BITSERY_DETAILS_FLEXIBLE_COMMON_H
+
+#include "../traits/core/traits.h"
+#include <limits>
+
+namespace bitsery {
+    namespace flexible {
+
+        //these function overloads is required to apply maxSize, and optimize for fundamental types
+        //for contigous arrays of fundamenal types, memcpy will be applied
+
+        template<typename S, typename T, typename std::enable_if<
+                details::IsFundamentalType<typename traits::ContainerTraits<T>::TValue>::value
+                && traits::ContainerTraits<T>::isResizable
+        >::type * = nullptr>
+        void processContainer(S &s, T &c, size_t maxSize = std::numeric_limits<size_t>::max()) {
+            using TValue = typename traits::ContainerTraits<T>::TValue;
+            s.template container<sizeof(TValue)>(c, maxSize);
+        }
+
+        template<typename S, typename T, typename std::enable_if<
+                !details::IsFundamentalType<typename traits::ContainerTraits<T>::TValue>::value
+                && traits::ContainerTraits<T>::isResizable
+        >::type * = nullptr>
+        void processContainer(S &s, T &c, size_t maxSize = std::numeric_limits<size_t>::max()) {
+            s.container(c, maxSize);
+        }
+
+        template<typename S, typename T, typename std::enable_if<
+                details::IsFundamentalType<typename traits::ContainerTraits<T>::TValue>::value
+                && !traits::ContainerTraits<T>::isResizable
+        >::type * = nullptr>
+        void processContainer(S &s, T &c) {
+            using TValue = typename traits::ContainerTraits<T>::TValue;
+            s.template container<sizeof(TValue)>(c);
+        }
+
+        template<typename S, typename T, typename std::enable_if<
+                !details::IsFundamentalType<typename traits::ContainerTraits<T>::TValue>::value
+                && !traits::ContainerTraits<T>::isResizable
+        >::type * = nullptr>
+        void processContainer(S &s, T &c) {
+            s.container(c);
+        }
+
+        //overloads for text processing to apply maxSize
+
+        template<typename S, typename T, typename std::enable_if<
+                traits::ContainerTraits<T>::isResizable>::type * = nullptr>
+        void processText(S &s, T &c, size_t maxSize = std::numeric_limits<size_t>::max()) {
+            using TValue = typename traits::ContainerTraits<T>::TValue;
+            s.template text<sizeof(TValue)>(c, maxSize);
+        }
+
+        template<typename S, typename T, typename std::enable_if<
+                !traits::ContainerTraits<T>::isResizable>::type * = nullptr>
+        void processText(S &s, T &c) {
+            using TValue = typename traits::ContainerTraits<T>::TValue;
+            s.template text<sizeof(TValue)>(c);
+        }
+
+
+        //all wrapper functions, that modify behaviour, should inherit from this
+        struct ArchiveWrapperFnc {
+
+        };
+
+        //this type is used to differentiate between container and text behaviour
+        template<typename T, size_t N, bool isText>
+        struct CArray : public ArchiveWrapperFnc {
+            CArray(T (&data_)[N]) : data{data_} {};
+            T (&data)[N];
+        };
+
+        template<typename S, typename T, size_t N>
+        void serialize(S &s, CArray<T, N, true> &str) {
+            processText(s, str.data);
+        }
+
+        template<typename S, typename T, size_t N>
+        void serialize(S &s, CArray<T, N, false> &obj) {
+            processContainer(s, obj.data);
+        }
+
+        //used to set max container size
+        template<typename T>
+        struct MaxSize : public ArchiveWrapperFnc {
+            MaxSize(T &data_, size_t maxSize_) : data{data_}, maxSize{maxSize_} {};
+            T &data;
+            size_t maxSize;
+        };
+
+        //if container, then call procesContainer, this memcpy for fundamental types contiguous container
+        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>{});
+        }
+
+    }
+}
+
+#endif //BITSERY_DETAILS_FLEXIBLE_COMMON_H

include/bitsery/details/not_defined_type.h

@@ -0,0 +1,79 @@
+//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_DETAILS_NOT_DEFINED_TYPE_H
+#define BITSERY_DETAILS_NOT_DEFINED_TYPE_H
+
+#include <iterator>
+
+namespace bitsery {
+    namespace details {
+        //this type is used to show clearer error messages
+        struct NotDefinedType {
+            //just swallow anything that is passed during creating
+            template <typename ... 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
+            friend bool operator == (const NotDefinedType&, const NotDefinedType&) {
+                return true;
+            }
+            friend bool operator != (const NotDefinedType&, const NotDefinedType&) {
+                return false;
+            }
+            NotDefinedType& operator += (int) {
+                return *this;
+            }
+            NotDefinedType& operator -= (int) {
+                return *this;
+            }
+
+            friend int operator - (const NotDefinedType&, const NotDefinedType&) {
+                return 0;
+            }
+
+            int& operator*() {
+                return data;
+            }
+            int data{};
+        };
+
+        template <typename T>
+        struct IsDefined:public std::integral_constant<bool, !std::is_same<NotDefinedType, T>::value> {
+        };
+    }
+}
+
+namespace std {
+    //define iterator traits to work with standart algorithms
+    template <>
+    struct iterator_traits<bitsery::details::NotDefinedType> {
+        using difference_type = int;
+        using value_type = int;
+        using pointer = int*;
+        using reference = int&;
+        using iterator_category = std::random_access_iterator_tag;
+    };
+}
+#endif //BITSERY_DETAILS_NOT_DEFINED_TYPE_H

include/bitsery/details/serialization_common.h

@@ -24,99 +24,389 @@
 #define BITSERY_DETAILS_SERIALIZATION_COMMON_H
 
 #include <type_traits>
-#include "both_common.h"
+#include <utility>
+#include <tuple>
+#include "adapter_utils.h"
+#include "../traits/core/traits.h"
+
 
 namespace bitsery {
 
+    //this allows to call private serialize method, and construct instance (if no default constructor is provided) for your type
+    //just make friend it in your class
+    struct Access {
+        template<typename S, typename T>
+        static auto serialize(S &s, T &obj) -> decltype(obj.serialize(s)) {
+            obj.serialize(s);
+        }
+
+        template <typename T>
+        static T create() {
+            //if you get an error here, please create default constructor
+            return T{};
+        }
+        template <typename T>
+        static T* createInHeap() {
+            return new T{};
+        }
+
+    };
+
+    //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 have 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) {
+            return s._writer;
+        }
+
+        template<typename Deserializer>
+        static typename Deserializer::TReader &getReader(Deserializer &s) {
+            return s._reader;
+        }
+    };
+
     namespace details {
 
-        template<typename T, typename Enable = void>
-        struct SAME_SIZE_UNSIGNED_TYPE {
-            using type = typename std::make_unsigned<T>::type;
+        //helper types for error handling
+        template<typename T>
+        struct IsContainerTraitsDefined : public IsDefined<typename traits::ContainerTraits<T>::TValue> {
         };
 
         template<typename T>
-        struct SAME_SIZE_UNSIGNED_TYPE<T, typename std::enable_if<std::is_enum<T>::value>::type> {
-            using type = typename std::make_unsigned<typename std::underlying_type<T>::type>::type;
+        struct IsTextTraitsDefined : public IsDefined<typename traits::TextTraits<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 {
+            typedef void type;
+        };
+        template<typename... Ts>
+        using void_t = typename make_void<Ts...>::type;
+
+        template<typename, typename, typename = void>
+        struct HasSerializeFunction : std::false_type {
+        };
+
+        template<typename S, typename T>
+        struct HasSerializeFunction<S, T,
+                void_t<decltype(serialize(std::declval<S &>(), std::declval<T &>()))>
+        > : std::true_type {
+        };
+
+
+        template<typename, typename, typename = void>
+        struct HasSerializeMethod : std::false_type {
+        };
+
+        template<typename S, typename T>
+        struct HasSerializeMethod<S, T,
+                void_t<decltype(Access::serialize(std::declval<S &>(), std::declval<T &>()))>
+        > : std::true_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,
+                void_t<decltype(archiveProcess(std::declval<S &>(), std::declval<T &&>()))>
+        > : std::true_type {
+        };
+#endif
+
+
+        //used for extensions when extension TValue = void
+        struct DummyType {
+        };
+
+/*
+ * this includes all integral types, floats and enums(except bool)
+ */
+        template<typename T>
+        struct IsFundamentalType : std::integral_constant<bool,
+                std::is_enum<T>::value
+                || std::is_floating_point<T>::value
+                || std::is_integral<T>::value> {
+        };
+
+        template<typename T, typename Integral = void>
+        struct IntegralFromFundamental {
+            using TValue = T;
         };
 
         template<typename T>
-        struct SAME_SIZE_UNSIGNED_TYPE<T, typename std::enable_if<std::is_floating_point<T>::value>::type> {
-            using type = typename std::conditional<std::is_same<T, float>::value, uint32_t, uint64_t>::type;
+        struct IntegralFromFundamental<T, typename std::enable_if<std::is_enum<T>::value>::type> {
+            using TValue = typename std::underlying_type<T>::type;
         };
 
         template<typename T>
-        using SAME_SIZE_UNSIGNED = typename SAME_SIZE_UNSIGNED_TYPE<T>::type;
+        struct IntegralFromFundamental<T, typename std::enable_if<std::is_floating_point<T>::value>::type> {
+            using TValue = typename std::conditional<std::is_same<T, float>::value, uint32_t, uint64_t>::type;
+        };
+
+        template<typename T>
+        struct UnsignedFromFundamental {
+            using type = typename std::make_unsigned<typename IntegralFromFundamental<T>::TValue>::type;
+        };
+
+        template<typename T>
+        using SameSizeUnsigned = typename UnsignedFromFundamental<T>::type;
+
+
+/*
+ * functions for object serialization
+ */
+
+        template<typename S, typename T>
+        struct SerializeFunction {
+
+            static void invoke(S &s, T &v) {
+                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");
+                using TDecayed = typename std::decay<T>::type;
+                selectSerializeFnc(s, v, SelectSerializeFnc<TDecayed>{});
+            }
+
+        private:
+            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 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);
+            }
+        };
 
 /*
  * functions for object serialization
  */
 
         template<typename S, typename T, typename Enabled = void>
-        struct SerializeFunction {
-            static void invoke(S &s, T &v) {
-                static_assert(!std::is_void<Enabled>::value,
-                                      "\nPlease define 'serialize' function for your type:\n"
-                                      "  template<typename S>\n"
-                                      "  void serialize(S& s, <YourType>& o)\n"
-                                      "  {\n"
-                                      "    ...\n"
-                                      "  }\n");
+        struct ArchiveFunction {
+
+            static void invoke(S &s, T &&obj) {
+                static_assert(IsFlexibleIncluded<S, T>::value,
+                              "\nPlease include '<bitsery/flexible.h>' to use 'archive' function:\n");
+
+                archiveProcess(s, std::forward<T>(obj));
             }
         };
 
-        template<typename S, typename T>
-        struct SerializeFunction<S, T, typename std::enable_if<
-                std::is_same<void, decltype(serialize(std::declval<S &>(), std::declval<T &>()))>::value
-        >::type> {
-            static void invoke(S &s, T &v) {
-                serialize(s, v);
-            }
+        /*
+         * helper function for getting context from serializer/deserializer
+         */
+
+        template<typename T, template<typename...> class Template>
+        struct IsSpecializationOf : std::false_type {
         };
 
-        //used for extensions, when extension TValue = void
-        struct DummyType {
+        template<template<typename...> class Template, typename... Args>
+        struct IsSpecializationOf<Template<Args...>, Template> : std::true_type {
         };
 
-/*
- * delta functions
- */
-
-        class ObjectMemoryPosition {
-        public:
-
-            template<typename T>
-            ObjectMemoryPosition(const T &oldObj, const T &newObj)
-                    :ObjectMemoryPosition{reinterpret_cast<const char *>(&oldObj),
-                                          reinterpret_cast<const char *>(&newObj),
-                                          sizeof(T)} {
-            }
-
-            template<typename T>
-            bool isFieldsEquals(const T &newObjField) {
-                return *getOldObjectField(newObjField) == newObjField;
-            }
-
-            template<typename T>
-            const T *getOldObjectField(const T &field) {
-                auto offset = reinterpret_cast<const char *>(&field) - newObj;
-                return reinterpret_cast<const T *>(oldObj + offset);
-            }
-
-        private:
-
-            ObjectMemoryPosition(const char *objOld, const char *objNew, size_t)
-                    : oldObj{objOld},
-                      newObj{objNew} {
-            }
-
-            const char *oldObj;
-            const char *newObj;
+        //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. Context type doesn't exists.\nSome functionality requires (de)seserializer to have specific context.");
+            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. Context type doesn't exists.\nSome functionality requires (de)seserializer to have specific context.");
+            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

@@ -0,0 +1,246 @@
+//MIT License
+//
+//Copyright (c) 2018 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_DETAILS_SESSIONS_H
+#define BITSERY_DETAILS_SESSIONS_H
+
+#include <vector>
+#include <stack>
+#include "adapter_common.h"
+
+namespace bitsery {
+
+    namespace session {
+        /*
+         * writer/reader implementations that disable session support
+         */
+        template <typename TWriter>
+        struct DisabledSessionsWriter {
+            void begin(TWriter& ) {
+                static_assert(std::is_void<TWriter>::value, "Sessions is disabled, enable it via configuration");
+            }
+            void end(TWriter& ) {
+                static_assert(std::is_void<TWriter>::value, "Sessions is disabled, enable it via configuration");
+            }
+            void flushSessions(TWriter& ) {
+            }
+        };
+
+        template <typename TReader>
+        struct DisabledSessionsReader {
+            template <typename TBufferContext>
+            DisabledSessionsReader(TReader& , TBufferContext& ) {
+            }
+
+            void begin() {
+                static_assert(std::is_void<TReader>::value, "Sessions is disabled, enable it via configuration");
+            }
+
+            void end() {
+                static_assert(std::is_void<TReader>::value, "Sessions is disabled, enable it via configuration");
+            }
+
+            bool hasActiveSessions() const {
+                return false;
+            }
+        };
+
+        /*
+         * writer/reader real implementations
+         * sessions reading requires to have random access iterators, so it cannot be used with streams
+         */
+        template <typename TWriter>
+        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());
+                _sessions.emplace_back(0);
+            }
+
+            void end(TWriter& writer) {
+                assert(!_sessionIndex.empty());
+                //change position to session end
+                auto sessionIt = std::next(std::begin(_sessions), _sessionIndex.top());
+                _sessionIndex.pop();
+                auto sessionSize = writer.writtenBytesCount();
+                assert(sessionSize > 0);
+                *sessionIt = sessionSize;
+            }
+
+            void flushSessions(TWriter& writer) {
+                if (_sessions.size()) {
+                    assert(_sessionIndex.empty());
+                    auto dataSize = writer.writtenBytesCount();
+                    for(auto& s:_sessions) {
+                        details::writeSize(writer, s);
+                    }
+                    _sessions.clear();
+
+                    auto totalSize = writer.writtenBytesCount();
+                    //write offset where actual data ends
+                    auto sessionsOffset = totalSize - dataSize + 4;//4 bytes for offset data
+                    writer.template writeBytes<4>(static_cast<uint32_t>(sessionsOffset));
+                }
+            }
+        private:
+            std::vector<size_t> _sessions{};
+            std::stack<size_t> _sessionIndex{};
+        };
+
+        template <typename TReader>
+        struct SessionsReader {
+            using TIterator = typename TReader::TIterator;
+
+            template <typename InputAdapter>
+            SessionsReader(TReader& r, InputAdapter& adapter)
+                    :_reader{r},
+                     _beginIt{details::SessionAccess::posIteratorRef<InputAdapter, TIterator>(adapter)},
+                     _posItRef{details::SessionAccess::posIteratorRef<InputAdapter, TIterator>(adapter)},
+                     _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())
+                        return;
+                }
+
+                //save end position for current session
+                _sessionsStack.push(_endItRef);
+                if (_nextSessionIt != std::end(_sessions)) {
+                    if (std::distance(_posItRef, _endItRef) > 0) {
+                        //set end position for new session
+                        auto newEnd = std::next(_beginIt, *_nextSessionIt);
+                        if (std::distance(newEnd, _endItRef) < 0)
+                        {
+                            //new session cannot end further than current end
+                            _reader.setError(ReaderError::InvalidData);
+                            return;
+                        }
+                        _endItRef = newEnd;
+                        ++_nextSessionIt;
+                    }
+                    //if we reached the end, means that there is no more data to read, hence there is no more sessions to advance to
+                } else {
+                    //there is no data to read anymore
+                    //pos == end or buffer overflow while session is active
+                    if (!(_posItRef == _endItRef || _reader.error() == ReaderError::NoError) || !(_sessionsStack.size() > 1)) {
+                        _reader.setError(ReaderError::InvalidData);
+                    }
+                }
+            }
+
+            void end() {
+                if (!_sessionsStack.empty()) {
+                    //move position to the end of session
+                    //can additionaly be checked for session data versioning
+                    //_pos == _end : same versions
+                    //distance(_pos,_end) > 0: reading newer version
+                    //error() == BUFFER_OVERFLOW: reading older version
+                    auto dist = std::distance(_posItRef, _endItRef);
+                    if (dist > 0) {
+                        //newer version might have some inner sessions, try to find the one after current ends
+                        auto currPos = static_cast<size_t>(std::distance(_beginIt, _endItRef));
+                        for (; _nextSessionIt != std::end(_sessions); ++_nextSessionIt) {
+                            if (*_nextSessionIt > currPos)
+                                break;
+                        }
+                    }
+                    //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();
+                }
+            }
+
+            bool hasActiveSessions() const {
+                return _sessionsStack.size() > 0;
+            }
+
+        private:
+            TReader& _reader;
+            TIterator _beginIt;
+            TIterator& _posItRef;
+            TIterator& _endItRef;
+            std::vector<size_t> _sessions{};
+            std::vector<size_t>::iterator _nextSessionIt{};
+            std::stack<TIterator> _sessionsStack{};
+
+            bool initializeSessions() {
+                //save current position
+                auto currPos = _posItRef;
+                //read size
+                if (std::distance(_posItRef, _endItRef) < 4) {
+                    _reader.setError(ReaderError::InvalidData);
+                    return false;
+                }
+                auto endSessionsSizesIt = std::next(_endItRef, -4);
+                _posItRef = endSessionsSizesIt;
+                uint32_t sessionsOffset{};
+                _reader.template readBytes<4>(sessionsOffset);
+
+                auto bufferSize = std::distance(_beginIt, _endItRef);
+                if (static_cast<size_t>(bufferSize) < sessionsOffset) {
+                    _reader.setError(ReaderError::InvalidData);
+                    return false;
+                }
+                //we can initialy resizes to this value, and we'll shrink it after reading
+                //read session sizes
+                auto sessionsIt = std::back_inserter(_sessions);
+                _posItRef = std::next(_endItRef, -static_cast<int32_t>(sessionsOffset));
+                while (std::distance(_posItRef, endSessionsSizesIt) > 0) {
+                    size_t size;
+                    details::readSize(_reader, size, bufferSize);
+                    *sessionsIt++ = size;
+                }
+                _sessions.shrink_to_fit();
+                //set iterators to data
+                _posItRef = currPos;
+                _endItRef = std::next(_endItRef, -static_cast<int32_t>(sessionsOffset));
+                _nextSessionIt = std::begin(_sessions);//set before first session;
+                return true;
+            }
+        };
+
+    }
+}
+
+#endif //BITSERY_DETAILS_SESSIONS_H

include/bitsery/details/traits.h

@@ -1,165 +0,0 @@
-//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_DETAILS_TRAITS_H
-#define BITSERY_DETAILS_TRAITS_H
-
-#include <type_traits>
-#include <string>
-
-namespace bitsery {
-    namespace details {
-
-        /*
-         * helper traits that is used internaly, or by other traits
-         */
-        template <typename T, typename = int>
-        struct IsResizable : std::false_type {};
-
-        template <typename T>
-        struct IsResizable <T, decltype((void)std::declval<T>().resize(1u), 0)> : std::true_type {};
-
-        /*
-         * core library traits, used to extend library for custom types
-         */
-
-        //traits for extension
-        template<typename Extension, typename T>
-        struct ExtensionTraits {
-            //this type is used, when using extesion without custom lambda
-            // eg.: extension4b>(obj, myextension{}) will call s.value4b(obj) for TValue
-            // or extesion(obj, myextension{})  will call s.object(obj) for TValue
-            //when this is void, it will compile, but value and object overloads will do nothing.
-            using TValue = void;
-
-            //does extension support ext<N>(...) syntax, by calling value<N> with TValue
-            static constexpr bool SupportValueOverload = true;
-            //does extension support ext(...) syntax, by calling object with TValue
-            static constexpr bool SupportObjectOverload = true;
-            //does extension support ext(..., lambda)
-            static constexpr bool SupportLambdaOverload = true;
-        };
-
-        //primary traits for containers
-        template<typename T>
-        struct ContainerTraits {
-
-            using TValue = typename T::value_type;
-
-            //default behaviour is resizable if container has method T::resize(size_t)
-            static constexpr bool isResizable = IsResizable<T>::value;
-
-            //resize function, called only if container is resizable
-            static void resize(T& container, size_t size) {
-                container.resize(size);
-            }
-
-            //get container size
-            static size_t size(const T& container) {
-                return container.size();
-            }
-
-        };
-
-        //specialization for C style array
-        template<typename T, size_t N>
-        struct ContainerTraits<T[N]> {
-            using TValue = T;
-            static constexpr bool isResizable = IsResizable<T>::value;
-            static void resize(T (&container)[N], size_t size) {
-            }
-            static size_t size(const T (&container)[N]) {
-                return N;
-            }
-        };
-
-
-        //traits for text
-        template<typename T>
-        struct TextTraits {
-
-            static constexpr bool isResizable = true;
-
-            //resize is without null-terminated character as with std::string,
-            //but null terminated character will always be written
-            //if you container doesn't add null-terminated character automaticaly, resize it to size+1;
-            static void resize(T& container, size_t size) {
-                container.resize(size);
-            }
-
-            //used for serialization to get text length
-            //length is until null-terminated character, size and length might not be equal
-            static size_t length(const T& container) {
-                auto begin = std::begin(container);
-                using TValue = typename std::decay<decltype(*begin)>::type;
-                return std::char_traits<TValue>::length(std::addressof(*begin));
-            }
-        };
-
-        //text traits specialization for std::string
-        //for std::string return length as size(), for faster performance, so we don't need to traverse string to find null-terminated characeter
-        //although it is not correct behaviour, meaning that string might have null-terminated characters in the middle,
-        //but in this case it your decision if you store buffer in string and serialize it as a text.
-        template<typename ... Args>
-        struct TextTraits<std::basic_string<Args...>> {
-
-            static constexpr bool isResizable = true;
-
-            //resize is without null-terminated character as with std::string,
-            //but null terminated character will always be written
-            //if you container doesn't add null-terminated character automaticaly, resize it to size+1;
-            static void resize(std::basic_string<Args...>& container, size_t size) {
-                container.resize(size);
-            }
-
-            //used for serialization to get text length
-            //length is until null-terminated character, size and length might not be equal
-            static size_t length(const std::basic_string<Args...>& container) {
-                return container.size();
-            }
-        };
-
-
-        //traits only for buffer reader/writer
-        template <typename T>
-        struct BufferContainerTraits: public ContainerTraits<T> {
-            //this function is only used by BufferWriter, when writing data to buffer,
-            //it is called only current buffer size is not enough to write.
-            //it is used to dramaticaly improve performance by updating buffer directly
-            //instead of using back_insert_iterator to append each byte to buffer.
-            //thats why BufferWriter return range iterators
-            static void increaseBufferSize(T& container) {
-                //use default implementation behaviour;
-                //call push_back to use default resize strategy
-                container.push_back({});
-                //after allocation resize to take all capacity
-                container.resize(container.capacity());
-            }
-
-            using TDifference = typename T::difference_type;
-            using TIterator = typename T::iterator;
-        };
-
-    }
-}
-
-#endif //BITSERY_DETAILS_TRAITS_H

include/bitsery/ext/compact_value.h

@@ -0,0 +1,176 @@
+//MIT License
+//
+//Copyright (c) 2018 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_COMPACT_VALUE_H
+#define BITSERY_EXT_COMPACT_VALUE_H
+
+#include "../details/serialization_common.h"
+#include "../details/adapter_common.h"
+#include <cassert>
+
+namespace bitsery {
+
+    namespace details {
+
+        template <bool CheckOverflow>
+        class CompactValueImpl {
+        public:
+
+            template<typename Ser, typename Writer, typename T, typename Fnc>
+            void serialize(Ser &s, Writer &writer, const T &v, Fnc &&) const {
+                static_assert(std::is_integral<T>::value || std::is_enum<T>::value, "");
+                using TValue = typename IntegralFromFundamental<T>::TValue;
+                serializeImpl(s, writer, reinterpret_cast<const TValue&>(v), std::integral_constant<bool, sizeof(T) != 1>{});
+            }
+
+            template<typename Des, typename Reader, typename T, typename Fnc>
+            void deserialize(Des &d, Reader &reader, T &v, Fnc &&) const {
+                static_assert(std::is_integral<T>::value || std::is_enum<T>::value, "");
+                using TValue = typename IntegralFromFundamental<T>::TValue;
+                deserializeImpl(d, reader, reinterpret_cast<TValue &>(v), std::integral_constant<bool, sizeof(T) != 1>{});
+            }
+
+        private:
+
+            // if value is 1byte size, just serialize/ deserialize whole value
+            template<typename Ser, typename Writer, typename T>
+            void serializeImpl(Ser &s, Writer &, const T &v, std::false_type) const {
+                s.value1b(v);
+            }
+
+            template<typename Des, typename Reader, typename T>
+            void deserializeImpl(Des &d, Reader &, T &v, std::false_type) const {
+                d.value1b(v);
+            }
+
+            // when value is bigger than 1byte size,
+            template<typename Ser, typename Writer, typename T>
+            void serializeImpl(Ser &, Writer &writer, const T &v, std::true_type) const {
+                auto val = zigZagEncode(v, std::is_signed<typename IntegralFromFundamental<T>::TValue>{});
+                writeBytes(writer, val);
+            }
+
+
+            template<typename Des, typename Reader, typename T>
+            void deserializeImpl(Des &, Reader &reader, T &v, std::true_type) const {
+                using TUnsigned = SameSizeUnsigned<T>;
+                TUnsigned res{};
+                readBytes(reader, res);
+                v = zigZagDecode<T>(res, std::is_signed<typename IntegralFromFundamental<T>::TValue>{});
+            }
+
+            // zigzag encode signed types
+            template<typename T>
+            const SameSizeUnsigned<T> &zigZagEncode(const T &v, std::false_type) const {
+                return v;
+            }
+
+            template<typename TResult, typename TUnsigned>
+            const TResult &zigZagDecode(const TUnsigned &v, std::false_type) const{
+                return v;
+            }
+
+            template<typename T>
+            SameSizeUnsigned<T> zigZagEncode(const T &v, std::true_type) const {
+                return (v << 1) ^ (v >> (BitsSize<T>::value - 1));
+            }
+
+            template<typename TResult, typename TUnsigned>
+            TResult zigZagDecode(TUnsigned v, std::true_type) const {
+                return (v >> 1) ^ -(v & 1);
+            }
+
+            // write/read bytes one by one
+            template<typename Writer, typename T>
+            void writeBytes(Writer &w, const T &v) const {
+                auto val = v;
+                while(val > 0x7Fu) {
+                    w.template writeBytes<1>(static_cast<uint8_t>(val | 0x80u));
+                    val >>=7u;
+                }
+                w.template writeBytes<1>(static_cast<uint8_t>(val));
+            }
+
+            template<typename Reader, typename T>
+            void readBytes(Reader &r, T &v) const {
+                constexpr auto TBITS = sizeof(T)*8;
+                uint8_t b1{0x80u};
+                auto i = 0u;
+                for (;i < TBITS && b1 > 0x7Fu; i +=7u) {
+                    r.template readBytes<1>(b1);
+                    v += static_cast<T>(b1 & 0x7Fu) << i;
+                }
+                checkReadOverflow<Reader, T>(r, i, b1, std::integral_constant<bool, CheckOverflow>{});
+            }
+            template <typename Reader, typename T>
+            void checkReadOverflow(Reader &r, unsigned shiftedBy, uint8_t remainder, std::true_type) const {
+                constexpr auto TBITS = sizeof(T)*8;
+                if (shiftedBy > TBITS && remainder >> (TBITS + 7 - shiftedBy)) {
+                    r.setError(bitsery::ReaderError::DataOverflow);
+                }
+            }
+
+            template <typename Reader, typename T>
+            void checkReadOverflow(Reader &, unsigned , uint8_t , std::false_type) const {
+
+            }
+
+        };
+
+    }
+
+    namespace ext {
+
+        // this type will use value overload, and do not check if type is sufficiently large during deserialization
+        class CompactValue: public details::CompactValueImpl<false> {};
+
+        // this type will enable object overload, and set DataOverflow if value doesn't fit in type, during deserialization
+        class CompactValueAsObject: public details::CompactValueImpl<true> {};
+
+    }
+
+    namespace traits {
+        template<typename T>
+        struct ExtensionTraits<ext::CompactValue, T> {
+            using TValue = T;
+            static constexpr bool SupportValueOverload = true;
+            // disable object overload, because we don't have implemented serialization function for fundamental types
+            static constexpr bool SupportObjectOverload = false;
+            static constexpr bool SupportLambdaOverload = false;
+        };
+
+        template<typename T>
+        struct ExtensionTraits<ext::CompactValueAsObject, T> {
+            // use dummy implemenations for value and object overload
+            using TValue = void;
+            // only enable object overload
+            static constexpr bool SupportValueOverload = false;
+            static constexpr bool SupportObjectOverload = true;
+            static constexpr bool SupportLambdaOverload = false;
+        };
+
+    }
+
+}
+
+
+#endif //BITSERY_EXT_COMPACT_VALUE_H

include/bitsery/ext/entropy.h

@@ -37,7 +37,7 @@ namespace bitsery {
                 ++index;
             }
             return 0u;
-        };
+        }
     }
 
     namespace ext {
@@ -46,24 +46,34 @@ namespace bitsery {
         class Entropy {
         public:
 
-            constexpr explicit Entropy(TContainer& values) : _values{values} {
-
+            /**
+             * Allows entropy-encoding technique, by writing few bits for most common values
+             * @param values list of most common values
+             * @param alignBeforeData only makes sense when bit-packing enabled, by default aligns after writing bits for index
+             */
+            constexpr Entropy(TContainer& values, bool alignBeforeData=true)
+                    : _values{values},
+                      _alignBeforeData{alignBeforeData} {
             };
 
             template<typename Ser, typename Writer, typename T, typename Fnc>
-            void serialize(Ser &s, Writer &writer, const T &obj, Fnc &&fnc) const {
-                assert(details::ContainerTraits<TContainer>::size(_values) > 0);
+            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, details::ContainerTraits<TContainer>::size(_values)});
+                s.ext(index, ext::ValueRange<size_t>{0u, traits::ContainerTraits<TContainer>::size(_values)});
+                if (_alignBeforeData)
+                    s.align();
                 if (!index)
                     fnc(const_cast<T &>(obj));
             }
 
             template<typename Des, typename Reader, typename T, typename Fnc>
-            void deserialize(Des &d, Reader &reader, T &obj, Fnc &&fnc) const {
-                assert(details::ContainerTraits<TContainer>::size(_values) > 0);
+            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, details::ContainerTraits<TContainer>::size(_values)});
+                d.ext(index, ext::ValueRange<size_t>{0u, traits::ContainerTraits<TContainer>::size(_values)});
+                if (_alignBeforeData)
+                    d.align();
                 if (index)
                     obj = *std::next(std::begin(_values), index-1);
                 else
@@ -72,10 +82,11 @@ namespace bitsery {
 
         private:
             TContainer& _values;
+            bool _alignBeforeData;
         };
     }
 
-    namespace details {
+    namespace traits {
         template<typename TContainer, typename T>
         struct ExtensionTraits<ext::Entropy<TContainer>, T> {
             using TValue = T;

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();
@@ -49,7 +51,7 @@ namespace bitsery {
         };
     }
 
-    namespace details {
+    namespace traits {
         template<typename T>
         struct ExtensionTraits<ext::Growable, T> {
             using TValue = T;

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,196 @@
+//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 <cassert>
+#include "../traits/core/traits.h"
+#include "utils/pointer_utils.h"
+#include "utils/polymorphism_utils.h"
+#include "utils/rtti_utils.h"
+
+namespace bitsery {
+
+    namespace ext {
+
+        namespace pointer_details {
+
+            template<typename T>
+            struct PtrOwnerManager {
+                static_assert(std::is_pointer<T>::value, "");
+
+                using TElement = typename std::remove_pointer<T>::type;
+
+                static TElement* getPtr(T &obj) {
+                    return obj;
+                }
+
+                static constexpr PointerOwnershipType getOwnership() {
+                    return PointerOwnershipType::Owner;
+                }
+
+                static void assign(T& obj, TElement* valuePtr) {
+                    delete obj;
+                    obj = valuePtr;
+                }
+
+                static void clear(T& obj) {
+                    delete obj;
+                    obj = nullptr;
+                }
+            };
+
+            template<typename T>
+            struct PtrObserverManager {
+                static_assert(std::is_pointer<T>::value, "");
+
+                using TElement = typename std::remove_pointer<T>::type;
+
+                //observer must return reference to pointer, so that it could be updated later
+                static TElement*& getPtrRef(T& obj) {
+                    return obj;
+                }
+
+                static TElement* getPtr(T& obj) {
+                    return obj;
+                }
+
+                static constexpr PointerOwnershipType getOwnership() {
+                    return PointerOwnershipType::Observer;
+                }
+
+                static void assign(T& obj, TElement* valuePtr) {
+                    //do not delete existing object
+                    obj = valuePtr;
+                }
+
+                static void clear(T& obj) {
+                    obj = nullptr;
+                }
+
+            };
+
+            template<typename T>
+            struct NonPtrManager {
+
+                static_assert(!std::is_pointer<T>::value, "");
+
+                using TElement = T;
+
+                static TElement* getPtr(T& obj) {
+                    return &obj;
+                }
+
+                static constexpr PointerOwnershipType getOwnership() {
+                    return PointerOwnershipType::Owner;
+                }
+
+                // this code is unreachable for reference type, but is necessary to compile
+                // LCOV_EXCL_START
+                static void assign(T& , TElement* ) {}
+
+                static void clear(T& ) {}
+                // LCOV_EXCL_STOP
+
+            };
+
+            // this class is used by NonPtrManager
+            struct NoRTTI {
+                template<typename TBase>
+                static size_t get(TBase& ) {
+                    return 0;
+                }
+
+                template<typename TBase>
+                static constexpr size_t get() {
+                    return 0;
+                }
+
+                template<typename TBase, typename TDerived>
+                static constexpr TDerived* cast(TBase* obj) {
+                    static_assert(!std::is_pointer<TDerived>::value, "");
+                    return dynamic_cast<TDerived*>(obj);
+                }
+
+                template<typename TBase>
+                static constexpr bool isPolymorphic() {
+                    return false;
+                }
+            };
+
+        }
+
+        template<typename RTTI>
+        using PointerOwnerBase = pointer_utils::PointerObjectExtensionBase<
+                pointer_details::PtrOwnerManager, PolymorphicContext, RTTI>;
+
+        using PointerOwner = PointerOwnerBase<StandardRTTI>;
+
+        using PointerObserver = pointer_utils::PointerObjectExtensionBase<
+                pointer_details::PtrObserverManager, PolymorphicContext, pointer_details::NoRTTI>;
+
+        //inherit from PointerObjectExtensionBase in order to specify PointerType::NotNull
+        class ReferencedByPointer : public pointer_utils::PointerObjectExtensionBase<
+                pointer_details::NonPtrManager, PolymorphicContext, pointer_details::NoRTTI> {
+        public:
+            ReferencedByPointer() : pointer_utils::PointerObjectExtensionBase<
+                    pointer_details::NonPtrManager, PolymorphicContext, pointer_details::NoRTTI>(
+                    PointerType::NotNull) {}
+        };
+
+    }
+
+    namespace traits {
+
+        template<typename T, typename RTTI>
+        struct ExtensionTraits<ext::PointerOwnerBase<RTTI>, T*> {
+            using TValue = T;
+            static constexpr bool SupportValueOverload = true;
+            static constexpr bool SupportObjectOverload = true;
+            //if underlying type is not polymorphic, then we can enable lambda syntax
+            static constexpr bool SupportLambdaOverload = !RTTI::template isPolymorphic<TValue>();
+        };
+
+        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
+            //observer only writes/reads pointer id from pointer linking context
+            using TValue = T;
+            static constexpr bool SupportValueOverload = true;
+            static constexpr bool SupportObjectOverload = true;
+            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

@@ -20,16 +20,22 @@
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
 
-#ifndef BITSERY_EXT_CONTAINER_MAP_H
-#define BITSERY_EXT_CONTAINER_MAP_H
+#ifndef BITSERY_EXT_STD_MAP_H
+#define BITSERY_EXT_STD_MAP_H
+
+#include "../traits/core/traits.h"
+#include "../details/adapter_utils.h"
+#include "../details/serialization_common.h"
+//we need this, so we could reserve for non ordered map
+#include <unordered_map>
 
 namespace bitsery {
     namespace ext {
 
-        class ContainerMap {
+        class StdMap {
         public:
 
-            constexpr explicit ContainerMap(size_t maxSize):_maxSize{maxSize} {}
+            constexpr explicit StdMap(size_t maxSize):_maxSize{maxSize} {}
 
             template<typename Ser, typename Writer, typename T, typename Fnc>
             void serialize(Ser &, Writer &writer, const T &obj, Fnc &&fnc) const {
@@ -50,24 +56,37 @@ namespace bitsery {
 
                 size_t size{};
                 details::readSize(reader, size, _maxSize);
-                auto hint = obj.begin();
                 obj.clear();
+                reserve(obj, size);
 
+                auto hint = obj.begin();
                 for (auto i = 0u; i < size; ++i) {
-                    TKey key;
-                    TValue value;
+                    auto key{bitsery::Access::create<TKey>()};
+                    auto value{bitsery::Access::create<TValue>()};
                     fnc(key, value);
                     hint = obj.emplace_hint(hint, std::move(key), std::move(value));
                 }
             }
         private:
+            template <typename ... TArgs>
+            void reserve(std::unordered_map<TArgs...>& obj, size_t size) const {
+                obj.reserve(size);
+            }
+            template <typename ... TArgs>
+            void reserve(std::unordered_multimap<TArgs...>& obj, size_t size) const {
+                obj.reserve(size);
+            }
+            template <typename T>
+            void reserve(T& , size_t ) const {
+                //for ordered container do nothing
+            }
             size_t _maxSize;
         };
     }
 
-    namespace details {
+    namespace traits {
         template<typename T>
-        struct ExtensionTraits<ext::ContainerMap, T> {
+        struct ExtensionTraits<ext::StdMap, T> {
             using TValue = void;
             static constexpr bool SupportValueOverload = false;
             static constexpr bool SupportObjectOverload = false;
@@ -78,4 +97,4 @@ namespace bitsery {
 }
 
 
-#endif //BITSERY_EXT_CONTAINER_MAP_H
+#endif //BITSERY_EXT_STD_MAP_H

include/bitsery/ext/std_optional.h

@@ -21,8 +21,8 @@
 //SOFTWARE.
 
 
-#ifndef BITSERY_EXT_OPTIONAL_H
-#define BITSERY_EXT_OPTIONAL_H
+#ifndef BITSERY_EXT_STD_OPTIONAL_H
+#define BITSERY_EXT_STD_OPTIONAL_H
 
 
 //this module do not include optional, but expects it to be declared in std::optional
@@ -33,6 +33,8 @@
 //    using optional = experimental::optional<T>;
 //}
 #include <type_traits>
+#include "../traits/core/traits.h"
+#include "../details/serialization_common.h"
 
 namespace bitsery {
     namespace ext {
@@ -40,21 +42,27 @@ namespace bitsery {
         template<typename T>
         using std_optional = ::std::optional<T>;
 
-        class Optional {
+        class StdOptional {
         public:
 
+            /**
+             * Works with std::optional types
+             * @param alignBeforeData only makes sense when bit-packing enabled, by default aligns after writing/reading bool state of optional
+             */
+            explicit StdOptional(bool alignBeforeData=true):_alignBeforeData{alignBeforeData} {}
             template<typename T>
             constexpr void assertType() const {
                 using TOpt = typename std::remove_cv<T>::type;
                 using TVal = typename TOpt::value_type;
                 static_assert(std::is_same<TOpt, std_optional<TVal>>(), "");
-                static_assert(std::is_default_constructible<TVal>::value, "");
-            };
+            }
 
             template<typename Ser, typename Writer, typename T, typename Fnc>
             void serialize(Ser &ser, Writer &, const T &obj, Fnc &&fnc) const {
                 assertType<T>();
-                ser.boolByte(static_cast<bool>(obj));
+                ser.boolValue(static_cast<bool>(obj));
+                if (_alignBeforeData)
+                    ser.align();
                 if (obj)
                     fnc(const_cast<typename T::value_type & >(*obj));
             }
@@ -63,9 +71,11 @@ namespace bitsery {
             void deserialize(Des &des, Reader &, T &obj, Fnc &&fnc) const {
                 assertType<T>();
                 bool exists{};
-                des.boolByte(exists);
+                des.boolValue(exists);
+                if (_alignBeforeData)
+                    des.align();
                 if (exists) {
-                    typename T::value_type tmp{};
+                    auto tmp{::bitsery::Access::create<typename T::value_type>()};
                     fnc(tmp);
                     obj = tmp;
                 } else {
@@ -73,12 +83,14 @@ namespace bitsery {
                     obj = T{};
                 }
             }
+        private:
+            bool _alignBeforeData;
         };
     }
 
-    namespace details {
+    namespace traits {
         template<typename T>
-        struct ExtensionTraits<ext::Optional, T> {
+        struct ExtensionTraits<ext::StdOptional, T> {
             using TValue = typename T::value_type;
             static constexpr bool SupportValueOverload = true;
             static constexpr bool SupportObjectOverload = true;
@@ -89,4 +101,4 @@ namespace bitsery {
 }
 
 
-#endif //BITSERY_EXT_OPTIONAL_H
+#endif //BITSERY_EXT_STD_OPTIONAL_H

include/bitsery/ext/std_queue.h

@@ -0,0 +1,111 @@
+//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_STD_QUEUE_H
+#define BITSERY_EXT_STD_QUEUE_H
+
+#include <type_traits>
+#include <queue>
+//include type traits for deque and vector, because they are defaults for queue and priority_queue
+#include "../traits/deque.h"
+#include "../traits/vector.h"
+
+namespace bitsery {
+    namespace ext {
+
+        class StdQueue {
+        private:
+            //inherit from queue so we could take underlying container
+            template <typename T, typename C>
+            struct QueueCnt : public std::queue<T, C>
+            {
+                static const C& getContainer(const std::queue<T, C>& s )
+                {
+                    //get address of underlying container
+                    return s.*(&QueueCnt::c);
+                }
+                static C& getContainer(std::queue<T, C>& s )
+                {
+                    //get address of underlying container
+                    return s.*(&QueueCnt::c);
+                }
+            };
+            //inherit from queue so we could take underlying container
+            template <typename T, typename Seq, typename Cmp>
+            struct PriorityQueueCnt : public std::priority_queue<T, Seq, Cmp>
+            {
+                static const Seq& getContainer(const std::priority_queue<T, Seq, Cmp>& s )
+                {
+                    //get address of underlying container
+                    return s.*(&PriorityQueueCnt::c);
+                }
+                static Seq& getContainer(std::priority_queue<T, Seq, Cmp>& s )
+                {
+                    //get address of underlying container
+                    return s.*(&PriorityQueueCnt::c);
+                }
+            };
+
+            size_t _maxSize;
+        public:
+            explicit StdQueue(size_t maxSize):_maxSize{maxSize} {};
+
+            //for queue
+            template<typename Ser, typename Writer, typename T, typename C, typename Fnc>
+            void serialize(Ser &ser, Writer &, const std::queue<T,C> &obj, Fnc &&fnc) const {
+                ser.container(QueueCnt<T,C>::getContainer(obj), _maxSize, std::forward<Fnc>(fnc));
+            }
+
+            template<typename Des, typename Reader, typename T, typename C, typename Fnc>
+            void deserialize(Des &des, Reader &, std::queue<T,C> &obj, Fnc &&fnc) const {
+                des.container(QueueCnt<T,C>::getContainer(obj), _maxSize, std::forward<Fnc>(fnc));
+            }
+
+            //for priority_queue
+            template<typename Ser, typename Writer, typename T, typename C, typename Comp, typename Fnc>
+            void serialize(Ser &ser, Writer &, const std::priority_queue<T,C, Comp> &obj, Fnc &&fnc) const {
+                ser.container(PriorityQueueCnt<T,C, Comp>::getContainer(obj), _maxSize, std::forward<Fnc>(fnc));
+            }
+
+            template<typename Des, typename Reader, typename T, typename C, typename Comp, typename Fnc>
+            void deserialize(Des &des, Reader &, std::priority_queue<T,C, Comp> &obj, Fnc &&fnc) const {
+                des.container(PriorityQueueCnt<T,C, Comp>::getContainer(obj), _maxSize, std::forward<Fnc>(fnc));
+            }
+
+        };
+    }
+
+    namespace traits {
+        template<typename T>
+        struct ExtensionTraits<ext::StdQueue, T> {
+            using TValue = typename T::value_type;
+            static constexpr bool SupportValueOverload = true;
+            static constexpr bool SupportObjectOverload = true;
+            static constexpr bool SupportLambdaOverload = true;
+        };
+    }
+
+}
+
+
+#endif //BITSERY_EXT_STD_QUEUE_H

include/bitsery/ext/std_set.h

@@ -0,0 +1,97 @@
+//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_STD_SET_H
+#define BITSERY_EXT_STD_SET_H
+
+#include <cassert>
+#include "../details/adapter_utils.h"
+#include "../details/serialization_common.h"
+//we need this, so we could reserve for non ordered set
+#include <unordered_set>
+
+namespace bitsery {
+    namespace ext {
+
+        class StdSet {
+        public:
+
+            constexpr explicit StdSet(size_t maxSize):_maxSize{maxSize} {}
+
+            template<typename Ser, typename Writer, typename T, typename Fnc>
+            void serialize(Ser &, Writer &writer, const T &obj, Fnc &&fnc) const {
+                using TKey = typename T::key_type;
+                auto size = obj.size();
+                assert(size <= _maxSize);
+                details::writeSize(writer, size);
+
+                for (auto &v:obj)
+                    fnc(const_cast<TKey &>(v));
+            }
+
+            template<typename Des, typename Reader, typename T, typename Fnc>
+            void deserialize(Des &, Reader &reader, T &obj, Fnc &&fnc) const {
+                using TKey = typename T::key_type;
+
+                size_t size{};
+                details::readSize(reader, size, _maxSize);
+                obj.clear();
+                reserve(obj, size);
+                auto hint = obj.begin();
+                for (auto i = 0u; i < size; ++i) {
+                    auto key{bitsery::Access::create<TKey>()};
+                    fnc(key);
+                    hint = obj.emplace_hint(hint, std::move(key));
+                }
+            }
+        private:
+
+            template <typename ... TArgs>
+            void reserve(std::unordered_set<TArgs...>& obj, size_t size) const {
+                obj.reserve(size);
+            }
+            template <typename ... TArgs>
+            void reserve(std::unordered_multiset<TArgs...>& obj, size_t size) const {
+                obj.reserve(size);
+            }
+            template <typename T>
+            void reserve(T& , size_t ) const {
+                //for ordered container do nothing
+            }
+            size_t _maxSize;
+        };
+    }
+
+    namespace traits {
+        template<typename T>
+        struct ExtensionTraits<ext::StdSet, T> {
+            using TValue = typename T::key_type;
+            static constexpr bool SupportValueOverload = true;
+            static constexpr bool SupportObjectOverload = true;
+            static constexpr bool SupportLambdaOverload = true;
+        };
+    }
+
+}
+
+
+#endif //BITSERY_EXT_STD_SET_H

include/bitsery/ext/std_smart_ptr.h

@@ -0,0 +1,129 @@
+//MIT License
+//
+//Copyright (c) 2018 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_STD_SMART_PTR_H
+#define BITSERY_EXT_STD_SMART_PTR_H
+
+#include <cassert>
+#include "../traits/core/traits.h"
+#include "utils/pointer_utils.h"
+#include "utils/polymorphism_utils.h"
+#include "utils/rtti_utils.h"
+#include <memory>
+
+namespace bitsery {
+    namespace ext {
+
+        namespace smart_ptr_details {
+
+            //further code is for managing shared ownership
+            //do not nest this type in pointer manager class itself, because it will be different type for different T
+            struct SharedPtrSharedState : pointer_utils::PointerSharedStateBase {
+                std::shared_ptr<void> obj{};
+            };
+
+            template<typename T>
+            struct SmartPtrOwnerManager {
+
+                using TElement = typename T::element_type;
+
+                template <typename TDeleter>
+                static TElement *getPtr(std::unique_ptr<TElement, TDeleter> &obj) {
+                    return obj.get();
+                }
+
+                static TElement *getPtr(std::shared_ptr<TElement> &obj) {
+                    return obj.get();
+                }
+
+                static TElement *getPtr(std::weak_ptr<TElement> &obj) {
+                    if (auto ptr = obj.lock())
+                        return ptr.get();
+                    return nullptr;
+                }
+
+                static constexpr PointerOwnershipType getOwnership() {
+                    return ::bitsery::details::IsSpecializationOf<T, std::unique_ptr>::value
+                           ? PointerOwnershipType::Owner
+                           : std::is_same<std::shared_ptr<TElement>, T>::value
+                             ? PointerOwnershipType::SharedOwner
+                             : PointerOwnershipType::SharedObserver;
+                }
+
+                static void clear(T &obj) {
+                    obj.reset();
+                }
+
+                static void assign(T &obj, TElement *valuePtr) {
+                    obj.reset(valuePtr);
+                }
+
+                //this is used, when old object exists and is the same type
+                static std::unique_ptr<pointer_utils::PointerSharedStateBase> saveToSharedState(T &obj) {
+                    auto state = new SharedPtrSharedState{};
+                    //to work with weak_ptr and shared_ptr create new std::shared_ptr
+                    state->obj = std::shared_ptr<TElement>(obj);
+                    return std::unique_ptr<pointer_utils::PointerSharedStateBase>{state};
+                }
+
+                //this is used, when old object doesn't exists or is not the same type
+                static std::unique_ptr<pointer_utils::PointerSharedStateBase> createSharedState(TElement *valuePtr) {
+                    auto state = new SharedPtrSharedState{};
+                    state->obj = std::shared_ptr<TElement>(valuePtr);
+                    return std::unique_ptr<pointer_utils::PointerSharedStateBase>{state};
+                }
+
+                static void loadFromSharedState(pointer_utils::PointerSharedStateBase *ctx, T &obj) {
+                    auto state = dynamic_cast<SharedPtrSharedState *>(ctx);
+                    //reinterpret_pointer_cast is only since c++17
+                    auto p = reinterpret_cast<TElement *>(state->obj.get());
+                    obj = std::shared_ptr<TElement>(state->obj, p);
+                }
+
+            };
+        }
+
+        template<typename RTTI>
+        using StdSmartPtrBase = pointer_utils::PointerObjectExtensionBase<
+                smart_ptr_details::SmartPtrOwnerManager, PolymorphicContext, RTTI>;
+
+        //helper type for convienience
+        using StdSmartPtr = StdSmartPtrBase<StandardRTTI>;
+
+    }
+
+    namespace traits {
+
+        template<typename T, typename RTTI>
+        struct ExtensionTraits<ext::StdSmartPtrBase<RTTI>, T> {
+            using TValue = typename T::element_type;
+            static constexpr bool SupportValueOverload = true;
+            static constexpr bool SupportObjectOverload = true;
+            //if underlying type is not polymorphic, then we can enable lambda syntax
+            static constexpr bool SupportLambdaOverload = !RTTI::template isPolymorphic<TValue>();
+        };
+
+    }
+
+}
+
+#endif //BITSERY_EXT_STD_SMART_PTR_H

include/bitsery/ext/std_stack.h

@@ -0,0 +1,82 @@
+//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_STD_STACK_H
+#define BITSERY_EXT_STD_STACK_H
+
+#include <type_traits>
+#include <stack>
+//include type traits for deque, because stack default underlying container is deque
+#include "../traits/deque.h"
+
+namespace bitsery {
+    namespace ext {
+
+        class StdStack {
+        private:
+            //inherit from stack so we could take underlying container
+            template <typename T, typename C>
+            struct StackCnt : public std::stack<T, C>
+            {
+                static const C& getContainer(const std::stack<T, C>& s )
+                {
+                    //get address of underlying container
+                    return s.*(&StackCnt::c);
+                }
+                static C& getContainer(std::stack<T, C>& s )
+                {
+                    //get address of underlying container
+                    return s.*(&StackCnt::c);
+                }
+            };
+            size_t _maxSize;
+        public:
+            explicit StdStack(size_t maxSize):_maxSize{maxSize} {};
+
+            template<typename Ser, typename Writer, typename T, typename C, typename Fnc>
+            void serialize(Ser &ser, Writer &, const std::stack<T,C> &obj, Fnc &&fnc) const {
+                ser.container(StackCnt<T,C>::getContainer(obj), _maxSize, std::forward<Fnc>(fnc));
+            }
+
+            template<typename Des, typename Reader, typename T, typename C, typename Fnc>
+            void deserialize(Des &des, Reader &, std::stack<T,C> &obj, Fnc &&fnc) const {
+                des.container(StackCnt<T,C>::getContainer(obj), _maxSize, std::forward<Fnc>(fnc));
+            }
+
+        };
+    }
+
+    namespace traits {
+        template<typename T, typename Seq>
+        struct ExtensionTraits<ext::StdStack, std::stack<T, Seq>> {
+            using TValue = T;
+            static constexpr bool SupportValueOverload = true;
+            static constexpr bool SupportObjectOverload = true;
+            static constexpr bool SupportLambdaOverload = true;
+        };
+    }
+
+}
+
+
+#endif //BITSERY_EXT_STD_STACK_H

include/bitsery/ext/utils/pointer_utils.h

@@ -0,0 +1,387 @@
+//MIT License
+//
+//Copyright (c) 2018 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_POINTER_UTILS_H
+#define BITSERY_POINTER_UTILS_H
+
+#include <unordered_map>
+#include <vector>
+#include <memory>
+#include <algorithm>
+#include <cassert>
+#include "../../details/adapter_utils.h"
+#include "../../details/serialization_common.h"
+
+namespace bitsery {
+    namespace ext {
+
+        //change name
+        enum class PointerType {
+            Nullable,
+            NotNull
+        };
+
+        // Observer - not responsible for pointer lifetime management.
+        // Owner - only ONE owner is responsible for this pointers creation/destruction
+        // SharedOwner, SharedObserver - MANY shared owners is responsible for pointer creation/destruction
+        // requires additional context to manage shared owners themselves.
+        // SharedOwner actually manages life time e.g. std::shared_ptr
+        // SharedObserver do not manage life time of the pointer, but can observe shared state .e.. std::weak_ptr
+        // and differently from Observer, creates new object if necessary and saves to shared state
+        enum class PointerOwnershipType : uint8_t {
+            Observer,
+            Owner,
+            SharedOwner,
+            SharedObserver
+        };
+
+        //forward declaration
+        class PointerLinkingContext;
+
+        namespace pointer_utils {
+
+            //this class is used to store context for shared ptr owners
+            struct PointerSharedStateBase {
+                virtual ~PointerSharedStateBase() = default;
+            };
+
+            //PLC info is internal classes for serializer, and deserializer
+            struct PLCInfo {
+                explicit PLCInfo(PointerOwnershipType ownershipType_)
+                        : ownershipType{ownershipType_},
+                          isSharedProcessed{false} {};
+                PointerOwnershipType ownershipType;
+                bool isSharedProcessed;
+
+                void update(PointerOwnershipType ptrType) {
+                    //do nothing for observer
+                    if (ptrType == PointerOwnershipType::Observer)
+                        return;
+                    if (ownershipType == PointerOwnershipType::Observer) {
+                        //set ownership type
+                        ownershipType = ptrType;
+                        return;
+                    }
+                    //only shared ownership can get here multiple times
+                    assert(ptrType == PointerOwnershipType::SharedOwner || ptrType == PointerOwnershipType::SharedObserver);
+                    //check if need to update to SharedOwner
+                    if (ptrType == PointerOwnershipType::SharedOwner)
+                        ownershipType = ptrType;
+                    //mark that object already processed, so we do not serialize/deserialize duplicate objects
+                    isSharedProcessed = true;
+                }
+            };
+
+            struct PLCInfoSerializer: PLCInfo {
+                PLCInfoSerializer(size_t id_, PointerOwnershipType ownershipType_)
+                        : PLCInfo(ownershipType_), id{id_} {}
+                size_t id;
+            };
+
+            struct PLCInfoDeserializer : PLCInfo {
+                PLCInfoDeserializer(void *ptr, PointerOwnershipType ownershipType_)
+                        : PLCInfo(ownershipType_),
+                          ownerPtr{ptr} {};
+
+                //need to override these explicitly because we have pointer member
+                PLCInfoDeserializer(const PLCInfoDeserializer&) = delete;
+                PLCInfoDeserializer(PLCInfoDeserializer&&) = default;
+                PLCInfoDeserializer& operator =(const PLCInfoDeserializer&) = delete;
+                PLCInfoDeserializer& operator =(PLCInfoDeserializer&&) = 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.emplace_back(ptr);
+                    }
+                }
+
+                void *ownerPtr;
+                std::vector<std::reference_wrapper<void *>> observersList{};
+                std::unique_ptr<PointerSharedStateBase> sharedState{};
+            };
+
+            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;
+
+                const PLCInfoSerializer &getInfoByPtr(const void *ptr, PointerOwnershipType ptrType) {
+                    auto res = _ptrMap.emplace(ptr, PLCInfoSerializer{_currId + 1u, ptrType});
+                    auto &ptrInfo = res.first->second;
+                    if (res.second) {
+                        ++_currId;
+                        return ptrInfo;
+                    }
+                    ptrInfo.update(ptrType);
+                    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 *, PLCInfoSerializer> &p) {
+                                           return p.second.ownershipType == PointerOwnershipType::SharedOwner ||
+                                                  p.second.ownershipType == PointerOwnershipType::Owner;
+                                       });
+                }
+
+            private:
+                size_t _currId;
+                std::unordered_map<const void *, PLCInfoSerializer> _ptrMap;
+
+            };
+
+            class PointerLinkingContextDeserialization {
+            public:
+                explicit PointerLinkingContextDeserialization()
+                        : _idMap{} {}
+
+                PointerLinkingContextDeserialization(const PointerLinkingContextDeserialization &) = delete;
+
+                PointerLinkingContextDeserialization &operator=(const PointerLinkingContextDeserialization &) = delete;
+
+                PointerLinkingContextDeserialization(PointerLinkingContextDeserialization &&) = default;
+
+                PointerLinkingContextDeserialization &operator=(PointerLinkingContextDeserialization &&) = default;
+
+                ~PointerLinkingContextDeserialization() = default;
+
+                PLCInfoDeserializer &getInfoById(size_t id, PointerOwnershipType ptrType) {
+                    auto res = _idMap.emplace(id, PLCInfoDeserializer{nullptr, ptrType});
+                    auto &ptrInfo = res.first->second;
+                    if (!res.second)
+                        ptrInfo.update(ptrType);
+                    return ptrInfo;
+                }
+
+                void clearSharedState() {
+                    for (auto &item: _idMap)
+                        item.second.sharedState.reset();
+                }
+
+                //valid, when all pointers has owners
+                bool isPointerDeserializationValid() const {
+                    return std::all_of(_idMap.begin(), _idMap.end(),
+                                       [](const std::pair<const size_t, PLCInfoDeserializer> &p) {
+                                           return p.second.ownershipType == PointerOwnershipType::SharedOwner ||
+                                                  p.second.ownershipType == PointerOwnershipType::Owner;
+                                       });
+                }
+
+            private:
+                std::unordered_map<size_t, PLCInfoDeserializer> _idMap;
+            };
+
+            template<template<typename> class TPtrManager,
+                    template<typename> class TPolymorphicContext, typename RTTI>
+            class PointerObjectExtensionBase {
+            public:
+
+                explicit PointerObjectExtensionBase(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 &&fnc) const {
+
+                    auto ptr = TPtrManager<T>::getPtr(const_cast<T &>(obj));
+                    if (ptr) {
+                        auto ctx = ser.template context<PointerLinkingContext>();
+                        assert(ctx != nullptr);
+                        auto &ptrInfo = ctx->getInfoByPtr(getBasePtr(ptr), TPtrManager<T>::getOwnership());
+                        details::writeSize(w, ptrInfo.id);
+                        if (TPtrManager<T>::getOwnership() != PointerOwnershipType::Observer) {
+                            if (!ptrInfo.isSharedProcessed)
+                                serializeImpl(ser, ptr, std::forward<Fnc>(fnc), w, IsPolymorphic<T>{});
+                        }
+                    } 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 &&fnc) const {
+                    size_t id{};
+                    details::readSize(r, id, std::numeric_limits<size_t>::max());
+                    if (id) {
+                        auto ctx = des.template context<PointerLinkingContext>();
+                        assert(ctx != nullptr);
+                        auto &ptrInfo = ctx->getInfoById(id, TPtrManager<T>::getOwnership());
+                        deserializeImpl(ptrInfo, des, obj, std::forward<Fnc>(fnc), r, IsPolymorphic<T>{},
+                                        std::integral_constant<PointerOwnershipType, TPtrManager<T>::getOwnership()>{});
+                    } else {
+                        if (_ptrType == PointerType::Nullable) {
+                            TPtrManager<T>::clear(obj);
+                        } else
+                            r.setError(ReaderError::InvalidPointer);
+                    }
+                }
+
+            private:
+
+                template<typename T>
+                struct IsPolymorphic : std::integral_constant<bool,
+                        RTTI::template isPolymorphic<typename TPtrManager<T>::TElement>()> {
+                };
+
+                template<typename T>
+                const void *getBasePtr(const T *ptr) const {
+                    // todo implement handling of types with virtual inheritance
+                    // this is required to correctly track same object, when one object is derived and other is base class
+                    // e.g. shared_ptr<Base> and weak_ptr<Derived> or pointer observer Base*
+                    return ptr;
+                }
+
+                template<typename Ser, typename TPtr, typename Fnc, typename Writer>
+                void serializeImpl(Ser &ser, TPtr &ptr, Fnc &&, Writer &w, std::true_type) const {
+                    const auto &ctx = ser.template context<TPolymorphicContext<RTTI>>();
+                    ctx->serialize(ser, w, *ptr);
+                }
+
+                template<typename Ser, typename TPtr, typename Fnc, typename Writer>
+                void serializeImpl(Ser &, TPtr &ptr, Fnc &&fnc, Writer &, std::false_type) const {
+                    fnc(*ptr);
+                }
+
+                template<typename Des, typename T, typename Fnc, typename Reader>
+                void deserializeImpl(PLCInfoDeserializer &ptrInfo, Des &des, T &obj, Fnc &&,
+                                     Reader &r, std::true_type ,
+                                     std::integral_constant<PointerOwnershipType, PointerOwnershipType::Owner>) const {
+                    const auto &ctx = des.template context<TPolymorphicContext<RTTI>>();
+                    ctx->deserialize(des, r, TPtrManager<T>::getPtr(obj),
+                                     [&obj, this](typename TPtrManager<T>::TElement *valuePtr) {
+                                         TPtrManager<T>::assign(obj, valuePtr);
+                                     });
+                    ptrInfo.processOwner(TPtrManager<T>::getPtr(obj));
+                }
+
+                template<typename Des, typename T, typename Fnc, typename Reader>
+                void deserializeImpl(PLCInfoDeserializer &ptrInfo, Des &, T &obj, Fnc &&fnc,
+                                     Reader &, std::false_type ,
+                                     std::integral_constant<PointerOwnershipType, PointerOwnershipType::Owner>) const {
+                    auto ptr = TPtrManager<T>::getPtr(obj);
+                    if (ptr) {
+                        fnc(*ptr);
+                    } else {
+                        ptr = ::bitsery::Access::createInHeap<typename TPtrManager<T>::TElement>();
+                        fnc(*ptr);
+                        TPtrManager<T>::assign(obj, ptr);
+                    }
+                    ptrInfo.processOwner(ptr);
+                }
+
+                template<typename Des, typename T, typename Fnc, typename Reader>
+                void deserializeImpl(PLCInfoDeserializer &ptrInfo, Des &des, T &obj, Fnc &&,
+                                     Reader &r, std::true_type ,
+                                     std::integral_constant<PointerOwnershipType, PointerOwnershipType::SharedOwner>) const {
+                    auto &sharedState = ptrInfo.sharedState;
+                    if (!sharedState) {
+                        const auto &ctx = des.template context<TPolymorphicContext<RTTI>>();
+                        ctx->deserialize(des, r, TPtrManager<T>::getPtr(obj),
+                                         [&obj, &sharedState](typename TPtrManager<T>::TElement *valuePtr) {
+                                             sharedState = TPtrManager<T>::createSharedState(valuePtr);
+                                         });
+                        if (!sharedState)
+                            sharedState = TPtrManager<T>::saveToSharedState(obj);
+                    }
+                    TPtrManager<T>::loadFromSharedState(sharedState.get(), obj);
+                    ptrInfo.processOwner(TPtrManager<T>::getPtr(obj));
+                }
+
+                template<typename Des, typename T, typename Fnc, typename Reader>
+                void deserializeImpl(PLCInfoDeserializer &ptrInfo, Des &, T &obj, Fnc &&fnc,
+                                     Reader &, std::false_type ,
+                                     std::integral_constant<PointerOwnershipType, PointerOwnershipType::SharedOwner>) const {
+                    auto &sharedState = ptrInfo.sharedState;
+                    if (!sharedState) {
+                        if (auto ptr = TPtrManager<T>::getPtr(obj)) {
+                            fnc(*ptr);
+                            sharedState = TPtrManager<T>::saveToSharedState(obj);
+                        } else {
+                            auto res = ::bitsery::Access::createInHeap<typename TPtrManager<T>::TElement>();
+                            fnc(*res);
+                            sharedState = TPtrManager<T>::createSharedState(res);
+                        }
+                    }
+                    TPtrManager<T>::loadFromSharedState(sharedState.get(), obj);
+                    ptrInfo.processOwner(TPtrManager<T>::getPtr(obj));
+                }
+
+                template<typename Des, typename T, typename Fnc, typename Reader, typename isPolymorph>
+                void deserializeImpl(PLCInfoDeserializer &ptrInfo, Des &des, T &obj, Fnc &&fnc,
+                                     Reader &r, isPolymorph polymorph,
+                                     std::integral_constant<PointerOwnershipType, PointerOwnershipType::SharedObserver>) const {
+                    deserializeImpl(ptrInfo, des, obj, fnc, r, polymorph,
+                                    std::integral_constant<PointerOwnershipType, PointerOwnershipType::SharedOwner>{});
+                }
+
+                template<typename Des, typename T, typename Fnc, typename Reader, typename isPolymorphic>
+                void deserializeImpl(PLCInfoDeserializer &ptrInfo, Des &, T &obj, Fnc &&,
+                                     Reader &, isPolymorphic,
+                                     std::integral_constant<PointerOwnershipType, PointerOwnershipType::Observer>) const {
+                    ptrInfo.processObserver(reinterpret_cast<void *&>(TPtrManager<T>::getPtrRef(obj)));
+                }
+
+                PointerType _ptrType;
+            };
+
+        }
+
+        //this class is for convenience
+        class PointerLinkingContext :
+                public pointer_utils::PointerLinkingContextSerialization,
+                public pointer_utils::PointerLinkingContextDeserialization {
+        public:
+            explicit PointerLinkingContext() = default;
+            bool isValid() {
+                return isPointerSerializationValid() && isPointerDeserializationValid();
+            }
+        };
+
+    }
+}
+
+#endif //BITSERY_POINTER_UTILS_H

include/bitsery/ext/utils/polymorphism_utils.h

@@ -0,0 +1,238 @@
+//MIT License
+//
+//Copyright (c) 2018 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_POLYMORPHISM_UTILS_H
+#define BITSERY_EXT_POLYMORPHISM_UTILS_H
+
+#include <unordered_map>
+#include <memory>
+#include "../../details/adapter_common.h"
+#include "../../details/serialization_common.h"
+
+namespace bitsery {
+
+    namespace ext {
+
+        //helper type, that contains list of types
+        template<typename ...>
+        struct PolymorphicClassesList {
+        };
+
+        //specialize for your base class by deriving from PolymorphicDerivedClasses with list of derivatives that DIRECTLY inherits from your base class.
+//e.g.
+// template <> PolymorphicBaseClass<Animal>: PolymorphicDerivedClasses<Dog, Cat>{};
+// template <> PolymorphicBaseClass<Dog>: PolymorphicDerivedClasses<Bulldog, GoldenRetriever> {};
+// IMPORTANT !!!
+// although you can add all derivates to same base like this:
+// template <> PolymorphicBaseClass<Animal>:PolymorphicDerivedClasses<Dog, Cat, Bulldog, GoldenRetriever>{};
+// it will not work when you try to serialize Dog*, because it will not find Bulldog and GoldenRetriever
+        template<typename TBase>
+        struct PolymorphicBaseClass {
+            using Childs = PolymorphicClassesList<>;
+        };
+
+//derive from this class when specifying childs for your base class, atleast one child must exists, hence T1
+//e.g.
+// template <> PolymorphicBaseClass<Animal>: PolymorphicDerivedClasses<Dog, Cat>{};
+        template<typename T1, typename ... Tn>
+        struct PolymorphicDerivedClasses {
+            using Childs = PolymorphicClassesList<T1, Tn...>;
+        };
+
+        class PolymorphicHandlerBase {
+        public:
+            virtual void *create() const = 0;
+            virtual void process(void *ser, void *obj) const = 0;
+            virtual ~PolymorphicHandlerBase() = default;
+        };
+
+        template<typename RTTI, typename TSerializer, typename TBase, typename TDerived>
+        class PolymorphicHandler : public PolymorphicHandlerBase {
+        public:
+
+            void *create() const final {
+                return toBase(::bitsery::Access::createInHeap<TDerived>());
+            }
+
+            void process(void *ser, void *obj) const final {
+                static_cast<TSerializer *>(ser)->object(*static_cast<TDerived *>(fromBase(obj)));
+            }
+
+        private:
+
+            void *fromBase(void *obj) const {
+                return RTTI::template cast<TBase, TDerived>(static_cast<TBase *>(obj));
+            }
+
+            void *toBase(void *obj) const {
+                return RTTI::template cast<TDerived, TBase>(static_cast<TDerived *>(obj));
+            }
+
+        };
+
+        template<typename RTTI>
+        class PolymorphicContext {
+        private:
+
+            struct BaseToDerivedKey {
+
+                std::size_t baseHash;
+                std::size_t derivedHash;
+
+                bool operator==(const BaseToDerivedKey &other) const {
+                    return baseHash == other.baseHash && derivedHash == other.derivedHash;
+                }
+            };
+
+            struct BaseToDerivedKeyHashier {
+                size_t operator()(const BaseToDerivedKey &key) const {
+                    return (key.baseHash + (key.baseHash << 6) + (key.derivedHash >> 2)) ^ key.derivedHash;
+                }
+            };
+
+            template<typename TSerializer, template<typename> class THierarchy, typename TBase, typename TDerived>
+            void add() {
+                addToMap<TSerializer, TBase, TDerived>(std::is_abstract<TDerived>{});
+                addChilds<TSerializer, THierarchy, TBase, TDerived>(typename THierarchy<TDerived>::Childs{});
+            }
+
+            template<typename TSerializer, template<typename> class THierarchy, typename TBase, typename TDerived, typename T1, typename ... Tn>
+            void addChilds(PolymorphicClassesList<T1, Tn...>) {
+                static_assert(std::is_base_of<TDerived, T1>::value,
+                              "PolymorphicBaseClass<TBase> must derive a list of derived classes from TBase.");
+                add<TSerializer, THierarchy, TBase, T1>();
+                addChilds<TSerializer, THierarchy, TBase, TDerived>(PolymorphicClassesList<Tn...>{});
+                //iterate through derived class hierarchy as well
+                add<TSerializer, THierarchy, T1, T1>();
+            }
+
+            template<typename TSerializer, template<typename> class THierarchy, typename TBase, typename TDerived>
+            void addChilds(PolymorphicClassesList<>) {
+            }
+
+            template<typename TSerializer, typename TBase, typename TDerived>
+            void addToMap(std::false_type) {
+                BaseToDerivedKey key{RTTI::template get<TBase>(), RTTI::template get<TDerived>()};
+                if (_baseToDerivedMap.emplace(key, std::unique_ptr<PolymorphicHandlerBase>(
+                        new PolymorphicHandler<RTTI, TSerializer, TBase, TDerived>{})).second)
+                    _baseToDerivedArray[key.baseHash].push_back(key.derivedHash);
+            }
+
+            template<typename TSerializer, typename TBase, typename TDerived>
+            void addToMap(std::true_type) {
+                //cannot add abstract class
+            }
+
+            std::unordered_map<BaseToDerivedKey, std::unique_ptr<PolymorphicHandlerBase>, BaseToDerivedKeyHashier> _baseToDerivedMap{};
+            // this will allow convert from platform specific type information, to platform independent base->derived index
+            // this only works if all polymorphic relationships (PolymorphicBaseClass<TBase> -> PolymorphicDerivedClasses<TDerived...>)
+            // is equal between platforms.
+            std::unordered_map<size_t, std::vector<size_t>> _baseToDerivedArray{};
+
+        public:
+
+            void clear() {
+                _baseToDerivedMap.clear();
+                _baseToDerivedArray.clear();
+            }
+
+            template<typename TSerializer, template<typename> class THierarchy = PolymorphicBaseClass, typename T1, typename ...Tn>
+            [[deprecated("de/serializer instance is not required")]] void registerBasesList(const TSerializer &s, PolymorphicClassesList<T1, Tn...>) {
+                add<TSerializer, THierarchy, T1, T1>();
+                registerBasesList<TSerializer, THierarchy>(s, PolymorphicClassesList<Tn...>{});
+            }
+
+            template<typename TSerializer, template<typename> class THierarchy>
+            [[deprecated]] void registerBasesList(const TSerializer &, PolymorphicClassesList<>) {
+            }
+
+            // THierarchy is the name of class, that defines hierarchy
+            // PolymorphicBaseClass is defined as default parameter, so that at instantiation time
+            // it will get unique symbol in translation unit for PolymorphicBaseClass (which is defined in anonymous namespace)
+            // https://github.com/fraillt/bitsery/issues/9
+            template<typename TSerializer, template<typename> class THierarchy = PolymorphicBaseClass, typename T1, typename ...Tn>
+            void registerBasesList(PolymorphicClassesList<T1, Tn...>) {
+                add<TSerializer, THierarchy, T1, T1>();
+                registerBasesList<TSerializer, THierarchy>(PolymorphicClassesList<Tn...>{});
+            }
+
+            template<typename TSerializer, template<typename> class THierarchy>
+            void registerBasesList(PolymorphicClassesList<>) {
+            }
+
+            // optional method, in case you want to construct base class hierarchy your self
+            template <typename TSerializer, typename TBase, typename TDerived>
+            void registerSingleBaseBranch() {
+                static_assert(std::is_base_of<TBase, TDerived>::value, "TDerived must be derived from TBase");
+                static_assert(!std::is_abstract<TDerived>::value, "TDerived cannot be abstract");
+                addToMap<TSerializer, TBase, TDerived>(std::false_type{});
+            }
+
+
+            template<typename Serializer, typename Writer, typename TBase>
+            void serialize(Serializer &ser, Writer &writer, TBase &obj) {
+                //get derived key
+                BaseToDerivedKey key{RTTI::template get<TBase>(), RTTI::template get<TBase>(obj)};
+                auto it = _baseToDerivedMap.find(key);
+                assert(it != _baseToDerivedMap.end());
+
+                //convert derived hash to derived index, to make it work in cross-platform environment
+                auto &vec = _baseToDerivedArray.find(key.baseHash)->second;
+                auto derivedIndex = static_cast<size_t>(std::distance(vec.begin(), std::find(vec.begin(), vec.end(),
+                                                                                             key.derivedHash)));
+                details::writeSize(writer, derivedIndex);
+
+                //serialize
+                it->second->process(&ser, &obj);
+            }
+
+            template<typename Deserializer, typename Reader, typename TBase, typename TAssignFnc>
+            void deserialize(Deserializer &des, Reader &reader, TBase *obj, TAssignFnc assignFnc) {
+                size_t derivedIndex{};
+                details::readSize(reader, derivedIndex, std::numeric_limits<size_t>::max());
+
+                auto baseToDerivedVecIt = _baseToDerivedArray.find(RTTI::template get<TBase>());
+                //base class is known at compile time, so we can assert on this one
+                assert(baseToDerivedVecIt != _baseToDerivedArray.end());
+
+                if (baseToDerivedVecIt->second.size() > derivedIndex) {
+                    //convert derived index to derived hash, to make it work in cross-platform environment
+                    auto derivedHash = baseToDerivedVecIt->second[derivedIndex];
+                    auto &handler = _baseToDerivedMap.find(
+                            BaseToDerivedKey{RTTI::template get<TBase>(), derivedHash})->second;
+                    //if object is null or different type, create new and assign it
+                    if (obj == nullptr || RTTI::template get<TBase>(*obj) != derivedHash) {
+                        obj = static_cast<TBase *>(handler->create());
+                        assignFnc(obj);
+                    }
+                    handler->process(&des, obj);
+                } else
+                    reader.setError(ReaderError::InvalidPointer);
+            }
+
+        };
+
+    }
+
+}
+
+#endif //BITSERY_EXT_POLYMORPHISM_UTILS_H

include/bitsery/ext/utils/rtti_utils.h

@@ -0,0 +1,65 @@
+//MIT License
+//
+//Copyright (c) 2018 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_RTTI_UTILS_H
+#define BITSERY_RTTI_UTILS_H
+
+#include <typeinfo>
+#include <type_traits>
+#include <cstddef>
+
+namespace bitsery {
+    namespace ext {
+
+        struct StandardRTTI {
+
+//                static_assert(!std::is_pointer<TBase>::value &&
+//                              !std::is_const<TBase>::value &&
+//                              !std::is_volatile<TBase>::value, "");
+
+            template<typename TBase>
+            static size_t get(TBase &obj) {
+                return typeid(obj).hash_code();
+            }
+
+            template<typename TBase>
+            static constexpr size_t get() {
+                return typeid(TBase).hash_code();
+            }
+
+            template<typename TBase, typename TDerived>
+            static constexpr TDerived *cast(TBase *obj) {
+                static_assert(!std::is_pointer<TDerived>::value, "");
+                return dynamic_cast<TDerived *>(obj);
+            }
+
+            template<typename TBase>
+            static constexpr bool isPolymorphic() {
+                return std::is_polymorphic<TBase>::value;
+            }
+
+        };
+
+    }
+}
+
+#endif //BITSERY_RTTI_UTILS_H

include/bitsery/ext/value_range.h

@@ -24,7 +24,7 @@
 #define BITSERY_EXT_VALUE_RANGE_H
 
 #include "../details/serialization_common.h"
-#include "../details/buffer_common.h"
+#include "../details/adapter_common.h"
 #include <cassert>
 
 namespace bitsery {
@@ -96,7 +96,7 @@ namespace bitsery {
             constexpr RangeSpec(T minValue, T maxValue, T precision) :
                     min{minValue},
                     max{maxValue},
-                    bitsRequired{calcRequiredBits<details::SAME_SIZE_UNSIGNED<T>>({}, ((max - min) / precision))} {
+                    bitsRequired{calcRequiredBits<details::SameSizeUnsigned<T>>({}, ((max - min) / precision))} {
 
             }
 
@@ -106,42 +106,42 @@ namespace bitsery {
         };
 
         template<typename T, typename std::enable_if<std::is_integral<T>::value>::type * = nullptr>
-        details::SAME_SIZE_UNSIGNED<T> getRangeValue(const T &v, const RangeSpec<T> &r) {
-            return static_cast<details::SAME_SIZE_UNSIGNED<T>>(v - r.min);
-        };
+        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::SAME_SIZE_UNSIGNED<T> getRangeValue(const T &v, const RangeSpec<T> &r) {
-            using VT = details::SAME_SIZE_UNSIGNED<T>;
+        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::SAME_SIZE_UNSIGNED<T> getRangeValue(const T &v, const RangeSpec<T> &r) {
-            using VT = details::SAME_SIZE_UNSIGNED<T>;
+        details::SameSizeUnsigned<T> getRangeValue(const T &v, const RangeSpec<T> &r) {
+            using VT = details::SameSizeUnsigned<T>;
             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) {
-            using UIT = details::SAME_SIZE_UNSIGNED<T>;
+            using UIT = details::SameSizeUnsigned<T>;
             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 {
@@ -174,10 +174,10 @@ namespace bitsery {
 
             template<typename Des, typename Reader, typename T, typename Fnc>
             void deserialize(Des &, Reader &reader, T &v, Fnc &&) const {
-                reader.readBits(reinterpret_cast<details::SAME_SIZE_UNSIGNED<T> &>(v), _range.bitsRequired);
+                reader.readBits(reinterpret_cast<details::SameSizeUnsigned<T> &>(v), _range.bitsRequired);
                 details::setRangeValue(v, _range);
                 if (!details::isRangeValid(v, _range)) {
-                    reader.setError(BufferReaderError::INVALID_BUFFER_DATA);
+                    reader.setError(ReaderError::InvalidData);
                     v = _range.min;
                 }
             }
@@ -190,7 +190,7 @@ namespace bitsery {
         };
     }
 
-    namespace details {
+    namespace traits {
         template<typename T>
         struct ExtensionTraits<ext::ValueRange<T>, T> {
             using TValue = void;

include/bitsery/flexible.h

@@ -0,0 +1,110 @@
+//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_FLEXIBLE_H
+#define BITSERY_FLEXIBLE_H
+
+#include "details/serialization_common.h"
+#include "details/flexible_common.h"
+
+namespace bitsery {
+
+    namespace flexible {
+
+        //overload when T is reference type
+        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>
+        void archiveProcessImpl(S &s, T &&head, std::false_type) {
+            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);
+        }
+
+    }
+
+    //define function that enables s.archive(....) usage
+    template<typename S, typename T>
+    void archiveProcess(S &s, T &&head) {
+        flexible::archiveProcessImpl(s, std::forward<T>(head), std::is_reference<T>{});
+    }
+
+    //wrapper functions that enables to serialize as container or string
+    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) {
+        return {obj, max};
+    }
+
+//define serialize function for fundamental types
+    template<typename S>
+    void serialize(S &s, bool &v) {
+        s.boolValue(v);
+    }
+
+    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 &, 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>
+    void assertFundamentalTypeSizes() {
+        //http://en.cppreference.com/w/cpp/language/types
+        static_assert(sizeof(short) == TShort, "");
+        static_assert(sizeof(int) == TInt, "");
+        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.
+    }
+
+}
+
+#endif //BITSERY_FLEXIBLE_H

include/bitsery/flexible/array.h

@@ -0,0 +1,37 @@
+//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_FLEXIBLE_TYPE_STD_ARRAY_H
+#define BITSERY_FLEXIBLE_TYPE_STD_ARRAY_H
+
+#include "../traits/array.h"
+#include "../details/flexible_common.h"
+
+namespace bitsery {
+    template<typename S, typename T, size_t N>
+    void serialize(S &s, std::array<T, N> &obj) {
+        flexible::processContainer(s, obj);
+    }
+}
+
+#endif //BITSERY_FLEXIBLE_TYPE_STD_ARRAY_H

include/bitsery/flexible/deque.h

@@ -0,0 +1,37 @@
+//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_FLEXIBLE_TYPE_STD_DEQUE_H
+#define BITSERY_FLEXIBLE_TYPE_STD_DEQUE_H
+
+#include "../traits/deque.h"
+#include "../details/flexible_common.h"
+
+namespace bitsery {
+    template<typename S, typename ... TArgs>
+    void serialize(S &s, std::deque<TArgs... > &obj) {
+        flexible::processContainer(s, obj);
+    }
+}
+
+#endif //BITSERY_FLEXIBLE_TYPE_STD_DEQUE_H

include/bitsery/flexible/forward_list.h

@@ -0,0 +1,37 @@
+//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_FLEXIBLE_TYPE_STD_FORWARD_LIST_H
+#define BITSERY_FLEXIBLE_TYPE_STD_FORWARD_LIST_H
+
+#include "../traits/forward_list.h"
+#include "../details/flexible_common.h"
+
+namespace bitsery {
+    template<typename S, typename ... TArgs>
+    void serialize(S &s, std::forward_list<TArgs... > &obj) {
+        flexible::processContainer(s, obj);
+    }
+}
+
+#endif //BITSERY_FLEXIBLE_TYPE_STD_FORWARD_LIST_H

include/bitsery/flexible/list.h

@@ -0,0 +1,37 @@
+//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_FLEXIBLE_TYPE_STD_LIST_H
+#define BITSERY_FLEXIBLE_TYPE_STD_LIST_H
+
+#include "../traits/list.h"
+#include "../details/flexible_common.h"
+
+namespace bitsery {
+    template<typename S, typename ... TArgs>
+    void serialize(S &s, std::list<TArgs... > &obj) {
+        flexible::processContainer(s, obj);
+    }
+}
+
+#endif //BITSERY_FLEXIBLE_TYPE_STD_LIST_H

include/bitsery/flexible/map.h

@@ -0,0 +1,54 @@
+//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_FLEXIBLE_TYPE_STD_MAP_H
+#define BITSERY_FLEXIBLE_TYPE_STD_MAP_H
+
+#include <map>
+#include "../ext/std_map.h"
+
+namespace bitsery {
+    template<typename S, typename ... TArgs>
+    void serialize(S &s, std::map<TArgs ... > &obj, size_t maxSize = std::numeric_limits<size_t>::max()) {
+        using TKey = typename std::map<TArgs...>::key_type;
+        using TValue = typename std::map<TArgs...>::mapped_type;
+        s.ext(obj, ext::StdMap{maxSize},
+              [&s](TKey& key, TValue& value) {
+                  s.object(key);
+                  s.object(value);
+              });
+    }
+
+    template<typename S, typename ... TArgs>
+    void serialize(S &s, std::multimap<TArgs ... > &obj, size_t maxSize = std::numeric_limits<size_t>::max()) {
+        using TKey = typename std::multimap<TArgs...>::key_type;
+        using TValue = typename std::multimap<TArgs...>::mapped_type;
+        s.ext(obj, ext::StdMap{maxSize},
+              [&s](TKey& key, TValue& value) {
+                  s.object(key);
+                  s.object(value);
+              });
+    }
+}
+
+#endif //BITSERY_FLEXIBLE_TYPE_STD_MAP_H

include/bitsery/flexible/memory.h

@@ -0,0 +1,45 @@
+//MIT License
+//
+//Copyright (c) 2018 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_FLEXIBLE_TYPE_STD_MEMORY_H
+#define BITSERY_FLEXIBLE_TYPE_STD_MEMORY_H
+
+#include "../ext/std_smart_ptr.h"
+
+namespace bitsery {
+    template<typename S, typename T, typename D>
+    void serialize(S &s, std::unique_ptr<T, D> &obj) {
+        s.ext(obj, ext::StdSmartPtr{});
+    }
+
+    template<typename S, typename T>
+    void serialize(S &s, std::shared_ptr<T> &obj) {
+        s.ext(obj, ext::StdSmartPtr{});
+    }
+
+    template<typename S, typename T>
+    void serialize(S &s, std::weak_ptr<T> &obj) {
+        s.ext(obj, ext::StdSmartPtr{});
+    }
+}
+
+#endif //BITSERY_FLEXIBLE_TYPE_STD_MEMORY_H

include/bitsery/flexible/queue.h

@@ -0,0 +1,42 @@
+//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_FLEXIBLE_TYPE_STD_QUEUE_H
+#define BITSERY_FLEXIBLE_TYPE_STD_QUEUE_H
+
+#include "../ext/std_queue.h"
+
+namespace bitsery {
+    template<typename S, typename T, typename C>
+    void serialize(S &s, std::queue<T, C> &obj, size_t maxSize = std::numeric_limits<size_t>::max()) {
+        s.ext(obj, ext::StdQueue{maxSize});
+    }
+
+    template<typename S, typename T, typename C, typename Comp>
+    void serialize(S &s, std::priority_queue<T, C, Comp> &obj, size_t maxSize = std::numeric_limits<size_t>::max()) {
+        s.ext(obj, ext::StdQueue{maxSize});
+    }
+
+}
+
+#endif //BITSERY_FLEXIBLE_TYPE_STD_QUEUE_H

include/bitsery/flexible/set.h

@@ -0,0 +1,43 @@
+//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_FLEXIBLE_TYPE_STD_SET_H
+#define BITSERY_FLEXIBLE_TYPE_STD_SET_H
+
+#include <set>
+#include "../ext/std_set.h"
+
+namespace bitsery {
+    template<typename S, typename ... TArgs>
+    void serialize(S &s, std::set<TArgs...> &obj, size_t maxSize = std::numeric_limits<size_t>::max()) {
+        s.ext(obj, ext::StdSet{maxSize});
+    }
+
+    template<typename S, typename ... TArgs>
+    void serialize(S &s, std::multiset<TArgs...> &obj, size_t maxSize = std::numeric_limits<size_t>::max()) {
+        s.ext(obj, ext::StdSet{maxSize});
+    }
+
+}
+
+#endif //BITSERY_FLEXIBLE_TYPE_STD_SET_H

include/bitsery/flexible/stack.h

@@ -0,0 +1,36 @@
+//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_FLEXIBLE_TYPE_STD_STACK_H
+#define BITSERY_FLEXIBLE_TYPE_STD_STACK_H
+
+#include "../ext/std_stack.h"
+
+namespace bitsery {
+    template<typename S, typename T, typename C>
+    void serialize(S &s, std::stack<T, C> &obj, size_t maxSize = std::numeric_limits<size_t>::max()) {
+        s.ext(obj, ext::StdStack{maxSize});
+    }
+}
+
+#endif //BITSERY_FLEXIBLE_TYPE_STD_STACK_H

include/bitsery/flexible/string.h

@@ -0,0 +1,37 @@
+//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_FLEXIBLE_TYPE_STD_STRING_H
+#define BITSERY_FLEXIBLE_TYPE_STD_STRING_H
+
+#include "../traits/string.h"
+#include "../details/flexible_common.h"
+
+namespace bitsery {
+    template<typename S, typename T, typename ... TArgs>
+    void serialize(S &s, std::basic_string<T, TArgs...> &str) {
+        flexible::processContainer(s, str);
+    }
+}
+
+#endif //BITSERY_FLEXIBLE_TYPE_STD_STRING_H

include/bitsery/flexible/unordered_map.h

@@ -0,0 +1,55 @@
+//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_FLEXIBLE_TYPE_STD_UNORDERED_MAP_H
+#define BITSERY_FLEXIBLE_TYPE_STD_UNORDERED_MAP_H
+
+#include <unordered_map>
+#include "../ext/std_map.h"
+
+namespace bitsery {
+    template<typename S, typename ... TArgs>
+    void serialize(S &s, std::unordered_map<TArgs ... > &obj, size_t maxSize = std::numeric_limits<size_t>::max()) {
+        using TKey = typename std::unordered_map<TArgs...>::key_type;
+        using TValue = typename std::unordered_map<TArgs...>::mapped_type;
+        s.ext(obj, ext::StdMap{maxSize},
+              [&s](TKey& key, TValue& value) {
+                  s.object(key);
+                  s.object(value);
+              });
+    }
+
+    template<typename S, typename ... TArgs>
+    void serialize(S &s, std::unordered_multimap<TArgs ... > &obj, size_t maxSize = std::numeric_limits<size_t>::max()) {
+        using TKey = typename std::unordered_multimap<TArgs...>::key_type;
+        using TValue = typename std::unordered_multimap<TArgs...>::mapped_type;
+        s.ext(obj, ext::StdMap{maxSize},
+              [&s](TKey& key, TValue& value) {
+                  s.object(key);
+                  s.object(value);
+              });
+    }
+
+}
+
+#endif //BITSERY_FLEXIBLE_TYPE_STD_UNORDERED_MAP_H

include/bitsery/flexible/unordered_set.h

@@ -0,0 +1,43 @@
+//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_FLEXIBLE_TYPE_STD_UNORDERED_SET_H
+#define BITSERY_FLEXIBLE_TYPE_STD_UNORDERED_SET_H
+
+#include <unordered_set>
+#include "../ext/std_set.h"
+
+namespace bitsery {
+    template<typename S, typename ... TArgs>
+    void serialize(S &s, std::unordered_set<TArgs...> &obj, size_t maxSize = std::numeric_limits<size_t>::max()) {
+        s.ext(obj, ext::StdSet{maxSize});
+    }
+
+    template<typename S, typename ... TArgs>
+    void serialize(S &s, std::unordered_multiset<TArgs...> &obj, size_t maxSize = std::numeric_limits<size_t>::max()) {
+        s.ext(obj, ext::StdSet{maxSize});
+    }
+
+}
+
+#endif //BITSERY_FLEXIBLE_TYPE_STD_UNORDERED_SET_H

include/bitsery/flexible/vector.h

@@ -0,0 +1,37 @@
+//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_FLEXIBLE_TYPE_STD_VECTOR_H
+#define BITSERY_FLEXIBLE_TYPE_STD_VECTOR_H
+
+#include "../traits/vector.h"
+#include "../details/flexible_common.h"
+
+namespace bitsery {
+    template<typename S, typename ... TArgs>
+    void serialize(S &s, std::vector<TArgs... > &obj) {
+        flexible::processContainer(s, obj);
+    }
+}
+
+#endif //BITSERY_FLEXIBLE_TYPE_STD_VECTOR_H

include/bitsery/serializer.h

@@ -24,28 +24,58 @@
 #ifndef BITSERY_SERIALIZER_H
 #define BITSERY_SERIALIZER_H
 
-#include "common.h"
 #include "details/serialization_common.h"
+#include "adapter_writer.h"
 #include <cassert>
 
 namespace bitsery {
 
-
-
-
-    template<typename Config>
+    template<typename TAdapterWriter, typename TContext = void>
     class BasicSerializer {
     public:
-        explicit BasicSerializer(BasicBufferWriter<Config> &w, void* context = nullptr) : _writter{w}, _context{context} {};
+        //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, 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, TContext* context = nullptr)
+                : _writer{std::forward<WriterParam>(w)},
+                  _context{context},
+                  _internalContext{}
+        {
+        }
+
+        //copying disabled
+        BasicSerializer(const BasicSerializer&) = delete;
+        BasicSerializer& operator = (const BasicSerializer&) = delete;
+
+        //move enabled
+        BasicSerializer(BasicSerializer&& ) = default;
+        BasicSerializer& operator = (BasicSerializer&& ) = default;
 
         /*
          * get serialization context.
          * this is optional, but might be required for some specific serialization flows.
          */
-        void* getContext() {
+        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
          */
@@ -57,26 +87,35 @@ 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
+         */
+        template<typename T, typename ... TArgs>
+        void archive(T &&head, TArgs &&... tail) {
+            //serialize object
+            details::ArchiveFunction<BasicSerializer, T>::invoke(*this, std::forward<T>(head));
+            //expand other elements
+            archive(std::forward<TArgs>(tail)...);
+        }
 
         /*
          * value overloads
          */
 
-        template<size_t VSIZE, typename T, typename std::enable_if<std::is_floating_point<T>::value>::type * = nullptr>
+        template<size_t VSIZE, typename T, typename std::enable_if<details::IsFundamentalType<T>::value>::type * = nullptr>
         void value(const T &v) {
-            static_assert(std::numeric_limits<T>::is_iec559, "");
-            _writter.template writeBytes<VSIZE>(reinterpret_cast<const details::SAME_SIZE_UNSIGNED<T> &>(v));
+            using TValue = typename details::IntegralFromFundamental<T>::TValue;
+            _writer.template writeBytes<VSIZE>(reinterpret_cast<const TValue &>(v));
         }
 
-        template<size_t VSIZE, typename T, typename std::enable_if<std::is_enum<T>::value>::type * = nullptr>
-        void value(const T &v) {
-            _writter.template writeBytes<VSIZE>(reinterpret_cast<const typename std::underlying_type<T>::type &>(v));
-        }
-
-        template<size_t VSIZE, typename T, typename std::enable_if<std::is_integral<T>::value>::type * = nullptr>
-        void value(const T &v) {
-            _writter.template writeBytes<VSIZE>(v);
+        /*
+         * enable bit-packing
+         */
+        template <typename Fnc>
+        void enableBitPacking(Fnc&& fnc) {
+            procEnableBitPacking(std::forward<Fnc>(fnc), std::integral_constant<bool, TAdapterWriter::BitPackingEnabled>{});
         }
 
         /*
@@ -84,43 +123,39 @@ namespace bitsery {
          */
 
         template<typename T, typename Ext, typename Fnc>
-        void ext(const T &obj, Ext &&extension, Fnc &&fnc) {
-            using ExtType = typename std::decay<Ext>::type;
-            static_assert(details::ExtensionTraits<ExtType,T>::SupportLambdaOverload,
+        void ext(const T &obj, const Ext &extension, Fnc &&fnc) {
+            static_assert(details::IsExtensionTraitsDefined<Ext, T>::value, "Please define ExtensionTraits");
+            static_assert(traits::ExtensionTraits<Ext,T>::SupportLambdaOverload,
                           "extension doesn't support overload with lambda");
-            extension.serialize(*this, _writter, obj, std::forward<Fnc>(fnc));
-        };
-
-        template<size_t VSIZE, typename T, typename Ext>
-        void ext(const T &obj, Ext &&extension) {
-            using ExtType = typename std::decay<Ext>::type;
-            static_assert(details::ExtensionTraits<ExtType,T>::SupportValueOverload,
-                          "extension doesn't support overload with `value<N>`");
-            using ExtVType = typename details::ExtensionTraits<ExtType, T>::TValue;
-            using VType = typename std::conditional<std::is_void<ExtVType>::value, details::DummyType, ExtVType>::type;
-            extension.serialize(*this, _writter, obj, [this](VType &v) { value<VSIZE>(v); });
-        };
-
-        template<typename T, typename Ext>
-        void ext(const T &obj, Ext &&extension) {
-            using ExtType = typename std::decay<Ext>::type;
-            static_assert(details::ExtensionTraits<ExtType,T>::SupportObjectOverload,
-                          "extension doesn't support overload with `object`");
-            using ExtVType = typename details::ExtensionTraits<ExtType, T>::TValue;
-            using VType = typename std::conditional<std::is_void<ExtVType>::value, details::DummyType, ExtVType>::type;
-            extension.serialize(*this, _writter, obj, [this](VType &v) { object(v); });
-        };
-
-        /*
-         * bool
-         */
-
-        void boolBit(bool v) {
-            _writter.writeBits(static_cast<unsigned char>(v ? 1 : 0), 1);
+            extension.serialize(*this, _writer, obj, std::forward<Fnc>(fnc));
         }
 
-        void boolByte(bool v) {
-            _writter.template writeBytes<1>(static_cast<unsigned char>(v ? 1 : 0));
+        template<size_t VSIZE, typename T, typename Ext>
+        void ext(const T &obj, const Ext &extension) {
+            static_assert(details::IsExtensionTraitsDefined<Ext, T>::value, "Please define ExtensionTraits");
+            static_assert(traits::ExtensionTraits<Ext,T>::SupportValueOverload,
+                          "extension doesn't support overload with `value<N>`");
+            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) {
+            static_assert(details::IsExtensionTraitsDefined<Ext, T>::value, "Please define ExtensionTraits");
+            static_assert(traits::ExtensionTraits<Ext,T>::SupportObjectOverload,
+                          "extension doesn't support overload with `object`");
+            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
+         */
+
+        void boolValue(bool v) {
+            procBoolValue(v, std::integral_constant<bool, TAdapterWriter::BitPackingEnabled>{});
         }
 
         /*
@@ -129,37 +164,20 @@ namespace bitsery {
 
         template<size_t VSIZE, typename T>
         void text(const T &str, size_t maxSize) {
-            static_assert(details::TextTraits<T>::isResizable,
+            static_assert(details::IsTextTraitsDefined<T>::value,
+                          "Please define TextTraits or include from <bitsery/traits/...>");
+            static_assert(traits::ContainerTraits<T>::isResizable,
                           "use text(const T&) overload without `maxSize` for static container");
-            auto size = details::TextTraits<T>::length(str);
-            //size can be equal to maxSize
-            assert(size <= maxSize);
-            details::writeSize(_writter, size);
-            auto begin = std::begin(str);
-            procContainer<VSIZE>(begin, std::next(begin, size), std::true_type{});
+            procText<VSIZE>(str, maxSize);
         }
 
         template<size_t VSIZE, typename T>
         void text(const T &str) {
-            static_assert(!details::TextTraits<T>::isResizable,
+            static_assert(details::IsTextTraitsDefined<T>::value,
+                          "Please define TextTraits or include from <bitsery/traits/...>");
+            static_assert(!traits::ContainerTraits<T>::isResizable,
                           "use text(const T&, size_t) overload with `maxSize` for dynamic containers");
-            auto size = details::TextTraits<T>::length(str);
-            auto begin = std::begin(str);
-            auto end = std::end(str);
-            //size must be less than container capacity, because we need to store null-terminated character
-            assert(size < std::distance(begin, end));
-            details::writeSize(_writter, size);
-
-            procContainer<VSIZE>(begin, std::next(begin, size), std::true_type{});
-        }
-
-        template<size_t VSIZE, typename T, size_t N>
-        void text(const T (&str)[N]) {
-            auto size = details::TextTraits<T[N]>::length(str);
-            assert(size < N);
-            details::writeSize(_writter, size);
-            auto begin = std::begin(str);
-            procContainer<VSIZE>(begin, std::next(begin, size), std::true_type{});
+            procText<VSIZE>(str, traits::ContainerTraits<T>::size(str));
         }
 
         /*
@@ -170,34 +188,39 @@ namespace bitsery {
 
         template<typename T, typename Fnc>
         void container(const T &obj, size_t maxSize, Fnc &&fnc) {
-
-            static_assert(details::ContainerTraits<T>::isResizable,
+            static_assert(details::IsContainerTraitsDefined<T>::value,
+                          "Please define ContainerTraits or include from <bitsery/traits/...>");
+            static_assert(traits::ContainerTraits<T>::isResizable,
                           "use container(const T&, Fnc) overload without `maxSize` for static containers");
-            auto size = details::ContainerTraits<T>::size(obj);
+            auto size = traits::ContainerTraits<T>::size(obj);
             assert(size <= maxSize);
-            details::writeSize(_writter, size);
+            details::writeSize(_writer, size);
             procContainer(std::begin(obj), std::end(obj), std::forward<Fnc>(fnc));
         }
 
         template<size_t VSIZE, typename T>
         void container(const T &obj, size_t maxSize) {
-            static_assert(details::ContainerTraits<T>::isResizable,
+            static_assert(details::IsContainerTraitsDefined<T>::value,
+                          "Please define ContainerTraits or include from <bitsery/traits/...>");
+            static_assert(traits::ContainerTraits<T>::isResizable,
                           "use container(const T&) overload without `maxSize` for static containers");
             static_assert(VSIZE > 0, "");
-            auto size = details::ContainerTraits<T>::size(obj);
+            auto size = traits::ContainerTraits<T>::size(obj);
             assert(size <= maxSize);
-            details::writeSize(_writter, size);
-            //todo optimisation is possible for contigous containers, but currently there is no compile-time check for this
-            procContainer<VSIZE>(std::begin(obj), std::end(obj), std::false_type{});
+            details::writeSize(_writer, size);
+
+            procContainer<VSIZE>(std::begin(obj), std::end(obj), std::integral_constant<bool, traits::ContainerTraits<T>::isContiguous>{});
         }
 
         template<typename T>
         void container(const T &obj, size_t maxSize) {
-            static_assert(details::ContainerTraits<T>::isResizable,
+            static_assert(details::IsContainerTraitsDefined<T>::value,
+                          "Please define ContainerTraits or include from <bitsery/traits/...>");
+            static_assert(traits::ContainerTraits<T>::isResizable,
                           "use container(const T&) overload without `maxSize` for static containers");
-            auto size = details::ContainerTraits<T>::size(obj);
+            auto size = traits::ContainerTraits<T>::size(obj);
             assert(size <= maxSize);
-            details::writeSize(_writter, size);
+            details::writeSize(_writer, size);
             procContainer(std::begin(obj), std::end(obj));
         }
 
@@ -205,47 +228,34 @@ namespace bitsery {
 
         template<typename T, typename Fnc, typename std::enable_if<!std::is_integral<Fnc>::value>::type * = nullptr>
         void container(const T &obj, Fnc &&fnc) {
-            static_assert(!details::ContainerTraits<T>::isResizable,
+            static_assert(details::IsContainerTraitsDefined<T>::value,
+                          "Please define ContainerTraits or include from <bitsery/traits/...>");
+            static_assert(!traits::ContainerTraits<T>::isResizable,
                           "use container(const T&, size_t, Fnc) overload with `maxSize` for dynamic containers");
             procContainer(std::begin(obj), std::end(obj), std::forward<Fnc>(fnc));
         }
 
         template<size_t VSIZE, typename T>
         void container(const T &obj) {
-            static_assert(!details::ContainerTraits<T>::isResizable,
+            static_assert(details::IsContainerTraitsDefined<T>::value,
+                          "Please define ContainerTraits or include from <bitsery/traits/...>");
+            static_assert(!traits::ContainerTraits<T>::isResizable,
                           "use container(const T&, size_t) overload with `maxSize` for dynamic containers");
             static_assert(VSIZE > 0, "");
-            //todo optimisation is possible for contigous containers, but currently there is no compile-time check for this
-            procContainer<VSIZE>(std::begin(obj), std::end(obj), std::false_type{});
+            procContainer<VSIZE>(std::begin(obj), std::end(obj), std::integral_constant<bool, traits::ContainerTraits<T>::isContiguous>{});
         }
 
         template<typename T>
         void container(const T &obj) {
-            static_assert(!details::ContainerTraits<T>::isResizable,
+            static_assert(details::IsContainerTraitsDefined<T>::value,
+                          "Please define ContainerTraits or include from <bitsery/traits/...>");
+            static_assert(!traits::ContainerTraits<T>::isResizable,
                           "use container(const T&, size_t) overload with `maxSize` for dynamic containers");
             procContainer(std::begin(obj), std::end(obj));
         }
 
-        //c-style array overloads
-
-        template<typename T, size_t N, typename Fnc>
-        void container(const T (&arr)[N], Fnc &&fnc) {
-            procContainer(std::begin(arr), std::end(arr), std::forward<Fnc>(fnc));
-        }
-
-        template<size_t VSIZE, typename T, size_t N>
-        void container(const T (&arr)[N]) {
-            static_assert(VSIZE > 0, "");
-            procContainer<VSIZE>(std::begin(arr), std::end(arr), std::true_type{});
-        }
-
-        template<typename T, size_t N>
-        void container(const T (&arr)[N]) {
-            procContainer(std::begin(arr), std::end(arr));
-        }
-
         void align() {
-            _writter.align();
+            _writer.align();
         }
 
         //overloads for functions with explicit type size
@@ -263,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); }
@@ -283,14 +293,14 @@ namespace bitsery {
         template<typename T>
         void text4b(const T &str, size_t maxSize) { text<4>(str, maxSize); }
 
-        template<typename T, size_t N>
-        void text1b(const T (&str)[N]) { text<1, T, N>(str); }
+        template<typename T>
+        void text1b(const T &str) { text<1>(str); }
 
-        template<typename T, size_t N>
-        void text2b(const T (&str)[N]) { text<2, T, N>(str); }
+        template<typename T>
+        void text2b(const T &str) { text<2>(str); }
 
-        template<typename T, size_t N>
-        void text4b(const T (&str)[N]) { text<4, T, N>(str); }
+        template<typename T>
+        void text4b(const T &str) { text<4>(str); }
 
         template<typename T>
         void container1b(T &&obj, size_t maxSize) { container<1>(std::forward<T>(obj), maxSize); }
@@ -316,21 +326,12 @@ namespace bitsery {
         template<typename T>
         void container8b(T &&obj) { container<8>(std::forward<T>(obj)); }
 
-        template<typename T, size_t N>
-        void container1b(const T (&arr)[N]) { container<1>(arr); }
-
-        template<typename T, size_t N>
-        void container2b(const T (&arr)[N]) { container<2>(arr); }
-
-        template<typename T, size_t N>
-        void container4b(const T (&arr)[N]) { container<4>(arr); }
-
-        template<typename T, size_t N>
-        void container8b(const T (&arr)[N]) { container<8>(arr); }
-
     private:
-        BasicBufferWriter<Config> &_writter;
-        void* _context;
+        friend AdapterAccess;
+
+        TAdapterWriter _writer;
+        TContext* _context;
+        typename TWriter::TConfig::InternalContext _internalContext;
 
         //process value types
         //false_type means that we must process all elements individually
@@ -338,14 +339,18 @@ 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
         template<size_t VSIZE, typename It>
         void procContainer(It first, It last, std::true_type) {
-            _writter.template writeBuffer<VSIZE>(&(*first), std::distance(first, last));
-        };
+            using TValue = typename std::decay<decltype(*first)>::type;
+            using TIntegral = typename details::IntegralFromFundamental<TValue>::TValue;
+			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>
@@ -354,14 +359,46 @@ namespace bitsery {
             for (; first != last; ++first) {
                 fnc(const_cast<TValue&>(*first));
             }
-        };
+        }
+
+        //process text,
+        template<size_t VSIZE, typename T>
+        void procText(const T& str, size_t maxSize) {
+            auto length = traits::TextTraits<T>::length(str);
+            assert((length + (traits::TextTraits<T>::addNUL ? 1u : 0u)) <= maxSize);
+            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) {
+            _writer.writeBits(static_cast<unsigned char>(v ? 1 : 0), 1);
+        }
+
+        void procBoolValue(bool v, std::false_type) {
+            _writer.template writeBytes<1>(static_cast<unsigned char>(v ? 1 : 0));
+        }
+
+        //enable bit-packing or do nothing if it is already enabled
+        template <typename Fnc>
+        void procEnableBitPacking(const Fnc& fnc, std::true_type) {
+            fnc(*this);
+        }
+
+        template <typename Fnc>
+        void procEnableBitPacking(const Fnc& fnc, std::false_type) {
+            //create serializer using bitpacking wrapper
+            BPEnabledType tmp(_writer, _context);
+            fnc(tmp);
+        }
 
         //these are dummy functions for extensions that have TValue = void
         void object(const details::DummyType&) {
@@ -373,10 +410,34 @@ namespace bitsery {
 
         }
 
+        //dummy function, that stops archive variadic arguments expansion
+        void archive() {
+        }
+
     };
 
     //helper type
-    using Serializer = BasicSerializer<DefaultConfig>;
+    template <typename Adapter>
+    using Serializer = BasicSerializer<AdapterWriter<Adapter, DefaultConfig>>;
+
+    //helper function that set ups all the basic steps and after serialziation returns serialized bytes count
+    template <typename Adapter, typename T>
+    size_t quickSerialization(Adapter adapter, const T& value) {
+        Serializer<Adapter> ser{std::move(adapter)};
+        ser.object(value);
+        auto& w = AdapterAccess::getWriter(ser);
+        w.flush();
+        return w.writtenBytesCount();
+    }
+
+    template <typename T>
+    size_t quickMeasureSize(const T& value) {
+        BasicSerializer<MeasureSize> ser {nullptr};
+        ser.object(value);
+        auto& w = AdapterAccess::getWriter(ser);
+        w.flush();
+        return w.writtenBytesCount();
+    }
 
 }
 #endif //BITSERY_SERIALIZER_H

include/bitsery/traits/array.h

@@ -0,0 +1,44 @@
+//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_TRAITS_STD_ARRAY_H
+#define BITSERY_TRAITS_STD_ARRAY_H
+
+#include "core/std_defaults.h"
+#include <array>
+
+namespace bitsery {
+
+    namespace traits {
+        template<typename T, size_t N>
+        struct ContainerTraits<std::array<T, N>>
+                :public StdContainer<std::array<T, N>, false, true> {};
+
+        template<typename T, size_t N>
+        struct BufferAdapterTraits<std::array<T, N>>
+                :public StdContainerForBufferAdapter<std::array<T, N>> {};
+    }
+
+}
+
+#endif //BITSERY_TYPE_TRAITS_STD_ARRAY_H

include/bitsery/traits/core/std_defaults.h

@@ -0,0 +1,101 @@
+//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_TRAITS_CORE_STD_DEFAULTS_H
+#define BITSERY_TRAITS_CORE_STD_DEFAULTS_H
+
+#include "traits.h"
+#include "../../details/serialization_common.h"
+
+namespace bitsery {
+    namespace traits {
+
+        /*
+         * these are helper types, to easier write specializations for std types
+         */
+
+        template<typename T, bool Resizable, bool Contiguous>
+        struct StdContainer {
+            using TValue = typename T::value_type;
+            static constexpr bool isResizable = Resizable;
+            static constexpr bool isContiguous = Contiguous;
+            static size_t size(const T& container) {
+                return container.size();
+            }
+        };
+
+        //specialization for resizable
+        template<typename T, bool Contiguous>
+        struct StdContainer<T, true, Contiguous> {
+            using TValue = typename T::value_type;
+            static constexpr bool isResizable = true;
+            static constexpr bool isContiguous = Contiguous;
+            static size_t size(const T& container) {
+                return container.size();
+            }
+            static void resize(T& container, size_t size) {
+                resizeImpl(container, size, std::is_default_constructible<TValue>{});
+            }
+        private:
+            static void resizeImpl(T& container, size_t size, std::true_type) {
+                container.resize(size);
+            }
+            static void resizeImpl(T& container, size_t newSize, std::false_type) {
+                const auto oldSize = size(container);
+                for (auto it = oldSize; it < newSize; ++it) {
+                    container.push_back(::bitsery::Access::create<TValue>());
+                }
+                if (oldSize > newSize) {
+                    container.erase(std::next(std::begin(container), newSize));
+                }
+            }
+
+        };
+
+        template <typename T, bool Resizable = ContainerTraits<T>::isResizable>
+        struct StdContainerForBufferAdapter {
+            using TIterator = typename T::iterator;
+            using TConstIterator = typename T::const_iterator;
+            using TValue = typename ContainerTraits<T>::TValue;
+        };
+
+        //specialization for resizable buffers
+        template <typename T>
+        struct StdContainerForBufferAdapter<T, true> {
+
+            static void increaseBufferSize(T& container) {
+                //since we're writing to buffer use different resize strategy than default implementation
+                //when small size grow faster, to avoid thouse 2/4/8/16... byte allocations
+                auto newSize = static_cast<size_t>(container.size() * 1.5 + 128);
+                //make data cache friendly
+                newSize -= newSize % 64;//64 is cache line size
+                container.resize((std::max)(newSize, container.capacity()));
+            }
+            using TIterator = typename T::iterator;
+            using TConstIterator = typename T::const_iterator;
+            using TValue = typename ContainerTraits<T>::TValue;
+        };
+
+    }
+}
+
+#endif //BITSERY_TRAITS_CORE_STD_DEFAULTS_H

include/bitsery/traits/core/traits.h

@@ -0,0 +1,188 @@
+//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_TRAITS_CORE_TRAITS_H
+#define BITSERY_TRAITS_CORE_TRAITS_H
+
+#include <type_traits>
+#include "../../details/not_defined_type.h"
+
+namespace bitsery {
+    namespace traits {
+
+        /*
+         * core library traits, used to extend library for custom types
+         */
+
+        //traits for extension
+        template<typename Extension, typename T>
+        struct ExtensionTraits {
+            //this type is used, when using extesion without custom lambda
+            // eg.: extension4b>(obj, myextension{}) will call s.value4b(obj) for TValue
+            // or extesion(obj, myextension{})  will call s.object(obj) for TValue
+            //when this is void, it will compile, but value and object overloads will do nothing.
+            using TValue = details::NotDefinedType;
+
+            //does extension support ext<N>(...) syntax, by calling value<N> with TValue
+            static constexpr bool SupportValueOverload = false;
+            //does extension support ext(...) syntax, by calling object with TValue
+            static constexpr bool SupportObjectOverload = false;
+            //does extension support ext(..., lambda)
+            static constexpr bool SupportLambdaOverload = false;
+        };
+
+        //primary traits for containers
+        template<typename T>
+        struct ContainerTraits {
+
+            using TValue = details::NotDefinedType;
+
+            static constexpr bool isResizable = false;
+            //contiguous arrays has oppurtunity to memcpy whole buffer directly when using funtamental types
+            //contiguous doesn't nesessary equal to random access iterator.
+            //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& , 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& ) {
+                static_assert(std::is_void<T>::value,
+                              "Define ContainerTraits or include from <bitsery/traits/...> to use as container");
+                return 0u;
+            }
+        };
+
+        //specialization for C style array
+        template<typename T, size_t N>
+        struct ContainerTraits<T[N]> {
+            using TValue = T;
+            static constexpr bool isResizable = false;
+            static constexpr bool isContiguous = true;
+            static size_t size(const T (&)[N]) {
+                return N;
+            }
+        };
+
+        //specialization for initializer list.
+        //only serializer can use it
+        template<typename T>
+        struct ContainerTraits<std::initializer_list<T>> {
+            using TValue = T;
+            static constexpr bool isResizable = false;
+            static constexpr bool isContiguous = true;
+            static size_t size(const std::initializer_list<T>& container) {
+                return container.size();
+            }
+        };
+
+        //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
+        template<typename T>
+        struct TextTraits {
+            using TValue = details::NotDefinedType;
+            //if container is not null-terminated by default, add NUL at the end
+            static constexpr bool addNUL = true;
+
+            //get length of null terminated 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;
+            }
+        };
+
+        //traits only for buffer adapters
+        template <typename T>
+        struct BufferAdapterTraits {
+            //this function is only applies to resizable containers
+
+            //this function is only used by Writer, when writing data to buffer,
+            //it is called only current buffer size is not enough to write.
+            //it is used to dramaticaly improve performance by updating buffer directly
+            //instead of using back_insert_iterator to append each byte to buffer.
+            //thats why Writer return range iterators
+
+            static void increaseBufferSize(T& ) {
+                static_assert(std::is_void<T>::value,
+                              "Define BufferAdapterTraits or include from <bitsery/traits/...> to use as buffer adapter container");
+            }
+
+            using TIterator = details::NotDefinedType;
+            using TConstIterator = details::NotDefinedType;
+            using TValue = typename ContainerTraits<T>::TValue;
+        };
+
+        //specialization for c-style buffer
+        template <typename T, size_t N>
+        struct BufferAdapterTraits<T[N]> {
+            using TIterator = T*;
+            using TConstIterator = const T*;
+            using TValue = T;
+        };
+
+        //specialization for pointer type buffer
+        template <typename T>
+        struct BufferAdapterTraits<const T*> {
+            using TIterator = const T*;
+            using TConstIterator = const T*;
+            using TValue = T;
+        };
+
+        template <typename T>
+        struct BufferAdapterTraits<T*> {
+            using TIterator = T*;
+            using TConstIterator = const T*;
+            using TValue = T;
+        };
+
+    }
+}
+
+#endif //BITSERY_TRAITS_CORE_TRAITS_H

include/bitsery/traits/deque.h

@@ -0,0 +1,42 @@
+//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_TRAITS_STD_DEQUE_H
+#define BITSERY_TRAITS_STD_DEQUE_H
+
+#include "core/std_defaults.h"
+#include <deque>
+
+namespace bitsery {
+
+    namespace traits {
+
+        template<typename ... TArgs>
+        struct ContainerTraits<std::deque<TArgs...>>
+                : public StdContainer<std::deque<TArgs...>, true, false> {};
+
+    }
+
+}
+
+#endif //BITSERY_TRAITS_STD_DEQUE_H

include/bitsery/traits/forward_list.h

@@ -0,0 +1,68 @@
+//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_TRAITS_STD_FORWARD_LIST_H
+#define BITSERY_TRAITS_STD_FORWARD_LIST_H
+
+#include "core/traits.h"
+#include "../details/serialization_common.h"
+#include <forward_list>
+
+namespace bitsery {
+
+    namespace traits {
+
+        template<typename ... TArgs>
+        struct ContainerTraits<std::forward_list<TArgs...>> {
+            using TValue = typename std::forward_list<TArgs...>::value_type;
+            static constexpr bool isResizable = true;
+            static constexpr bool isContiguous = false;
+            static size_t size(const std::forward_list<TArgs...>& container) {
+                return static_cast<size_t>(std::distance(container.begin(), container.end()));
+            }
+            static void resize(std::forward_list<TArgs...>& container, size_t size) {
+                resizeImpl(container, size, std::is_default_constructible<TValue>{});
+            }
+        private:
+            static void resizeImpl(std::forward_list<TArgs...>& container, size_t size, std::true_type) {
+                container.resize(size);
+            }
+            static void resizeImpl(std::forward_list<TArgs...>& container, size_t newSize, std::false_type) {
+                const auto oldSize = size(container);
+                for (auto it = oldSize; it < newSize; ++it) {
+                    container.push_front(::bitsery::Access::create<TValue>());
+                }
+                if (oldSize > newSize) {
+                    //erase_after must have atleast one element to work
+                    if (newSize > 0)
+                        container.erase_after(std::next(std::begin(container), newSize-1));
+                    else
+                        container.clear();
+                }
+            }
+        };
+    }
+}
+
+
+#endif //BITSERY_TRAITS_STD_FORWARD_LIST_H

include/bitsery/traits/list.h

@@ -0,0 +1,42 @@
+//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_TRAITS_STD_LIST_H
+#define BITSERY_TRAITS_STD_LIST_H
+
+#include "core/std_defaults.h"
+#include <list>
+
+namespace bitsery {
+
+    namespace traits {
+
+        template<typename ... TArgs>
+        struct ContainerTraits<std::list<TArgs...>>
+                : public StdContainer<std::list<TArgs...>, true, false> {};
+
+    }
+
+}
+
+#endif //BITSERY_TRAITS_STD_LIST_H

include/bitsery/traits/string.h

@@ -0,0 +1,71 @@
+//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_TRAITS_STD_STRING_H
+#define BITSERY_TRAITS_STD_STRING_H
+
+#include "core/std_defaults.h"
+#include <string>
+
+namespace bitsery {
+
+    namespace traits {
+
+        // specialization for string, because string is already included for std::char_traits
+
+        template<typename ... TArgs>
+        struct ContainerTraits<std::basic_string<TArgs...>>
+            :public StdContainer<std::basic_string<TArgs...>, true, true> {};
+
+        template <typename ... TArgs>
+        struct TextTraits<std::basic_string<TArgs...>> {
+            using TValue = typename ContainerTraits<std::basic_string<TArgs...>>::TValue;
+            //string is automatically null-terminated
+            static constexpr bool addNUL = false;
+
+            //is is not 100% accurate, but for performance reasons assume that string stores text, not binary data
+            static size_t length(const std::basic_string<TArgs...>& str) {
+                return str.size();
+            }
+        };
+
+        //specialization for c-array
+        template <typename T, size_t N>
+        struct TextTraits<T[N]> {
+            using TValue = T;
+            static constexpr bool addNUL = true;
+
+            static size_t length(const T (&container)[N]) {
+                return std::char_traits<T>::length(container);
+            }
+        };
+
+        template<typename ... TArgs>
+        struct BufferAdapterTraits<std::basic_string<TArgs...>>
+                :public StdContainerForBufferAdapter<std::basic_string<TArgs...>> {};
+
+    }
+
+}
+
+#endif //BITSERY_TRAITS_VECTOR_H

include/bitsery/traits/vector.h

@@ -0,0 +1,50 @@
+//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_TRAITS_STD_VECTOR_H
+#define BITSERY_TRAITS_STD_VECTOR_H
+
+#include "core/std_defaults.h"
+#include <vector>
+
+namespace bitsery {
+
+    namespace traits {
+        template<typename ... TArgs>
+        struct ContainerTraits<std::vector<TArgs...>>
+                :public StdContainer<std::vector<TArgs...>, true, true> {};
+
+        //bool vector is not contiguous, do not copy it directly to buffer
+        template<typename Allocator>
+        struct ContainerTraits<std::vector<bool, Allocator>>
+                :public StdContainer<std::vector<bool, Allocator>, true, false> {};
+
+        template<typename ... TArgs>
+        struct BufferAdapterTraits<std::vector<TArgs...>>
+                :public StdContainerForBufferAdapter<std::vector<TArgs...>> {};
+
+    }
+
+}
+
+#endif //BITSERY_TRAITS_STD_VECTOR_H

scripts/CTestConfig.cmake

@@ -0,0 +1,7 @@
+set(CTEST_PROJECT_NAME "bitsery")
+
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "my.cdash.org")
+set(CTEST_DROP_LOCATION "/submit.php?project=bitsery")
+set(CTEST_DROP_SITE_CDASH TRUE)
+

scripts/build.bitsery.cmake

@@ -0,0 +1,20 @@
+# run from linux shell:
+#$ ctest -S build.bitsery.cmake
+set(CTEST_SOURCE_DIRECTORY "..") #path to bitsery root (top-level) directory
+set(CTEST_BINARY_DIRECTORY "build")
+
+set(ENV{CXXFLAGS} "--coverage")
+#when using Ninja generator, ctest_coverage cannot find files...
+set(CTEST_CMAKE_GENERATOR "CodeBlocks - Unix Makefiles")
+#set(CTEST_USE_LAUNCHERS 1)
+
+set(CTEST_COVERAGE_COMMAND "gcov")
+
+configure_file(CTestConfig.cmake ${CTEST_SOURCE_DIRECTORY}/CTestConfig.cmake)
+
+ctest_start("Continuous")
+ctest_configure(OPTIONS "-DBITSERY_BUILD_EXAMPLES=OFF;-DBITSERY_BUILD_TESTS=ON")
+ctest_build()
+ctest_test(BUILD ${CTEST_BINARY_DIRECTORY}/tests)
+ctest_coverage()
+#ctest_submit()

scripts/show_coverage.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+BUILD_DIR=./build
+TESTS_BUILD_DIR=$BUILD_DIR/tests/CMakeFiles/
+COV_INFO=$TESTS_BUILD_DIR/bitsery_coverage.info
+lcov --directory $TESTS_BUILD_DIR --capture --output-file $COV_INFO
+lcov --extract $COV_INFO '*include/bitsery*' --output-file $COV_INFO.clean
+genhtml --output-directory $TESTS_BUILD_DIR/coverage_web $COV_INFO.clean
+xdg-open $TESTS_BUILD_DIR/coverage_web/index.html

tests/CMakeLists.txt

@@ -20,55 +20,47 @@
 #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 #SOFTWARE.
 
-cmake_minimum_required(VERSION 3.2)
-set(TestProjectName bitsery_tests)
-project(${TestProjectName} C CXX)
+cmake_minimum_required(VERSION 3.5)
+project(bitsery_tests CXX)
 
+find_package(GTest 1.8 REQUIRED)
 
-find_package(Threads REQUIRED)
-
-#add googletest external project
-#USE_GMOCK enable gmock
-#exports variables GTEST_INCLUDE_DIRS, GTEST_LIBS_DIR, GTEST_LIBNAME, GTEST_MAIN_LIBNAME
-set(ExtCMakeFilesDir ${CMAKE_SOURCE_DIR}/ext)
-set(UseGMock ON)
-add_subdirectory(${ExtCMakeFilesDir}/gtest ${CMAKE_BINARY_DIR}/gtest)
-
-#this helps idea to know which files are actually used
-file(GLOB_RECURSE IncludeHeaders ${CMAKE_SOURCE_DIR}/include/bitsery/*.h)
-# set common include folder for module
-include_directories(SYSTEM ${GTestIncludeDirs})
-include_directories(${CMAKE_SOURCE_DIR}/include)
+if (NOT TARGET Bitsery::bitsery)
+    message(FATAL_ERROR "Bitsery::bitsery alias not set. Please generate CMake from bitsery root directory.")
+endif()
 
 file(GLOB TestSourceFiles ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     message(WARNING "extension tests for optional is disable for VS, because VS currenty doesn't have <optional>")
-    list(REMOVE_ITEM TestSourceFiles ${CMAKE_CURRENT_SOURCE_DIR}/serialization_ext_optional.cpp)
+    list(REMOVE_ITEM TestSourceFiles ${CMAKE_CURRENT_SOURCE_DIR}/serialization_ext_std_optional.cpp)
 endif()
 
-include(${ExtCMakeFilesDir}/LinkTestLib.cmake)
+enable_testing()
 
-FOREACH(TestFile ${TestSourceFiles})
+foreach (TestFile ${TestSourceFiles})
     get_filename_component(TestName ${TestFile} NAME_WE)
-    set(TestName TEST_${TestName})
-    add_executable(${TestName} ${TestFile} ${IncludeHeaders})
-    LinkTestLib(${TestName})
+    set(TestName bitsery.test.${TestName})
+    add_executable(${TestName} ${TestFile})
+    target_link_libraries(${TestName} PRIVATE GTest::Main Bitsery::bitsery)
+    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+        target_compile_options(${TestName} PRIVATE -Wextra -Wno-missing-braces -Wpedantic -Weffc++ -Wno-c++14-extensions)
+    endif()
 
     add_test(NAME ${TestName} COMMAND $<TARGET_FILE:${TestName}>)
+endforeach()
 
-ENDFOREACH()
+#======================= setup development environment ====================
 
-#all in one tests for code coverage
-add_executable(${TestProjectName} ${TestSourceFiles})
-
-if(CMAKE_COMPILER_IS_GNUCXX)
-    include(${ExtCMakeFilesDir}/CodeCoverage.cmake)
-    target_compile_options(${TestProjectName} PUBLIC -O0 -fprofile-arcs -ftest-coverage)
-    target_link_libraries(${TestProjectName} -O0 -fprofile-arcs -ftest-coverage)
-    setup_target_for_coverage(tests_coverage ${TestProjectName} coverage)
+# get all header files for IDE  (in my case Clion) and create dummy project that consumes theses files
+get_directory_property(ParentDir PARENT_DIRECTORY)
+if (ParentDir)
+    # only include when working from root project (Bitsery)
+    file(GLOB_RECURSE HeadersForIDE ${ParentDir}/include/bitsery/*.h)
+    # create dummy target IDE
+    file(WRITE ${CMAKE_BINARY_DIR}/dummy_for_ide.cpp "//generated by CMake to create dummy target with all includes for IDE.")
+    add_library(bitsery.dummy_for_ide ${CMAKE_BINARY_DIR}/dummy_for_ide.cpp)
+    # add headers so IDE correctly show them
+    target_sources(bitsery.dummy_for_ide PRIVATE ${HeadersForIDE} serialization_test_utils.h)
+    target_link_libraries(bitsery.dummy_for_ide PRIVATE GTest::Main Bitsery::bitsery)
 endif()
-
-LinkTestLib(${TestProjectName})
-
-

tests/adapter_stream.cpp

@@ -0,0 +1,162 @@
+//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 <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 <gmock/gmock.h>
+#include <sstream>
+
+//some helper types
+using Stream = std::stringstream;
+using OutputAdapter = bitsery::OutputStreamAdapter;
+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, CorrectlyReturnsIsCompletedSuccessfully) {
+    //setup data
+    uint8_t t1 = 111;
+
+    Stream buf{};
+    Writer w{{buf}};
+    w.writeBytes<1>(t1);
+    w.flush();
+
+    Reader r{{buf}};
+
+    uint8_t r1{};
+    EXPECT_THAT(r.isCompletedSuccessfully(), Eq(false));
+    r.readBytes<1>(r1);
+    EXPECT_THAT(r.isCompletedSuccessfully(), Eq(true));
+    EXPECT_THAT(r1, Eq(t1));
+}
+
+TEST(AdapterIOStream, ReadingMoreThanAvailableReturnsZero) {
+    //setup data
+    uint8_t t1 = 111;
+
+    Stream buf{};
+    Writer w{{buf}};
+    w.writeBytes<1>(t1);
+    w.flush();
+
+    Reader r{{buf}};
+
+    uint8_t r1{};
+    r.readBytes<1>(r1);
+    r.readBytes<1>(r1);
+    EXPECT_THAT(r1, Eq(0));
+}
+
+//this is strange, but probably stringstream doesnt use any of the base methods that sets io_base::iostate flags
+TEST(AdapterIOStream, WhenReadingMoreThanAvailableThenDataOverflow) {
+    //setup data
+    uint8_t t1 = 111;
+
+    Stream buf{};
+    Writer w{{buf}};
+    w.writeBytes<1>(t1);
+    w.flush();
+
+    Reader r{{buf}};
+
+    uint8_t r1{};
+    EXPECT_THAT(r.isCompletedSuccessfully(), Eq(false));
+    EXPECT_THAT(r.error(), Eq(bitsery::ReaderError::NoError));
+    r.readBytes<1>(r1);
+    EXPECT_THAT(r.isCompletedSuccessfully(), Eq(true));
+    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));
+    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/buffer_operations.cpp

@@ -1,344 +0,0 @@
-//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 <bitsery/buffer_writer.h>
-#include <bitsery/buffer_reader.h>
-#include <bitsery/ext/value_range.h>
-
-using testing::Eq;
-using testing::ContainerEq;
-using bitsery::BufferWriter;
-using bitsery::BufferReader;
-using Buffer = bitsery::DefaultConfig::BufferType;
-
-struct IntegralUnsignedTypes {
-    uint32_t a;
-    uint16_t b;
-    uint8_t c;
-    uint8_t d;
-    uint64_t e;
-};
-
-template <typename T>
-constexpr size_t getBits(T v) {
-    return bitsery::details::calcRequiredBits<T>({}, v);
-};
-
-// *** bits operations
-
-TEST(BufferBitsAndBytesOperations, WriteAndReadBitsMaxTypeValues) {
-    Buffer buf;
-    BufferWriter bw{buf};
-    bw.writeBits(std::numeric_limits<uint64_t>::max(), 64);
-    bw.writeBits(std::numeric_limits<uint32_t>::max(), 32);
-    bw.writeBits(std::numeric_limits<uint16_t>::max(), 16);
-    bw.writeBits(std::numeric_limits<uint8_t>::max(), 8);
-    bw.flush();
-
-    BufferReader br{bw.getWrittenRange()};
-    uint64_t v64{};
-    uint32_t v32{};
-    uint16_t v16{};
-    uint8_t v8{};
-    br.readBits(v64, 64);
-    br.readBits(v32, 32);
-    br.readBits(v16, 16);
-    br.readBits(v8, 8);
-
-    EXPECT_THAT(v64, Eq(std::numeric_limits<uint64_t>::max()));
-    EXPECT_THAT(v32, Eq(std::numeric_limits<uint32_t>::max()));
-    EXPECT_THAT(v16, Eq(std::numeric_limits<uint16_t>::max()));
-    EXPECT_THAT(v8, Eq(std::numeric_limits<uint8_t>::max()));
-}
-
-TEST(BufferBitsAndBytesOperations, WriteAndReadBits) {
-    //setup data
-    constexpr IntegralUnsignedTypes data{
-        485454,//bits 19
-        45978,//bits 16
-        0,//bits 1
-        36,//bits 6
-        479845648946//bits 39
-    };
-
-    constexpr size_t aBITS = getBits(data.a) + 2;
-    constexpr size_t bBITS = getBits(data.b) + 0;
-    constexpr size_t cBITS = getBits(data.c) + 2;
-    constexpr size_t dBITS = getBits(data.d) + 1;
-    constexpr size_t eBITS = getBits(data.e) + 8;
-
-    //create and write to buffer
-    Buffer buf;
-    BufferWriter bw{buf};
-
-    bw.writeBits(data.a, aBITS);
-    bw.writeBits(data.b, bBITS);
-    bw.writeBits(data.c, cBITS);
-    bw.writeBits(data.d, dBITS);
-    bw.writeBits(data.e, eBITS);
-    bw.flush();
-    auto range = bw.getWrittenRange();
-    auto bytesCount = ((aBITS + bBITS + cBITS + dBITS + eBITS) / 8) +1 ;
-    EXPECT_THAT(std::distance(range.begin(), range.end()), Eq(bytesCount));
-    //read from buffer
-    BufferReader br{range};
-    IntegralUnsignedTypes res;
-
-    br.readBits(res.a, aBITS);
-    br.readBits(res.b, bBITS);
-    br.readBits(res.c, cBITS);
-    br.readBits(res.d, dBITS);
-    br.readBits(res.e, eBITS);
-
-    EXPECT_THAT(res.a, Eq(data.a));
-    EXPECT_THAT(res.b, Eq(data.b));
-    EXPECT_THAT(res.c, Eq(data.c));
-    EXPECT_THAT(res.d, Eq(data.d));
-    EXPECT_THAT(res.e, Eq(data.e));
-
-}
-
-TEST(BufferBitsAndBytesOperations, BufferSizeIsCountedPerByteNotPerBit) {
-    //setup data
-
-    //create and write to buffer
-    Buffer buf;
-    BufferWriter bw{buf};
-
-    bw.writeBits(7u,3);
-    bw.flush();
-    auto range = bw.getWrittenRange();
-    EXPECT_THAT(std::distance(range.begin(), range.end()), Eq(1));
-
-    //read from buffer
-    BufferReader br{range};
-    uint16_t tmp;
-    br.readBits(tmp,4);
-    br.readBits(tmp,2);
-    br.readBits(tmp,2);
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::NO_ERROR));
-    br.readBits(tmp,2);
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::BUFFER_OVERFLOW));//false
-
-    //part of next byte
-    BufferReader br1{range};
-    br1.readBits(tmp,2);
-    EXPECT_THAT(br1.getError(), Eq(bitsery::BufferReaderError::NO_ERROR));
-    br1.readBits(tmp,7);
-    EXPECT_THAT(br1.getError(), Eq(bitsery::BufferReaderError::BUFFER_OVERFLOW));//false
-
-    //bigger than byte
-    BufferReader br2{range};
-    br2.readBits(tmp,9);
-    EXPECT_THAT(br2.getError(), Eq(bitsery::BufferReaderError::BUFFER_OVERFLOW));//false
-}
-
-TEST(BufferBitsAndBytesOperations, ConsecutiveCallsToAlignHasNoEffect) {
-    Buffer buf;
-    BufferWriter bw{buf};
-
-    bw.writeBits(3u, 2);
-    //3 calls to align after 1st data
-    bw.align();
-    bw.align();
-    bw.align();
-    bw.writeBits(7u, 3);
-    //1 call to align after 2nd data
-    bw.align();
-    bw.writeBits(15u, 4);
-    bw.flush();
-
-    unsigned char tmp;
-    BufferReader br{bw.getWrittenRange()};
-    br.readBits(tmp,2);
-    EXPECT_THAT(tmp, Eq(3u));
-    br.align();
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::NO_ERROR));
-    br.readBits(tmp,3);
-    br.align();
-    br.align();
-    br.align();
-    EXPECT_THAT(tmp, Eq(7u));
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::NO_ERROR));
-
-    br.readBits(tmp,4);
-    EXPECT_THAT(tmp, Eq(15u));
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::NO_ERROR));
-}
-
-TEST(BufferBitsAndBytesOperations, AlignWritesZerosBits) {
-    //setup data
-
-    //create and write to buffer
-    Buffer buf;
-    BufferWriter bw{buf};
-
-    //write 2 bits and align
-    bw.writeBits(3u, 2);
-    bw.align();
-    bw.flush();
-    auto range = bw.getWrittenRange();
-    EXPECT_THAT(std::distance(range.begin(), range.end()), Eq(1));
-    unsigned char tmp;
-    BufferReader br1{range};
-    br1.readBits(tmp,2);
-    //read aligned bits
-    br1.readBits(tmp,6);
-    EXPECT_THAT(tmp, Eq(0));
-
-    BufferReader br2{range};
-    //read 2 bits
-    br2.readBits(tmp,2);
-    br2.align();
-    EXPECT_THAT(br2.getError(), Eq(bitsery::BufferReaderError::NO_ERROR));
-}
-
-
-// *** bytes operations
-
-struct IntegralTypes {
-    int64_t a;
-    uint32_t b;
-    int16_t c;
-    uint8_t d;
-    int8_t e;
-    int8_t f[2];
-};
-
-TEST(BufferBitsAndBytesOperations, WriteAndReadBytes) {
-    //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{};
-    BufferWriter bw{buf};
-    bw.writeBytes<4>(data.b);
-    bw.writeBytes<2>(data.c);
-    bw.writeBytes<1>(data.d);
-    bw.writeBytes<8>(data.a);
-    bw.writeBytes<1>(data.e);
-    bw.writeBuffer<1>(data.f, 2);
-    bw.flush();
-    auto range = bw.getWrittenRange();
-
-    EXPECT_THAT(std::distance(range.begin(), range.end()), Eq(18));
-    //read from buffer
-    BufferReader br{range};
-    IntegralTypes res{};
-    br.readBytes<4>(res.b);
-    br.readBytes<2>(res.c);
-    br.readBytes<1>(res.d);
-    br.readBytes<8>(res.a);
-    br.readBytes<1>(res.e);
-    br.readBuffer<1>(res.f, 2);
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::NO_ERROR));
-    //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(BufferBitsAndBytesOperations, ReadWriteBufferFncCanAcceptSignedData) {
-    //setup data
-    constexpr size_t DATA_SIZE = 3;
-    int16_t src[DATA_SIZE] {54,-4877,30067};
-    //create and write to buffer
-    Buffer buf{};
-    BufferWriter bw{buf};
-    bw.writeBuffer<2>(src, DATA_SIZE);
-    bw.flush();
-    //read from buffer
-    BufferReader br1{bw.getWrittenRange()};
-    int16_t dst[DATA_SIZE]{};
-    br1.readBuffer<2>(dst, DATA_SIZE);
-    EXPECT_THAT(br1.getError(), Eq(bitsery::BufferReaderError::NO_ERROR));
-    EXPECT_THAT(dst, ContainerEq(src));
-}
-
-TEST(BufferBitsAndBytesOperations, ReadWriteBufferCanWorkOnUnalignedData) {
-    //setup data
-    constexpr size_t DATA_SIZE = 3;
-    int16_t src[DATA_SIZE] {54,-4877,30067};
-    //create and write to buffer
-    Buffer buf{};
-    BufferWriter bw{buf};
-    bw.writeBits(15u, 4);
-    bw.writeBuffer<2>(src, DATA_SIZE);
-    bw.writeBits(12u, 4);
-    bw.flush();
-    auto range = bw.getWrittenRange();
-    EXPECT_THAT(std::distance(range.begin(), range.end()), Eq(sizeof(src) + 1));
-
-    //read from buffer
-    BufferReader br1{range};
-    int16_t dst[DATA_SIZE]{};
-    uint8_t tmp{};
-    br1.readBits(tmp, 4);
-    EXPECT_THAT(tmp, Eq(15));
-    br1.readBuffer<2>(dst, DATA_SIZE);
-    EXPECT_THAT(br1.getError(), Eq(bitsery::BufferReaderError::NO_ERROR));
-    EXPECT_THAT(dst, ContainerEq(src));
-    br1.readBits(tmp, 4);
-    EXPECT_THAT(tmp, Eq(12));
-}
-
-TEST(BufferBitsAndBytesOperations, RegressionTestReadBytesAfterReadBitsWithLotsOfZeroBits) {
-    //setup data
-    int16_t data[2]{0x0000, 0x7FFF};
-    int16_t res[2]{};
-    //create and write to buffer
-    Buffer buf{};
-    BufferWriter bw{buf};
-    bw.writeBits(2u, 2);
-    bw.writeBytes<2>(data[0]);
-    bw.writeBytes<2>(data[1]);
-    bw.align();
-    bw.flush();
-    auto range = bw.getWrittenRange();
-
-    //read from buffer
-    BufferReader br{range};
-    uint8_t tmp{};
-    br.readBits(tmp, 2);
-    EXPECT_THAT(tmp, Eq(2));
-    br.readBytes<2>(res[0]);
-    br.readBytes<2>(res[1]);
-    br.align();
-    EXPECT_THAT(res[0], Eq(data[0]));
-    EXPECT_THAT(res[1], Eq(data[1]));
-}
-
-

tests/buffer_reading_errors.cpp

@@ -1,119 +0,0 @@
-//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;
-using bitsery::BufferWriter;
-using bitsery::BufferReader;
-using Buffer = bitsery::DefaultConfig::BufferType;
-
-TEST(BufferReadingErrors, WhenContainerOrTextSizeIsMoreThanMaxThenInvalidBufferDataError) {
-    SerializationContext ctx;
-    std::string tmp = "larger text then allowed";
-    ctx.createSerializer().text1b(tmp,100);
-    ctx.createDeserializer().text1b(tmp, 10);
-    EXPECT_THAT(ctx.br->getError(), Eq(bitsery::BufferReaderError::INVALID_BUFFER_DATA));
-}
-
-TEST(BufferReadingErrors, WhenReadingBoolByteReadsMoreThanOneThenInvalidBufferDataErrorAndResultIsFalse) {
-    SerializationContext ctx;
-    auto ser = ctx.createSerializer();
-    ser.value1b(uint8_t{1});
-    ser.value1b(uint8_t{2});
-    bool res{};
-    auto des = ctx.createDeserializer();
-    des.boolByte(res);
-    EXPECT_THAT(res, Eq(true));
-    des.boolByte(res);
-    EXPECT_THAT(res, Eq(false));
-    EXPECT_THAT(ctx.br->getError(), Eq(bitsery::BufferReaderError::INVALID_BUFFER_DATA));
-}
-
-TEST(BufferReadingErrors, WhenReadingAlignHasNonZerosThenInvalidBufferDataError) {
-    Buffer buf{};
-    BufferWriter bw{buf};
-    uint8_t tmp{0xFF};
-    bw.writeBytes<1>(tmp);
-    bw.flush();
-    BufferReader br{bw.getWrittenRange()};
-
-    br.readBits(tmp,3);
-    br.align();
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::INVALID_BUFFER_DATA));
-}
-
-TEST(BufferReadingErrors, WhenReadingNewSessionInMiddleOfOldDataThenInvalidBufferError) {
-    uint8_t tmp{0xFF};
-    Buffer buf{};
-    BufferWriter bw{buf};
-    for (auto i = 0; i < 2; ++i) {
-        bw.beginSession();
-        bw.writeBytes<1>(tmp);
-        bw.writeBytes<1>(tmp);
-        bw.endSession();
-    }
-    bw.flush();
-    BufferReader br{bw.getWrittenRange()};
-    for (auto i = 0; i < 2; ++i) {
-        br.beginSession();
-        br.readBytes<1>(tmp);
-        br.beginSession();
-        br.readBytes<1>(tmp);
-        br.endSession();
-        br.endSession();
-    }
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::INVALID_BUFFER_DATA));
-}
-
-
-TEST(BufferReadingErrors, WhenInitializingSessionsWhenNotEnoughDataThenInvalidBufferData) {
-    uint8_t tmp1{0xFF};
-    Buffer buf1{};
-    BufferWriter bw1{buf1};
-    bw1.writeBytes<1>(tmp1);
-    bw1.flush();
-    BufferReader br1{bw1.getWrittenRange()};
-    br1.beginSession();
-    EXPECT_THAT(br1.getError(), Eq(bitsery::BufferReaderError::INVALID_BUFFER_DATA));
-
-    Buffer buf2{};
-    BufferWriter bw2{buf2};
-    uint16_t tmp2{0x8000};
-    bw2.writeBytes<2>(tmp2);
-    bw2.flush();
-    BufferReader br2{bw2.getWrittenRange()};
-    br2.beginSession();
-    EXPECT_THAT(br2.getError(), Eq(bitsery::BufferReaderError::INVALID_BUFFER_DATA));
-}
-
-TEST(BufferReadingErrors, WhenInitializingSessionsWhereSessionsDataOffsetIsCorruptedThenInvalidBufferData) {
-    Buffer buf{};
-    BufferWriter bw{buf};
-    bw.writeBytes<1>(uint8_t{1});
-    bw.writeBytes<1>(uint8_t{1});
-    bw.writeBytes<2>(uint16_t{10});
-    BufferReader br{bw.getWrittenRange()};
-    br.beginSession();
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::INVALID_BUFFER_DATA));
-}

tests/buffer_writing.cpp

@@ -1,117 +0,0 @@
-//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 <bitsery/buffer_writer.h>
-#include <bitsery/buffer_reader.h>
-#include <bitsery/details/serialization_common.h>
-
-using testing::Eq;
-using testing::ContainerEq;
-using bitsery::EndiannessType;
-using bitsery::DefaultConfig;
-using Buffer = bitsery::DefaultConfig::BufferType;
-
-struct FixedBufferConfig: public DefaultConfig {
-    using BufferType = std::array<uint8_t, 100>;
-};
-
-struct NonFixedBufferConfig: public DefaultConfig  {
-    using BufferType = std::vector<uint8_t>;
-};
-
-template <typename Config>
-class BufferWriting:public testing::Test {
-public:
-    using type = Config;
-
-};
-
-using BufferWritingConfigs = ::testing::Types<
-        NonFixedBufferConfig,
-        FixedBufferConfig>;
-
-TYPED_TEST_CASE(BufferWriting, BufferWritingConfigs);
-
-static constexpr size_t DATA_SIZE = 14u;
-
-template <typename BW>
-void writeData(BW& bw) {
-    uint16_t tmp1{45}, tmp2{6543}, tmp3{46533};
-    uint32_t tmp4{8979445}, tmp5{7987564};
-    bw.template writeBytes<2>(tmp1);
-    bw.template writeBytes<2>(tmp2);
-    bw.template writeBytes<2>(tmp3);
-    bw.template writeBytes<4>(tmp4);
-    bw.template writeBytes<4>(tmp5);
-}
-
-TYPED_TEST(BufferWriting, GetWrittenRangeReturnsBeginEndIterators) {
-    using Config = typename TestFixture::type;
-    using Buffer = typename Config::BufferType;
-    Buffer buf{};
-    bitsery::BasicBufferWriter<Config> bw{buf};
-    writeData(bw);
-    bw.flush();
-    auto range = bw.getWrittenRange();
-    EXPECT_THAT(std::distance(range.begin(), range.end()), DATA_SIZE);
-}
-
-TYPED_TEST(BufferWriting, WhenWritingBitsThenMustFlushWriter) {
-    using Config = typename TestFixture::type;
-    using Buffer = typename Config::BufferType;
-    Buffer buf{};
-    bitsery::BasicBufferWriter<Config> bw{buf};
-    bw.writeBits(3u, 2);
-    auto range1 = bw.getWrittenRange();
-    bw.flush();
-    auto range2 = bw.getWrittenRange();
-    EXPECT_THAT(std::distance(range1.begin(), range1.end()), Eq(0));
-    EXPECT_THAT(std::distance(range2.begin(), range2.end()), Eq(1));
-}
-
-TYPED_TEST(BufferWriting, WhenDataAlignedThenFlushHasNoEffect) {
-    using Config = typename TestFixture::type;
-    using Buffer = typename Config::BufferType;
-    Buffer buf{};
-    bitsery::BasicBufferWriter<Config> bw{buf};
-
-    bw.writeBits(3u, 2);
-    bw.align();
-    auto range1 = bw.getWrittenRange();
-    bw.flush();
-    auto range2 = bw.getWrittenRange();
-    EXPECT_THAT(std::distance(range1.begin(), range1.end()), Eq(1));
-    EXPECT_THAT(std::distance(range2.begin(), range2.end()), Eq(1));
-}
-
-TEST(BufferWrittingNonFixedBuffer, BufferIsAlwaysResizedToCapacity) {
-    using Buffer = typename NonFixedBufferConfig::BufferType;
-    Buffer buf{};
-    bitsery::BasicBufferWriter<NonFixedBufferConfig> bw{buf};
-    for (auto i = 0; i < 5; ++i) {
-        uint32_t tmp{};
-        bw.writeBytes<4>(tmp);
-        bw.writeBytes<4>(tmp);
-        EXPECT_TRUE(buf.size() == buf.capacity());
-    }
-}

tests/data_endianness.cpp

@@ -21,16 +21,16 @@
 //SOFTWARE.
 
 
-#include <gmock/gmock.h>
-#include <bitsery/buffer_writer.h>
-#include <bitsery/buffer_reader.h>
+#include <bitsery/adapter_writer.h>
+#include <bitsery/adapter_reader.h>
 #include <bitsery/ext/value_range.h>
+#include "serialization_test_utils.h"
+#include <gmock/gmock.h>
 
 using testing::Eq;
 using testing::ContainerEq;
 using bitsery::EndiannessType;
 using bitsery::DefaultConfig;
-using Buffer = bitsery::DefaultConfig::BufferType;
 
 constexpr EndiannessType getInverseEndianness(EndiannessType e) {
     return e == EndiannessType::LittleEndian
@@ -50,27 +50,29 @@ struct IntegralTypes {
     int8_t e;
 };
 
+using InverseReader = bitsery::AdapterReader<InputAdapter, InverseEndiannessConfig>;
 
-TEST(BufferEndianness, WhenWriteBytesThenBytesAreSwapped) {
+
+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{};
-    bitsery::BasicBufferWriter<DefaultConfig> bw{buf};
+    Writer bw{buf};
     bw.writeBytes<8>(src.a);
     bw.writeBytes<4>(src.b);
     bw.writeBytes<2>(src.c);
@@ -78,7 +80,7 @@ TEST(BufferEndianness, WhenWriteBytesThenBytesAreSwapped) {
     bw.writeBytes<1>(src.e);
     bw.flush();
     //read from buffer using inverse endianness config
-    bitsery::BasicBufferReader<InverseEndiannessConfig> br{bw.getWrittenRange()};
+    InverseReader br{InputAdapter{buf.begin(), bw.writtenBytesCount()}};
     IntegralTypes res{};
     br.readBytes<8>(res.a);
     br.readBytes<4>(res.b);
@@ -93,25 +95,25 @@ TEST(BufferEndianness, WhenWriteBytesThenBytesAreSwapped) {
     EXPECT_THAT(res.e, Eq(resInv.e));
 }
 
-TEST(BufferEndianness, WhenWriteBuffer1ByteValuesThenEndiannessIsIgnored) {
+TEST(DataEndianness, WhenWrite1ByteValuesThenEndiannessIsIgnored) {
     //fill initial values
     constexpr size_t SIZE = 4;
     uint8_t src[SIZE] = {0xAA, 0xBB, 0xCC, 0xDD};
     uint8_t res[SIZE] = {};
     //create and write to buffer
     Buffer buf{};
-    bitsery::BasicBufferWriter<DefaultConfig> bw{buf};
+    Writer bw{buf};
     bw.writeBuffer<1>(src, SIZE);
     bw.flush();
     //read from buffer using inverse endianness config
-    bitsery::BasicBufferReader<InverseEndiannessConfig> br{bw.getWrittenRange()};
+    InverseReader br{InputAdapter{buf.begin(), bw.writtenBytesCount()}};
     br.readBuffer<1>(res, SIZE);
     //result is identical, because we write separate values, of size 1byte, that requires no swapping
     //check results
     EXPECT_THAT(res, ContainerEq(src));
 }
 
-TEST(BufferEndianness, WhenWriteBufferMoreThan1ByteValuesThenValuesAreSwapped) {
+TEST(DataEndianness, WhenWriteMoreThan1ByteValuesThenValuesAreSwapped) {
     //fill initial values
     constexpr size_t SIZE = 4;
     uint16_t src[SIZE] = {0xAA00, 0xBB11, 0xCC22, 0xDD33};
@@ -119,11 +121,11 @@ TEST(BufferEndianness, WhenWriteBufferMoreThan1ByteValuesThenValuesAreSwapped) {
     uint16_t res[SIZE] = {};
     //create and write to buffer
     Buffer buf{};
-    bitsery::BasicBufferWriter<DefaultConfig> bw{buf};
+    Writer bw{buf};
     bw.writeBuffer<2>(src, SIZE);
     bw.flush();
     //read from buffer using inverse endianness config
-    bitsery::BasicBufferReader<InverseEndiannessConfig> br{bw.getWrittenRange()};
+    InverseReader br{InputAdapter{buf.begin(), bw.writtenBytesCount()}};
     br.readBuffer<2>(res, SIZE);
     //result is identical, because we write separate values, of size 1byte, that requires no swapping
     //check results
@@ -134,7 +136,7 @@ TEST(BufferEndianness, WhenWriteBufferMoreThan1ByteValuesThenValuesAreSwapped) {
 template <typename T>
 constexpr size_t getBits(T v) {
     return bitsery::details::calcRequiredBits<T>({}, v);
-};
+}
 
 struct IntegralUnsignedTypes {
     uint64_t a;
@@ -143,15 +145,13 @@ struct IntegralUnsignedTypes {
     uint8_t d;
 };
 
-TEST(BufferEndianness, WhenBufferValueTypeIs1ByteThenBitOperationsIsNotAffectedByEndianness) {
-    //fill initial values
-    static_assert(sizeof(bitsery::details::BufferContainerTraits<DefaultConfig::BufferType>::TValue) == 1, "currently only 1 byte size, value size is supported");
+TEST(DataEndianness, WhenValueTypeIs1ByteThenBitOperationsIsNotAffectedByEndianness) {
     //fill initial values
     constexpr IntegralUnsignedTypes src {
-            0x0000334455667788,//bits 19
-            0x00CCDDEE,//bits 16
-            0x00DD,//bits 1
-            0x0F,//bits 6
+            0x0000334455667788,
+            0x00CCDDEE,
+            0x00DD,
+            0x0F,
     };
 
     constexpr size_t aBITS = getBits(src.a) + 8;
@@ -160,19 +160,21 @@ TEST(BufferEndianness, WhenBufferValueTypeIs1ByteThenBitOperationsIsNotAffectedB
     constexpr size_t dBITS = getBits(src.d) + 2;
     //create and write to buffer
     Buffer buf{};
-    bitsery::BasicBufferWriter<DefaultConfig> bw{buf};
-    bw.writeBits(src.a, aBITS);
-    bw.writeBits(src.b, bBITS);
-    bw.writeBits(src.c, cBITS);
-    bw.writeBits(src.d, dBITS);
-    bw.flush();
+    Writer bw{buf};
+    bitsery::AdapterWriterBitPackingWrapper<Writer> bpw{bw};
+    bpw.writeBits(src.a, aBITS);
+    bpw.writeBits(src.b, bBITS);
+    bpw.writeBits(src.c, cBITS);
+    bpw.writeBits(src.d, dBITS);
+    bpw.flush();
     //read from buffer using inverse endianness config
-    bitsery::BasicBufferReader<InverseEndiannessConfig> br{bw.getWrittenRange()};
+    InverseReader br{InputAdapter{buf.begin(), bpw.writtenBytesCount()}};
+    bitsery::AdapterReaderBitPackingWrapper<InverseReader> bpr{br};
     IntegralUnsignedTypes res{};
-    br.readBits(res.a, aBITS);
-    br.readBits(res.b, bBITS);
-    br.readBits(res.c, cBITS);
-    br.readBits(res.d, dBITS);
+    bpr.readBits(res.a, aBITS);
+    bpr.readBits(res.b, bBITS);
+    bpr.readBits(res.c, cBITS);
+    bpr.readBits(res.d, dBITS);
     //check results
     EXPECT_THAT(res.a, Eq(src.a));
     EXPECT_THAT(res.b, Eq(src.b));

tests/data_operations.cpp

@@ -0,0 +1,408 @@
+//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 <bitsery/ext/value_range.h>
+#include <gmock/gmock.h>
+#include "serialization_test_utils.h"
+
+
+using testing::Eq;
+using testing::ContainerEq;
+
+using AdapterBitPackingWriter = bitsery::AdapterWriterBitPackingWrapper<Writer>;
+using AdapterBitPackingReader = bitsery::AdapterReaderBitPackingWrapper<Reader>;
+
+
+struct IntegralUnsignedTypes {
+    uint32_t a;
+    uint16_t b;
+    uint8_t c;
+    uint8_t d;
+    uint64_t e;
+};
+
+template <typename T>
+constexpr size_t getBits(T v) {
+    return bitsery::details::calcRequiredBits<T>({}, v);
+}
+
+// *** bits operations
+
+TEST(DataBitsAndBytesOperations, WriteAndReadBitsMaxTypeValues) {
+    Buffer buf;
+    Writer bw{buf};
+    AdapterBitPackingWriter bpw{bw};
+    bpw.writeBits(std::numeric_limits<uint64_t>::max(), 64);
+    bpw.writeBits(std::numeric_limits<uint32_t>::max(), 32);
+    bpw.writeBits(std::numeric_limits<uint16_t>::max(), 16);
+    bpw.writeBits(std::numeric_limits<uint8_t>::max(), 8);
+    bpw.flush();
+
+    Reader br{InputAdapter{buf.begin(), bpw.writtenBytesCount()}};
+    AdapterBitPackingReader bpr{br};
+    uint64_t v64{};
+    uint32_t v32{};
+    uint16_t v16{};
+    uint8_t v8{};
+    bpr.readBits(v64, 64);
+    bpr.readBits(v32, 32);
+    bpr.readBits(v16, 16);
+    bpr.readBits(v8, 8);
+
+    EXPECT_THAT(v64, Eq(std::numeric_limits<uint64_t>::max()));
+    EXPECT_THAT(v32, Eq(std::numeric_limits<uint32_t>::max()));
+    EXPECT_THAT(v16, Eq(std::numeric_limits<uint16_t>::max()));
+    EXPECT_THAT(v8, Eq(std::numeric_limits<uint8_t>::max()));
+}
+
+TEST(DataBitsAndBytesOperations, WriteAndReadBits) {
+    //setup data
+    constexpr IntegralUnsignedTypes data{
+        485454,//bits 19
+        45978,//bits 16
+        0,//bits 1
+        36,//bits 6
+        479845648946//bits 39
+    };
+
+    constexpr size_t aBITS = getBits(data.a) + 2;
+    constexpr size_t bBITS = getBits(data.b) + 0;
+    constexpr size_t cBITS = getBits(data.c) + 2;
+    constexpr size_t dBITS = getBits(data.d) + 1;
+    constexpr size_t eBITS = getBits(data.e) + 8;
+
+    //create and write to buffer
+    Buffer buf;
+    Writer bw{buf};
+    AdapterBitPackingWriter bpw{bw};
+
+    bpw.writeBits(data.a, aBITS);
+    bpw.writeBits(data.b, bBITS);
+    bpw.writeBits(data.c, cBITS);
+    bpw.writeBits(data.d, dBITS);
+    bpw.writeBits(data.e, eBITS);
+    bpw.flush();
+    auto writtenSize = bpw.writtenBytesCount();
+    auto bytesCount = ((aBITS + bBITS + cBITS + dBITS + eBITS) / 8) +1 ;
+    EXPECT_THAT(writtenSize, Eq(bytesCount));
+    //read from buffer
+    Reader br{InputAdapter{buf.begin(), writtenSize}};
+    AdapterBitPackingReader bpr{br};
+
+    IntegralUnsignedTypes res{};
+
+    bpr.readBits(res.a, aBITS);
+    bpr.readBits(res.b, bBITS);
+    bpr.readBits(res.c, cBITS);
+    bpr.readBits(res.d, dBITS);
+    bpr.readBits(res.e, eBITS);
+
+    EXPECT_THAT(res.a, Eq(data.a));
+    EXPECT_THAT(res.b, Eq(data.b));
+    EXPECT_THAT(res.c, Eq(data.c));
+    EXPECT_THAT(res.d, Eq(data.d));
+    EXPECT_THAT(res.e, Eq(data.e));
+
+}
+
+TEST(DataBitsAndBytesOperations, WrittenSizeIsCountedPerByteNotPerBit) {
+    //setup data
+
+    //create and write to buffer
+    Buffer buf;
+    Writer bw{buf};
+    AdapterBitPackingWriter bpw{bw};
+
+    bpw.writeBits(7u,3);
+    bpw.flush();
+    auto writtenSize = bpw.writtenBytesCount();
+    EXPECT_THAT(writtenSize, Eq(1));
+
+    //read from buffer
+    Reader br{InputAdapter{buf.begin(), writtenSize}};
+    AdapterBitPackingReader bpr{br};
+    uint16_t tmp;
+    bpr.readBits(tmp,4);
+    bpr.readBits(tmp,2);
+    bpr.readBits(tmp,2);
+    EXPECT_THAT(bpr.error(), Eq(bitsery::ReaderError::NoError));
+    bpr.readBits(tmp,2);
+    EXPECT_THAT(bpr.error(), Eq(bitsery::ReaderError::DataOverflow));//false
+
+    //part of next byte
+    Reader br1{InputAdapter{buf.begin(), writtenSize}};
+    AdapterBitPackingReader bpr1{br1};
+    bpr1.readBits(tmp,2);
+    EXPECT_THAT(bpr1.error(), Eq(bitsery::ReaderError::NoError));
+    bpr1.readBits(tmp,7);
+    EXPECT_THAT(bpr1.error(), Eq(bitsery::ReaderError::DataOverflow));//false
+
+    //bigger than byte
+    Reader br2{InputAdapter{buf.begin(), writtenSize}};
+    AdapterBitPackingReader bpr2{br2};
+    bpr2.readBits(tmp,9);
+    EXPECT_THAT(bpr2.error(), Eq(bitsery::ReaderError::DataOverflow));//false
+}
+
+TEST(DataBitsAndBytesOperations, ConsecutiveCallsToAlignHasNoEffect) {
+    Buffer buf;
+    Writer bw{buf};
+    AdapterBitPackingWriter bpw{bw};
+
+    bpw.writeBits(3u, 2);
+    //3 calls to align after 1st data
+    bpw.align();
+    bpw.align();
+    bpw.align();
+    bpw.writeBits(7u, 3);
+    //1 call to align after 2nd data
+    bpw.align();
+    bpw.writeBits(15u, 4);
+    bpw.flush();
+
+    unsigned char tmp;
+    Reader br{InputAdapter{buf.begin(), bpw.writtenBytesCount()}};
+    AdapterBitPackingReader bpr{br};
+    bpr.readBits(tmp,2);
+    EXPECT_THAT(tmp, Eq(3u));
+    bpr.align();
+    EXPECT_THAT(bpr.error(), Eq(bitsery::ReaderError::NoError));
+    bpr.readBits(tmp,3);
+    bpr.align();
+    bpr.align();
+    bpr.align();
+    EXPECT_THAT(tmp, Eq(7u));
+    EXPECT_THAT(bpr.error(), Eq(bitsery::ReaderError::NoError));
+
+    bpr.readBits(tmp,4);
+    EXPECT_THAT(tmp, Eq(15u));
+    EXPECT_THAT(bpr.error(), Eq(bitsery::ReaderError::NoError));
+}
+
+TEST(DataBitsAndBytesOperations, AlignWritesZerosBits) {
+    //setup data
+
+    //create and write to buffer
+    Buffer buf;
+    Writer bw{buf};
+    AdapterBitPackingWriter bpw{bw};
+
+    //write 2 bits and align
+    bpw.writeBits(3u, 2);
+    bpw.align();
+    bpw.flush();
+    auto writtenSize = bpw.writtenBytesCount();
+    EXPECT_THAT(writtenSize, Eq(1));
+    unsigned char tmp;
+    Reader br1{InputAdapter{buf.begin(), writtenSize}};
+    AdapterBitPackingReader bpr1{br1};
+    bpr1.readBits(tmp,2);
+    //read aligned bits
+    bpr1.readBits(tmp,6);
+    EXPECT_THAT(tmp, Eq(0));
+
+    Reader br2{InputAdapter{buf.begin(), writtenSize}};
+    AdapterBitPackingReader bpr2{br2};
+    //read 2 bits
+    bpr2.readBits(tmp,2);
+    bpr2.align();
+    EXPECT_THAT(bpr2.error(), Eq(bitsery::ReaderError::NoError));
+}
+
+
+// *** bytes operations
+
+struct IntegralTypes {
+    int64_t a;
+    uint32_t b;
+    int16_t c;
+    uint8_t d;
+    int8_t e;
+    int8_t f[2];
+};
+
+TEST(DataBitsAndBytesOperations, WriteAndReadBytes) {
+    //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};
+    bw.writeBytes<4>(data.b);
+    bw.writeBytes<2>(data.c);
+    bw.writeBytes<1>(data.d);
+    bw.writeBytes<8>(data.a);
+    bw.writeBytes<1>(data.e);
+    bw.writeBuffer<1>(data.f, 2);
+    bw.flush();
+    auto writtenSize = bw.writtenBytesCount();
+
+    EXPECT_THAT(writtenSize, Eq(18));
+    //read from buffer
+    Reader br{InputAdapter{buf.begin(), writtenSize}};
+    IntegralTypes res{};
+    br.readBytes<4>(res.b);
+    br.readBytes<2>(res.c);
+    br.readBytes<1>(res.d);
+    br.readBytes<8>(res.a);
+    br.readBytes<1>(res.e);
+    br.readBuffer<1>(res.f, 2);
+    EXPECT_THAT(br.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, 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;
+    int16_t src[DATA_SIZE] {54,-4877,30067};
+    //create and write to buffer
+    Buffer buf{};
+    Writer bw{buf};
+    bw.writeBuffer<2>(src, DATA_SIZE);
+    bw.flush();
+    //read from buffer
+    Reader br1{InputAdapter{buf.begin(), bw.writtenBytesCount()}};
+    int16_t dst[DATA_SIZE]{};
+    br1.readBuffer<2>(dst, DATA_SIZE);
+    EXPECT_THAT(br1.error(), Eq(bitsery::ReaderError::NoError));
+    EXPECT_THAT(dst, ContainerEq(src));
+}
+
+TEST(DataBitsAndBytesOperations, ReadWriteCanWorkOnUnalignedData) {
+    //setup data
+    constexpr size_t DATA_SIZE = 3;
+    int16_t src[DATA_SIZE] {54,-4877,30067};
+    //create and write to buffer
+    Buffer buf{};
+    Writer bw{buf};
+    AdapterBitPackingWriter bpw{bw};
+    bpw.writeBits(15u, 4);
+    bpw.writeBuffer<2>(src, DATA_SIZE);
+    bpw.writeBits(12u, 4);
+    bpw.flush();
+    auto writtenSize = bpw.writtenBytesCount();
+    EXPECT_THAT(writtenSize, Eq(sizeof(src) + 1));
+
+    //read from buffer
+    Reader br1{InputAdapter{buf.begin(), writtenSize}};
+    AdapterBitPackingReader bpr1{br1};
+    int16_t dst[DATA_SIZE]{};
+    uint8_t tmp{};
+    bpr1.readBits(tmp, 4);
+    EXPECT_THAT(tmp, Eq(15));
+    bpr1.readBuffer<2>(dst, DATA_SIZE);
+    EXPECT_THAT(bpr1.error(), Eq(bitsery::ReaderError::NoError));
+    EXPECT_THAT(dst, ContainerEq(src));
+    bpr1.readBits(tmp, 4);
+    EXPECT_THAT(tmp, Eq(12));
+}
+
+TEST(DataBitsAndBytesOperations, RegressionTestReadBytesAfterReadBitsWithLotsOfZeroBits) {
+    //setup data
+    int16_t data[2]{0x0000, 0x7FFF};
+    int16_t res[2]{};
+    //create and write to buffer
+    Buffer buf{};
+    Writer bw{buf};
+    AdapterBitPackingWriter bpw{bw};
+    bpw.writeBits(2u, 2);
+    bpw.writeBytes<2>(data[0]);
+    bpw.writeBytes<2>(data[1]);
+    bpw.align();
+    bpw.flush();
+
+    //read from buffer
+    Reader br{InputAdapter{buf.begin(), bpw.writtenBytesCount()}};
+    AdapterBitPackingReader bpr{br};
+    uint8_t tmp{};
+    bpr.readBits(tmp, 2);
+    EXPECT_THAT(tmp, Eq(2));
+    bpr.readBytes<2>(res[0]);
+    bpr.readBytes<2>(res[1]);
+    bpr.align();
+    EXPECT_THAT(res[0], Eq(data[0]));
+    EXPECT_THAT(res[1], Eq(data[1]));
+}
+

tests/data_reading.cpp

@@ -22,15 +22,11 @@
 
 
 #include <gmock/gmock.h>
-#include <bitsery/buffer_writer.h>
-#include <bitsery/buffer_reader.h>
+#include "serialization_test_utils.h"
 #include <list>
 #include <bitset>
 
 using testing::Eq;
-using bitsery::BufferWriter;
-using bitsery::BufferReader;
-using Buffer = bitsery::DefaultConfig::BufferType;
 
 struct IntegralTypes {
     int64_t a;
@@ -41,48 +37,48 @@ struct IntegralTypes {
     int8_t f[2];
 };
 
-TEST(BufferReading, WhenReadingMoreThanAvailableThenEmptyBufferError) {
+TEST(DataReading, WhenReadingMoreThanAvailableThenEmptyBufferError) {
     //setup data
     uint8_t a = 111;
 
     //create and write to buffer
     Buffer buf{};
-    BufferWriter bw{buf};
+    Writer bw{buf};
 
     bw.writeBytes<1>(a);
     bw.writeBytes<1>(a);
     bw.writeBytes<1>(a);
     bw.flush();
     //read from buffer
-    BufferReader br{bw.getWrittenRange()};
+    Reader br{InputAdapter{buf.begin(), bw.writtenBytesCount()}};
     int32_t c;
     br.readBytes<4>(c);
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::BUFFER_OVERFLOW));
+    EXPECT_THAT(br.error(), Eq(bitsery::ReaderError::DataOverflow));
 }
 
-TEST(BufferReading, WhenErrorOccursThenAllOtherOperationsFailsForSameError) {
+TEST(DataReading, WhenErrorOccursThenAllOtherOperationsFailsForSameError) {
     //setup data
     uint8_t a = 111;
 
     //create and write to buffer
     Buffer buf{};
-    BufferWriter bw{buf};
+    Writer bw{buf};
 
     bw.writeBytes<1>(a);
     bw.writeBytes<1>(a);
     bw.writeBytes<1>(a);
     bw.flush();
     //read from buffer
-    BufferReader br{bw.getWrittenRange()};
+    Reader br{InputAdapter{buf.begin(), bw.writtenBytesCount()}};
     int32_t c;
     br.readBytes<4>(c);
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::BUFFER_OVERFLOW));
+    EXPECT_THAT(br.error(), Eq(bitsery::ReaderError::DataOverflow));
     br.readBytes<1>(a);
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::BUFFER_OVERFLOW));
+    EXPECT_THAT(br.error(), Eq(bitsery::ReaderError::DataOverflow));
 }
 
 
-TEST(BufferReading, ReadIsCompletedSuccessfullyWhenAllBytesAreReadWithoutErrors) {
+TEST(DataReading, ReadIsCompletedSuccessfullyWhenAllBytesAreReadWithoutErrors) {
     //setup data
     IntegralTypes data;
     data.b = 94545646;
@@ -91,68 +87,94 @@ TEST(BufferReading, ReadIsCompletedSuccessfullyWhenAllBytesAreReadWithoutErrors)
 
     //create and write to buffer
     Buffer buf{};
-    BufferWriter bw{buf};
+    Writer bw{buf};
 
     bw.writeBytes<4>(data.b);
     bw.writeBytes<2>(data.c);
     bw.writeBytes<1>(data.d);
     bw.flush();
     //read from buffer
-    BufferReader br{bw.getWrittenRange()};
+    Reader br{InputAdapter{buf.begin(), bw.writtenBytesCount()}};
     IntegralTypes res;
     br.readBytes<4>(res.b);
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::NO_ERROR));
+    EXPECT_THAT(br.error(), Eq(bitsery::ReaderError::NoError));
     br.readBytes<2>(res.c);
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::NO_ERROR));
+    EXPECT_THAT(br.error(), Eq(bitsery::ReaderError::NoError));
     EXPECT_THAT(br.isCompletedSuccessfully(), Eq(false));
     br.readBytes<1>(res.d);
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::NO_ERROR));
+    EXPECT_THAT(br.error(), Eq(bitsery::ReaderError::NoError));
     EXPECT_THAT(br.isCompletedSuccessfully(), Eq(true));
     br.readBytes<1>(res.d);
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::BUFFER_OVERFLOW));
+    EXPECT_THAT(br.error(), Eq(bitsery::ReaderError::DataOverflow));
     EXPECT_THAT(br.isCompletedSuccessfully(), Eq(false));
 
-    BufferReader br1{bw.getWrittenRange()};
+    Reader br1{InputAdapter{buf.begin(), bw.writtenBytesCount()}};
     br1.readBytes<4>(res.b);
-    EXPECT_THAT(br1.getError(), Eq(bitsery::BufferReaderError::NO_ERROR));
+    EXPECT_THAT(br1.error(), Eq(bitsery::ReaderError::NoError));
     br1.readBytes<2>(res.c);
-    EXPECT_THAT(br1.getError(), Eq(bitsery::BufferReaderError::NO_ERROR));
+    EXPECT_THAT(br1.error(), Eq(bitsery::ReaderError::NoError));
     EXPECT_THAT(br1.isCompletedSuccessfully(), Eq(false));
     br1.readBytes<2>(res.c);
-    EXPECT_THAT(br1.getError(), Eq(bitsery::BufferReaderError::BUFFER_OVERFLOW));
+    EXPECT_THAT(br1.error(), Eq(bitsery::ReaderError::DataOverflow));
     EXPECT_THAT(br1.isCompletedSuccessfully(), Eq(false));
     br1.readBytes<1>(res.d);
-    EXPECT_THAT(br1.getError(), Eq(bitsery::BufferReaderError::BUFFER_OVERFLOW));
+    EXPECT_THAT(br1.error(), Eq(bitsery::ReaderError::DataOverflow));
     EXPECT_THAT(br1.isCompletedSuccessfully(), Eq(false));
 }
 
-TEST(BufferReading, WhenReaderHasErrorsAllOperationsReadsReturnZero) {
+TEST(DataReading, WhenReaderHasErrorsAllOperationsReadsReturnZero) {
     //setup data
     uint8_t a = 111;
 
     //create and write to buffer
     Buffer buf{};
-    BufferWriter bw{buf};
+    Writer bw{buf};
 
     bw.writeBytes<1>(a);
     bw.writeBytes<1>(a);
     bw.writeBytes<1>(a);
     bw.flush();
     //read from buffer
-    BufferReader br{bw.getWrittenRange()};
+    Reader br{InputAdapter{buf.begin(), bw.writtenBytesCount()}};
+    bitsery::AdapterReaderBitPackingWrapper<Reader> bpr{br};
     int32_t c;
-    br.readBytes<4>(c);
-    EXPECT_THAT(br.getError(), Eq(bitsery::BufferReaderError::BUFFER_OVERFLOW));
+    bpr.readBytes<4>(c);
+    EXPECT_THAT(br.error(), Eq(bitsery::ReaderError::DataOverflow));
 
     int16_t r1= {-645};
     uint32_t r2[2] = {54898,87854};
     uint8_t r3 = 0xFF;
 
-    br.readBytes<2>(r1);
-    br.readBuffer<4>(r2, 2);
-    br.readBits(r3, 7);
+    bpr.readBytes<2>(r1);
+    bpr.readBuffer<4>(r2, 2);
+    bpr.readBits(r3, 7);
     EXPECT_THAT(r1, Eq(0));
     EXPECT_THAT(r2[0], Eq(0u));
     EXPECT_THAT(r2[1], Eq(0u));
     EXPECT_THAT(r3, Eq(0u));
 }
+
+TEST(DataReading, ConstBufferAllAdapters) {
+    //create and write to buffer
+    uint16_t data = 7549;
+    Buffer bufWrite{};
+    Writer bw{bufWrite};
+    bw.writeBytes<2>(data);
+    bw.flush();
+    const Buffer buf{bufWrite};
+
+    //read from buffer
+    using Adapter1 = bitsery::InputBufferAdapter<const Buffer>;
+    using Adapter2 = bitsery::UnsafeInputBufferAdapter<const Buffer>;
+
+    bitsery::AdapterReader<Adapter1, bitsery::DefaultConfig> r1{Adapter1{buf.begin(), buf.end()}};
+    bitsery::AdapterReader<Adapter2, bitsery::DefaultConfig> r2{Adapter2{buf.begin(), buf.end()}};
+
+    uint16_t res1{};
+    r1.readBytes<2>(res1);
+
+    uint16_t res2{};
+    r2.readBytes<2>(res2);
+    EXPECT_THAT(res1, Eq(data));
+    EXPECT_THAT(res2, Eq(data));
+}

tests/data_reading_errors.cpp

@@ -0,0 +1,137 @@
+//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 <bitsery/traits/string.h>
+#include <gmock/gmock.h>
+#include "serialization_test_utils.h"
+
+
+using testing::Eq;
+using SessionsEnabledWriter = bitsery::AdapterWriter<OutputAdapter, SessionsEnabledConfig>;
+using SessionsEnabledReader = bitsery::AdapterReader<InputAdapter, SessionsEnabledConfig>;
+
+TEST(DataReadingErrors, WhenContainerOrTextSizeIsMoreThanMaxThenInvalidDataError) {
+    SerializationContext ctx;
+    std::string tmp = "larger text then allowed";
+    ctx.createSerializer().text1b(tmp,100);
+    ctx.createDeserializer().text1b(tmp, 10);
+    EXPECT_THAT(ctx.br->error(), Eq(bitsery::ReaderError::InvalidData));
+}
+
+TEST(DataReadingErrors, WhenReadingBoolByteReadsMoreThanOneThenInvalidBufferDataErrorAndResultIsFalse) {
+    SerializationContext ctx;
+    auto& ser = ctx.createSerializer();
+    ser.value1b(uint8_t{1});
+    ser.value1b(uint8_t{2});
+    bool res{};
+    auto& des = ctx.createDeserializer();
+    des.boolValue(res);
+    EXPECT_THAT(res, Eq(true));
+    des.boolValue(res);
+    EXPECT_THAT(res, Eq(false));
+    EXPECT_THAT(ctx.br->error(), Eq(bitsery::ReaderError::InvalidData));
+}
+
+TEST(DataReadingErrors, WhenReadingAlignHasNonZerosThenInvalidDataError) {
+    Buffer buf{};
+    Writer bw{buf};
+    uint8_t tmp{0xFF};
+    bw.writeBytes<1>(tmp);
+    bw.flush();
+
+    Reader br{InputAdapter{buf.begin(), bw.writtenBytesCount()}};
+    bitsery::AdapterReaderBitPackingWrapper<Reader> bpr{br};
+
+    bpr.readBits(tmp,3);
+    bpr.align();
+    EXPECT_THAT(bpr.error(), Eq(bitsery::ReaderError::InvalidData));
+}
+
+TEST(DataReadingErrors, WhenReadingNewSessionInMiddleOfOldDataThenInvalidDataError) {
+    uint8_t tmp{0xFF};
+    Buffer buf{};
+    SessionsEnabledWriter bw{buf};
+    for (auto i = 0; i < 2; ++i) {
+        bw.beginSession();
+        bw.writeBytes<1>(tmp);
+        bw.writeBytes<1>(tmp);
+        bw.endSession();
+    }
+    bw.flush();
+    SessionsEnabledReader br{InputAdapter{buf.begin(), bw.writtenBytesCount()}};
+    for (auto i = 0; i < 2; ++i) {
+        br.beginSession();
+        br.readBytes<1>(tmp);
+        br.beginSession();
+        br.readBytes<1>(tmp);
+        br.endSession();
+        br.endSession();
+    }
+    EXPECT_THAT(br.error(), Eq(bitsery::ReaderError::InvalidData));
+}
+
+
+TEST(DataReadingErrors, WhenInitializingSessionsWhenNotEnoughDataThenInvalidData) {
+    uint8_t tmp1{0xFF};
+    Buffer buf1{};
+    SessionsEnabledWriter bw1{buf1};
+    bw1.writeBytes<1>(tmp1);
+    bw1.flush();
+    SessionsEnabledReader br1{InputAdapter{buf1.begin(), bw1.writtenBytesCount()}};
+    br1.beginSession();
+    EXPECT_THAT(br1.error(), Eq(bitsery::ReaderError::InvalidData));
+
+    Buffer buf2{};
+    SessionsEnabledWriter bw2{buf2};
+    uint16_t tmp2{0x8000};
+    bw2.writeBytes<2>(tmp2);
+    bw2.flush();
+    SessionsEnabledReader br2{InputAdapter{buf2.begin(), bw2.writtenBytesCount()}};
+    br2.beginSession();
+    EXPECT_THAT(br2.error(), Eq(bitsery::ReaderError::InvalidData));
+}
+
+TEST(DataReadingErrors, WhenInitializingSessionsWhereSessionsDataOffsetIsCorruptedThenInvalidData) {
+    Buffer buf{};
+    SessionsEnabledWriter bw{buf};
+    bw.writeBytes<1>(uint8_t{1});
+    bw.writeBytes<1>(uint8_t{1});
+    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/data_writing.cpp

@@ -0,0 +1,111 @@
+//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 <bitsery/details/serialization_common.h>
+#include <bitsery/traits/array.h>
+
+#include <gmock/gmock.h>
+#include "serialization_test_utils.h"
+
+using testing::Eq;
+using testing::ContainerEq;
+using bitsery::EndiannessType;
+
+template <typename BufType>
+class DataWriting:public testing::Test {
+public:
+    using TWriter = bitsery::AdapterWriter<bitsery::OutputBufferAdapter<BufType>, bitsery::DefaultConfig>;
+    using TBuffer = BufType;
+};
+
+using NonFixedContainer = std::vector<uint8_t>;
+using FixedContainer = std::array<uint8_t, 100>;
+
+using ContainerTypes = ::testing::Types<FixedContainer,NonFixedContainer>;
+
+TYPED_TEST_CASE(DataWriting, ContainerTypes);
+
+static constexpr size_t DATA_SIZE = 14u;
+
+template <typename BW>
+void writeData(BW& bw) {
+    uint16_t tmp1{45}, tmp2{6543}, tmp3{46533};
+    uint32_t tmp4{8979445}, tmp5{7987564};
+    bw.template writeBytes<2>(tmp1);
+    bw.template writeBytes<2>(tmp2);
+    bw.template writeBytes<2>(tmp3);
+    bw.template writeBytes<4>(tmp4);
+    bw.template writeBytes<4>(tmp5);
+}
+
+TYPED_TEST(DataWriting, GetWrittenBytesCountReturnsActualBytesWritten) {
+    using TWriter = typename TestFixture::TWriter;
+    using TBuffer = typename TestFixture::TBuffer;
+    TBuffer buf{};
+    TWriter bw{buf};
+    writeData(bw);
+    bw.flush();
+    auto writtenSize = bw.writtenBytesCount();
+    EXPECT_THAT(writtenSize, DATA_SIZE);
+    EXPECT_THAT(buf.size(), ::testing::Ge(DATA_SIZE));
+}
+
+TYPED_TEST(DataWriting, WhenWritingBitsThenMustFlushWriter) {
+    using TWriter = typename TestFixture::TWriter;
+    using TBuffer = typename TestFixture::TBuffer;
+    TBuffer buf{};
+    TWriter bw{buf};
+    bitsery::AdapterWriterBitPackingWrapper<TWriter> bpw{bw};
+    bpw.writeBits(3u, 2);
+    auto writtenSize1 = bpw.writtenBytesCount();
+    bpw.flush();
+    auto writtenSize2 = bpw.writtenBytesCount();
+    EXPECT_THAT(writtenSize1, Eq(0));
+    EXPECT_THAT(writtenSize2, Eq(1));
+}
+
+TYPED_TEST(DataWriting, WhenDataAlignedThenFlushHasNoEffect) {
+    using TWriter = typename TestFixture::TWriter;
+    using TBuffer = typename TestFixture::TBuffer;
+    TBuffer buf{};
+    TWriter bw{buf};
+    bitsery::AdapterWriterBitPackingWrapper<TWriter> bpw{bw};
+    bpw.writeBits(3u, 2);
+    bpw.align();
+    auto writtenSize1 = bpw.writtenBytesCount();
+    bpw.flush();
+    auto writtenSize2 = bpw.writtenBytesCount();
+    EXPECT_THAT(writtenSize1, Eq(1));
+    EXPECT_THAT(writtenSize2, Eq(1));
+
+}
+
+TEST(DataWritingNonFixedBufferContainer, ContainerIsAlwaysResizedToCapacity) {
+    NonFixedContainer buf{};
+    bitsery::AdapterWriter<bitsery::OutputBufferAdapter<NonFixedContainer>, bitsery::DefaultConfig> bw{buf};
+    for (auto i = 0; i < 5; ++i) {
+        uint32_t tmp{};
+        bw.writeBytes<4>(tmp);
+        bw.writeBytes<4>(tmp);
+        EXPECT_TRUE(buf.size() == buf.capacity());
+    }
+}

tests/flexible_syntax.cpp

@@ -0,0 +1,398 @@
+//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 <bitsery/flexible.h>
+#include <bitsery/flexible/string.h>
+#include <bitsery/flexible/array.h>
+#include <bitsery/flexible/vector.h>
+#include <bitsery/flexible/list.h>
+#include <bitsery/flexible/forward_list.h>
+#include <bitsery/flexible/deque.h>
+#include <bitsery/flexible/queue.h>
+#include <bitsery/flexible/stack.h>
+#include <bitsery/flexible/map.h>
+#include <bitsery/flexible/unordered_map.h>
+#include <bitsery/flexible/set.h>
+#include <bitsery/flexible/unordered_set.h>
+#include <bitsery/flexible/memory.h>
+
+#include <gmock/gmock.h>
+#include "serialization_test_utils.h"
+
+using testing::Eq;
+
+TEST(FlexibleSyntax, FundamentalTypesAndBool) {
+    int ti = 8745;
+    MyEnumClass te = MyEnumClass::E4;
+    float tf = 485.042f;
+    double td = -454184.48445;
+    bool tb = true;
+    SerializationContext ctx{};
+    ctx.createSerializer().archive(ti, te, tf, td, tb);
+
+    //result
+    int ri{};
+    MyEnumClass re{};
+    float rf{};
+    double rd{};
+    bool rb{};
+    ctx.createDeserializer().archive(ri, re, rf, rd, rb);
+
+    //test
+    EXPECT_THAT(ri, Eq(ti));
+    EXPECT_THAT(re, Eq(te));
+    EXPECT_THAT(rf, Eq(tf));
+    EXPECT_THAT(rd, Eq(td));
+    EXPECT_THAT(rb, Eq(tb));
+}
+
+TEST(FlexibleSyntax, UseObjectFncInsteadOfValueN) {
+    int ti = 8745;
+    MyEnumClass te = MyEnumClass::E4;
+    float tf = 485.042f;
+    double td = -454184.48445;
+    bool tb = true;
+    SerializationContext ctx;
+    auto &ser = ctx.createSerializer();
+    ser.object(ti);
+    ser.object(te);
+    ser.object(tf);
+    ser.object(td);
+    ser.object(tb);
+
+    //result
+    int ri{};
+    MyEnumClass re{};
+    float rf{};
+    double rd{};
+    bool rb{};
+    auto &des = ctx.createDeserializer();
+    des.object(ri);
+    des.object(re);
+    des.object(rf);
+    des.object(rd);
+    des.object(rb);
+
+    //test
+    EXPECT_THAT(ri, Eq(ti));
+    EXPECT_THAT(re, Eq(te));
+    EXPECT_THAT(rf, Eq(tf));
+    EXPECT_THAT(rd, Eq(td));
+    EXPECT_THAT(rb, Eq(tb));
+}
+
+TEST(FlexibleSyntax, MixDifferentSyntax) {
+    int ti = 8745;
+    MyEnumClass te = MyEnumClass::E4;
+    float tf = 485.042f;
+    double td = -454184.48445;
+    bool tb = true;
+    SerializationContext ctx;
+    auto &ser = ctx.createSerializer();
+    ser.value<sizeof(ti)>(ti);
+    ser.archive(te, tf, td);
+    ser.object(tb);
+
+    //result
+    int ri{};
+    MyEnumClass re{};
+    float rf{};
+    double rd{};
+    bool rb{};
+    auto &des = ctx.createDeserializer();
+    des.archive(ri, re, rf);
+    des.value8b(rd);
+    des.object(rb);
+
+    //test
+    EXPECT_THAT(ri, Eq(ti));
+    EXPECT_THAT(re, Eq(te));
+    EXPECT_THAT(rf, Eq(tf));
+    EXPECT_THAT(rd, Eq(td));
+    EXPECT_THAT(rb, Eq(tb));
+}
+
+template<typename T>
+T procArchive(const T& testData) {
+    SerializationContext ctx;
+    ctx.createSerializer().archive(testData);
+    T res{};
+    ctx.createDeserializer().archive(res);
+    return res;
+}
+
+template<typename T>
+T procArchiveWithMaxSize(const T& testData) {
+    SerializationContext ctx;
+    ctx.createSerializer().archive(bitsery::maxSize(testData, 100));
+    T res{};
+    ctx.createDeserializer().archive(bitsery::maxSize(res, 100));
+    return res;
+}
+
+TEST(FlexibleSyntax, CStyleArrayForValueTypesAsContainer) {
+    const int t1[3]{8748, -484, 45};
+    int r1[3]{0, 0, 0};
+
+    SerializationContext ctx;
+    ctx.createSerializer().archive(bitsery::asContainer(t1));
+    ctx.createDeserializer().archive(bitsery::asContainer(r1));
+
+    EXPECT_THAT(r1, ::testing::ContainerEq(t1));
+}
+
+TEST(FlexibleSyntax, CStyleArrayForIntegralTypesAsText) {
+    const char t1[3]{"hi"};
+    char r1[3]{0, 0, 0};
+
+    SerializationContext ctx;
+    ctx.createSerializer().archive(bitsery::asText(t1));
+    ctx.createDeserializer().archive(bitsery::asText(r1));
+
+    EXPECT_THAT(r1, ::testing::ContainerEq(t1));
+}
+
+TEST(FlexibleSyntax, CStyleArray) {
+    const MyEnumClass t1[3]{MyEnumClass::E1, MyEnumClass::E4, MyEnumClass::E2};
+    MyEnumClass r1[3]{};
+
+    SerializationContext ctx;
+    ctx.createSerializer().archive(t1);
+    ctx.createDeserializer().archive(r1);
+
+    EXPECT_THAT(r1, ::testing::ContainerEq(t1));
+}
+
+TEST(FlexibleSyntax, StdString) {
+    std::string t1{"my nice string"};
+    std::string t2{};
+
+    EXPECT_THAT(procArchive(t1), Eq(t1));
+    EXPECT_THAT(procArchive(t2), Eq(t2));
+    EXPECT_THAT(procArchiveWithMaxSize(t1), Eq(t1));
+    EXPECT_THAT(procArchiveWithMaxSize(t2), Eq(t2));
+}
+
+TEST(FlexibleSyntax, StdArray) {
+    std::array<int, 3> t1{8748, -484, 45};
+    std::array<int, 0> t2{};
+
+    EXPECT_THAT(procArchive(t1), Eq(t1));
+    EXPECT_THAT(procArchive(t2), Eq(t2));
+}
+
+TEST(FlexibleSyntax, StdVector) {
+    std::vector<int> t1{8748, -484, 45};
+    std::vector<float> t2{5.f, 0.198f};
+
+    EXPECT_THAT(procArchive(t1), Eq(t1));
+    EXPECT_THAT(procArchive(t2), Eq(t2));
+    EXPECT_THAT(procArchiveWithMaxSize(t1), Eq(t1));
+    EXPECT_THAT(procArchiveWithMaxSize(t2), Eq(t2));
+}
+
+TEST(FlexibleSyntax, StdList) {
+    std::list<int> t1{8748, -484, 45};
+    std::list<float> t2{5.f, 0.198f};
+
+    EXPECT_THAT(procArchive(t1), Eq(t1));
+    EXPECT_THAT(procArchive(t2), Eq(t2));
+    EXPECT_THAT(procArchiveWithMaxSize(t1), Eq(t1));
+    EXPECT_THAT(procArchiveWithMaxSize(t2), Eq(t2));
+}
+
+TEST(FlexibleSyntax, StdForwardList) {
+    std::forward_list<int> t1{8748, -484, 45};
+    std::forward_list<float> t2{5.f, 0.198f};
+
+    EXPECT_THAT(procArchive(t1), Eq(t1));
+    EXPECT_THAT(procArchive(t2), Eq(t2));
+    EXPECT_THAT(procArchiveWithMaxSize(t1), Eq(t1));
+    EXPECT_THAT(procArchiveWithMaxSize(t2), Eq(t2));
+}
+
+TEST(FlexibleSyntax, StdDeque) {
+    std::deque<int> t1{8748, -484, 45};
+    std::deque<float> t2{5.f, 0.198f};
+
+    EXPECT_THAT(procArchive(t1), Eq(t1));
+    EXPECT_THAT(procArchive(t2), Eq(t2));
+    EXPECT_THAT(procArchiveWithMaxSize(t1), Eq(t1));
+    EXPECT_THAT(procArchiveWithMaxSize(t2), Eq(t2));
+}
+
+TEST(FlexibleSyntax, StdQueue) {
+    std::queue<std::string> t1;
+    t1.push("first");
+    t1.push("second string");
+
+    EXPECT_THAT(procArchive(t1), Eq(t1));
+    EXPECT_THAT(procArchiveWithMaxSize(t1), Eq(t1));
+}
+
+TEST(FlexibleSyntax, StdPriorityQueue) {
+    std::priority_queue<std::string> t1;
+    t1.push("first");
+    t1.push("second string");
+    t1.push("third");
+    t1.push("fourth");
+    auto r1 = procArchive(t1);
+    //we cannot compare priority queue directly
+
+    EXPECT_THAT(r1.size(), Eq(t1.size()));
+    for (auto i = 0u; i < r1.size(); ++i) {
+        EXPECT_THAT(r1.top(), Eq(t1.top()));
+        r1.pop();
+        t1.pop();
+    }
+}
+
+TEST(FlexibleSyntax, StdStack) {
+    std::stack<std::string> t1;
+    t1.push("first");
+    t1.push("second string");
+
+    EXPECT_THAT(procArchive(t1), Eq(t1));
+    EXPECT_THAT(procArchiveWithMaxSize(t1), Eq(t1));
+}
+
+TEST(FlexibleSyntax, StdUnorderedMap) {
+    std::unordered_map<int, int> t1;
+    t1.emplace(3423, 624);
+    t1.emplace(-5484, -845);
+
+    EXPECT_THAT(procArchive(t1), Eq(t1));
+    EXPECT_THAT(procArchiveWithMaxSize(t1), Eq(t1));
+}
+
+TEST(FlexibleSyntax, StdUnorderedMultiMap) {
+    std::unordered_multimap<std::string, int> t1;
+    t1.emplace("one", 624);
+    t1.emplace("two", -845);
+    t1.emplace("one", 897);
+
+    EXPECT_TRUE(procArchive(t1) == t1);
+    EXPECT_TRUE(procArchiveWithMaxSize(t1) == t1);
+}
+
+TEST(FlexibleSyntax, StdMap) {
+    std::map<int, int> t1;
+    t1.emplace(3423, 624);
+    t1.emplace(-5484, -845);
+
+    EXPECT_THAT(procArchive(t1), Eq(t1));
+    EXPECT_THAT(procArchiveWithMaxSize(t1), Eq(t1));
+}
+
+TEST(FlexibleSyntax, StdMultiMap) {
+    std::multimap<std::string, int> t1;
+    t1.emplace("one", 624);
+    t1.emplace("two", -845);
+    t1.emplace("one", 897);
+
+    auto res = procArchive(t1);
+    //same key values is not ordered, and operator == compares each element at same position
+    //so we need to compare our selves
+    EXPECT_THAT(res.size(), Eq(3));
+    for (auto it = t1.begin(); it != t1.end();) {
+        const auto lr = t1.equal_range(it->first);
+        const auto rr = res.equal_range(it->first);
+        EXPECT_TRUE(std::distance(lr.first, lr.second) == std::distance(rr.first, rr.second));
+        EXPECT_TRUE(std::is_permutation(lr.first, lr.second, rr.first));
+        it = lr.second;
+    }
+}
+
+TEST(FlexibleSyntax, StdUnorderedSet) {
+    std::unordered_set<std::string> t1;
+    t1.emplace("one");
+    t1.emplace("two");
+    t1.emplace("three");
+
+    EXPECT_TRUE(procArchive(t1) == t1);
+    EXPECT_TRUE(procArchiveWithMaxSize(t1) == t1);
+}
+
+TEST(FlexibleSyntax, StdUnorderedMultiSet) {
+    std::unordered_multiset<std::string> t1;
+    t1.emplace("one");
+    t1.emplace("two");
+    t1.emplace("three");
+    t1.emplace("one");
+
+    EXPECT_TRUE(procArchive(t1) == t1);
+    EXPECT_TRUE(procArchiveWithMaxSize(t1) == t1);
+}
+
+TEST(FlexibleSyntax, StdSet) {
+    std::set<std::string> t1;
+    t1.emplace("one");
+    t1.emplace("two");
+    t1.emplace("three");
+
+    EXPECT_TRUE(procArchive(t1) == t1);
+    EXPECT_TRUE(procArchiveWithMaxSize(t1) == t1);
+}
+
+TEST(FlexibleSyntax, StdMultiSet) {
+    std::multiset<std::string> t1;
+    t1.emplace("one");
+    t1.emplace("two");
+    t1.emplace("three");
+    t1.emplace("one");
+    t1.emplace("two");
+
+    EXPECT_TRUE(procArchive(t1) == t1);
+    EXPECT_TRUE(procArchiveWithMaxSize(t1) == t1);
+}
+
+TEST(FlexibleSyntax, StdSmartPtr) {
+    std::shared_ptr<int> dataShared1(new int{4});
+    std::weak_ptr<int> dataWeak1(dataShared1);
+    std::unique_ptr<std::string> dataUnique1{new std::string{"hello world"}};
+
+    bitsery::ext::PointerLinkingContext plctx1{};
+    BasicSerializationContext<bitsery::DefaultConfig, bitsery::ext::PointerLinkingContext> ctx;
+    ctx.createSerializer(&plctx1).archive(dataShared1, dataWeak1, dataUnique1);
+
+    std::shared_ptr<int> resShared1{};
+    std::weak_ptr<int> resWeak1{};
+    std::unique_ptr<std::string> resUnique1{};
+    ctx.createDeserializer(&plctx1).archive(resShared1, resWeak1, resUnique1);
+    //clear shared state from pointer linking context
+    plctx1.clearSharedState();
+
+    EXPECT_TRUE(plctx1.isValid());
+    EXPECT_THAT(*resShared1, Eq(*dataShared1));
+    EXPECT_THAT(*resWeak1.lock(), Eq(*dataWeak1.lock()));
+    EXPECT_THAT(*resUnique1, Eq(*dataUnique1));
+}
+
+TEST(FlexibleSyntax, NestedTypes) {
+    std::unordered_map<std::string, std::vector<std::string>> t1;
+    t1.emplace("my key", std::vector<std::string>{"very", "nice", "string"});
+    t1.emplace("other key", std::vector<std::string>{"just a string"});
+
+    EXPECT_THAT(procArchive(t1), Eq(t1));
+    EXPECT_THAT(procArchiveWithMaxSize(t1), Eq(t1));
+}

tests/not_default_constructible.cpp

@@ -0,0 +1,327 @@
+//MIT License
+//
+//Copyright (c) 2019 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 <forward_list>
+#include <bitsery/traits/forward_list.h>
+#include <bitsery/ext/std_set.h>
+#include <bitsery/ext/std_map.h>
+#include <bitsery/ext/pointer.h>
+#include <bitsery/ext/std_smart_ptr.h>
+
+#include <gmock/gmock.h>
+#include "serialization_test_utils.h"
+
+
+using testing::ContainerEq;
+using testing::Eq;
+
+//forward declare, for testing with std::unordered_map
+struct HasherForNonDefaultConstructible;
+
+class NonDefaultConstructible {
+    int32_t i{0};
+    friend class HasherForNonDefaultConstructible;
+
+
+
+
+    friend class bitsery::Access;
+    NonDefaultConstructible() = default;
+
+    template <typename S>
+    void serialize(S& s) {
+        s.value4b(i);
+    }
+
+public:
+
+    explicit NonDefaultConstructible(int32_t v):i{v} {}
+
+    bool operator == (const NonDefaultConstructible& other) const {
+        return i == other.i;
+    }
+
+    bool operator < (const NonDefaultConstructible& other) const {
+        return i < other.i;
+    }
+};
+
+struct HasherForNonDefaultConstructible {
+    size_t operator()(const NonDefaultConstructible& o) const {
+        return std::hash<int32_t>()(o.i);
+    }
+};
+
+
+
+
+TEST(DeserializeNonDefaultConstructible, Container) {
+    SerializationContext ctx{};
+    std::vector<NonDefaultConstructible> data{};
+    data.emplace_back(1);
+    data.emplace_back(2);
+    data.emplace_back(3);
+    std::vector<NonDefaultConstructible> res{};
+
+    ctx.createSerializer().container(data, 10);
+    ctx.createDeserializer().container(res, 10);
+
+    EXPECT_THAT(res, ContainerEq(data));
+}
+//this test is here, because when object is not constructible we cannot simple "resize" container
+TEST(DeserializeNonDefaultConstructible, ResultContainerShouldShrink) {
+    SerializationContext ctx{};
+    std::vector<NonDefaultConstructible> data{};
+    data.emplace_back(1);
+    std::vector<NonDefaultConstructible> res{};
+    res.emplace_back(2);
+    res.emplace_back(3);
+
+    ctx.createSerializer().container(data, 10);
+    ctx.createDeserializer().container(res, 10);
+
+    EXPECT_THAT(res, ContainerEq(data));
+}
+
+TEST(DeserializeNonDefaultConstructible, ResultStdForwardListShouldShrink) {
+    // forward list doesn't have .erase function, bet has erase_after
+    // in this case, if new size is 0 it must call clear, so we need to check two cases
+    {
+        // 1) when result should have more than 0 elements
+        SerializationContext ctx{};
+        std::forward_list<NonDefaultConstructible> data{};
+        data.push_front(NonDefaultConstructible{1});
+        std::forward_list<NonDefaultConstructible> res{};
+        res.push_front(NonDefaultConstructible{21});
+        res.push_front(NonDefaultConstructible{14});
+
+        ctx.createSerializer().container(data, 10);
+        ctx.createDeserializer().container(res, 10);
+
+        auto resIt = res.begin();
+        for (auto it = data.begin(); it != data.end(); ++it, ++resIt) {
+            EXPECT_THAT(*resIt, Eq(*it));
+        }
+        EXPECT_THAT(resIt, Eq(res.end()));
+
+    }
+    {
+        // 1) when result should have 0 elements
+        SerializationContext ctx{};
+        std::forward_list<NonDefaultConstructible> data{};
+        std::forward_list<NonDefaultConstructible> res{};
+        res.push_front(NonDefaultConstructible{1});
+        res.push_front(NonDefaultConstructible{14});
+
+        ctx.createSerializer().container(data, 10);
+        ctx.createDeserializer().container(res, 10);
+
+        EXPECT_THAT(res.begin(), Eq(res.end()));
+
+    }
+}
+
+TEST(DeserializeNonDefaultConstructible, StdSet) {
+    SerializationContext ctx{};
+    std::set<NonDefaultConstructible> data;
+    data.insert(NonDefaultConstructible{1});
+    data.insert(NonDefaultConstructible{2});
+    std::set<NonDefaultConstructible> res{};
+    data.insert(NonDefaultConstructible{3});
+
+    ctx.createSerializer().ext(data, bitsery::ext::StdSet{10});
+    ctx.createDeserializer().ext(res, bitsery::ext::StdSet{10});
+
+    EXPECT_THAT(res, ContainerEq(data));
+}
+
+TEST(DeserializeNonDefaultConstructible, StdMap) {
+    SerializationContext ctx{};
+    std::unordered_map<NonDefaultConstructible, NonDefaultConstructible, HasherForNonDefaultConstructible> data;
+    data.emplace(NonDefaultConstructible{2}, NonDefaultConstructible{3});
+
+    std::unordered_map<NonDefaultConstructible, NonDefaultConstructible, HasherForNonDefaultConstructible> res{};
+    data.emplace(NonDefaultConstructible{2}, NonDefaultConstructible{3});
+    data.emplace(NonDefaultConstructible{4}, NonDefaultConstructible{4});
+
+    auto& ser = ctx.createSerializer();
+    ser.ext(data, bitsery::ext::StdMap{10},[&ser](NonDefaultConstructible& key, NonDefaultConstructible& value) {
+        ser.object(key);
+        ser.object(value);
+    });
+    auto& des = ctx.createDeserializer();
+    des.ext(res, bitsery::ext::StdMap{10},[&des](NonDefaultConstructible& key, NonDefaultConstructible& value) {
+        des.object(key);
+        des.object(value);
+    });
+
+    EXPECT_THAT(res, ContainerEq(data));
+}
+
+
+struct NonPolymorphicPointers {
+    NonDefaultConstructible* pp;
+    std::unique_ptr<NonDefaultConstructible> up;
+    std::shared_ptr<NonDefaultConstructible> sp;
+    std::weak_ptr<NonDefaultConstructible> wp;
+};
+
+template <typename S>
+void serialize(S& s, NonPolymorphicPointers& o) {
+    s.ext(o.pp, bitsery::ext::PointerOwner{});
+    s.ext(o.up, bitsery::ext::StdSmartPtr{});
+    s.ext(o.sp, bitsery::ext::StdSmartPtr{});
+    s.ext(o.wp, bitsery::ext::StdSmartPtr{});
+}
+
+TEST(DeserializeNonDefaultConstructible, NonPolymorphicPointerAndSmartPointer) {
+    using SerContext = BasicSerializationContext<bitsery::DefaultConfig, bitsery::ext::PointerLinkingContext>;
+    SerContext ctx{};
+    NonPolymorphicPointers data{};
+    data.pp = new NonDefaultConstructible{3};
+    data.up = std::unique_ptr<NonDefaultConstructible>(new NonDefaultConstructible{54});
+    data.sp = std::shared_ptr<NonDefaultConstructible>(new NonDefaultConstructible{-481});
+    data.wp = data.sp;
+
+    NonPolymorphicPointers res{};
+    bitsery::ext::PointerLinkingContext plctx1{};
+    ctx.createSerializer(&plctx1).object(data);
+    ctx.createDeserializer(&plctx1).object(res);
+
+    EXPECT_THAT(*res.pp, Eq(*data.pp));
+    delete res.pp;
+    delete data.pp;
+    EXPECT_THAT(*res.up, Eq(*data.up));
+    EXPECT_THAT(*res.sp, Eq(*data.sp));
+    EXPECT_THAT(*(res.wp.lock()), Eq(*(data.wp.lock())));
+}
+
+class PolymorphicNDCBase {
+public:
+    virtual ~PolymorphicNDCBase() = 0;
+    template <typename S>
+    void serialize(S& ) {}
+};
+
+
+PolymorphicNDCBase::~PolymorphicNDCBase() = default;
+
+class PolymorphicNDC1:public PolymorphicNDCBase {
+    int8_t i{};
+    friend class bitsery::Access;
+
+    template <typename S>
+    void serialize(S& s) {
+        s.value1b(i);
+    }
+public:
+    PolymorphicNDC1() = default;
+    PolymorphicNDC1(int8_t v):i{v} {}
+    bool operator == (const PolymorphicNDC1& other) const {
+        return i == other.i;
+    }
+};
+
+class PolymorphicNDC2:public PolymorphicNDCBase {
+    uint16_t ui{};
+
+    friend class bitsery::Access;
+
+    template <typename S>
+    void serialize(S& s) {
+        s.value2b(ui);
+    }
+public:
+    PolymorphicNDC2() = default;
+    PolymorphicNDC2(uint16_t v):ui{v} {}
+    bool operator == (const PolymorphicNDC2& other) const {
+        return ui == other.ui;
+    }
+
+};
+
+
+namespace bitsery {
+    namespace ext {
+
+        template<>
+        struct PolymorphicBaseClass<PolymorphicNDCBase> : PolymorphicDerivedClasses<PolymorphicNDC1, PolymorphicNDC2> {
+        };
+    }
+}
+
+
+struct PolymorphicPointers {
+    PolymorphicNDCBase* pp;
+    std::unique_ptr<PolymorphicNDCBase> up;
+    std::shared_ptr<PolymorphicNDCBase> sp;
+    std::weak_ptr<PolymorphicNDCBase> wp;
+};
+
+template <typename S>
+void serialize(S& s, PolymorphicPointers& o) {
+    s.ext(o.pp, bitsery::ext::PointerOwner{});
+    s.ext(o.up, bitsery::ext::StdSmartPtr{});
+    s.ext(o.sp, bitsery::ext::StdSmartPtr{});
+    s.ext(o.wp, bitsery::ext::StdSmartPtr{});
+}
+
+TEST(DeserializeNonDefaultConstructible, PolymorphicPointerAndSmartPointer) {
+    using TContext = std::tuple<bitsery::ext::PointerLinkingContext, bitsery::ext::PolymorphicContext<bitsery::ext::StandardRTTI>>;
+    using SerContext = BasicSerializationContext<bitsery::DefaultConfig, TContext>;
+    SerContext ctx{};
+    PolymorphicPointers data{};
+    data.pp = new PolymorphicNDC1{-4};
+    data.up = std::unique_ptr<PolymorphicNDCBase>(new PolymorphicNDC2{54});
+    data.sp = std::shared_ptr<PolymorphicNDCBase>(new PolymorphicNDC1{15});
+    data.wp = data.sp;
+
+    PolymorphicPointers res{};
+    TContext serCtx{};
+    std::get<1>(serCtx).registerBasesList<typename SerContext::TSerializer>(bitsery::ext::PolymorphicClassesList<PolymorphicNDCBase>{});
+    TContext desCtx{};
+    std::get<1>(desCtx).registerBasesList<typename SerContext::TDeserializer>(bitsery::ext::PolymorphicClassesList<PolymorphicNDCBase>{});
+
+    ctx.createSerializer(&serCtx).object(data);
+    ctx.createDeserializer(&desCtx).object(res);
+    auto respp = dynamic_cast<PolymorphicNDC1*>(res.pp);
+    auto resup = dynamic_cast<PolymorphicNDC2*>(res.up.get());
+    auto ressp = dynamic_cast<PolymorphicNDC1*>(res.sp.get());
+    auto reswp = dynamic_cast<PolymorphicNDC1*>(res.wp.lock().get());
+
+    auto datapp = dynamic_cast<PolymorphicNDC1*>(data.pp);
+    auto dataup = dynamic_cast<PolymorphicNDC2*>(data.up.get());
+    auto datasp = dynamic_cast<PolymorphicNDC1*>(data.sp.get());
+    auto datawp = dynamic_cast<PolymorphicNDC1*>(data.wp.lock().get());
+
+    EXPECT_THAT(respp, ::testing::Ne(nullptr));
+    EXPECT_THAT(resup, ::testing::Ne(nullptr));
+    EXPECT_THAT(ressp, ::testing::Ne(nullptr));
+    EXPECT_THAT(reswp, ::testing::Ne(nullptr));
+
+    EXPECT_THAT(*respp, Eq(*datapp));
+    delete res.pp;
+    delete data.pp;
+    EXPECT_THAT(*resup, Eq(*dataup));
+    EXPECT_THAT(*ressp, Eq(*datasp));
+    EXPECT_THAT(*reswp, Eq(*datawp));
+}

tests/serialization_bool.cpp

@@ -26,19 +26,28 @@
 
 using testing::Eq;
 
+using Serializer = bitsery::BasicSerializer<bitsery::AdapterWriterBitPackingWrapper<Writer>>;
+
+using Deserializer = bitsery::BasicDeserializer<bitsery::AdapterReaderBitPackingWrapper<Reader>>;
+
 
 TEST(SerializeBooleans, BoolAsBit) {
-    SerializationContext ctx;
+
+    SerializationContext ctx{};
     bool t1{true};
     bool t2{false};
     bool res1;
     bool res2;
-    auto ser = ctx.createSerializer();
-    ser.boolBit(t1);
-    ser.boolBit(t2);
-    auto des = ctx.createDeserializer();
-    des.boolBit(res1);
-    des.boolBit(res2);
+    auto& ser = ctx.createSerializer();
+    ser.enableBitPacking([&t1, &t2](Serializer& sbp) {
+        sbp.boolValue(t1);
+        sbp.boolValue(t2);
+    });
+    auto& des = ctx.createDeserializer();
+    des.enableBitPacking([&res1, &res2](Deserializer& sbp) {
+        sbp.boolValue(res1);
+        sbp.boolValue(res2);
+    });
 
     EXPECT_THAT(res1, Eq(t1));
     EXPECT_THAT(res2, Eq(t2));
@@ -51,12 +60,12 @@ TEST(SerializeBooleans, BoolAsByte) {
     bool t2{false};
     bool res1;
     bool res2;
-    auto ser = ctx.createSerializer();
-    ser.boolByte(t1);
-    ser.boolByte(t2);
-    auto des = ctx.createDeserializer();
-    des.boolByte(res1);
-    des.boolByte(res2);
+    auto& ser = ctx.createSerializer();
+    ser.boolValue(t1);
+    ser.boolValue(t2);
+    auto& des = ctx.createDeserializer();
+    des.boolValue(res1);
+    des.boolValue(res2);
 
     EXPECT_THAT(res1, Eq(t1));
     EXPECT_THAT(res2, Eq(t2));

tests/serialization_container.cpp

@@ -22,13 +22,13 @@
 
 
 
-#include <gmock/gmock.h>
-#include <algorithm>
-#include <numeric>
-#include <deque>
-#include <list>
-#include "serialization_test_utils.h"
+#include <bitsery/traits/array.h>
+#include <bitsery/traits/list.h>
+#include <bitsery/traits/deque.h>
+#include <bitsery/traits/forward_list.h>
 
+#include <gmock/gmock.h>
+#include "serialization_test_utils.h"
 
 using testing::ContainerEq;
 using testing::Eq;
@@ -78,13 +78,15 @@ public:
     TContainer res{};
 
     size_t getExpectedBufSize(const SerializationContext &ctx) const {
-        return ctx.containerSizeSerializedBytesCount(src.size()) + src.size() * sizeof(TValue);
+        auto size = bitsery::traits::ContainerTraits<TContainer>::size(src);
+        return ctx.containerSizeSerializedBytesCount(size) + size * sizeof(TValue);
     }
 };
 //std::forward_list is not supported, because it doesn't have size() method
 using SequenceContainersWithArthmeticTypes = ::testing::Types<
         std::vector<int>,
         std::list<float>,
+        std::forward_list<int>,
         std::deque<unsigned short>>;
 
 TYPED_TEST_CASE(SerializeContainerDynamicSizeArthmeticTypes, SequenceContainersWithArthmeticTypes);
@@ -104,11 +106,11 @@ TYPED_TEST(SerializeContainerDynamicSizeArthmeticTypes, CustomFunctionIncrements
     SerializationContext ctx{};
     using TValue = typename TestFixture::TValue;
 
-    auto ser = ctx.createSerializer();
+    auto& ser = ctx.createSerializer();
     ser.container(this->src, 1000, [&ser](TValue& v) {
         ser.template value<sizeof(v)>(v);
     });
-    auto des = ctx.createDeserializer();
+    auto& des = ctx.createDeserializer();
     des.container(this->res, 1000, [&des](TValue &v) {
         des.template value<sizeof(v)>(v);
         //increment by 1 after reading
@@ -159,7 +161,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);
 
@@ -213,7 +215,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);
 
@@ -228,14 +230,14 @@ TYPED_TEST(SerializeContainerFixedSizeCompositeTypes, CustomFunctionThatSerializ
 
     using TValue = decltype(*std::begin(res));
 
-    SerializationContext ctx;
-    auto ser = ctx.createSerializer();
+    SerializationContext ctx{};
+    auto& ser = ctx.createSerializer();
     ser.container(src, [&ser](TValue &v) {
         char tmp{};
         ser.object(v);
         ser.value1b(tmp);
     });
-    auto des = ctx.createDeserializer();
+    auto& des = ctx.createDeserializer();
     des.container(res, [&des](TValue &v) {
         char tmp{};
         des.object(v);
@@ -246,4 +248,22 @@ TYPED_TEST(SerializeContainerFixedSizeCompositeTypes, CustomFunctionThatSerializ
     EXPECT_THAT(res, ContainerEq(src));
 }
 
+class SerializeContainer : public ::testing::TestWithParam<size_t> {
+};
+
+TEST_P(SerializeContainer, SizeHasVariableLength) {
+    SerializationContext ctx{};
+    auto emptyFnc = [](uint8_t &) {};
+
+    std::vector<uint8_t > src(GetParam());
+    std::vector<uint8_t > res{};
+    ctx.createSerializer().container(src, std::numeric_limits<size_t>::max(), emptyFnc);
+    ctx.createDeserializer().container(res, std::numeric_limits<size_t>::max(), emptyFnc);
+
+    EXPECT_THAT(res.size(), Eq(src.size()));
+    EXPECT_THAT(ctx.getBufferSize(), Eq(ctx.containerSizeSerializedBytesCount(src.size())));
+}
+
+//last comma is to suppress error that otherwise can be suppressed by clang/gcc with -Wgnu-zero-variadic-macro-arguments
+INSTANTIATE_TEST_CASE_P(LargeContainerSize, SerializeContainer, ::testing::Values(0x01, 0x80, 0x4000),);