diff --git a/unitTests/CMakeLists.txt b/unitTests/CMakeLists.txt index 45307fca..a28586d3 100644 --- a/unitTests/CMakeLists.txt +++ b/unitTests/CMakeLists.txt @@ -34,7 +34,6 @@ add_executable(unit_tests test_tiffheader.cpp test_types.cpp test_LangAltValueRead.cpp - gtestwrapper.h ${unit_tests_exiv2lib_SOURCES} ) diff --git a/unitTests/gtestwrapper.h b/unitTests/gtestwrapper.h deleted file mode 100644 index 2757163c..00000000 --- a/unitTests/gtestwrapper.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef GTESTWRAPPER_H_ -#define GTESTWRAPPER_H_ - -#ifdef _MSC_VER - #pragma warning(push) - #pragma warning(disable : 4251) - #pragma warning(disable : 4275) - #pragma warning(disable : 4996) -#endif -#include -#ifdef _MSC_VER - #pragma warning(pop) -#endif - -#endif // #ifndef GTESTWRAPPER_H_ diff --git a/unitTests/mainTestRunner.cpp b/unitTests/mainTestRunner.cpp index 0dd94973..714ee6be 100644 --- a/unitTests/mainTestRunner.cpp +++ b/unitTests/mainTestRunner.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. */ -#include "gtestwrapper.h" +#include #include int main(int argc, char** argv) diff --git a/unitTests/test_DateValue.cpp b/unitTests/test_DateValue.cpp index a03a99e0..db02eec5 100644 --- a/unitTests/test_DateValue.cpp +++ b/unitTests/test_DateValue.cpp @@ -19,7 +19,8 @@ */ #include "value.hpp" -#include "gtestwrapper.h" +#include + using namespace Exiv2; TEST(ADateValue, isDefaultConstructed) diff --git a/unitTests/test_LangAltValueRead.cpp b/unitTests/test_LangAltValueRead.cpp index ad44ee63..0faa11eb 100644 --- a/unitTests/test_LangAltValueRead.cpp +++ b/unitTests/test_LangAltValueRead.cpp @@ -20,7 +20,7 @@ #include -#include "gtestwrapper.h" +#include using namespace Exiv2; diff --git a/unitTests/test_TimeValue.cpp b/unitTests/test_TimeValue.cpp index 472bf3aa..46141762 100644 --- a/unitTests/test_TimeValue.cpp +++ b/unitTests/test_TimeValue.cpp @@ -19,7 +19,7 @@ */ #include "value.hpp" -#include "gtestwrapper.h" +#include using namespace Exiv2; TEST(ATimeValue, isDefaultConstructed) diff --git a/unitTests/test_XmpKey.cpp b/unitTests/test_XmpKey.cpp index 089840d5..f2ebe26a 100644 --- a/unitTests/test_XmpKey.cpp +++ b/unitTests/test_XmpKey.cpp @@ -20,7 +20,8 @@ #include #include -#include "gtestwrapper.h" +#include + using namespace Exiv2; namespace diff --git a/unitTests/test_basicio.cpp b/unitTests/test_basicio.cpp index 45424a54..9b265c74 100644 --- a/unitTests/test_basicio.cpp +++ b/unitTests/test_basicio.cpp @@ -19,7 +19,8 @@ */ #include -#include "gtestwrapper.h" +#include + using namespace Exiv2; TEST(MemIo, seek_out_of_bounds_00) diff --git a/unitTests/test_cr2header_int.cpp b/unitTests/test_cr2header_int.cpp index 455a12f3..d33b2100 100644 --- a/unitTests/test_cr2header_int.cpp +++ b/unitTests/test_cr2header_int.cpp @@ -19,7 +19,8 @@ */ #include "cr2header_int.hpp" -#include "gtestwrapper.h" +#include + using namespace Exiv2; static const byte cr2LittleEndian[] = {0x49, 0x49, 0x2a, 0x00, 0x10, 0x00, 0x00, 0x00, @@ -75,4 +76,4 @@ TEST(ACr2Header, failToReadDataFromBufferWithInvalidTag) 0x43, 0x52, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00}; Internal::Cr2Header header; ASSERT_FALSE(header.read(bufferInvalidTag, 16)); -} \ No newline at end of file +} diff --git a/unitTests/test_enforce.cpp b/unitTests/test_enforce.cpp index da084ab1..7480b947 100644 --- a/unitTests/test_enforce.cpp +++ b/unitTests/test_enforce.cpp @@ -21,7 +21,7 @@ #include #include -#include "gtestwrapper.h" +#include #include diff --git a/unitTests/test_futils.cpp b/unitTests/test_futils.cpp index 7d67c353..0d4690cb 100644 --- a/unitTests/test_futils.cpp +++ b/unitTests/test_futils.cpp @@ -28,7 +28,7 @@ #include #include -#include "gtestwrapper.h" +#include using namespace Exiv2; diff --git a/unitTests/test_helper_functions.cpp b/unitTests/test_helper_functions.cpp index 1899f2ed..3f3e1513 100644 --- a/unitTests/test_helper_functions.cpp +++ b/unitTests/test_helper_functions.cpp @@ -19,7 +19,7 @@ */ #include "helper_functions.hpp" -#include "gtestwrapper.h" +#include TEST(string_from_unterminated, terminatedArray) { diff --git a/unitTests/test_image_int.cpp b/unitTests/test_image_int.cpp index 268d7b48..72220eac 100644 --- a/unitTests/test_image_int.cpp +++ b/unitTests/test_image_int.cpp @@ -19,7 +19,7 @@ */ #include -#include "gtestwrapper.h" +#include #include using namespace Exiv2::Internal; diff --git a/unitTests/test_safe_op.cpp b/unitTests/test_safe_op.cpp index f59aa9b7..01eba636 100644 --- a/unitTests/test_safe_op.cpp +++ b/unitTests/test_safe_op.cpp @@ -19,7 +19,8 @@ */ #include -#include "gtestwrapper.h" +#include + namespace si = Safe::Internal; /*! diff --git a/unitTests/test_slice.cpp b/unitTests/test_slice.cpp index 75bdc938..dda14dec 100644 --- a/unitTests/test_slice.cpp +++ b/unitTests/test_slice.cpp @@ -22,7 +22,8 @@ #include #include "slice.hpp" #include "types.hpp" -#include "gtestwrapper.h" +#include + using namespace Exiv2; template diff --git a/unitTests/test_tiffheader.cpp b/unitTests/test_tiffheader.cpp index 09d4745a..8ef7dce1 100644 --- a/unitTests/test_tiffheader.cpp +++ b/unitTests/test_tiffheader.cpp @@ -19,7 +19,7 @@ */ #include -#include "gtestwrapper.h" +#include #include using namespace Exiv2; @@ -80,4 +80,4 @@ TEST_F(ATiffHeader, printsDefaultValues) std::ostringstream str; header.print(str, ""); ASSERT_STREQ("TIFF header, offset = 0x00000008, little endian encoded\n", str.str().c_str()); -} \ No newline at end of file +} diff --git a/unitTests/test_types.cpp b/unitTests/test_types.cpp index f98f6e88..e3f71e6c 100644 --- a/unitTests/test_types.cpp +++ b/unitTests/test_types.cpp @@ -21,7 +21,7 @@ #include #include #include -#include "gtestwrapper.h" +#include using namespace Exiv2; // More info about tm : http://www.cplusplus.com/reference/ctime/tm/