summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-11-25 20:05:32 +0200
committerTor Lillqvist <tml@collabora.com>2014-11-25 20:05:45 +0200
commit4ccf97ee849c94ea4d941f332dd3f93701d8abf7 (patch)
tree1ededc2b0a0beb31bcdf1eb145ab1794fa1e6162
parenta7a79ee92d5663248abdc3f6d1476e28c1abda6a (diff)
Fix C2864: only static const integral data members can be initialized within
Change-Id: I01f66eb78e357780f35cfd1df6722301cc5753b2
-rw-r--r--vcl/workben/vcldemo.cxx11
1 files changed, 8 insertions, 3 deletions
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 51474bc7d017..706daf5e6d7c 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -74,6 +74,10 @@ class DemoRenderer
};
struct RegionRenderer {
public:
+ RegionRenderer() :
+ sumTime(0),
+ countTime(0)
+ { }
virtual ~RegionRenderer() {}
virtual OUString getName() = 0;
virtual sal_uInt16 getAccelerator() = 0;
@@ -85,13 +89,13 @@ class DemoRenderer
virtual sal_uInt16 getAccelerator() SAL_OVERRIDE \
{ return key; }
- double sumTime = 0;
- int countTime = 0;
+ double sumTime;
+ int countTime;
};
std::vector< RegionRenderer * > maRenderers;
sal_Int32 mnSelectedRenderer;
- sal_Int32 iterCount = 0;
+ sal_Int32 iterCount;
void InitRenderers();
@@ -99,6 +103,7 @@ public:
DemoRenderer() : mnSegmentsX(4)
, mnSegmentsY(3)
, mnSelectedRenderer(-1)
+ , iterCount(0)
#if FIXME_BOUNCE_BUTTON
, mpButton(NULL)
, mpButtonWin(NULL)