From 36cb7535c46632b83e212cb2b1c05c12c41b4f30 Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Wed, 14 Jan 2015 10:41:17 +0000 Subject: [PATCH] Fix compiler error due to tbb member having more restrictive exception filter --- Source/EmberCL/RendererCL.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/EmberCL/RendererCL.h b/Source/EmberCL/RendererCL.h index 1478851..cb4475f 100644 --- a/Source/EmberCL/RendererCL.h +++ b/Source/EmberCL/RendererCL.h @@ -18,7 +18,7 @@ namespace EmberCLns class EMBERCL_API RendererCLBase { public: - virtual ~RendererCLBase() { } + virtual ~RendererCLBase() __TBB_NOEXCEPT(false) { } virtual bool ReadFinal(byte* pixels) = 0; virtual bool ClearFinal() = 0; }; @@ -83,7 +83,7 @@ using EmberNs::Renderer::XformDistributionsSize; public: RendererCL(uint platform = 0, uint device = 0, bool shared = false, GLuint outputTexID = 0); - ~RendererCL(); + ~RendererCL() __TBB_NOEXCEPT(false); //Non-virtual member functions for OpenCL specific tasks. bool Init(uint platform, uint device, bool shared, GLuint outputTexID);