Disable 4251 and 4275, pop warnings, and use const char * for ctor

Signed-off-by: Zachary Michaels <[email protected]>
ros2 · Jan 23, 2020 · f1f385c · f1f385c
1 parent c3db1bc
commit f1f385c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/include/rcpputils/asserts.hpp b/include/rcpputils/asserts.hpp
@@ -26,6 +26,7 @@
 // This should be fine since its extending an STL class.
 #ifdef _WIN32
 # pragma warning(push)
+# pragma warning(disable:4251)
 # pragma warning(disable:4275)
 #endif
 
@@ -37,19 +38,17 @@ class RCPPUTILS_PUBLIC AssertionException : public std::exception
   std::string msg_;
 
 public:
-  explicit AssertionException(const std::string & msg)
-  : msg_{msg} {}
+  explicit AssertionException(const char * msg);
 
   virtual const char * what() const throw();
 };
 
-class RCPPUTILS_PUBLIC IllegalStateException : public std::exception
+class IllegalStateException : public std::exception
 {
   std::string msg_;
 
 public:
-  explicit IllegalStateException(const std::string & msg)
-  : msg_{msg} {}
+  explicit IllegalStateException(const char * msg);
 
   virtual const char * what() const throw();
 };
@@ -100,4 +99,8 @@ inline void assert_true(bool condition)
 }
 }  // namespace rcpputils
 
+#ifdef _WIN32
+# pragma warning(pop)
+#endif
+
 #endif  // RCPPUTILS__ASSERTS_HPP_
diff --git a/src/asserts.cpp b/src/asserts.cpp
@@ -16,11 +16,21 @@
 
 namespace rcpputils
 {
+AssertionException::AssertionException(const char * msg)
+{
+  msg_ = msg;
+}
+
 const char * AssertionException::what() const throw()
 {
   return msg_.c_str();
 }
 
+IllegalStateException::IllegalStateException(const char * msg)
+{
+  msg_ = msg;
+}
+
 const char * IllegalStateException::what() const throw()
 {
   return msg_.c_str();