gtest - remove wrapper which is not needed anymore

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}
 )
 

unitTests/gtestwrapper.h

@@ -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 <gtest/gtest.h>
-#ifdef _MSC_VER
-        #pragma warning(pop)
-#endif
-
-#endif // #ifndef GTESTWRAPPER_H_

unitTests/mainTestRunner.cpp

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
 #include <iostream>
 
 int main(int argc, char** argv)

unitTests/test_DateValue.cpp

@@ -19,7 +19,8 @@
  */
 
 #include "value.hpp"
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
+
 using namespace Exiv2;
 
 TEST(ADateValue, isDefaultConstructed)

unitTests/test_LangAltValueRead.cpp

@@ -20,7 +20,7 @@
 
 #include <exiv2/exiv2.hpp>
 
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
 
 using namespace Exiv2;
 

unitTests/test_TimeValue.cpp

@@ -19,7 +19,7 @@
  */
 
 #include "value.hpp"
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
 using namespace Exiv2;
 
 TEST(ATimeValue, isDefaultConstructed)

unitTests/test_XmpKey.cpp

@@ -20,7 +20,8 @@
 
 #include <exiv2/error.hpp>
 #include <exiv2/properties.hpp>
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
+
 using namespace Exiv2;
 
 namespace

unitTests/test_basicio.cpp

@@ -19,7 +19,8 @@
  */
 
 #include <exiv2/basicio.hpp>
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
+
 using namespace Exiv2;
 
 TEST(MemIo, seek_out_of_bounds_00)

unitTests/test_cr2header_int.cpp

@@ -19,7 +19,8 @@
  */
 
 #include "cr2header_int.hpp"
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
+
 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));
-}
+}

unitTests/test_enforce.cpp

@@ -21,7 +21,7 @@
 #include <exiv2/exiv2.hpp>
 #include <enforce.hpp>
 
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
 
 #include <stdexcept>
 

unitTests/test_futils.cpp

@@ -28,7 +28,7 @@
 #include <cerrno>
 #include <stdexcept>
 
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
 
 using namespace Exiv2;
 

unitTests/test_helper_functions.cpp

@@ -19,7 +19,7 @@
  */
 
 #include "helper_functions.hpp"
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
 
 TEST(string_from_unterminated, terminatedArray)
 {

unitTests/test_image_int.cpp

@@ -19,7 +19,7 @@
  */
 
 #include <exiv2/exiv2.hpp>
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
 #include <image_int.hpp>
 
 using namespace Exiv2::Internal;

unitTests/test_safe_op.cpp

@@ -19,7 +19,8 @@
  */
 
 #include <safe_op.hpp>
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
+
 namespace si = Safe::Internal;
 
 /*!

unitTests/test_slice.cpp

@@ -22,7 +22,8 @@
 #include <stdint.h>
 #include "slice.hpp"
 #include "types.hpp"
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
+
 using namespace Exiv2;
 
 template <typename T>

unitTests/test_tiffheader.cpp

@@ -19,7 +19,7 @@
  */
 
 #include <tiffimage_int.hpp>
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
 #include <sstream>
 
 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());
-}
+}

unitTests/test_types.cpp

@@ -21,7 +21,7 @@
 #include <exiv2/types.hpp>
 #include <cmath>
 #include <limits>
-#include "gtestwrapper.h"
+#include <gtest/gtest.h>
 using namespace Exiv2;
 
 // More info about tm : http://www.cplusplus.com/reference/ctime/tm/