diff options
| author | Michele Calgaro <[email protected]> | 2021-07-25 17:48:10 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2021-07-27 09:40:09 +0900 |
| commit | d238093c89cd17a06ca82a71db5e361ce5db39d0 (patch) | |
| tree | e3bb7ab237f2ccd747ee6e3a48a8c21ae5adf887 | |
| parent | d63c9d696eb6e2539528b99afc21f4086c9defe3 (diff) | |
| download | koffice-d238093c89cd17a06ca82a71db5e361ce5db39d0.tar.gz koffice-d238093c89cd17a06ca82a71db5e361ce5db39d0.zip | |
Fixed FTBFS caused by usage of dynamic exception specification, no longer accepted in c++17.r14.0.11
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 085b8b6c98a2893a8bb7303b40c88d417f40cdbe)
| -rw-r--r-- | chalk/core/kis_math_toolbox.h | 6 | ||||
| -rw-r--r-- | configure.in.in | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/chalk/core/kis_math_toolbox.h b/chalk/core/kis_math_toolbox.h index 1909d218..f79b7b94 100644 --- a/chalk/core/kis_math_toolbox.h +++ b/chalk/core/kis_math_toolbox.h @@ -36,7 +36,7 @@ class KisMathToolbox : public TQObject { public: struct KisFloatRepresentation { - KisFloatRepresentation(uint nsize, uint ndepth) throw(std::bad_alloc ) : coeffs(new float[nsize*nsize*ndepth]) ,size(nsize), depth(ndepth) + KisFloatRepresentation(uint nsize, uint ndepth) : coeffs(new float[nsize*nsize*ndepth]) ,size(nsize), depth(ndepth) { // XXX: Valgrind shows that these are being used without being initialised. for (TQ_UINT32 i = 0; i < nsize*nsize*ndepth; ++i) { @@ -58,7 +58,7 @@ class KisMathToolbox : public TQObject { * This function initialize a wavelet structure * @param lay the layer that will be used for the transformation */ - inline KisWavelet* initWavelet(KisPaintDeviceSP lay, const TQRect&) throw(std::bad_alloc ); + inline KisWavelet* initWavelet(KisPaintDeviceSP lay, const TQRect&); inline uint fastWaveletTotalSteps(const TQRect&); /** * This function reconstruct the layer from the information of a wavelet @@ -103,7 +103,7 @@ class KisMathToolboxFactoryRegistry : public KisGenericRegistry<KisMathToolbox*> }; -inline KisMathToolbox::KisWavelet* KisMathToolbox::initWavelet(KisPaintDeviceSP src, const TQRect& rect) throw(std::bad_alloc ) +inline KisMathToolbox::KisWavelet* KisMathToolbox::initWavelet(KisPaintDeviceSP src, const TQRect& rect) { int size; int maxrectsize = (rect.height() < rect.width()) ? rect.width() : rect.height(); diff --git a/configure.in.in b/configure.in.in index fcc96492..3f2a9fb5 100644 --- a/configure.in.in +++ b/configure.in.in @@ -293,7 +293,6 @@ then AC_LANG_CPLUSPLUS SAVED_CXXFLAGS="$CXXFLAGS" for CXX_STD_TEST in "" 11 14 17; do - CXXFLAGS="$SAVED_CXXFLAGS" if test "x$CXX_STD_TEST" = "x"; then AC_MSG_CHECKING([OpenEXR build with default C++ standard]) OPENEXR_CXXFLAGS="" @@ -301,7 +300,7 @@ then AC_MSG_CHECKING([OpenEXR build with C++$CXX_STD_TEST]) OPENEXR_CXXFLAGS="-std=c++$CXX_STD_TEST" fi - CXXFLAGS="$SAVED_CXXFLAGS $OPENEXR_CFLAGS $OPENEXR_CXXFLAGS" + CXXFLAGS="$SAVED_CXXFLAGS $USE_EXCEPTIONS $OPENEXR_CFLAGS $OPENEXR_CXXFLAGS" AC_TRY_COMPILE([ #include <ImfRgbaFile.h> ],[ ], |