Dreaded_X/io
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed issies with multiple definitions

Browse Source
This commit is contained in:
Dreaded_X 2020-05-06 21:23:59 +02:00
parent 7201035a20
commit d3c6337068
4 changed files with 63 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/io/read.h
View File

@ -36,30 +36,10 @@ namespace io {
}
template <>
float read(std::istream& is) {
union {
uint32_t a;
float b;
} u;
u.a = read_bytes<uint32_t>(is, sizeof(uint32_t));
return u.b;
}
float read(std::istream& is);
template<>
size_t read(std::istream& is) {
size_t value = 0;
uint8_t length = io::read<uint8_t>(is);
if (length & 0b10000000) {
value = read_bytes<size_t>(is, length & 0b01111111);
} else {
value = length;
}
return value;
}
size_t read(std::istream& is);
template <typename T> requires std::is_convertible_v<std::string, T>
T read(std::istream& is, size_t length) {

28
include/io/write.h
View File

@ -32,35 +32,11 @@ namespace io {
}
template <>
void write(std::ostream& os, float value) {
union {
uint32_t a;
float b;
} u;
u.b = value;
write_bytes(os, u.a, sizeof(uint32_t));
}
void write(std::ostream& os, float value);
// Special implementation for size_t (also uint64_t, so maybe this is not that smart)
template <>
void write(std::ostream& os, size_t value) {
// Check if we need more then one byte
if (value > 0b01111111) {
// Calculate how many bytes we need to store the number
uint8_t length = 0;
auto x = value;
while (x != 0) {
x >>= 8;
length++;
}
write<uint8_t>(os, length | 0b10000000);
write_bytes(os, value, length);
} else {
write<uint8_t>(os, value);
}
}
void write(std::ostream& os, size_t value);
template <typename T> requires std::is_convertible_v<T, std::string_view>
void write(std::ostream& os, T value, bool store_length = true) {

27
src/read.cpp Normal file
View File

@ -0,0 +1,27 @@
#include "io/read.h"
namespace io {
template<>
float read(std::istream& is) {
union {
uint32_t a;
float b;
} u;
u.a = read_bytes<uint32_t>(is, sizeof(uint32_t));
return u.b;
}
template<>
size_t read(std::istream& is) {
size_t value = 0;
uint8_t length = io::read<uint8_t>(is);
if (length & 0b10000000) {
value = read_bytes<size_t>(is, length & 0b01111111);
} else {
value = length;
}
return value;
}
}

33
src/write.cpp
View File

@ -1,3 +1,34 @@
#include "io/write.h"
// We do not implement anything without templates
namespace io {
template<>
void write(std::ostream& os, float value) {
union {
uint32_t a;
float b;
} u;
u.b = value;
write_bytes(os, u.a, sizeof(uint32_t));
}
// Special implementation for size_t (also uint64_t, so maybe this is not that smart)
template<>
void write(std::ostream& os, size_t value) {
// Check if we need more then one byte
if (value > 0b01111111) {
// Calculate how many bytes we need to store the number
uint8_t length = 0;
auto x = value;
while (x != 0) {
x >>= 8;
length++;
}
write<uint8_t>(os, length | 0b10000000);
write_bytes(os, value, length);
} else {
write<uint8_t>(os, value);
}
}
}