From 1c2cc1fae26c0da3f22be89ca613dce7e56d478d Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 16 Aug 2025 20:18:51 +0300 Subject: [PATCH] Revert "Add RFC-9562 compliant Max UUID (section 5.10)" This reverts commit bf16d95746559c4780822803b62a5d7f65ffb3c4. --- include/boost/uuid/max_generator.hpp | 39 ---------------------------- test/CMakeLists.txt | 1 - test/Jamfile.v2 | 1 - test/test_max_generator.cpp | 31 ---------------------- 4 files changed, 72 deletions(-) delete mode 100644 include/boost/uuid/max_generator.hpp delete mode 100644 test/test_max_generator.cpp diff --git a/include/boost/uuid/max_generator.hpp b/include/boost/uuid/max_generator.hpp deleted file mode 100644 index d82166e..0000000 --- a/include/boost/uuid/max_generator.hpp +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef BOOST_UUID_MAX_GENERATOR_HPP_INCLUDED -#define BOOST_UUID_MAX_GENERATOR_HPP_INCLUDED - -// Copyright 2025 James E. King III -// Distributed under the Boost Software License, Version 1.0. -// https://www.boost.org/LICENSE_1_0.txt - -// RFC 9562 section 5.10 - -#include - -namespace boost { -namespace uuids { - -// generate a max uuid -struct max_generator -{ - using result_type = uuid; - - uuid operator()() const noexcept - { - return {{ - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - }}; - } -}; - -inline uuid max_uuid() noexcept -{ - return {{ - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - }}; -} - -}} // namespace boost::uuids - -#endif // BOOST_UUID_MAX_GENERATOR_HPP_INCLUDED diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a0d3baa..fca0c7d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -36,7 +36,6 @@ boost_test(TYPE run SOURCES test_to_chars_2.cpp) boost_test(TYPE run SOURCES test_uuid_clock.cpp) -boost_test(TYPE run SOURCES test_max_generator.cpp) boost_test(TYPE run SOURCES test_nil_generator.cpp) boost_test(TYPE run SOURCES test_string_generator.cpp) boost_test(TYPE run SOURCES test_random_generator.cpp LINK_LIBRARIES Boost::random Boost::predef) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index b4ad5ba..6964591 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -100,7 +100,6 @@ run test_uuid_clock.cpp ; # test generators -run test_max_generator.cpp ; run test_nil_generator.cpp ; run test_string_generator.cpp ; diff --git a/test/test_max_generator.cpp b/test/test_max_generator.cpp deleted file mode 100644 index 8b2939c..0000000 --- a/test/test_max_generator.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2025 James E. King III -// Distributed under the Boost Software License, Version 1.0. (See -// accompanying file LICENSE_1_0.txt or copy at -// https://www.boost.org/LICENSE_1_0.txt) - -// libs/uuid/test/test_max_generator.cpp -------------------------------// - -#include -#include -#include -#include -#include - -int main(int, char*[]) -{ - using namespace boost::uuids; - - uuid uunil = nil_generator()(); - uuid uumax = max_generator()(); - uuid expected = {{ - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF - }}; - BOOST_TEST_EQ(uumax, expected); - BOOST_TEST_LT(uunil, uumax); - - uuid u3 = max_uuid(); - BOOST_TEST_EQ(u3, expected); - - return boost::report_errors(); -}