Ticket #2094: boost_iostreams_no_exceptions.diff

boost/iostreams/detail/system_failure.hpp

@@ -18 +18 @@
 #include <cstring>
 #include <string>
 #include <boost/config.hpp>
+#include <boost/throw_exception.hpp>
 #include <boost/iostreams/detail/config/windows_posix.hpp>
 #include <boost/iostreams/detail/ios.hpp>  // failure.
 
@@ -73 +74 @@
 { return system_failure(msg.c_str()); }
 
 inline void throw_system_failure(const char* msg)
-{ throw system_failure(msg); }
+{ boost::throw_exception(system_failure(msg)); }
 
 inline void throw_system_failure(const std::string& msg)
-{ throw system_failure(msg); }
+{ boost::throw_exception(system_failure(msg)); }
 
 } } } // End namespaces detail, iostreams, boost.
 

libs/iostreams/src/bzip2.cpp

@@ -14 +14 @@
 // than using it (possibly importing code).
 #define BOOST_IOSTREAMS_SOURCE 
 
+#include <boost/throw_exception.hpp>
 #include <boost/iostreams/detail/config/dyn_link.hpp>
 #include <boost/iostreams/filter/bzip2.hpp> 
 #include "bzlib.h"  // Julian Seward's "bzip.h" header.
@@ -65 +66 @@
     case BZ_STREAM_END:
         return;
     case BZ_MEM_ERROR: 
-        throw std::bad_alloc();
+        boost::throw_exception(std::bad_alloc());
     default:
-        throw bzip2_error(error);
+        boost::throw_exception(bzip2_error(error));
     }
 }
 

libs/iostreams/src/file_descriptor.cpp

@@ -24 +24 @@
 #include <boost/iostreams/detail/ios.hpp>         // openmodes, failure.
 #include <boost/iostreams/device/file_descriptor.hpp>
 #include <boost/integer_traits.hpp>
+#include <boost/throw_exception.hpp>
 
     // OS-specific headers for low-level i/o.
 
@@ -154 +155 @@
 
     int fd = BOOST_IOSTREAMS_FD_OPEN(path.c_str(), oflag, pmode);
     if (fd == -1) {
-        throw BOOST_IOSTREAMS_FAILURE("bad open");
+        boost::throw_exception(BOOST_IOSTREAMS_FAILURE("bad open"));
     } else {
         pimpl_->handle_ = fd;
         pimpl_->flags_ = impl::close_on_exit;
@@ -172 +173 @@
 #ifdef BOOST_IOSTREAMS_WINDOWS
     DWORD result;
     if (!::ReadFile(pimpl_->handle_, s, n, &result, NULL))
-        throw detail::bad_read();
+        boost::throw_exception(detail::bad_read());
     return result == 0 ? -1 : static_cast<std::streamsize>(result);
 #else // #ifdef BOOST_IOSTREAMS_WINDOWS
     errno = 0;
     std::streamsize result = BOOST_IOSTREAMS_FD_READ(pimpl_->handle_, s, n);
     if (errno != 0)
-        throw detail::bad_read();
+        boost::throw_exception(detail::bad_read());
     return result == 0 ? -1 : result;
 #endif // #ifdef BOOST_IOSTREAMS_WINDOWS
 }
@@ -192 +193 @@
         if ( dwResult == INVALID_SET_FILE_POINTER &&
              ::GetLastError() != NO_ERROR )
         {
-            throw detail::bad_seek();
+            boost::throw_exception(detail::bad_seek());
         }
     }
     DWORD ignore;
     if (!::WriteFile(pimpl_->handle_, s, n, &ignore, NULL))
-        throw detail::bad_write();
+        boost::throw_exception(detail::bad_write());
     return n;
 #else // #ifdef BOOST_IOSTREAMS_WINDOWS
     int amt = BOOST_IOSTREAMS_FD_WRITE(pimpl_->handle_, s, n);
     if (amt < n)
-        throw detail::bad_write(); // Handles blocking fd's only.
+        boost::throw_exception(detail::bad_write()); // Handles blocking fd's only.
     return n;
 #endif // #ifdef BOOST_IOSTREAMS_WINDOWS
 }
@@ -226 +227 @@
     if ( dwResultLow == INVALID_SET_FILE_POINTER &&
          ::GetLastError() != NO_ERROR )
     {
-        throw detail::bad_seek();
+        boost::throw_exception(detail::bad_seek());
     } else {
        return offset_to_position(
                       (stream_offset(lDistanceToMoveHigh) << 32) + dwResultLow
@@ -236 +237 @@
     if ( off > integer_traits<BOOST_IOSTREAMS_FD_OFFSET>::const_max ||
          off < integer_traits<BOOST_IOSTREAMS_FD_OFFSET>::const_min )
     {
-        throw BOOST_IOSTREAMS_FAILURE("bad offset");
+        boost::throw_exception(BOOST_IOSTREAMS_FAILURE("bad offset"));
     }
     stream_offset result =
         BOOST_IOSTREAMS_FD_SEEK(
@@ -249 +250 @@
                       SEEK_END ) 
         );
     if (result == -1)
-        throw detail::bad_seek();
+        boost::throw_exception(detail::bad_seek());
     return offset_to_position(result);
 #endif // #ifdef BOOST_IOSTREAMS_WINDOWS
 }
@@ -261 +262 @@
 #ifdef BOOST_IOSTREAMS_WINDOWS
     if (i.handle_ != reinterpret_cast<handle_type>(-1)) {
         if (!::CloseHandle(i.handle_))
-            throw BOOST_IOSTREAMS_FAILURE("bad close");
+            boost::throw_exception(BOOST_IOSTREAMS_FAILURE("bad close"));
         i.handle_ = reinterpret_cast<handle_type>(-1);
         i.flags_ = 0;
         return;
@@ -269 +270 @@
 #else // #ifdef BOOST_IOSTREAMS_WINDOWS
     if (i.handle_ != -1) {
         if (BOOST_IOSTREAMS_FD_CLOSE(i.handle_) == -1)
-            throw BOOST_IOSTREAMS_FAILURE("bad close");
+            boost::throw_exception(BOOST_IOSTREAMS_FAILURE("bad close"));
         i.handle_ = -1;
         i.flags_ = 0;
     }

libs/iostreams/src/mapped_file.cpp

@@ -22 +22 @@
 #include <boost/iostreams/detail/ios.hpp>  // failure.
 #include <boost/iostreams/detail/system_failure.hpp>
 #include <boost/iostreams/device/mapped_file.hpp>
+#include <boost/throw_exception.hpp>
 
 #ifdef BOOST_IOSTREAMS_WINDOWS
 # define WIN32_LEAN_AND_MEAN  // Exclude rarely-used stuff from Windows headers
@@ -338 +339 @@
     using namespace std;
 
     if (is_open())
-        throw BOOST_IOSTREAMS_FAILURE("file already open");
+        boost::throw_exception(BOOST_IOSTREAMS_FAILURE("file already open"));
     if (!pimpl_)
         pimpl_.reset(new impl_type);
     else

libs/iostreams/src/zlib.cpp

@@ -14 +14 @@
 // than using it (possibly importing code).
 #define BOOST_IOSTREAMS_SOURCE 
 
+#include <boost/throw_exception.hpp>
 #include <boost/iostreams/detail/config/dyn_link.hpp>
 #include <boost/iostreams/filter/zlib.hpp> 
 #include "zlib.h"   // Jean-loup Gailly's and Mark Adler's "zlib.h" header.
@@ -78 +79 @@
     //case Z_BUF_ERROR: 
         return;
     case Z_MEM_ERROR: 
-        throw std::bad_alloc();
+        boost::throw_exception(std::bad_alloc());
     default:
-        throw zlib_error(error);
+        boost::throw_exception(zlib_error(error));
         ;
     }
 }