From 09264537c4baeabfc8eccddc1132ae8612a29555 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 27 Jun 2007 16:45:57 +0000 Subject: Fix annoying warning from canvas var stuff. git-svn-id: svn://localhost/ardour2/trunk@2070 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/configuration.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'libs') diff --git a/libs/ardour/ardour/configuration.h b/libs/ardour/ardour/configuration.h index d60d40a68d..51c0a31aca 100644 --- a/libs/ardour/ardour/configuration.h +++ b/libs/ardour/ardour/configuration.h @@ -92,11 +92,6 @@ class Configuration : public PBD::Stateful #undef CONFIG_VARIABLE #undef CONFIG_VARIABLE_SPECIAL -#undef CANVAS_VARIABLE -#define CANVAS_VARIABLE(var,name) ConfigVariable var; // <-- is this really so bad? -#include "ardour/canvas_vars.h" -#undef CANVAS_VARIABLE - private: /* declare variables */ @@ -109,6 +104,13 @@ class Configuration : public PBD::Stateful #undef CONFIG_VARIABLE #undef CONFIG_VARIABLE_SPECIAL + public: /* ugh */ +#undef CANVAS_VARIABLE +#define CANVAS_VARIABLE(var,name) ConfigVariable var; // <-- is this really so bad? +#include "ardour/canvas_vars.h" +#undef CANVAS_VARIABLE + + private: ConfigVariableBase::Owner current_owner; XMLNode* _control_protocol_state; -- cgit v1.2.3