Fixed FTBFS caused by usage of dynamic exception specification, no longer accepted in c++17.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/13/head
Michele Calgaro 3 years ago
parent 8b78a8791b
commit 085b8b6c98
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -36,7 +36,7 @@ class KisMathToolbox : public TQObject {
public: public:
struct KisFloatRepresentation { 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. // XXX: Valgrind shows that these are being used without being initialised.
for (TQ_UINT32 i = 0; i < nsize*nsize*ndepth; ++i) { for (TQ_UINT32 i = 0; i < nsize*nsize*ndepth; ++i) {
@ -58,7 +58,7 @@ class KisMathToolbox : public TQObject {
* This function initialize a wavelet structure * This function initialize a wavelet structure
* @param lay the layer that will be used for the transformation * @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&); inline uint fastWaveletTotalSteps(const TQRect&);
/** /**
* This function reconstruct the layer from the information of a wavelet * 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 size;
int maxrectsize = (rect.height() < rect.width()) ? rect.width() : rect.height(); int maxrectsize = (rect.height() < rect.width()) ? rect.width() : rect.height();

@ -293,7 +293,6 @@ then
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
SAVED_CXXFLAGS="$CXXFLAGS" SAVED_CXXFLAGS="$CXXFLAGS"
for CXX_STD_TEST in "" 11 14 17; do for CXX_STD_TEST in "" 11 14 17; do
CXXFLAGS="$SAVED_CXXFLAGS"
if test "x$CXX_STD_TEST" = "x"; then if test "x$CXX_STD_TEST" = "x"; then
AC_MSG_CHECKING([OpenEXR build with default C++ standard]) AC_MSG_CHECKING([OpenEXR build with default C++ standard])
OPENEXR_CXXFLAGS="" OPENEXR_CXXFLAGS=""
@ -301,7 +300,7 @@ then
AC_MSG_CHECKING([OpenEXR build with C++$CXX_STD_TEST]) AC_MSG_CHECKING([OpenEXR build with C++$CXX_STD_TEST])
OPENEXR_CXXFLAGS="-std=c++$CXX_STD_TEST" OPENEXR_CXXFLAGS="-std=c++$CXX_STD_TEST"
fi fi
CXXFLAGS="$SAVED_CXXFLAGS $OPENEXR_CFLAGS $OPENEXR_CXXFLAGS" CXXFLAGS="$SAVED_CXXFLAGS $USE_EXCEPTIONS $OPENEXR_CFLAGS $OPENEXR_CXXFLAGS"
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <ImfRgbaFile.h> #include <ImfRgbaFile.h>
],[ ], ],[ ],

Loading…
Cancel
Save