Remove YUNI_STATIC_ASSERT (#1863)

AntaresSimulatorTeam · Jan 4, 2024 · f4321a2 · f4321a2
1 parent 2aca866
commit f4321a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/libs/antares/study/sets.hxx b/src/libs/antares/study/sets.hxx
@@ -404,9 +404,8 @@ template<class T>
 template<class StringT>
 inline bool Sets<T>::hasOutput(const StringT& s) const
 {
-    using namespace Yuni;
     // Assert, if a C* container can not be found at compile time
-    YUNI_STATIC_ASSERT(Traits::CString<StringT>::valid, HasOutput_InvalidTypeForBuffer);
+    static_assert(Yuni::Traits::CString<StringT>::valid);
 
     typename MapOptions::const_iterator i = pOptions.find(s);
     return (i != pOptions.end()) ? i->second.output : false;
@@ -422,9 +421,8 @@ template<class T>
 template<class StringT>
 inline uint Sets<T>::resultSize(const StringT& s) const
 {
-    using namespace Yuni;
     // Assert, if a C* container can not be found at compile time
-    YUNI_STATIC_ASSERT(Traits::CString<StringT>::valid, HasOutput_InvalidTypeForBuffer);
+    static_assert(Yuni::Traits::CString<StringT>::valid);
 
     typename MapOptions::const_iterator i = pOptions.find(s);
     return (i != pOptions.end()) ? i->second.resultSize : 0;
@@ -434,9 +432,8 @@ template<class T>
 template<class StringT>
 inline typename Sets<T>::IDType Sets<T>::caption(const StringT& s) const
 {
-    using namespace Yuni;
     // Assert, if a C* container can not be found at compile time
-    YUNI_STATIC_ASSERT(Traits::CString<StringT>::valid, HasOutput_InvalidTypeForBuffer);
+    static_assert(Yuni::Traits::CString<StringT>::valid);
 
     typename MapOptions::const_iterator i = pOptions.find(s);
     return (i != pOptions.end()) ? i->second.caption : IDType();

diff --git a/src/libs/antares/study/version.cpp b/src/libs/antares/study/version.cpp
@@ -41,8 +41,7 @@ enum
     versionFromCMake = (ANTARES_VERSION_HI * 100 + ANTARES_VERSION_LO * 10),
 };
 
-YUNI_STATIC_ASSERT((uint)versionFromCMake == (uint)Antares::Data::versionLatest,
-                   DiscrepancyBetweenCMakeVersionAndAntaresVersion);
+static_assert((uint)versionFromCMake == (uint)Antares::Data::versionLatest);
 
 namespace Antares::Data
 {