mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 21:20:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix destructor exception-permissiveness errors in a less idiotic way

Browse Source
This commit is contained in:
Simon Detheridge 2015-01-14 13:10:25 +00:00
parent 940c51f16a
commit fbdd160061
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Ember/RendererBase.cpp
View File

@ -8,6 +8,7 @@ namespace EmberNs
/// The thread count is set to the number of cores detected on the system. /// The thread count is set to the number of cores detected on the system.
/// </summary> /// </summary>
RendererBase::RendererBase() RendererBase::RendererBase()
:m_TaskGroup(new tbb::task_group)
{ {
m_Abort = false; m_Abort = false;
m_LockAccum = false; m_LockAccum = false;

4
Source/Ember/RendererBase.h
View File

@ -94,7 +94,7 @@ class EMBER_API RendererBase : public EmberReport
//using EmberReport::m_ErrorReport; //using EmberReport::m_ErrorReport;
public: public:
RendererBase(); RendererBase();
virtual ~RendererBase() __TBB_NOEXCEPT(false) { } virtual ~RendererBase() { }
//Non-virtual processing functions. //Non-virtual processing functions.
void ChangeVal(std::function<void(void)> func, eProcessAction action); void ChangeVal(std::function<void(void)> func, eProcessAction action);
@ -222,7 +222,7 @@ protected:
vector<size_t> m_SubBatch; vector<size_t> m_SubBatch;
vector<size_t> m_BadVals; vector<size_t> m_BadVals;
vector<QTIsaac<ISAAC_SIZE, ISAAC_INT>> m_Rand; vector<QTIsaac<ISAAC_SIZE, ISAAC_INT>> m_Rand;
tbb::task_group m_TaskGroup; auto_ptr<tbb::task_group> m_TaskGroup;
CriticalSection m_RenderingCs, m_AccumCs, m_FinalAccumCs, m_ResizeCs; CriticalSection m_RenderingCs, m_AccumCs, m_FinalAccumCs, m_ResizeCs;
Timing m_RenderTimer, m_IterTimer, m_ProgressTimer; Timing m_RenderTimer, m_IterTimer, m_ProgressTimer;
}; };

2
Source/Ember/Utils.h
View File

@ -90,7 +90,7 @@ public:
/// <summary> /// <summary>
/// Virtual destructor needed for virtual classes. /// Virtual destructor needed for virtual classes.
/// </summary> /// </summary>
virtual ~EmberReport() __TBB_NOEXCEPT(false) { } virtual ~EmberReport() { }
/// <summary> /// <summary>
/// Write the entire error report as a single string to the console. /// Write the entire error report as a single string to the console.

4
Source/EmberCL/RendererCL.h
View File

@ -18,7 +18,7 @@ namespace EmberCLns
class EMBERCL_API RendererCLBase class EMBERCL_API RendererCLBase
{ {
public: public:
virtual ~RendererCLBase() __TBB_NOEXCEPT(false) { } virtual ~RendererCLBase() { }
virtual bool ReadFinal(byte* pixels) = 0; virtual bool ReadFinal(byte* pixels) = 0;
virtual bool ClearFinal() = 0; virtual bool ClearFinal() = 0;
}; };
@ -83,7 +83,7 @@ using EmberNs::Renderer<T, T>::XformDistributionsSize;
public: public:
RendererCL(uint platform = 0, uint device = 0, bool shared = false, GLuint outputTexID = 0); RendererCL(uint platform = 0, uint device = 0, bool shared = false, GLuint outputTexID = 0);
~RendererCL() __TBB_NOEXCEPT(false); ~RendererCL();
//Non-virtual member functions for OpenCL specific tasks. //Non-virtual member functions for OpenCL specific tasks.
bool Init(uint platform, uint device, bool shared, GLuint outputTexID); bool Init(uint platform, uint device, bool shared, GLuint outputTexID);