Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Prefer logical punctuators instead of named operator keywords

Browse Source 
Some compilers (eg. MSVC) still require inclusion of <ciso646>
in order to import named operator keywords.
It is easier to stick with traditional punctuators.
This commit is contained in:
Mateusz Loskot 2018-02-14 01:10:02 +01:00 committed by Patrick Niklaus
parent 342da81591
commit ae41066fbe
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/engine/base64.hpp
View File

@ -87,7 +87,7 @@ inline std::string encodeBase64(const std::string &x) { return encodeBase64(x.da
// Encode any sufficiently trivial object to Base64. // Encode any sufficiently trivial object to Base64.
template <typename T> std::string encodeBase64Bytewise(const T &x) template <typename T> std::string encodeBase64Bytewise(const T &x)
{ {
#if not defined __GNUC__ or __GNUC__ > 4 #if !defined(__GNUC__) || (__GNUC__ > 4)
static_assert(std::is_trivially_copyable<T>::value, "requires a trivially copyable type"); static_assert(std::is_trivially_copyable<T>::value, "requires a trivially copyable type");
#endif #endif
@ -124,7 +124,7 @@ inline std::string decodeBase64(const std::string &encoded)
// Decodes from Base 64 to any sufficiently trivial object. // Decodes from Base 64 to any sufficiently trivial object.
template <typename T> T decodeBase64Bytewise(const std::string &encoded) template <typename T> T decodeBase64Bytewise(const std::string &encoded)
{ {
#if not defined __GNUC__ or __GNUC__ > 4 #if !defined(__GNUC__) || (__GNUC__ > 4)
static_assert(std::is_trivially_copyable<T>::value, "requires a trivially copyable type"); static_assert(std::is_trivially_copyable<T>::value, "requires a trivially copyable type");
#endif #endif

4
include/storage/io.hpp
View File

@ -96,7 +96,7 @@ class FileReader
/* Read count objects of type T into pointer dest */ /* Read count objects of type T into pointer dest */
template <typename T> void ReadInto(T *dest, const std::size_t count) template <typename T> void ReadInto(T *dest, const std::size_t count)
{ {
#if not defined __GNUC__ or __GNUC__ > 4 #if !defined(__GNUC__) || (__GNUC__ > 4)
static_assert(!std::is_pointer<T>::value, "saving pointer types is not allowed"); static_assert(!std::is_pointer<T>::value, "saving pointer types is not allowed");
static_assert(std::is_trivially_copyable<T>::value, static_assert(std::is_trivially_copyable<T>::value,
"bytewise reading requires trivially copyable type"); "bytewise reading requires trivially copyable type");
@ -214,7 +214,7 @@ class FileWriter
/* Write count objects of type T from pointer src to output stream */ /* Write count objects of type T from pointer src to output stream */
template <typename T> void WriteFrom(const T *src, const std::size_t count) template <typename T> void WriteFrom(const T *src, const std::size_t count)
{ {
#if not defined __GNUC__ or __GNUC__ > 4 #if !defined(__GNUC__) || (__GNUC__ > 4)
static_assert(std::is_trivially_copyable<T>::value, static_assert(std::is_trivially_copyable<T>::value,
"bytewise writing requires trivially copyable type"); "bytewise writing requires trivially copyable type");
#endif #endif

2
include/util/guidance/entry_class.hpp
View File

@ -64,7 +64,7 @@ class EntryClass
friend std::size_t std::hash<EntryClass>::operator()(const EntryClass &) const; friend std::size_t std::hash<EntryClass>::operator()(const EntryClass &) const;
}; };
#if not defined __GNUC__ or __GNUC__ > 4 #if !defined(__GNUC__) || (__GNUC__ > 4)
static_assert(std::is_trivially_copyable<EntryClass>::value, static_assert(std::is_trivially_copyable<EntryClass>::value,
"Class is serialized trivially in " "Class is serialized trivially in "
"the datafacades. Bytewise writing " "the datafacades. Bytewise writing "