Fix compil warnings: disable #pragma specific to MSVC
This commit is contained in:
parent
4746bde4b3
commit
6f9affe3db
|
@ -32,8 +32,10 @@
|
||||||
#include <wx/debug.h>
|
#include <wx/debug.h>
|
||||||
#include "../../libs/kimath/include/geometry/eda_angle.h"
|
#include "../../libs/kimath/include/geometry/eda_angle.h"
|
||||||
|
|
||||||
|
#if defined( _MSC_VER )
|
||||||
#pragma warning( push )
|
#pragma warning( push )
|
||||||
#pragma warning( disable : 4275 )
|
#pragma warning( disable : 4275 )
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace KIFONT
|
namespace KIFONT
|
||||||
{
|
{
|
||||||
|
@ -117,6 +119,8 @@ typedef std::vector<BOX2D> GLYPH_BOUNDING_BOX_LIST;
|
||||||
|
|
||||||
} // namespace KIFONT
|
} // namespace KIFONT
|
||||||
|
|
||||||
|
#if defined( _MSC_VER )
|
||||||
#pragma warning( pop )
|
#pragma warning( pop )
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif // GLYPH_H
|
#endif // GLYPH_H
|
||||||
|
|
|
@ -33,8 +33,10 @@ struct WINDOW_SETTINGS;
|
||||||
class wxString;
|
class wxString;
|
||||||
class wxWindow;
|
class wxWindow;
|
||||||
|
|
||||||
|
#if defined( _MSC_VER )
|
||||||
#pragma warning( push )
|
#pragma warning( push )
|
||||||
#pragma warning( disable : 4275 )
|
#pragma warning( disable : 4275 )
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace KIGFX
|
namespace KIGFX
|
||||||
{
|
{
|
||||||
|
@ -118,7 +120,9 @@ namespace KIGFX
|
||||||
|
|
||||||
} // namespace KIGFX
|
} // namespace KIGFX
|
||||||
|
|
||||||
|
#if defined( _MSC_VER )
|
||||||
#pragma warning( pop )
|
#pragma warning( pop )
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -121,8 +121,10 @@ private:
|
||||||
FuncType m_func;
|
FuncType m_func;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if defined( _MSC_VER )
|
||||||
#pragma warning( push )
|
#pragma warning( push )
|
||||||
#pragma warning( disable : 5266 ) // 'const' qualifier on return type has no effect
|
#pragma warning( disable : 5266 ) // 'const' qualifier on return type has no effect
|
||||||
|
#endif
|
||||||
|
|
||||||
template<typename Owner, typename T, typename Base = Owner>
|
template<typename Owner, typename T, typename Base = Owner>
|
||||||
class METHOD
|
class METHOD
|
||||||
|
@ -176,7 +178,9 @@ public:
|
||||||
METHOD() = delete;
|
METHOD() = delete;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if defined( _MSC_VER )
|
||||||
#pragma warning( pop )
|
#pragma warning( pop )
|
||||||
|
#endif
|
||||||
|
|
||||||
class PROPERTY_BASE
|
class PROPERTY_BASE
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,8 +33,10 @@
|
||||||
#include <math/box2.h>
|
#include <math/box2.h>
|
||||||
#include <inspectable.h>
|
#include <inspectable.h>
|
||||||
|
|
||||||
|
#if defined( _MSC_VER )
|
||||||
#pragma warning( push )
|
#pragma warning( push )
|
||||||
#pragma warning( disable : 4275 )
|
#pragma warning( disable : 4275 )
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace KIGFX
|
namespace KIGFX
|
||||||
{
|
{
|
||||||
|
@ -164,6 +166,8 @@ private:
|
||||||
|
|
||||||
} // namespace KIGFX
|
} // namespace KIGFX
|
||||||
|
|
||||||
|
#if defined( _MSC_VER )
|
||||||
#pragma warning( pop )
|
#pragma warning( pop )
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue