King_DuckZ/DoorKeeper
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Buildfix on gcc 4.8

Browse source
This commit is contained in:
King_DuckZ 2015-06-24 23:05:33 +02:00
parent f1bcf8674d
commit 7140ee6b38
4 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/doorkeeper/helpers/typename.hpp
View file

@ -19,6 +19,8 @@
# include "sprout/string.hpp" # include "sprout/string.hpp"
# include "doorkeeper/implem/tiger_bt.hpp" # include "doorkeeper/implem/tiger_bt.hpp"
# include <stdexcept> # include <stdexcept>
#else
# include <string>
#endif #endif
#include "doorkeeper/implem/compatibility.h" #include "doorkeeper/implem/compatibility.h"
#include <cstdint> #include <cstdint>

17
include/doorkeeper/implem/typename.inl
View file

@ -24,8 +24,8 @@ namespace dk {
inline std::string type_name() inline std::string type_name()
#endif #endif
{ {
#if defined(IS_PRETTY_FUNC_CONSTEXPR) #if defined(__GNUC__)
# if defined(__GNUC__) # if defined(IS_PRETTY_FUNC_CONSTEXPR)
typedef sprout::string<implem::type_name_info<T>().len> sproutstring; typedef sprout::string<implem::type_name_info<T>().len> sproutstring;
typedef sprout::string<implem::type_name_len<T>()> sproutstringret; typedef sprout::string<implem::type_name_len<T>()> sproutstringret;
@ -37,7 +37,12 @@ namespace dk {
implem::type_name_len<T>() - 1 implem::type_name_len<T>() - 1
); );
# else # else
# error "not implemented" std::string pf(__PRETTY_FUNCTION__);
const auto read_start = pf.find('=', pf.find('[') + 1) + 2;
return pf.substr(
read_start,
pf.find(';', read_start) - read_start
);
# endif # endif
#else #else
# error "not implemented" # error "not implemented"
@ -47,14 +52,18 @@ namespace dk {
} }
namespace implem { namespace implem {
#if defined(IS_PRETTY_FUNC_CONSTEXPR)
template <typename T> template <typename T>
constexpr type_name_info<T>::type_name_info() : constexpr type_name_info<T>::type_name_info() :
# if defined(__GNUC__)
len(sizeof(__PRETTY_FUNCTION__)), len(sizeof(__PRETTY_FUNCTION__)),
str(__PRETTY_FUNCTION__) str(__PRETTY_FUNCTION__)
# else
# error "not implemented"
# endif
{ {
} }
#if defined(IS_PRETTY_FUNC_CONSTEXPR)
template <typename T> template <typename T>
constexpr std::size_t type_name_len() { constexpr std::size_t type_name_len() {
typedef sprout::string<implem::type_name_info<T>().len> sproutstring; typedef sprout::string<implem::type_name_info<T>().len> sproutstring;

2
src/typename.cpp
View file

@ -15,7 +15,7 @@ namespace dk {
::tiger(parString, parLen, retval, TigerPaddingV2); ::tiger(parString, parLen, retval, TigerPaddingV2);
HashType hash(retval[0], retval[1], retval[2]); HashType hash{retval[0], retval[1], retval[2]};
return hash; return hash;
} }
} //namespace implem } //namespace implem

41
test/main.cpp
View file

@ -57,32 +57,27 @@ int main() {
std::cout << dk::type_name<std::vector<std::pair<std::map<std::string, unsigned short int>, bool>>>() << '\n'; std::cout << dk::type_name<std::vector<std::pair<std::map<std::string, unsigned short int>, bool>>>() << '\n';
std::cout << dk::type_name_hash<dk::Tyler<2>>() << '\n'; std::cout << dk::type_name_hash<dk::Tyler<2>>() << '\n';
static constexpr auto h = dk::tiger("message digest", 14, 0x01); //static constexpr auto h = dk::tiger("message digest", 14, 0x01);
std::cout << std::hex << h.a << '\n' << 0x951A2078CBF881D9ULL << std::endl; //std::cout << std::hex << h.a << '\n' << 0x951A2078CBF881D9ULL << std::endl;
static constexpr auto h2 = dk::tiger("abc", 3, 0x01); //static constexpr auto h2 = dk::tiger("abc", 3, 0x01);
std::cout << std::hex << h2.a << '\n' << 0xF258C1E88414AB2AULL << std::endl; //std::cout << std::hex << h2.a << '\n' << 0xF258C1E88414AB2AULL << std::endl;
static constexpr auto h3 = dk::tiger("", 0, 0x01); //static constexpr auto h3 = dk::tiger("", 0, 0x01);
std::cout << std::hex << h3.a << '\n' << 0x24F0130C63AC9332ULL << std::endl; //std::cout << std::hex << h3.a << '\n' << 0x24F0130C63AC9332ULL << std::endl;
{ //{
static constexpr dk::HashType hashtest(1, 2, 3); // static constexpr dk::HashType hashtest{1, 2, 3};
static_assert(hashtest.a == 1, "wrong value"); // static_assert(hashtest.a == 1, "wrong value");
static_assert(hashtest.b == 2, "wrong value"); // static_assert(hashtest.b == 2, "wrong value");
static_assert(hashtest.c == 3, "wrong value"); // static_assert(hashtest.c == 3, "wrong value");
} //}
{ //{
static constexpr dk::HashType hashtest(2, 'c', 0, 'a', 1, 'b'); // static constexpr dk::HashType hashtest(2, 'c', 0, 'a', 1, 'b');
static_assert(hashtest.a == 'a', "wrong value"); // static_assert(hashtest.a == 'a', "wrong value");
static_assert(hashtest.b == 'b', "wrong value"); // static_assert(hashtest.b == 'b', "wrong value");
static_assert(hashtest.c == 'c', "wrong value"); // static_assert(hashtest.c == 'c', "wrong value");
} //}
{
const uint64_t test = *reinterpret_cast<const uint64_t*>("A\0\0\0\0\0\0");
if ((test & 0xFF) != 'A')
throw 1;
}
return 0; return 0;
typedef dk::Tyler<2>::coords coords2; typedef dk::Tyler<2>::coords coords2;