Merge pull request #60 from tribal-tec/master

Fix MSVC build

Author: eile

bin/zerobufCxx.py

@@ -917,7 +917,8 @@ def special_member_functions(self):
                                   "}"))
         # move ctor
         functions.append(Function(None,
-                                  "{0}( {0}&& rhs ) noexcept".format(self.name),
+                                  "{0}( {0}&& rhs ){1}".format(self.name,\
+                                  " throw()" if os.name == "nt" else " noexcept"),
                                   ": ::zerobuf::Zerobuf( std::move( rhs ))\n" +
                                   self.get_move_initializer()))
         # copy-from-baseclass ctor

tests/constAllocator.cpp

@@ -22,7 +22,7 @@ BOOST_AUTO_TEST_CASE(construction)
                 new zerobuf::ConstAllocator( data.data(), data.size( )));
     BOOST_CHECK_THROW( mutableBaseAlloc->getData(), std::runtime_error );
     BOOST_CHECK_THROW( mutableBaseAlloc->copyBuffer( nullptr, 0 ), std::runtime_error );
-    BOOST_CHECK_THROW( mutableBaseAlloc->updateAllocation( 1, 2, 3 ), std::runtime_error );
+    BOOST_CHECK_THROW( mutableBaseAlloc->updateAllocation( 0, false, 0 ), std::runtime_error );
     BOOST_CHECK_THROW( mutableBaseAlloc->compact( 42 ), std::runtime_error );
 }
 

tests/doubleString.cpp

@@ -26,10 +26,10 @@ BOOST_AUTO_TEST_CASE(reallocation)
     for( size_t i = 0; i < 1000; ++i )
     {
         size_t len = ::rand() % 20;
-        doubleString.setKey( std::string( len, len ));
+        doubleString.setKey( std::string( len, 'a' ));
 
         len = ::rand() % 20;
-        doubleString.setValue( std::string( len, len ));
+        doubleString.setValue( std::string( len, 'a' ));
         BOOST_CHECK_LE( doubleString.toBinary().size,
                         36/*header*/ + 19/*biggest hole*/ + 40/*20b strings*/ );
     }