Use ASIO_ASSERT in place of BOOST_ASSERT.

Author: chriskohlhoff

asio/include/asio/detail/assert.hpp

@@ -0,0 +1,32 @@
+//
+// detail/assert.hpp
+// ~~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2011 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef ASIO_DETAIL_ASSERT_HPP
+#define ASIO_DETAIL_ASSERT_HPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include "asio/detail/config.hpp"
+
+#if defined(ASIO_HAS_BOOST_ASSERT)
+# include <boost/assert.hpp>
+#else // defined(ASIO_HAS_BOOST_ASSERT)
+# include <cassert>
+#endif // defined(ASIO_HAS_BOOST_ASSERT)
+
+#if defined(ASIO_HAS_BOOST_ASSERT)
+# define ASIO_ASSERT(expr) BOOST_ASSERT(expr)
+#else // defined(ASIO_HAS_BOOST_ASSERT)
+# define ASIO_ASSERT(expr) assert(expr)
+#endif // defined(ASIO_HAS_BOOST_ASSERT)
+
+#endif // ASIO_DETAIL_ASSERT_HPP

asio/include/asio/detail/buffered_stream_storage.hpp

@@ -17,7 +17,7 @@
 
 #include "asio/detail/config.hpp"
 #include "asio/buffer.hpp"
-#include <boost/assert.hpp>
+#include "asio/detail/assert.hpp"
 #include <cstddef>
 #include <cstring>
 #include <vector>
@@ -78,7 +78,7 @@ class buffered_stream_storage
   // Resize the buffer to the specified length.
   void resize(size_type length)
   {
-    BOOST_ASSERT(length <= capacity());
+    ASIO_ASSERT(length <= capacity());
     if (begin_offset_ + length <= capacity())
     {
       end_offset_ = begin_offset_ + length;
@@ -101,7 +101,7 @@ class buffered_stream_storage
   // Consume multiple bytes from the beginning of the buffer.
   void consume(size_type count)
   {
-    BOOST_ASSERT(begin_offset_ + count <= end_offset_);
+    ASIO_ASSERT(begin_offset_ + count <= end_offset_);
     begin_offset_ += count;
     if (empty())
       clear();

asio/include/asio/detail/config.hpp

@@ -440,4 +440,11 @@
 // Helper to prevent macro expansion.
 #define ASIO_PREVENT_MACRO_SUBSTITUTION
 
+// Boost assert macro.
+#if !defined(ASIO_DISABLE_BOOST_ASSERT)
+# if !defined(ASIO_HAS_BOOST_ASSERT)
+#  define ASIO_HAS_BOOST_ASSERT 1
+# endif // !defined(ASIO_HAS_BOOST_ASSERT)
+#endif // !defined(ASIO_DISABLE_BOOST_ASSERT)
+
 #endif // ASIO_DETAIL_CONFIG_HPP

asio/include/asio/detail/hash_map.hpp

@@ -16,9 +16,9 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include "asio/detail/config.hpp"
-#include <boost/assert.hpp>
 #include <list>
 #include <utility>
+#include "asio/detail/assert.hpp"
 #include "asio/detail/noncopyable.hpp"
 
 #if defined(ASIO_WINDOWS) || defined(__CYGWIN__)
@@ -179,7 +179,7 @@ class hash_map
   // Erase an entry from the map.
   void erase(iterator it)
   {
-    BOOST_ASSERT(it != values_.end());
+    ASIO_ASSERT(it != values_.end());
 
     size_t bucket = calculate_hash_value(it->first) % num_buckets_;
     bool is_first = (it == buckets_[bucket].first);

asio/include/asio/detail/posix_event.hpp

@@ -19,8 +19,8 @@
 
 #if defined(ASIO_HAS_PTHREADS)
 
-#include <boost/assert.hpp>
 #include <pthread.h>
+#include "asio/detail/assert.hpp"
 #include "asio/detail/noncopyable.hpp"
 
 #include "asio/detail/push_options.hpp"
@@ -45,7 +45,7 @@ class posix_event
   template <typename Lock>
   void signal(Lock& lock)
   {
-    BOOST_ASSERT(lock.locked());
+    ASIO_ASSERT(lock.locked());
     (void)lock;
     signalled_ = true;
     ::pthread_cond_signal(&cond_); // Ignore EINVAL.
@@ -55,7 +55,7 @@ class posix_event
   template <typename Lock>
   void signal_and_unlock(Lock& lock)
   {
-    BOOST_ASSERT(lock.locked());
+    ASIO_ASSERT(lock.locked());
     signalled_ = true;
     lock.unlock();
     ::pthread_cond_signal(&cond_); // Ignore EINVAL.
@@ -65,7 +65,7 @@ class posix_event
   template <typename Lock>
   void clear(Lock& lock)
   {
-    BOOST_ASSERT(lock.locked());
+    ASIO_ASSERT(lock.locked());
     (void)lock;
     signalled_ = false;
   }
@@ -74,7 +74,7 @@ class posix_event
   template <typename Lock>
   void wait(Lock& lock)
   {
-    BOOST_ASSERT(lock.locked());
+    ASIO_ASSERT(lock.locked());
     while (!signalled_)
       ::pthread_cond_wait(&cond_, &lock.mutex().mutex_); // Ignore EINVAL.
   }

asio/include/asio/detail/win_event.hpp

@@ -19,7 +19,7 @@
 
 #if defined(ASIO_WINDOWS)
 
-#include <boost/assert.hpp>
+#include "asio/detail/assert.hpp"
 #include "asio/detail/noncopyable.hpp"
 #include "asio/detail/socket_types.hpp"
 
@@ -45,7 +45,7 @@ class win_event
   template <typename Lock>
   void signal(Lock& lock)
   {
-    BOOST_ASSERT(lock.locked());
+    ASIO_ASSERT(lock.locked());
     (void)lock;
     ::SetEvent(event_);
   }
@@ -54,7 +54,7 @@ class win_event
   template <typename Lock>
   void signal_and_unlock(Lock& lock)
   {
-    BOOST_ASSERT(lock.locked());
+    ASIO_ASSERT(lock.locked());
     lock.unlock();
     ::SetEvent(event_);
   }
@@ -63,7 +63,7 @@ class win_event
   template <typename Lock>
   void clear(Lock& lock)
   {
-    BOOST_ASSERT(lock.locked());
+    ASIO_ASSERT(lock.locked());
     (void)lock;
     ::ResetEvent(event_);
   }
@@ -72,7 +72,7 @@ class win_event
   template <typename Lock>
   void wait(Lock& lock)
   {
-    BOOST_ASSERT(lock.locked());
+    ASIO_ASSERT(lock.locked());
     lock.unlock();
     ::WaitForSingleObject(event_, INFINITE);
     lock.lock();