Scarfski/bitsery
1
0
Fork 0
mirror of https://github.com/fraillt/bitsery.git synced 2026-09-13 22:08:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation with gcc 4.8.2 (#33)

Browse Source 
Update for gcc4.8.2 for Centos7
This commit is contained in:
Arnaud Botella
2020-01-17 07:08:49 +01:00
committed by Mindaugas Vinkelis
parent 501d60f67d
commit 0e76e0608c
7 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/bitsery/details/serialization_common.h
View File

@@ -380,7 +380,7 @@ namespace bitsery {
template <typename ... TArgs>
explicit AdapterAndContextRef(Context& ctx, TArgs&& ... args)
: _adapter{std::forward<TArgs>(args)...},
_context{ctx}
_context(ctx)
{
}

2
include/bitsery/ext/inheritance.h
View File

@@ -36,7 +36,7 @@ namespace bitsery {
class InheritanceContext {
public:
explicit InheritanceContext(MemResourceBase* memResource = nullptr)
:_virtualBases{pointer_utils::StdPolyAlloc<const void*>{memResource}}
:_virtualBases{0, std::hash<const void*>{}, std::equal_to<const void*>{}, pointer_utils::StdPolyAlloc<const void*>{memResource}}
{}
InheritanceContext(const InheritanceContext&) = delete;
InheritanceContext&operator = (const InheritanceContext&) = delete;

4
include/bitsery/ext/std_map.h
View File

@@ -62,8 +62,8 @@ namespace bitsery {
auto hint = obj.begin();
for (auto i = 0u; i < size; ++i) {
auto key{bitsery::Access::create<TKey>()};
auto value{bitsery::Access::create<TValue>()};
auto key = bitsery::Access::create<TKey>();
auto value = bitsery::Access::create<TValue>();
fnc(des, key, value);
hint = obj.emplace_hint(hint, std::move(key), std::move(value));
}

2
include/bitsery/ext/std_set.h
View File

@@ -58,7 +58,7 @@ namespace bitsery {
reserve(obj, size);
auto hint = obj.begin();
for (auto i = 0u; i < size; ++i) {
auto key{bitsery::Access::create<TKey>()};
auto key = bitsery::Access::create<TKey>();
fnc(des, key);
hint = obj.emplace_hint(hint, std::move(key));
}

34
include/bitsery/ext/utils/memory_resource.h
View File

@@ -24,6 +24,7 @@
#define BITSERY_EXT_MEMORY_RESOURCE_H
#include "../../details/serialization_common.h"
#include <cstddef>
#include <new>
namespace bitsery {
@@ -127,6 +128,39 @@ namespace bitsery {
class StdPolyAlloc {
public:
using value_type = T;
using pointer = T*;
using const_pointer = const T*;
using reference = T&;
using const_reference = const T&;
using size_type = size_t;
using difference_type = ptrdiff_t;
size_t max_size() const noexcept {
return std::numeric_limits<size_t>::max() / sizeof(value_type);
}
void construct(T *p, const T &val) {
new((void *) p) T(val);
}
template<class U, class... Args>
void construct(U *p, Args &&... args) {
new((void *) p) U(std::forward<Args>(args)...);
}
void destroy(T *p) {
p->~T();
}
template<class U>
void destroy(U *p) {
p->~U();
}
template<typename U>
struct rebind {
using other = StdPolyAlloc<U>;
};
explicit constexpr StdPolyAlloc(MemResourceBase* memResource)
:_alloc{memResource} {}

4
include/bitsery/ext/utils/pointer_utils.h
View File

@@ -153,7 +153,7 @@ namespace bitsery {
public:
explicit PointerLinkingContextSerialization(MemResourceBase* memResource = nullptr)
: _currId{0},
_ptrMap{StdPolyAlloc<std::pair<const void* const, PLCInfoSerializer>>{memResource}} {}
_ptrMap{0, std::hash<const void*>{}, std::equal_to<const void*>{}, StdPolyAlloc<std::pair<const void* const, PLCInfoSerializer>>{memResource}} {}
PointerLinkingContextSerialization(const PointerLinkingContextSerialization&) = delete;
@@ -198,7 +198,7 @@ namespace bitsery {
public:
explicit PointerLinkingContextDeserialization(MemResourceBase* memResource = nullptr)
: _memResource{memResource},
_idMap{StdPolyAlloc<std::pair<const size_t, PLCInfoDeserializer>>{memResource}} {}
_idMap{0, std::hash<size_t>{}, std::equal_to<size_t>{}, StdPolyAlloc<std::pair<const size_t, PLCInfoDeserializer>>{memResource}} {}
PointerLinkingContextDeserialization(const PointerLinkingContextDeserialization&) = delete;

7
include/bitsery/ext/utils/polymorphism_utils.h
View File

@@ -185,11 +185,8 @@ namespace bitsery {
explicit PolymorphicContext(MemResourceBase* memResource = nullptr)
:_memResource{memResource},
_baseToDerivedMap{pointer_utils::StdPolyAlloc<std::pair<const BaseToDerivedKey,
std::shared_ptr<PolymorphicHandlerBase>>>{memResource}},
_baseToDerivedArray{pointer_utils::StdPolyAlloc<std::pair<const size_t,
std::vector<size_t, pointer_utils::StdPolyAlloc<size_t>>>>{memResource}}
{}
_baseToDerivedMap{0, BaseToDerivedKeyHashier{}, std::equal_to<BaseToDerivedKey>{}, pointer_utils::StdPolyAlloc<std::pair<const BaseToDerivedKey, std::shared_ptr<PolymorphicHandlerBase>>>{memResource}},
_baseToDerivedArray{0, std::hash<size_t>{}, std::equal_to<size_t>{}, pointer_utils::StdPolyAlloc<std::pair<const size_t, std::vector<size_t, pointer_utils::StdPolyAlloc<size_t>>>>{memResource}} {}
PolymorphicContext(const PolymorphicContext& ) = delete;
PolymorphicContext& operator = (const PolymorphicContext&) = delete;