Change uses of std::sprintf in tests to boost::core::snprintf, to avoid deprecation warnings

include/boost/system/detail/error_category_impl.hpp

@@ -98,33 +98,26 @@ inline char const * error_category::message( int ev, char * buffer, std::size_t
 #if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)
 
 #include <boost/system/detail/std_category_impl.hpp>
+#include <boost/system/detail/mutex.hpp>
 #include <new>
 
-#if !defined(BOOST_SYSTEM_DISABLE_THREADS)
-# include <mutex>
-#endif
-
 namespace boost
 {
 namespace system
 {
 
-#if !defined(BOOST_SYSTEM_DISABLE_THREADS)
-
 namespace detail
 {
 
 template<class = void> struct stdcat_mx_holder
 {
-    static std::mutex mx_;
+    static mutex mx_;
 };
 
-template<class T> std::mutex stdcat_mx_holder<T>::mx_;
+template<class T> mutex stdcat_mx_holder<T>::mx_;
 
 } // namespace detail
 
-#endif
-
 inline void error_category::init_stdcat() const
 {
     static_assert( sizeof( stdcat_ ) >= sizeof( boost::system::detail::std_category ), "sizeof(stdcat_) is not enough for std_category" );
@@ -137,9 +130,7 @@ inline void error_category::init_stdcat() const
 
 #endif
 
-#if !defined(BOOST_SYSTEM_DISABLE_THREADS)
-    std::lock_guard<std::mutex> lk( boost::system::detail::stdcat_mx_holder<>::mx_ );
-#endif
+    system::detail::lock_guard<system::detail::mutex> lk( system::detail::stdcat_mx_holder<>::mx_ );
 
     if( sc_init_.load( std::memory_order_acquire ) == 0 )
     {

include/boost/system/detail/mutex.hpp

@@ -0,0 +1,88 @@
+#ifndef BOOST_SYSTEM_DETAIL_MUTEX_HPP_INCLUDED
+#define BOOST_SYSTEM_DETAIL_MUTEX_HPP_INCLUDED
+
+// Copyright 2023 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt)
+
+#include <boost/config.hpp>
+
+#if defined(BOOST_SYSTEM_DISABLE_THREADS)
+
+namespace boost
+{
+namespace system
+{
+namespace detail
+{
+
+struct mutex
+{
+    void lock()
+    {
+    }
+
+    void unlock()
+    {
+    }
+};
+
+} // namespace detail
+} // namespace system
+} // namespace boost
+
+#else
+
+#include <mutex>
+
+namespace boost
+{
+namespace system
+{
+namespace detail
+{
+
+using std::mutex;
+
+} // namespace detail
+} // namespace system
+} // namespace boost
+
+#endif
+
+namespace boost
+{
+namespace system
+{
+namespace detail
+{
+
+template<class Mtx> class lock_guard
+{
+private:
+
+    Mtx& mtx_;
+
+private:
+
+    lock_guard( lock_guard const& );
+    lock_guard& operator=( lock_guard const& );
+
+public:
+
+    explicit lock_guard( Mtx& mtx ): mtx_( mtx )
+    {
+        mtx_.lock();
+    }
+
+    ~lock_guard()
+    {
+        mtx_.unlock();
+    }
+};
+
+} // namespace detail
+} // namespace system
+} // namespace boost
+
+#endif // #ifndef BOOST_SYSTEM_DETAIL_MUTEX_HPP_INCLUDED

test/error_category_test.cpp

@@ -8,11 +8,9 @@
 
 // See library home page at http://www.boost.org/libs/system
 
-// Avoid spurious VC++ warnings
-# define _CRT_SECURE_NO_WARNINGS
-
 #include <boost/system/error_code.hpp>
 #include <boost/core/lightweight_test.hpp>
+#include <boost/core/snprintf.hpp>
 #include <cstdio>
 
 //
@@ -31,7 +29,7 @@ public:
     virtual std::string message( int ev ) const
     {
         char buffer[ 256 ];
-        std::sprintf( buffer, "user message %d", ev );
+        boost::core::snprintf( buffer, sizeof( buffer ), "user message %d", ev );
 
         return buffer;
     }

test/error_category_test2.cpp

@@ -8,11 +8,9 @@
 
 // See library home page at http://www.boost.org/libs/system
 
-// Avoid spurious VC++ warnings
-#define _CRT_SECURE_NO_WARNINGS
-
 #include <boost/system/error_category.hpp>
 #include <boost/core/lightweight_test.hpp>
+#include <boost/core/snprintf.hpp>
 #include <cstdio>
 
 //
@@ -31,7 +29,7 @@ public:
     virtual std::string message( int ev ) const
     {
         char buffer[ 256 ];
-        std::sprintf( buffer, "user message %d", ev );
+        boost::core::snprintf( buffer, sizeof( buffer ), "user message %d", ev );
 
         return buffer;
     }

test/failed_test.cpp

@@ -2,11 +2,9 @@
 // Copyright 2018 Peter Dimov.
 // Distributed under the Boost Software License, Version 1.0.
 
-// Avoid spurious VC++ warnings
-#define _CRT_SECURE_NO_WARNINGS
-
 #include <boost/system/error_code.hpp>
 #include <boost/core/lightweight_test.hpp>
+#include <boost/core/snprintf.hpp>
 #include <cstdio>
 
 using namespace boost::system;
@@ -28,7 +26,7 @@ struct http_category_impl: public error_category
     {
         char buffer[ 32 ];
 
-        std::sprintf( buffer, "HTTP/1.0 %d", ev );
+        boost::core::snprintf( buffer, sizeof( buffer ), "HTTP/1.0 %d", ev );
         return buffer;
     }
 

test/std_interop_test.cpp

@@ -8,9 +8,6 @@
 
 // See library home page at http://www.boost.org/libs/system
 
-// Avoid spurious VC++ warnings
-# define _CRT_SECURE_NO_WARNINGS
-
 #include <boost/system/error_code.hpp>
 #include <boost/config.hpp>
 #include <boost/config/pragma_message.hpp>
@@ -30,6 +27,7 @@ int main()
 #else
 
 #include <boost/core/lightweight_test.hpp>
+#include <boost/core/snprintf.hpp>
 #include <system_error>
 #include <cerrno>
 #include <string>
@@ -127,7 +125,7 @@ public:
     virtual std::string message( int ev ) const
     {
         char buffer[ 256 ];
-        std::sprintf( buffer, "user message %d", ev );
+        boost::core::snprintf( buffer, sizeof( buffer ), "user message %d", ev );
 
         return buffer;
     }
@@ -267,7 +265,7 @@ public:
     virtual std::string message( int ev ) const
     {
         char buffer[ 256 ];
-        std::sprintf( buffer, "user2 message %d", ev );
+        boost::core::snprintf( buffer, sizeof( buffer ), "user2 message %d", ev );
 
         return buffer;
     }

test/system_category_test.cpp

@@ -8,11 +8,9 @@
 
 // See library home page at http://www.boost.org/libs/system
 
-// Avoid spurious VC++ warnings
-# define _CRT_SECURE_NO_WARNINGS
-
 #include <boost/system/error_code.hpp>
 #include <boost/core/lightweight_test.hpp>
+#include <boost/core/snprintf.hpp>
 #include <cstring>
 #include <cstdio>
 
@@ -65,7 +63,7 @@ std::string sys_strerror( int ev )
     {
         char buffer[ 38 ];
 
-        std::sprintf( buffer, "Unknown error (%d)", ev );
+        boost::core::snprintf( buffer, sizeof( buffer ), "Unknown error (%d)", ev );
         return buffer;
     }