use static_assert

jlblancoc · Feb 6, 2023 · a9dd644 · a9dd644
1 parent 662535b
commit a9dd644
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/gtsam/base/Matrix.h b/gtsam/base/Matrix.h
@@ -279,7 +279,7 @@ struct Reshape<N, M, InOptions, M, N, InOptions> {
 
 template <int OutM, int OutN, int OutOptions, int InM, int InN, int InOptions>
 inline typename Reshape<OutM, OutN, OutOptions, InM, InN, InOptions>::ReshapedType reshape(const Eigen::Matrix<double, InM, InN, InOptions> & m){
-  BOOST_STATIC_ASSERT(InM * InN == OutM * OutN);
+  static_assert(InM * InN == OutM * OutN);
   return Reshape<OutM, OutN, OutOptions, InM, InN, InOptions>::reshape(m);
 }
 

diff --git a/gtsam/base/std_optional_serialization.h b/gtsam/base/std_optional_serialization.h
@@ -67,7 +67,7 @@ void save(Archive& ar, const std::optional<T>& t, const unsigned int /*version*/
   // It is an inherent limitation to the serialization of optional.hpp
   // that the underlying type must be either a pointer or must have a
   // default constructor.
-  BOOST_STATIC_ASSERT(boost::serialization::detail::is_default_constructible<T>::value || boost::is_pointer<T>::value);
+  static_assert(boost::serialization::detail::is_default_constructible<T>::value || boost::is_pointer<T>::value);
   const bool tflag = t.has_value();
   ar << boost::serialization::make_nvp("initialized", tflag);
   if (tflag) {

diff --git a/wrap/matlab.h b/wrap/matlab.h
@@ -490,15 +490,15 @@ Class* unwrap_ptr(const mxArray* obj, const string& propertyName) {
 //template <>
 //Vector unwrap_shared_ptr<Vector>(const mxArray* obj, const string& propertyName) {
 //  bool unwrap_shared_ptr_Vector_attempted = false;
-//  BOOST_STATIC_ASSERT(unwrap_shared_ptr_Vector_attempted, "Vector cannot be unwrapped as a shared pointer");
+//  static_assert(unwrap_shared_ptr_Vector_attempted, "Vector cannot be unwrapped as a shared pointer");
 //  return Vector();
 //}
 
 //// throw an error if unwrap_shared_ptr is attempted for an Eigen Matrix
 //template <>
 //Matrix unwrap_shared_ptr<Matrix>(const mxArray* obj, const string& propertyName) {
 //  bool unwrap_shared_ptr_Matrix_attempted = false;
-//  BOOST_STATIC_ASSERT(unwrap_shared_ptr_Matrix_attempted, "Matrix cannot be unwrapped as a shared pointer");
+//  static_assert(unwrap_shared_ptr_Matrix_attempted, "Matrix cannot be unwrapped as a shared pointer");
 //  return Matrix();
 //}