From 86c47a6a8bf83172aff0f3442a6bde4944de7f67 Mon Sep 17 00:00:00 2001 From: "Philipp A. Hartmann" Date: Thu, 3 Jul 2014 14:56:43 +0200 Subject: [PATCH] document.h: move inclusion of template meta functions In order to activate the suppression of "-Weffc++" warnings in the template meta function classes (non-virtual destructor), move the inclusion of the meta-function header `internal/meta.h` after the suppression pragma. --- include/rapidjson/document.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h index 183db67..9639014 100644 --- a/include/rapidjson/document.h +++ b/include/rapidjson/document.h @@ -5,11 +5,6 @@ #include "internal/strfunc.h" #include // placement new -#ifndef RAPIDJSON_NOMEMBERITERATORCLASS -#include "internal/meta.h" -#include // std::iterator, std::random_access_iterator_tag -#endif - #ifdef _MSC_VER #pragma warning(push) #pragma warning(disable : 4127) // conditional expression is constant @@ -20,6 +15,11 @@ #pragma GCC diagnostic ignored "-Weffc++" #endif +#ifndef RAPIDJSON_NOMEMBERITERATORCLASS +#include "internal/meta.h" +#include // std::iterator, std::random_access_iterator_tag +#endif + namespace rapidjson { // Forward declaration.