[Libreoffice-commits] core.git: vcl/workben
Tor Lillqvist
tml at collabora.com
Wed Oct 8 07:11:39 PDT 2014
vcl/workben/icontest.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit e7447790e65b61ac212586eacefe3b861ad46628
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 8 17:07:17 2014 +0300
ISO C++ forbids in-class initialization of non-const static member 'nRet'
Change-Id: Ia2bfaff2a284c2ea40198f1152716860d5963482
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index c043ae0..2d09231 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -116,7 +116,7 @@ public:
virtual int Main() SAL_OVERRIDE;
private:
- int nRet = EXIT_SUCCESS;
+ int nRet;
void DoItWithVcl(std::vector<OUString>& aImageFiles);
void DoItWithOpenGL(std::vector<OUString>& aImageFiles);
@@ -124,6 +124,8 @@ private:
void IconTestApp::Init()
{
+ nRet = EXIT_SUCCESS;
+
uno::Reference<uno::XComponentContext> xContext =
cppu::defaultBootstrap_InitialComponentContext();
uno::Reference<lang::XMultiComponentFactory> xFactory =
More information about the Libreoffice-commits
mailing list