Sync from upstream.

boostorg · Aug 20, 2024 · b3b4f6e · b3b4f6e
2 parents b84db5a + c432e16
commit b3b4f6e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.drone.jsonnet b/.drone.jsonnet
@@ -32,6 +32,8 @@ local linux_pipeline(name, image, environment, packages = "", sources = [], arch
             commands:
             [
                 'set -e',
+                'uname -a',
+                'echo $DRONE_STAGE_MACHINE',
                 'wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -',
             ] +
             (if sources != [] then [ ('apt-add-repository "' + source + '"') for source in sources ] else []) +
@@ -145,14 +147,14 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
     linux_pipeline(
         "Linux 22.04 GCC 12 32/64 UBSAN",
         "cppalliance/droneubuntu2204:1",
-        { TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '11,14,17,20', ADDRMD: '32,64' } + ubsan,
+        { TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '11,14,17,20,2b', ADDRMD: '32,64' } + ubsan,
         "g++-12-multilib",
     ),
 
     linux_pipeline(
-        "Linux 22.04 GCC 12 32/64 ASAN",
+        "Linux 22.04 GCC 12 32 ASAN",
         "cppalliance/droneubuntu2204:1",
-        { TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '11,14,17,20', ADDRMD: '32,64' } + asan,
+        { TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + asan,
         "g++-12-multilib",
     ),
 
@@ -171,9 +173,9 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
     ),
 
     linux_pipeline(
-        "Linux 23.04 GCC 13 32/64 ASAN",
+        "Linux 23.04 GCC 13 32 ASAN",
         "cppalliance/droneubuntu2304:1",
-        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32,64' } + asan,
+        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + asan,
         "g++-13-multilib",
     ),
 

diff --git a/include/boost/uuid/detail/to_chars.hpp b/include/boost/uuid/detail/to_chars.hpp
@@ -47,7 +47,7 @@ template<class Ch> inline Ch* to_chars( uuid const& u, Ch* out ) noexcept
 
     for( std::size_t i = 0; i < 16; ++i )
     {
-        std::uint8_t ch = u.data[ i ];
+        std::uint8_t ch = u.data()[ i ];
 
         *out++ = p[ (ch >> 4) & 0x0F ];
         *out++ = p[ ch & 0x0F ];

diff --git a/include/boost/uuid/uuid.hpp b/include/boost/uuid/uuid.hpp
@@ -121,8 +121,8 @@ struct uuid
     iterator begin() noexcept { return data; }
     const_iterator begin() const noexcept { return data; }
 
-    iterator end() noexcept { return data + size(); }
-    const_iterator end() const noexcept { return data + size(); }
+    iterator end() noexcept { return data() + size(); }
+    const_iterator end() const noexcept { return data() + size(); }
 
     // size
 

diff --git a/include/boost/uuid/uuid_clock.hpp b/include/boost/uuid/uuid_clock.hpp
@@ -63,7 +63,7 @@ inline uuid_clock::time_point uuid_clock::from_timestamp( std::uint64_t timestam
 
 inline std::uint64_t uuid_clock::to_timestamp( time_point const& tp ) noexcept
 {
-    return tp.time_since_epoch().count();
+    return static_cast<std::uint64_t>(tp.time_since_epoch().count());
 }
 
 } // uuids