luo980/stduuid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forward declare to_string function

Browse Source 
Forward declare to_string function before it is used in a friend
declaration and deleted the default template parameters from the
definition to prevent warnings in GCC.

Also add "if constexp" to an if statement that was constant.
This commit is contained in:
Jason 2022-01-13 13:52:16 -08:00
parent 1da3294a8b
commit c4728ee83b
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/uuid.h
View File

@ -352,6 +352,13 @@ namespace uuids
name_based_sha1 = 5 // The name-based version specified in RFS 4122 with SHA1 hashing name_based_sha1 = 5 // The name-based version specified in RFS 4122 with SHA1 hashing
}; };
// Forward declare uuid & to_string so that we can declare to_string as a friend later.
class uuid;
template <class CharT = char,
class Traits = std::char_traits<CharT>,
class Allocator = std::allocator<CharT>>
std::basic_string<CharT, Traits, Allocator> to_string(uuid const &id);
// -------------------------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------------------------
// uuid class // uuid class
// -------------------------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------------------------
@ -550,9 +557,9 @@ namespace uuids
return lhs.data < rhs.data; return lhs.data < rhs.data;
} }
template<class CharT = char, template <class CharT,
class Traits = std::char_traits<CharT>, class Traits,
class Allocator = std::allocator<CharT>> class Allocator>
inline std::basic_string<CharT, Traits, Allocator> to_string(uuid const & id) inline std::basic_string<CharT, Traits, Allocator> to_string(uuid const & id)
{ {
std::basic_string<CharT, Traits, Allocator> uustr{detail::empty_guid<CharT>}; std::basic_string<CharT, Traits, Allocator> uustr{detail::empty_guid<CharT>};
@ -920,7 +927,7 @@ namespace std
static_cast<uint64_t>(uuid.data[14]) << 8 | static_cast<uint64_t>(uuid.data[14]) << 8 |
static_cast<uint64_t>(uuid.data[15]); static_cast<uint64_t>(uuid.data[15]);
if (sizeof(result_type) > 4) if constexpr (sizeof(result_type) > 4)
{ {
return result_type(l ^ h); return result_type(l ^ h);
} }