fix releae build

voivoid · Apr 10, 2017 · d5adfb4 · d5adfb4
1 parent f5fbec6
commit d5adfb4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,7 +36,7 @@ add_executable(BsonParserTestEncodeDecode test/test-encode-decode.cpp
                                           test/test-input.h)
 target_link_libraries(BsonParserTestEncodeDecode PRIVATE BsonParser)
 
-add_test(NAME BsonParserUtils COMMAND BsonParserTestUtils)
+add_test(NAME BsonParserUtils COMMAND BsonParserTestParsers)
 add_test(NAME BsonParserEncode COMMAND BsonParserTestDecode)
 add_test(NAME BsonParserDecode COMMAND BsonParserTestEncode)
 add_test(NAME BsonParserEncodeDecode COMMAND BsonParserTestEncodeDecode)

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -33,6 +33,7 @@ int main(int argc, char** argv)
 
     boost::filesystem::ifstream fstream(filePath, std::ios_base::binary);
     assert(fstream);
+    fstream.unsetf(std::ios::skipws);
 
     Bson::Bytes content;
     content.reserve(fileSize);

diff --git a/src/parsers.cpp b/src/parsers.cpp
@@ -10,6 +10,8 @@
 #include <boost/hana/at_key.hpp>
 #include <boost/hana/fold_left.hpp>
 
+#define UNUSED __attribute__((unused))
+
 namespace Bson
 {
 namespace Details
@@ -111,7 +113,7 @@ CString read(Istream& stream)
 template <>
 False read(Istream& stream)
 {
-    const auto byte = read<Byte>(stream);
+    UNUSED const auto byte = read<Byte>(stream);
     assert(byte == 0x00);
 
     return {};
@@ -120,7 +122,7 @@ False read(Istream& stream)
 template <>
 True read(Istream& stream)
 {
-    const auto byte = read<Byte>(stream);
+    UNUSED const auto byte = read<Byte>(stream);
     assert(byte == 0x01);
 
     return {};
@@ -157,12 +159,12 @@ List read(Istream& stream)
 template <>
 Document read(Istream& stream)
 {
-    const Int32 documentSize = Details::read<Int32>(stream);
+    UNUSED const Int32 documentSize = Details::read<Int32>(stream);
     assert(documentSize >= static_cast<Int32>(sizeof(Int32) + sizeof(Byte)));
 
     Document document;
     document.getList() = Details::read<List>(stream);
-    const auto endByte = Details::read<Byte>(stream);
+    UNUSED const auto endByte = Details::read<Byte>(stream);
     assert(endByte == 0);
 
     return document;
@@ -225,5 +227,16 @@ void write(const Document& document, Ostream& stream, const size_t documentSize)
     Details::write(static_cast<Byte>(0), stream);
 }
 
+#define BSON_INSTANTIATE_FUNCS(type)    \
+     template type read(Istream& iter); \
+     template void write(const type value, Ostream& iter);
+
+BSON_INSTANTIATE_FUNCS(Byte);
+BSON_INSTANTIATE_FUNCS(Int32);
+BSON_INSTANTIATE_FUNCS(Int64);
+BSON_INSTANTIATE_FUNCS(Uint64);
+BSON_INSTANTIATE_FUNCS(Double);
+BSON_INSTANTIATE_FUNCS(Decimal);
+
 } // namespace Details
 } // namespace Bson
diff --git a/test/test-parsers.cpp b/test/test-parsers.cpp
@@ -48,8 +48,12 @@ bool testStream(const T& val)
 template <typename T>
 void test(const T& value)
 {
-    assert(testMemory(value));
-    assert(testStream(value));
+    bool result = testMemory(value) && testStream(value);
+
+    if(!result)
+    {
+        throw std::runtime_error("Test failed");
+    }
 }
 
 int main()