From d4243bc66fc911012c8222514d5b33a222993ae5 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sat, 2 Mar 2019 16:24:02 +0100 Subject: Disabled "inheritance by dominance" warning (try 2) --- src/classdef.cpp | 6 ++++++ src/definition.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/classdef.cpp b/src/classdef.cpp index 5ea8cea..cd7b3a1 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -49,6 +49,12 @@ //----------------------------------------------------------------------------- +#if defined(_WIN32) && !defined(__CYGWIN__) +// To disable 'inherits via dominance' warnings. +// See also https://stackoverflow.com/a/14487243/784672 +#pragma warning( disable: 4250 ) +#endif + /** Implementation of the ClassDef interface */ class ClassDefImpl : public DefinitionImpl, public ClassDef diff --git a/src/definition.h b/src/definition.h index a2307f7..a7bcf2a 100644 --- a/src/definition.h +++ b/src/definition.h @@ -23,12 +23,6 @@ #include "types.h" -#if defined(_WIN32) && !defined(__CYGWIN__) -// To disable 'inherits via dominance' warnings. -// See also https://stackoverflow.com/a/14487243/784672 -#pragma warning( disable: 4250 ) -#endif - class FileDef; class OutputList; class SectionDict; -- cgit v0.12