Rework deprecation control for better flexibility, and move up ST::null

deprecation to version 3.4
zrax · Nov 6, 2020 · 2dca62c · 2dca62c
1 parent 9afe063
commit 2dca62c
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 22 deletions.
diff --git a/include/st_charbuffer.h b/include/st_charbuffer.h
@@ -43,7 +43,7 @@ namespace ST
         constexpr null_t() noexcept { }
     };
 
-    ST_DEPRECATED_IN_4_0("Use empty initializer {} instead.")
+    ST_DEPRECATED_IN_3_4("Use empty initializer {} instead.")
     static constexpr null_t null;
 
     template <typename char_T>
@@ -88,7 +88,7 @@ namespace ST
         constexpr buffer() noexcept
             : m_chars(m_data), m_size(), m_data() { }
 
-        ST_DEPRECATED_IN_4_0("Use empty initializer {} instead.")
+        ST_DEPRECATED_IN_3_4("Use empty initializer {} instead.")
         constexpr buffer(const null_t &) noexcept
             : m_chars(m_data), m_size(), m_data() { }
 
@@ -146,7 +146,7 @@ namespace ST
             traits_t::assign(m_data, local_length, 0);
         }
 
-        ST_DEPRECATED_IN_4_0("Use clear() instead")
+        ST_DEPRECATED_IN_3_4("Use clear() instead")
         buffer<char_T> &operator=(const null_t &) noexcept
         {
             clear();
@@ -230,7 +230,7 @@ namespace ST
         }
 
         ST_NODISCARD
-        ST_DEPRECATED_IN_4_0("Use empty() instead")
+        ST_DEPRECATED_IN_3_4("Use empty() instead")
         bool operator==(const null_t &) const noexcept
         {
             return empty();
@@ -243,7 +243,7 @@ namespace ST
         }
 
         ST_NODISCARD
-        ST_DEPRECATED_IN_4_0("Use !empty() instead")
+        ST_DEPRECATED_IN_3_4("Use !empty() instead")
         bool operator!=(const null_t &) const noexcept
         {
             return !empty();
@@ -441,15 +441,15 @@ namespace ST
 
     template <typename char_T>
     ST_NODISCARD
-    ST_DEPRECATED_IN_4_0("Use buffer<T>::empty() instead")
+    ST_DEPRECATED_IN_3_4("Use buffer<T>::empty() instead")
     bool operator==(const null_t &, const buffer<char_T> &right) noexcept
     {
         return right.empty();
     }
 
     template <typename char_T>
     ST_NODISCARD
-    ST_DEPRECATED_IN_4_0("Use !buffer<T>::empty() instead")
+    ST_DEPRECATED_IN_3_4("Use !buffer<T>::empty() instead")
     bool operator!=(const null_t &, const buffer<char_T> &right) noexcept
     {
         return !right.empty();

diff --git a/include/st_config.h.in b/include/st_config.h.in
@@ -57,19 +57,30 @@
 #   define ST_DEPRECATED(message)
 #endif
 
-#if defined(ST_NO_3_0_DEPRECATION)
-#   define ST_DEPRECATED_IN_3_0(message)
-#else
-#   define ST_DEPRECATED_IN_3_0(message) ST_DEPRECATED(message)
+#ifndef ST_DEPRECATED_VERSION
+#   if defined(ST_NO_3_0_DEPRECATION)
+#       define ST_DEPRECATED_VERSION    299
+#   else
+#       define ST_DEPRECATED_VERSION    ST_VERSION
+#   endif
 #endif
 
-#if !defined(ST_4_0_DEPRECATION)
-#   define ST_NO_4_0_DEPRECATION
+#if ST_DEPRECATED_VERSION >= 300
+#   define ST_DEPRECATED_IN_3_0(message) ST_DEPRECATED(message)
+#else
+#   define ST_DEPRECATED_IN_3_0(message)
 #endif
-#if defined(ST_NO_4_0_DEPRECATION)
-#   define ST_DEPRECATED_IN_4_0(message)
+
+#if ST_DEPRECATED_VERSION >= 304
+#   define ST_DEPRECATED_IN_3_4(message) ST_DEPRECATED(message)
 #else
+#   define ST_DEPRECATED_IN_3_4(message)
+#endif
+
+#if ST_DEPRECATED_VERSION >= 400
 #   define ST_DEPRECATED_IN_4_0(message) ST_DEPRECATED(message)
+#else
+#   define ST_DEPRECATED_IN_4_0(message)
 #endif
 
 #if defined(ST_HAVE_NODISCARD_ATTR)

diff --git a/include/st_string.h b/include/st_string.h
@@ -133,7 +133,7 @@ namespace ST
     public:
         string() noexcept { }
 
-        ST_DEPRECATED_IN_4_0("Use empty initializer {} instead")
+        ST_DEPRECATED_IN_3_4("Use empty initializer {} instead")
         string(const null_t &) noexcept { }
 
         string(const char *cstr, size_t size = ST_AUTO_SIZE,
@@ -290,7 +290,7 @@ namespace ST
         }
 #endif
 
-        ST_DEPRECATED_IN_4_0("Use clear() instead")
+        ST_DEPRECATED_IN_3_4("Use clear() instead")
         void set(const null_t &) noexcept { m_buffer.clear(); }
 
         void set(const char *cstr, size_t size = ST_AUTO_SIZE,
@@ -513,7 +513,7 @@ namespace ST
             m_buffer.clear();
         }
 
-        ST_DEPRECATED_IN_4_0("Use clear() instead")
+        ST_DEPRECATED_IN_3_4("Use clear() instead")
         string &operator=(const null_t &) noexcept
         {
             m_buffer.clear();
@@ -1632,7 +1632,7 @@ namespace ST
         }
 
         ST_NODISCARD
-        ST_DEPRECATED_IN_4_0("Use empty() instead")
+        ST_DEPRECATED_IN_3_4("Use empty() instead")
         bool operator==(const null_t &) const noexcept
         {
             return empty();
@@ -1659,7 +1659,7 @@ namespace ST
 #endif
 
         ST_NODISCARD
-        ST_DEPRECATED_IN_4_0("Use !empty() instead")
+        ST_DEPRECATED_IN_3_4("Use !empty() instead")
         bool operator!=(const null_t &) const noexcept
         {
             return !empty();
@@ -2651,14 +2651,14 @@ namespace ST
     }
 
     ST_NODISCARD
-    ST_DEPRECATED_IN_4_0("Use string::empty() instead")
+    ST_DEPRECATED_IN_3_4("Use string::empty() instead")
     inline bool operator==(const null_t &, const string &right) noexcept
     {
         return right.empty();
     }
 
     ST_NODISCARD
-    ST_DEPRECATED_IN_4_0("Use !string::empty() instead")
+    ST_DEPRECATED_IN_3_4("Use !string::empty() instead")
     inline bool operator!=(const null_t &, const string &right) noexcept
     {
         return !right.empty();