diff --git a/Linux/CMakeLists.txt b/Linux/CMakeLists.txt index 884c139b6..13997f1e1 100644 --- a/Linux/CMakeLists.txt +++ b/Linux/CMakeLists.txt @@ -632,7 +632,7 @@ add_library(Siv3D STATIC ../Siv3D/src/Siv3D/UnicodeConverter/SivUnicodeConverter.cpp ../Siv3D/src/Siv3D/UserAction/CUserAction.cpp ../Siv3D/src/Siv3D/UserAction/UserActionFactory.cpp - ../Siv3D/src/Siv3D/UUID/SivUUID.cpp + ../Siv3D/src/Siv3D/UUIDValue/SivUUIDValue.cpp ../Siv3D/src/Siv3D/Vector2D/SivVector2D.cpp ../Siv3D/src/Siv3D/Vector3D/SivVector3D.cpp ../Siv3D/src/Siv3D/Vector4D/SivVector4D.cpp diff --git a/Siv3D/include/Siv3D.hpp b/Siv3D/include/Siv3D.hpp index 05ab7deda..bb5ce935c 100644 --- a/Siv3D/include/Siv3D.hpp +++ b/Siv3D/include/Siv3D.hpp @@ -823,7 +823,7 @@ # include // UUID | UUID -# include +# include ////////////////////////////////////////////////// // diff --git a/Siv3D/include/Siv3D/UUID.hpp b/Siv3D/include/Siv3D/UUIDValue.hpp similarity index 60% rename from Siv3D/include/Siv3D/UUID.hpp rename to Siv3D/include/Siv3D/UUIDValue.hpp index 51d9763bf..cfded5e0c 100644 --- a/Siv3D/include/Siv3D/UUID.hpp +++ b/Siv3D/include/Siv3D/UUIDValue.hpp @@ -17,7 +17,7 @@ namespace s3d { - class UUID + class UUIDValue { public: @@ -42,17 +42,17 @@ namespace s3d using value_type = uint8; SIV3D_NODISCARD_CXX20 - UUID() = default; + UUIDValue() = default; SIV3D_NODISCARD_CXX20 - explicit UUID(const value_type(&uuid)[16]) noexcept; + explicit UUIDValue(const value_type(&uuid)[16]) noexcept; SIV3D_NODISCARD_CXX20 - explicit constexpr UUID(const std::array& uuid) noexcept; + explicit constexpr UUIDValue(const std::array& uuid) noexcept; template SIV3D_NODISCARD_CXX20 - explicit UUID(Iterator first, Iterator last); + explicit UUIDValue(Iterator first, Iterator last); [[nodiscard]] constexpr bool isNil() const noexcept; @@ -72,55 +72,55 @@ namespace s3d [[nodiscard]] constexpr const std::array& getData() const noexcept; - void swap(UUID& other); + void swap(UUIDValue& other); [[nodiscard]] size_t hash() const noexcept; [[nodiscard]] - friend bool operator ==(const UUID& lhs, const UUID& rhs) noexcept + friend bool operator ==(const UUIDValue& lhs, const UUIDValue& rhs) noexcept { return (lhs.m_data == rhs.m_data); } [[nodiscard]] - friend bool operator !=(const UUID& lhs, const UUID& rhs) noexcept + friend bool operator !=(const UUIDValue& lhs, const UUIDValue& rhs) noexcept { return (lhs.m_data != rhs.m_data); } [[nodiscard]] - friend bool operator <(const UUID& lhs, const UUID& rhs) noexcept + friend bool operator <(const UUIDValue& lhs, const UUIDValue& rhs) noexcept { return (lhs.m_data < rhs.m_data); } [[nodiscard]] - static UUID Generate(); + static UUIDValue Generate(); [[nodiscard]] - static UUID GenerateFromRNG(DefaultRNG& rng = GetDefaultRNG()); + static UUIDValue GenerateFromRNG(DefaultRNG& rng = GetDefaultRNG()); [[nodiscard]] - static UUID GenerateFromName(const UUID& namespaceUUID, const std::string& name); + static UUIDValue GenerateFromName(const UUIDValue& namespaceUUIDValue, const std::string& name); [[nodiscard]] - static UUID GenerateFromName(const UUID& namespaceUUID, const String& name); + static UUIDValue GenerateFromName(const UUIDValue& namespaceUUIDValue, const String& name); [[nodiscard]] - static UUID Nil(); + static UUIDValue Nil(); [[nodiscard]] - static UUID NamespaceDNS() noexcept; + static UUIDValue NamespaceDNS() noexcept; [[nodiscard]] - static UUID NamespaceURL() noexcept; + static UUIDValue NamespaceURL() noexcept; [[nodiscard]] - static UUID NamespaceOID() noexcept; + static UUIDValue NamespaceOID() noexcept; [[nodiscard]] - static UUID NamespaceX500() noexcept; + static UUIDValue NamespaceX500() noexcept; [[nodiscard]] static bool IsValid(std::string_view uuid); @@ -129,18 +129,18 @@ namespace s3d static bool IsValid(StringView uuid); [[nodiscard]] - static Optional Parse(std::string_view uuid); + static Optional Parse(std::string_view uuid); [[nodiscard]] - static Optional Parse(StringView uuid); + static Optional Parse(StringView uuid); template - friend std::basic_ostream& operator <<(std::basic_ostream& output, const UUID& value) + friend std::basic_ostream& operator <<(std::basic_ostream& output, const UUIDValue& value) { return (output << value.str()); } - friend void Formatter(FormatData& formatData, const UUID& value); + friend void Formatter(FormatData& formatData, const UUIDValue& value); private: @@ -149,7 +149,7 @@ namespace s3d } template <> -struct SIV3D_HIDDEN fmt::formatter +struct SIV3D_HIDDEN fmt::formatter { std::u32string tag; @@ -159,7 +159,7 @@ struct SIV3D_HIDDEN fmt::formatter } template - auto format(const s3d::UUID& value, FormatContext& ctx) + auto format(const s3d::UUIDValue& value, FormatContext& ctx) { const s3d::String s = value.str(); const basic_string_view sv(s.data(), s.size()); @@ -177,16 +177,16 @@ struct SIV3D_HIDDEN fmt::formatter }; template <> -struct std::hash +struct std::hash { [[nodiscard]] - size_t operator()(const s3d::UUID& value) const noexcept + size_t operator()(const s3d::UUIDValue& value) const noexcept { return value.hash(); } }; template <> -inline void std::swap(s3d::UUID& a, s3d::UUID& b) noexcept; +inline void std::swap(s3d::UUIDValue& a, s3d::UUIDValue& b) noexcept; -# include "detail/UUID.ipp" +# include "detail/UUIDValue.ipp" diff --git a/Siv3D/include/Siv3D/detail/UUID.ipp b/Siv3D/include/Siv3D/detail/UUIDValue.ipp similarity index 60% rename from Siv3D/include/Siv3D/detail/UUID.ipp rename to Siv3D/include/Siv3D/detail/UUIDValue.ipp index 549d53d7e..09db3b131 100644 --- a/Siv3D/include/Siv3D/detail/UUID.ipp +++ b/Siv3D/include/Siv3D/detail/UUIDValue.ipp @@ -13,11 +13,11 @@ namespace s3d { - inline constexpr UUID::UUID(const std::array& uuid) noexcept + inline constexpr UUIDValue::UUIDValue(const std::array& uuid) noexcept : m_data{ uuid } {} template - inline UUID::UUID(Iterator first, Iterator last) + inline UUIDValue::UUIDValue(Iterator first, Iterator last) { if (std::distance(first, last) == 16) { @@ -25,7 +25,7 @@ namespace s3d } } - inline constexpr bool UUID::isNil() const noexcept + inline constexpr bool UUIDValue::isNil() const noexcept { for (auto& value : m_data) { @@ -38,24 +38,24 @@ namespace s3d return true; } - inline constexpr const std::array& UUID::getData() const noexcept + inline constexpr const std::array& UUIDValue::getData() const noexcept { return m_data; } - inline void UUID::swap(UUID& other) + inline void UUIDValue::swap(UUIDValue& other) { m_data.swap(other.m_data); } - inline size_t UUID::hash() const noexcept + inline size_t UUIDValue::hash() const noexcept { return Hash::FNV1a(m_data); } } template <> -void std::swap(s3d::UUID& a, s3d::UUID& b) noexcept +void std::swap(s3d::UUIDValue& a, s3d::UUIDValue& b) noexcept { a.swap(b); } diff --git a/Siv3D/src/Siv3D/FileSystem/SivFileSystem.cpp b/Siv3D/src/Siv3D/FileSystem/SivFileSystem.cpp index 9e3ffa98b..7edf24614 100644 --- a/Siv3D/src/Siv3D/FileSystem/SivFileSystem.cpp +++ b/Siv3D/src/Siv3D/FileSystem/SivFileSystem.cpp @@ -10,7 +10,7 @@ //----------------------------------------------- # include -# include +# include namespace s3d { @@ -172,7 +172,7 @@ namespace s3d for (;;) { - const FilePath path = (directoryPath + UUID::Generate().str() + U".tmp"); + const FilePath path = (directoryPath + UUIDValue::Generate().str() + U".tmp"); if (not Exists(path)) { diff --git a/Siv3D/src/Siv3D/Script/ScriptData.cpp b/Siv3D/src/Siv3D/Script/ScriptData.cpp index 2f21a4a2f..f2d4c3b70 100644 --- a/Siv3D/src/Siv3D/Script/ScriptData.cpp +++ b/Siv3D/src/Siv3D/Script/ScriptData.cpp @@ -11,7 +11,7 @@ # include # include -# include +# include # include # include # include "IScript.hpp" @@ -29,7 +29,7 @@ namespace s3d ScriptData::ScriptData(Code, const StringView code, AngelScript::asIScriptEngine* const engine, const ScriptCompileOption compileOption) : m_engine{ engine } , m_module{ std::make_shared() } - , m_moduleName{ UUID::Generate().to_string() } + , m_moduleName{ UUIDValue::Generate().to_string() } , m_compileOption{ compileOption } { m_initialized = true; @@ -73,7 +73,7 @@ namespace s3d ScriptData::ScriptData(File, const FilePathView path, AngelScript::asIScriptEngine* const engine, const ScriptCompileOption compileOption) : m_engine{ engine } , m_module{ std::make_shared() } - , m_moduleName{ UUID::Generate().to_string() } + , m_moduleName{ UUIDValue::Generate().to_string() } , m_compileOption{ compileOption } , m_fullpath{ FileSystem::FullPath(path) } { @@ -112,7 +112,7 @@ namespace s3d } m_module->module = m_engine->GetModule(m_moduleName.c_str()); - m_moduleName = UUID::Generate().to_string(); + m_moduleName = UUIDValue::Generate().to_string(); m_module->context = m_engine->CreateContext(); m_module->withLineCues = withLineCues; diff --git a/Siv3D/src/Siv3D/UUID/SivUUID.cpp b/Siv3D/src/Siv3D/UUIDValue/SivUUIDValue.cpp similarity index 62% rename from Siv3D/src/Siv3D/UUID/SivUUID.cpp rename to Siv3D/src/Siv3D/UUIDValue/SivUUIDValue.cpp index 0dc7e40f1..e334d2db2 100644 --- a/Siv3D/src/Siv3D/UUID/SivUUID.cpp +++ b/Siv3D/src/Siv3D/UUIDValue/SivUUIDValue.cpp @@ -9,7 +9,7 @@ // //----------------------------------------------- -# include +# include # define UUID_SYSTEM_GENERATOR # include @@ -19,13 +19,13 @@ namespace s3d namespace detail { [[nodiscard]] - static UUID ToUUID(const uuids::uuid& id) noexcept + static UUIDValue ToUUIDValue(const uuids::uuid& id) noexcept { std::array data; std::memcpy(data.data(), id.as_bytes().data(), sizeof(data)); - return UUID{ data }; + return UUIDValue{ data }; } template @@ -41,22 +41,22 @@ namespace s3d } } - UUID::UUID(const value_type(&uuid)[16]) noexcept + UUIDValue::UUIDValue(const value_type(&uuid)[16]) noexcept { std::copy(std::begin(uuid), std::end(uuid), std::begin(m_data)); } - UUID::Variant UUID::variant() const noexcept + UUIDValue::Variant UUIDValue::variant() const noexcept { - return UUID::Variant{ FromEnum(uuids::uuid{ m_data }.variant()) }; + return UUIDValue::Variant{ FromEnum(uuids::uuid{ m_data }.variant()) }; } - UUID::Version UUID::version() const noexcept + UUIDValue::Version UUIDValue::version() const noexcept { - return UUID::Version{ FromEnum(uuids::uuid{ m_data }.version()) }; + return UUIDValue::Version{ FromEnum(uuids::uuid{ m_data }.version()) }; } - std::string UUID::to_string() const + std::string UUIDValue::to_string() const { std::string s(36, '-'); detail::ToHex(&s[0], m_data[0]); @@ -83,7 +83,7 @@ namespace s3d return s; } - String UUID::str() const + String UUIDValue::str() const { String s(36, U'-'); detail::ToHex(&s[0], m_data[0]); @@ -110,74 +110,74 @@ namespace s3d return s; } - UUID UUID::Generate() + UUIDValue UUIDValue::Generate() { const uuids::uuid id = uuids::uuid_system_generator{}(); - return detail::ToUUID(id); + return detail::ToUUIDValue(id); } - UUID UUID::GenerateFromRNG(DefaultRNG& rng) + UUIDValue UUIDValue::GenerateFromRNG(DefaultRNG& rng) { const uuids::uuid id = uuids::basic_uuid_random_generator{ rng }(); - return detail::ToUUID(id); + return detail::ToUUIDValue(id); } - UUID UUID::GenerateFromName(const UUID& namespaceUUID, const std::string& name) + UUIDValue UUIDValue::GenerateFromName(const UUIDValue& namespaceUUID, const std::string& name) { const uuids::uuid id = uuids::uuid_name_generator{ namespaceUUID.m_data }(name); - return detail::ToUUID(id); + return detail::ToUUIDValue(id); } - UUID UUID::GenerateFromName(const UUID& namespaceUUID, const String& name) + UUIDValue UUIDValue::GenerateFromName(const UUIDValue& namespaceUUID, const String& name) { const uuids::uuid id = uuids::uuid_name_generator{ namespaceUUID.m_data }(name.toUTF8()); - return detail::ToUUID(id); + return detail::ToUUIDValue(id); } - UUID UUID::Nil() + UUIDValue UUIDValue::Nil() { return{}; } - UUID UUID::NamespaceDNS() noexcept + UUIDValue UUIDValue::NamespaceDNS() noexcept { - return detail::ToUUID(uuids::uuid_namespace_dns); + return detail::ToUUIDValue(uuids::uuid_namespace_dns); } - UUID UUID::NamespaceURL() noexcept + UUIDValue UUIDValue::NamespaceURL() noexcept { - return detail::ToUUID(uuids::uuid_namespace_url); + return detail::ToUUIDValue(uuids::uuid_namespace_url); } - UUID UUID::NamespaceOID() noexcept + UUIDValue UUIDValue::NamespaceOID() noexcept { - return detail::ToUUID(uuids::uuid_namespace_oid); + return detail::ToUUIDValue(uuids::uuid_namespace_oid); } - UUID UUID::NamespaceX500() noexcept + UUIDValue UUIDValue::NamespaceX500() noexcept { - return detail::ToUUID(uuids::uuid_namespace_x500); + return detail::ToUUIDValue(uuids::uuid_namespace_x500); } - bool UUID::IsValid(const std::string_view uuid) + bool UUIDValue::IsValid(const std::string_view uuid) { return uuids::uuid::is_valid_uuid(std::string(uuid)); } - bool UUID::IsValid(const StringView uuid) + bool UUIDValue::IsValid(const StringView uuid) { return uuids::uuid::is_valid_uuid(uuid.toUTF8()); } - Optional UUID::Parse(const std::string_view uuid) + Optional UUIDValue::Parse(const std::string_view uuid) { if (auto result = uuids::uuid::from_string(std::string(uuid))) { - return detail::ToUUID(*result); + return detail::ToUUIDValue(*result); } else { @@ -185,11 +185,11 @@ namespace s3d } } - Optional UUID::Parse(const StringView uuid) + Optional UUIDValue::Parse(const StringView uuid) { if (auto result = uuids::uuid::from_string(uuid.toUTF8())) { - return detail::ToUUID(*result); + return detail::ToUUIDValue(*result); } else { @@ -197,7 +197,7 @@ namespace s3d } } - void Formatter(FormatData& formatData, const UUID& value) + void Formatter(FormatData& formatData, const UUIDValue& value) { formatData.string.append(value.str()); } diff --git a/Web/CMakeLists.txt b/Web/CMakeLists.txt index 5d79fd1cf..05bd870c7 100644 --- a/Web/CMakeLists.txt +++ b/Web/CMakeLists.txt @@ -655,7 +655,7 @@ add_library( ../Siv3D/src/Siv3D/UnicodeConverter/SivUnicodeConverter.cpp ../Siv3D/src/Siv3D/UserAction/CUserAction.cpp ../Siv3D/src/Siv3D/UserAction/UserActionFactory.cpp - ../Siv3D/src/Siv3D/UUID/SivUUID.cpp + ../Siv3D/src/Siv3D/UUIDValue/SivUUIDValue.cpp ../Siv3D/src/Siv3D/Vector2D/SivVector2D.cpp ../Siv3D/src/Siv3D/Vector3D/SivVector3D.cpp ../Siv3D/src/Siv3D/Vector4D/SivVector4D.cpp diff --git a/WindowsDesktop/Siv3D.vcxproj b/WindowsDesktop/Siv3D.vcxproj index a602f0618..dd53540fd 100644 --- a/WindowsDesktop/Siv3D.vcxproj +++ b/WindowsDesktop/Siv3D.vcxproj @@ -319,7 +319,7 @@ - + @@ -748,7 +748,7 @@ - + @@ -2392,7 +2392,7 @@ - + diff --git a/WindowsDesktop/Siv3D.vcxproj.filters b/WindowsDesktop/Siv3D.vcxproj.filters index 3c34405ca..aae8eb498 100644 --- a/WindowsDesktop/Siv3D.vcxproj.filters +++ b/WindowsDesktop/Siv3D.vcxproj.filters @@ -1297,7 +1297,7 @@ {84dbd56f-e925-4ed0-9eda-3fe795dfdb65} - + {cbfc11c1-9854-4174-92ef-47b8f70444ea} @@ -6243,13 +6243,13 @@ include\Siv3D\detail - + include\Siv3D src\ThirdParty\stduuid - + include\Siv3D\detail @@ -9047,8 +9047,8 @@ src\Siv3D\IPv4Address - - src\Siv3D\UUID + + src\Siv3D\UUIDValue src\Siv3D-Platform\WindowsDesktop\Siv3D\Shader diff --git a/macOS/OpenSiv3D.xcodeproj/project.pbxproj b/macOS/OpenSiv3D.xcodeproj/project.pbxproj index 9a0ae26bf..439e06c75 100644 --- a/macOS/OpenSiv3D.xcodeproj/project.pbxproj +++ b/macOS/OpenSiv3D.xcodeproj/project.pbxproj @@ -992,7 +992,7 @@ 2C61A00926C955EF00429B27 /* SivScript.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C61A00626C955EF00429B27 /* SivScript.cpp */; }; 2C61A00A26C955EF00429B27 /* ScriptData.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2C61A00726C955EF00429B27 /* ScriptData.hpp */; }; 2C61A00D26C9561100429B27 /* SivScriptModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C61A00C26C9561100429B27 /* SivScriptModule.cpp */; }; - 2C62196526750F3A0088B175 /* SivUUID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C62196426750F3A0088B175 /* SivUUID.cpp */; }; + 2C62196526750F3A0088B175 /* SivUUIDValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C62196426750F3A0088B175 /* SivUUIDValue.cpp */; }; 2C62197226750F6A0088B175 /* uuid.h in Headers */ = {isa = PBXBuildFile; fileRef = 2C62197126750F6A0088B175 /* uuid.h */; }; 2C631E8A2685D03F00166A8E /* SivKlattTTS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C631E892685D03F00166A8E /* SivKlattTTS.cpp */; }; 2C631E8D2687042500166A8E /* SivLine3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C631E8C2687042500166A8E /* SivLine3D.cpp */; }; @@ -3247,7 +3247,7 @@ 2C5C673B265F1E7E00FAA651 /* AudioResourceHolder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = AudioResourceHolder.hpp; sourceTree = ""; }; 2C5C673D265F1E8400FAA651 /* SoundTouchFunctions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = SoundTouchFunctions.hpp; sourceTree = ""; }; 2C5C6797265F315500FAA651 /* SivDLL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SivDLL.cpp; sourceTree = ""; }; - 2C5CD8C72675E43E004E290F /* UUID.ipp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = UUID.ipp; sourceTree = ""; }; + 2C5CD8C72675E43E004E290F /* UUIDValue.ipp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = UUIDValue.ipp; sourceTree = ""; }; 2C5CD8C826761A47004E290F /* Pentablet.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Pentablet.hpp; sourceTree = ""; }; 2C5CD8CA26761A6A004E290F /* PentabletFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PentabletFactory.cpp; sourceTree = ""; }; 2C5CD8CD26761A91004E290F /* SivPentablet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SivPentablet.cpp; sourceTree = ""; }; @@ -3347,8 +3347,8 @@ 2C61A00E26C965D400429B27 /* ScriptFunction.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ScriptFunction.hpp; sourceTree = ""; }; 2C61A00F26C965D400429B27 /* ScriptCompileOption.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ScriptCompileOption.hpp; sourceTree = ""; }; 2C61A01026C96E9900429B27 /* ScriptFunction.ipp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ScriptFunction.ipp; sourceTree = ""; }; - 2C62196226750F220088B175 /* UUID.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = UUID.hpp; sourceTree = ""; }; - 2C62196426750F3A0088B175 /* SivUUID.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SivUUID.cpp; sourceTree = ""; }; + 2C62196226750F220088B175 /* UUIDValue.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = UUIDValue.hpp; sourceTree = ""; }; + 2C62196426750F3A0088B175 /* SivUUIDValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SivUUIDValue.cpp; sourceTree = ""; }; 2C62196726750F550088B175 /* gsl_util */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gsl_util; sourceTree = ""; }; 2C62196826750F550088B175 /* gsl_assert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gsl_assert; sourceTree = ""; }; 2C62196926750F550088B175 /* span */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = span; sourceTree = ""; }; @@ -4968,7 +4968,7 @@ 2C063D5D2661426000368BEE /* UnicodeConverter.ipp */, 2C063D562661426000368BEE /* Utility_detail.ipp */, 2C063DF12661426000368BEE /* Utility.ipp */, - 2C5CD8C72675E43E004E290F /* UUID.ipp */, + 2C5CD8C72675E43E004E290F /* UUIDValue.ipp */, 2C063DDD2661426000368BEE /* VariableSpeedStopwatch.ipp */, 2C063DC32661426000368BEE /* Vector2D.ipp */, 2C063DB12661426000368BEE /* Vector3D.ipp */, @@ -6642,7 +6642,7 @@ 2C47B26524DD9789008D83BE /* Unicode */, 2C47B28024DD9789008D83BE /* UnicodeConverter */, 2C47B2A324DD9789008D83BE /* UserAction */, - 2C62196326750F3A0088B175 /* UUID */, + 2C62196326750F3A0088B175 /* UUIDValue */, 2C47B23624DD9789008D83BE /* Vector2D */, 2C47B2EE24DD9789008D83BE /* Vector3D */, 2C47B2AA24DD9789008D83BE /* Vector4D */, @@ -8541,12 +8541,12 @@ path = ScriptModule; sourceTree = ""; }; - 2C62196326750F3A0088B175 /* UUID */ = { + 2C62196326750F3A0088B175 /* UUIDValue */ = { isa = PBXGroup; children = ( - 2C62196426750F3A0088B175 /* SivUUID.cpp */, + 2C62196426750F3A0088B175 /* SivUUIDValue.cpp */, ); - path = UUID; + path = UUIDValue; sourceTree = ""; }; 2C62196626750F550088B175 /* gsl */ = { @@ -10357,7 +10357,7 @@ 2C5C0F0C266DFF06009C430B /* URLView.hpp */, 2CAAA75225E7FD0200C014D7 /* UserAction.hpp */, 2CAAA70525E7FD0200C014D7 /* Utility.hpp */, - 2C62196226750F220088B175 /* UUID.hpp */, + 2C62196226750F220088B175 /* UUIDValue.hpp */, 2CAAA76F25E7FD0200C014D7 /* VariableSpeedStopwatch.hpp */, 2CAAA75B25E7FD0200C014D7 /* Vector2D.hpp */, 2CAAA73725E7FD0200C014D7 /* Vector3D.hpp */, @@ -13063,7 +13063,7 @@ 2C794B6325C4241800034D81 /* GL4Texture.cpp in Sources */, 2C53C33825613B740072831A /* SivEllipse.cpp in Sources */, 2CEC7DC525FA4DD900704B99 /* exif.cpp in Sources */, - 2C62196526750F3A0088B175 /* SivUUID.cpp in Sources */, + 2C62196526750F3A0088B175 /* SivUUIDValue.cpp in Sources */, 2C47B32F24DD9789008D83BE /* CRenderer2D_Null.cpp in Sources */, 2C60AE73248158A500277281 /* frequency_non_windows_non_darwin.cpp in Sources */, 2CB18EC926B5A68700862C28 /* as_builder.cpp in Sources */,