Skip to content
Snippets Groups Projects
Commit e3e2f830 authored by Van Herck, Walter's avatar Van Herck, Walter
Browse files

Removed all remaining compiler warnings

parent 3890113d
No related branches found
No related tags found
No related merge requests found
Showing
with 99 additions and 7 deletions
......@@ -149,7 +149,7 @@ protected:
//! A polygonal surface, for testing form factor computations.
class FormFactorPolygonalSurface : public IFormFactorBorn {
class BA_CORE_API_ FormFactorPolygonalSurface : public IFormFactorBorn {
public:
FormFactorPolygonalSurface() {}
......
......@@ -18,9 +18,11 @@
#include "DataFormatUtils.h"
#ifdef _WIN32
#pragma warning ( push )
#pragma warning ( disable: 4244 )
#pragma warning ( disable: 4244 4275 )
#include "boost_streams.h"
#pragma warning ( pop )
#else
#include "boost_streams.h"
#endif
#include <fstream>
......
......@@ -18,9 +18,11 @@
#include "DataFormatUtils.h"
#ifdef _WIN32
#pragma warning ( push )
#pragma warning ( disable: 4244 )
#pragma warning ( disable: 4244 4275 )
#include "boost_streams.h"
#pragma warning ( pop )
#else
#include "boost_streams.h"
#endif
#include <fstream>
......
......@@ -3,5 +3,5 @@
set(test CoreIO)
add_executable(${test} main.cpp CoreIOTest.h CoreIOTest.cpp Benchmark.h Benchmark.cpp)
target_link_libraries(${test} BornAgainCore)
target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
#add_test(CoreSpecial/${test} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${test})
......@@ -22,7 +22,7 @@
//! Base class for all functional tests.
//! @class IFunctionalTest
class IFunctionalTest : public INamed
class BA_CORE_API_ IFunctionalTest : public INamed
{
public:
IFunctionalTest() {}
......
#ifdef _MSC_VER
#define _VARIADIC_MAX 10
#endif
#ifdef _WIN32
#pragma warning ( push )
#pragma warning ( disable: 4275 )
#include <gtest/gtest.h>
#pragma warning ( pop )
#else
#include <gtest/gtest.h>
#endif
#include "testlist.h"
#include "ErrorStreamRedirect.h"
......
#ifdef _MSC_VER
#define _VARIADIC_MAX 10
#endif
#ifdef _WIN32
#pragma warning ( push )
#pragma warning ( disable: 4275 )
#include <gtest/gtest.h>
#pragma warning ( pop )
#else
#include <gtest/gtest.h>
#endif
#include "testlist.h"
#include "ErrorStreamRedirect.h"
......
#ifdef _MSC_VER
#define _VARIADIC_MAX 10
#endif
#ifdef _WIN32
#pragma warning ( push )
#pragma warning ( disable: 4275 )
#include <gtest/gtest.h>
#pragma warning ( pop )
#else
#include <gtest/gtest.h>
#endif
#include "testlist.h"
#include "ErrorStreamRedirect.h"
......
#ifdef _MSC_VER
#define _VARIADIC_MAX 10
#endif
#ifdef _WIN32
#pragma warning ( push )
#pragma warning ( disable: 4275 )
#include <gtest/gtest.h>
#pragma warning ( pop )
#else
#include <gtest/gtest.h>
#endif
#include "testlist.h"
#include "ErrorStreamRedirect.h"
......
#ifdef _MSC_VER
#define _VARIADIC_MAX 10
#endif
#ifdef _WIN32
#pragma warning ( push )
#pragma warning ( disable: 4275 )
#include <gtest/gtest.h>
#pragma warning ( pop )
#else
#include <gtest/gtest.h>
#endif
#include "testlist.h"
#include "ErrorStreamRedirect.h"
......
#ifdef _MSC_VER
#define _VARIADIC_MAX 10
#endif
#ifdef _WIN32
#pragma warning ( push )
#pragma warning ( disable: 4275 )
#include <gtest/gtest.h>
#pragma warning ( pop )
#else
#include <gtest/gtest.h>
#endif
#include "testlist.h"
#include "ErrorStreamRedirect.h"
......
#ifdef _MSC_VER
#define _VARIADIC_MAX 10
#endif
#ifdef _WIN32
#pragma warning ( push )
#pragma warning ( disable: 4275 )
#include <gtest/gtest.h>
#pragma warning ( pop )
#else
#include <gtest/gtest.h>
#endif
#include "testlist.h"
#include "ErrorStreamRedirect.h"
......
#ifdef _MSC_VER
#define _VARIADIC_MAX 10
#endif
#ifdef _WIN32
#pragma warning ( push )
#pragma warning ( disable: 4275 )
#include <gtest/gtest.h>
#pragma warning ( pop )
#else
#include <gtest/gtest.h>
#endif
#include "testlist.h"
#include "ErrorStreamRedirect.h"
......
#ifdef _MSC_VER
#define _VARIADIC_MAX 10
#endif
#ifdef _WIN32
#pragma warning ( push )
#pragma warning ( disable: 4275 )
#include <gtest/gtest.h>
#pragma warning ( pop )
#else
#include <gtest/gtest.h>
#endif
#include "testlist.h"
#include "ErrorStreamRedirect.h"
......
#ifdef _MSC_VER
#define _VARIADIC_MAX 10
#endif
#ifdef _WIN32
#pragma warning ( push )
#pragma warning ( disable: 4275 )
#include <gtest/gtest.h>
#pragma warning ( pop )
#else
#include <gtest/gtest.h>
#endif
#include "testlist.h"
#include "ErrorStreamRedirect.h"
......
#ifdef _MSC_VER
#define _VARIADIC_MAX 10
#endif
#ifdef _WIN32
#pragma warning ( push )
#pragma warning ( disable: 4275 )
#include <gtest/gtest.h>
#pragma warning ( pop )
#else
#include <gtest/gtest.h>
#endif
#include "testlist.h"
#include "ErrorStreamRedirect.h"
......
......@@ -28,7 +28,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMATH_NO_PLUGIN_MANAGER -DHAS_MINUIT2 -
if(NOT WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
else()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267")
endif()
# --- making library ------------
......
......@@ -6,7 +6,7 @@ if(POLICY CMP0042)
endif()
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_VARIADIC_MAX=10 /wd4100")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_VARIADIC_MAX=10 /wd4100 /wd4275")
endif()
option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." ON)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment