archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: UUID, fix clang-tidy warnings

Browse Source 
Use explicit `uint32_t` instead of `uint`, add a missing end-of-namespace
comment, and change `auto` to `const auto *`.

No functional changes.
This commit is contained in:
Sybren A. Stüvel
2021-09-23 18:22:47 +02:00
parent 502543e46b
commit 18a4dc869d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenlib/BLI_uuid.h
View File

@@ -84,13 +84,13 @@ class bUUID : public ::bUUID {
bUUID(const ::bUUID &struct_uuid); bUUID(const ::bUUID &struct_uuid);
/** Initialise from 11 integers, 5 for the regular fields and 6 for the `node` array. */ /** Initialise from 11 integers, 5 for the regular fields and 6 for the `node` array. */
bUUID(std::initializer_list<uint> field_values); bUUID(std::initializer_list<uint32_t> field_values);
/** Initialise by parsing the string; undefined behaviour when the string is invalid. */ /** Initialise by parsing the string; undefined behaviour when the string is invalid. */
explicit bUUID(const std::string &string_formatted_uuid); explicit bUUID(const std::string &string_formatted_uuid);
uint64_t hash() const; uint64_t hash() const;
}; }; // namespace blender
bool operator==(bUUID uuid1, bUUID uuid2); bool operator==(bUUID uuid1, bUUID uuid2);
bool operator!=(bUUID uuid1, bUUID uuid2); bool operator!=(bUUID uuid1, bUUID uuid2);

6
source/blender/blenlib/intern/uuid.cc
View File

@@ -142,13 +142,13 @@ std::ostream &operator<<(std::ostream &stream, bUUID uuid)
namespace blender { namespace blender {
bUUID::bUUID(const std::initializer_list<uint> field_values) bUUID::bUUID(const std::initializer_list<uint32_t> field_values)
{ {
BLI_assert_msg(field_values.size() == 11, "bUUID requires 5 regular fields + 6 `node` values"); BLI_assert_msg(field_values.size() == 11, "bUUID requires 5 regular fields + 6 `node` values");
auto field_iter = field_values.begin(); const auto *field_iter = field_values.begin();
this->time_low = static_cast<uint32_t>(*field_iter++); this->time_low = *field_iter++;
this->time_mid = static_cast<uint16_t>(*field_iter++); this->time_mid = static_cast<uint16_t>(*field_iter++);
this->time_hi_and_version = static_cast<uint16_t>(*field_iter++); this->time_hi_and_version = static_cast<uint16_t>(*field_iter++);
this->clock_seq_hi_and_reserved = static_cast<uint8_t>(*field_iter++); this->clock_seq_hi_and_reserved = static_cast<uint8_t>(*field_iter++);