From 6752cf66809341c952f0b571e2a9f80ec2ca7c67 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Thu, 29 Oct 2015 15:40:21 +0100 Subject: [PATCH] Cancelcheck: don't declare the static unique instance in .h, seems wrong on windows --- src/utils/cancelcheck.cpp | 24 ++++++++++++++++++++++++ src/utils/cancelcheck.h | 5 +---- 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 src/utils/cancelcheck.cpp diff --git a/src/utils/cancelcheck.cpp b/src/utils/cancelcheck.cpp new file mode 100644 index 00000000..4a376e38 --- /dev/null +++ b/src/utils/cancelcheck.cpp @@ -0,0 +1,24 @@ +/* Copyright (C) 2005 J.F.Dockes + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the + * Free Software Foundation, Inc., + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "cancelcheck.h" + +CancelCheck& CancelCheck::instance() +{ + static CancelCheck ck; + return ck; +} diff --git a/src/utils/cancelcheck.h b/src/utils/cancelcheck.h index 70a78a7f..b878b2ea 100644 --- a/src/utils/cancelcheck.h +++ b/src/utils/cancelcheck.h @@ -39,10 +39,7 @@ class CancelExcept {}; class CancelCheck { public: - static CancelCheck& instance() { - static CancelCheck ck; - return ck; - } + static CancelCheck& instance(); void setCancel(bool on = true) { cancelRequested = on; }