[Libreoffice-commits] core.git: 2 commits - include/opencl sc/Library_scui.mk

[Tor Lillqvist]

 include/opencl/platforminfo.hxx |    3 ---
 sc/Library_scui.mk              |    4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 81e3c00d411014f4a139a494816e689a9f498a4c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Nov 28 09:28:14 2014 +0200

    The compiler-generated dtor is good enough, no need for this
    
    Change-Id: Ib72e0df4ac3ca90d440a32359e711d77e758cca0

diff --git a/include/opencl/platforminfo.hxx b/include/opencl/platforminfo.hxx
index 28c7ba8..6c40c43 100644
--- a/include/opencl/platforminfo.hxx
+++ b/include/opencl/platforminfo.hxx
@@ -43,9 +43,6 @@ struct OPENCL_DLLPUBLIC OpenCLPlatformInfo
     std::vector<OpenCLDeviceInfo> maDevices;
 
     OpenCLPlatformInfo();
-    ~OpenCLPlatformInfo()
-    {
-    }
 };
 
 OPENCL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStream, const OpenCLPlatformInfo& rPlatform);
commit a20269a5a818bea1c171102cc27eabdf426e939d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Nov 28 09:26:55 2014 +0200

    scui needs the opencl library at least on Windows
    
    Change-Id: I4183b957d59bb81b8df7a5f51418be94c879b3fe

diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index a00e81a..781b2e9 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_use_sdk_api,scui))
 
 $(eval $(call gb_Library_use_externals,scui,\
 	boost_headers \
-    $(call gb_Helper_optional,OPENCL,clew) \
+	$(call gb_Helper_optional,OPENCL,clew) \
 	mdds_headers \
 ))
 
@@ -36,6 +36,8 @@ $(eval $(call gb_Library_use_libraries,scui,\
 	for \
 	forui \
 	i18nlangtag \
+	$(call gb_Helper_optional,OPENCL, \
+		opencl) \
 	sal \
 	sc \
 	sfx \