diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-03-03 13:04:09 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-03-03 13:04:09 (GMT) |
commit | abe69bd634fea9554a84d93e31db889ee589661f (patch) | |
tree | b00be65c936484f529f220773f6022064303dd64 /src | |
parent | d4243bc66fc911012c8222514d5b33a222993ae5 (diff) | |
download | Doxygen-abe69bd634fea9554a84d93e31db889ee589661f.zip Doxygen-abe69bd634fea9554a84d93e31db889ee589661f.tar.gz Doxygen-abe69bd634fea9554a84d93e31db889ee589661f.tar.bz2 |
Revert "Disabled "inheritance by dominance" warning (try 2)"
This reverts commit d4243bc66fc911012c8222514d5b33a222993ae5.
Diffstat (limited to 'src')
-rw-r--r-- | src/classdef.cpp | 6 | ||||
-rw-r--r-- | src/definition.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp index cd7b3a1..5ea8cea 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -49,12 +49,6 @@ //----------------------------------------------------------------------------- -#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 a7bcf2a..a2307f7 100644 --- a/src/definition.h +++ b/src/definition.h @@ -23,6 +23,12 @@ #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; |