Merge pull request #5089 from afeher/add-abi-compatibility-flags-drqs…

…-172377144 Introducing forced ABI levels.
bloomberg · Jan 27, 2025 · 184e5ee · 184e5ee
2 parents 601357d + 955e006
commit 184e5ee
Show file tree

Hide file tree

Showing 24 changed files with 538 additions and 281 deletions.
diff --git a/groups/bdl/bdlb/bdlb_nullablevalue.h b/groups/bdl/bdlb/bdlb_nullablevalue.h
@@ -675,7 +675,7 @@ bool operator==(const bsl::optional<LHS_TYPE>& lhs,
     }
 #endif
 ;
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
 template <class LHS_TYPE, class RHS_TYPE>
 bool operator==(const NullableValue<LHS_TYPE>& lhs,
                 const std::optional<RHS_TYPE>& rhs)
@@ -694,7 +694,7 @@ bool operator==(const std::optional<LHS_TYPE>& lhs,
     }
 #endif
 ;
-#endif  // BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
 /// Return `true` if the specified `lhs` and `rhs` nullable objects do not
 /// have the same value, and `false` otherwise.  Two nullable objects do not
@@ -729,7 +729,7 @@ bool operator!=(const NullableValue<LHS_TYPE>& lhs,
     }
 #endif
 ;
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
 template <class LHS_TYPE, class RHS_TYPE>
 bool operator!=(const std::optional<LHS_TYPE>& lhs,
                 const NullableValue<RHS_TYPE>& rhs)
@@ -748,7 +748,7 @@ bool operator!=(const NullableValue<LHS_TYPE>& lhs,
     }
 #endif
 ;
-#endif  // BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
 /// Return `true` if the specified `lhs` and `rhs` objects do not have the
 /// same value, and `false` otherwise.  A nullable object and a value of
@@ -830,7 +830,7 @@ bool operator<(const NullableValue<LHS_TYPE>& lhs,
     }
 #endif
 ;
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
 template <class LHS_TYPE, class RHS_TYPE>
 bool operator<(const std::optional<LHS_TYPE>& lhs,
                const NullableValue<RHS_TYPE>& rhs)
@@ -849,7 +849,7 @@ bool operator<(const NullableValue<LHS_TYPE>& lhs,
     }
 #endif
 ;
-#endif  // BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
 /// Return `true` if the specified `lhs` nullable object is ordered before
 /// the specified `rhs`, and `false` otherwise.  `lhs` is ordered before
@@ -909,7 +909,7 @@ bool operator>(const NullableValue<LHS_TYPE>& lhs,
     }
 #endif
 ;
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
 template <class LHS_TYPE, class RHS_TYPE>
 bool operator>(const std::optional<LHS_TYPE>& lhs,
                const NullableValue<RHS_TYPE>& rhs)
@@ -928,7 +928,7 @@ bool operator>(const NullableValue<LHS_TYPE>& lhs,
     }
 #endif
 ;
-#endif  // BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
 /// Return `true` if the specified `lhs` nullable object is ordered after
 /// the specified `rhs`, and `false` otherwise.  `lhs` is ordered after
@@ -987,7 +987,7 @@ bool operator<=(const NullableValue<LHS_TYPE>& lhs,
     }
 #endif
 ;
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
 template <class LHS_TYPE, class RHS_TYPE>
 bool operator<=(const std::optional<LHS_TYPE>& lhs,
                 const NullableValue<RHS_TYPE>& rhs)
@@ -1006,7 +1006,7 @@ bool operator<=(const NullableValue<LHS_TYPE>& lhs,
     }
 #endif
 ;
-#endif  // BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
 /// Return `true` if the specified `lhs` nullable object is ordered before
 /// the specified `rhs` or `lhs` and `rhs` have the same value, and `false`
@@ -1065,7 +1065,7 @@ bool operator>=(const NullableValue<LHS_TYPE>& lhs,
     }
 #endif
 ;
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
 template <class LHS_TYPE, class RHS_TYPE>
 bool operator>=(const std::optional<LHS_TYPE>& lhs,
                 const NullableValue<RHS_TYPE>& rhs)
@@ -1084,7 +1084,7 @@ bool operator>=(const NullableValue<LHS_TYPE>& lhs,
     }
 #endif
 ;
-#endif  // BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
 /// Return `true` if the specified `lhs` nullable object is ordered after
 /// the specified `rhs` or `lhs` and `rhs` have the same value, and `false`
@@ -1864,7 +1864,7 @@ bool bdlb::operator==(const bsl::optional<LHS_TYPE>& lhs,
     return lhs == static_cast<const bsl::optional<RHS_TYPE>&>(rhs);
 }
 
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
 template <class LHS_TYPE, class RHS_TYPE>
 inline
 bool bdlb::operator==(const NullableValue<LHS_TYPE>& lhs,
@@ -1890,7 +1890,7 @@ bool bdlb::operator==(const std::optional<LHS_TYPE>& lhs,
 {
     return lhs == static_cast<const bsl::optional<RHS_TYPE>&>(rhs);
 }
-#endif  // BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
 template <class LHS_TYPE, class RHS_TYPE>
 inline
@@ -1932,7 +1932,7 @@ bool bdlb::operator!=(const NullableValue<LHS_TYPE>& lhs,
     return static_cast<const bsl::optional<LHS_TYPE>&>(lhs) != rhs;
 }
 
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
 template <class LHS_TYPE, class RHS_TYPE>
 inline
 bool bdlb::operator!=(const std::optional<LHS_TYPE>& lhs,
@@ -1958,7 +1958,7 @@ bool bdlb::operator!=(const NullableValue<LHS_TYPE>& lhs,
 {
     return static_cast<const bsl::optional<LHS_TYPE>&>(lhs) != rhs;
 }
-#endif  // BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
 template <class LHS_TYPE, class RHS_TYPE>
 inline
@@ -2044,7 +2044,7 @@ bool bdlb::operator<(const NullableValue<LHS_TYPE>& lhs,
     return static_cast<const bsl::optional<LHS_TYPE>&>(lhs) < rhs;
 }
 
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
 template <class LHS_TYPE, class RHS_TYPE>
 inline
 bool bdlb::operator<(const std::optional<LHS_TYPE>& lhs,
@@ -2070,7 +2070,7 @@ bool bdlb::operator<(const NullableValue<LHS_TYPE>& lhs,
 {
     return static_cast<const bsl::optional<LHS_TYPE>&>(lhs) < rhs;
 }
-#endif  // BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
 template <class LHS_TYPE, class RHS_TYPE>
 inline
@@ -2134,7 +2134,7 @@ bool bdlb::operator>(const NullableValue<LHS_TYPE>& lhs,
     return static_cast<const bsl::optional<LHS_TYPE>&>(lhs) > rhs;
 }
 
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
 template <class LHS_TYPE, class RHS_TYPE>
 inline
 bool bdlb::operator>(const std::optional<LHS_TYPE>& lhs,
@@ -2160,7 +2160,7 @@ bool bdlb::operator>(const NullableValue<LHS_TYPE>& lhs,
 {
     return static_cast<const bsl::optional<LHS_TYPE>&>(lhs) > rhs;
 }
-#endif  // BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
 template <class LHS_TYPE, class RHS_TYPE>
 inline
@@ -2226,7 +2226,7 @@ bool bdlb::operator<=(const NullableValue<LHS_TYPE>& lhs,
     return static_cast<const bsl::optional<LHS_TYPE>&>(lhs) <= rhs;
 }
 
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
 template <class LHS_TYPE, class RHS_TYPE>
 inline
 bool bdlb::operator<=(const std::optional<LHS_TYPE>& lhs,
@@ -2252,7 +2252,7 @@ bool bdlb::operator<=(const NullableValue<LHS_TYPE>& lhs,
 {
     return static_cast<const bsl::optional<LHS_TYPE>&>(lhs) <= rhs;
 }
-#endif  // BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
 template <class LHS_TYPE, class RHS_TYPE>
 inline
@@ -2319,7 +2319,7 @@ bool bdlb::operator>=(const NullableValue<LHS_TYPE>& lhs,
     return static_cast<const bsl::optional<LHS_TYPE>&>(lhs) >= rhs;
 }
 
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
 template <class LHS_TYPE, class RHS_TYPE>
 inline
 bool bdlb::operator>=(const std::optional<LHS_TYPE>& lhs,
@@ -2345,7 +2345,7 @@ bool bdlb::operator>=(const NullableValue<LHS_TYPE>& lhs,
 {
     return static_cast<const bsl::optional<LHS_TYPE>&>(lhs) >= rhs;
 }
-#endif  // BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
 template <class LHS_TYPE, class RHS_TYPE>
 inline

diff --git a/groups/bdl/bdlb/bdlb_nullablevalue.t.cpp b/groups/bdl/bdlb/bdlb_nullablevalue.t.cpp
@@ -58,11 +58,11 @@
 # include <bsl_tuple.h>
 #endif
 
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
 # include <optional>
 # include <string>
 # include <variant>
-#endif  // BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
 using namespace BloombergLP;
 using namespace bsl;
@@ -622,10 +622,10 @@ void testRelationalOperations(const INIT_TYPE& lesserVal,
     typedef bsl::optional< FIRST_TYPE>        FIRST_BO_TYPE;
     typedef bsl::optional<SECOND_TYPE>        SECOND_BO_TYPE;
 
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
     typedef std::optional< FIRST_TYPE>        FIRST_SO_TYPE;
     typedef std::optional<SECOND_TYPE>        SECOND_SO_TYPE;
-#endif
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
     testRelationalOperationsNonNull<FIRST_TYPE,    SECOND_NV_TYPE>(lesserVal,
                                                                    greaterVal);
@@ -648,7 +648,7 @@ void testRelationalOperations(const INIT_TYPE& lesserVal,
     testRelationalOperationsBothNull<FIRST_NV_TYPE, SECOND_BO_TYPE>();
     testRelationalOperationsBothNull<FIRST_BO_TYPE, SECOND_NV_TYPE>();
 
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
     testRelationalOperationsNonNull<FIRST_SO_TYPE, SECOND_NV_TYPE>(lesserVal,
                                                                    greaterVal);
     testRelationalOperationsNonNull<FIRST_NV_TYPE, SECOND_SO_TYPE>(lesserVal,
@@ -659,10 +659,11 @@ void testRelationalOperations(const INIT_TYPE& lesserVal,
 
     testRelationalOperationsBothNull<FIRST_NV_TYPE, SECOND_SO_TYPE>();
     testRelationalOperationsBothNull<FIRST_SO_TYPE, SECOND_NV_TYPE>();
-#endif
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
 
 #if defined BSLS_COMPILERFEATURES_SUPPORT_THREE_WAY_COMPARISON &&             \
-    defined BSLS_LIBRARYFEATURES_HAS_CPP20_CONCEPTS
+    defined BSLS_LIBRARYFEATURES_HAS_CPP20_CONCEPTS &&                        \
+	defined BSLSTL_OPTIONAL_USES_STD_ALIASES
 
     ASSERTV((
         bsl::three_way_comparable_with<FIRST_TYPE, SECOND_NV_TYPE> ==
@@ -6789,7 +6790,8 @@ struct Foo {
 template <class t_TYPE>
 void Foo::foo()
 {
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP20_CONCEPTS
+#if defined(BSLS_LIBRARYFEATURES_HAS_CPP20_CONCEPTS) && \
+    defined(BSLSTL_OPTIONAL_USES_STD_ALIASES)
     // Even more weirdly, the issue goes away if `NullableValue` is
     // instantiated with `t_TYPE` instead of a fixed type.
     bdlb::NullableValue<int> nv = 1;
@@ -7802,7 +7804,7 @@ int main(int argc, char *argv[])
          << "TEST `operator<<` FOR `std::optional` AND `std::variant`" << endl
          << "========================================================" << endl;
 
-#ifdef BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#ifdef BSLSTL_OPTIONAL_USES_STD_ALIASES
 
         bsl::ostringstream oss;
 
@@ -7871,7 +7873,7 @@ int main(int argc, char *argv[])
 #else
         if (verbose) cout << "SKIP: Not Available: "
                              "`std::optional`, `std::variant`" << endl;
-#endif  // BSLS_LIBRARYFEATURES_HAS_CPP17_BASELINE_LIBRARY
+#endif  // BSLSTL_OPTIONAL_USES_STD_ALIASES
       } break;
       case 32: {
         // --------------------------------------------------------------------