diff --git a/Engine/AppInstance.cpp b/Engine/AppInstance.cpp index ff53e8cb94..61a25b3428 100644 --- a/Engine/AppInstance.cpp +++ b/Engine/AppInstance.cpp @@ -44,7 +44,7 @@ #if !defined(SBK_RUN) && !defined(Q_MOC_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF // /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] -#include +#include #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #endif @@ -74,6 +74,8 @@ CLANG_DIAG_ON(unknown-pragmas) #include "Engine/Settings.h" #include "Engine/WriteNode.h" +using namespace boost::placeholders; + NATRON_NAMESPACE_ENTER FlagSetter::FlagSetter(bool initialValue, diff --git a/Engine/Bezier.cpp b/Engine/Bezier.cpp index af30254ae0..eb968705e2 100644 --- a/Engine/Bezier.cpp +++ b/Engine/Bezier.cpp @@ -37,8 +37,6 @@ #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF -// /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] -#include #include #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON diff --git a/Engine/EffectInstance.cpp b/Engine/EffectInstance.cpp index c431355f71..acb7d418d3 100644 --- a/Engine/EffectInstance.cpp +++ b/Engine/EffectInstance.cpp @@ -37,8 +37,6 @@ #if !defined(SBK_RUN) && !defined(Q_MOC_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF -// /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] -#include #include #include #include diff --git a/Engine/EffectInstanceRenderRoI.cpp b/Engine/EffectInstanceRenderRoI.cpp index d0e54721b6..cee5e0e523 100644 --- a/Engine/EffectInstanceRenderRoI.cpp +++ b/Engine/EffectInstanceRenderRoI.cpp @@ -45,7 +45,7 @@ #if !defined(SBK_RUN) && !defined(Q_MOC_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF // /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] -#include +#include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #endif @@ -82,6 +82,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON //#define NATRON_ALWAYS_ALLOCATE_FULL_IMAGE_BOUNDS +using namespace boost::placeholders; NATRON_NAMESPACE_ENTER diff --git a/Engine/Node.cpp b/Engine/Node.cpp index 068cc3cf9f..f186793bbd 100644 --- a/Engine/Node.cpp +++ b/Engine/Node.cpp @@ -37,8 +37,6 @@ #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF -// /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] -#include #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON diff --git a/Engine/OfxHost.cpp b/Engine/OfxHost.cpp index 861257e7ae..9d51dcd83b 100644 --- a/Engine/OfxHost.cpp +++ b/Engine/OfxHost.cpp @@ -53,7 +53,7 @@ CLANG_DIAG_ON(deprecated-register) #include // QtCore on Qt4, QtConcurrent on Qt5 GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF // /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] -#include +#include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #endif CLANG_DIAG_ON(deprecated) @@ -111,6 +111,8 @@ CLANG_DIAG_ON(unknown-pragmas) #include "Engine/TLSHolder.h" #include "Engine/ThreadPool.h" +using namespace boost::placeholders; + //An effect may not use more than this amount of threads #define NATRON_MULTI_THREAD_SUITE_MAX_NUM_CPU 4 diff --git a/Engine/OutputEffectInstance.cpp b/Engine/OutputEffectInstance.cpp index 9797fe87fc..d9be114f64 100644 --- a/Engine/OutputEffectInstance.cpp +++ b/Engine/OutputEffectInstance.cpp @@ -39,12 +39,6 @@ #include // QtCore on Qt4, QtConcurrent on Qt5 #include // QtCore on Qt4, QtConcurrent on Qt5 -#if !defined(SBK_RUN) && !defined(Q_MOC_RUN) -GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF -// /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] -#include -GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON -#endif #include // for removePath diff --git a/Engine/RotoContext.cpp b/Engine/RotoContext.cpp index 3c574836b0..091dda5418 100644 --- a/Engine/RotoContext.cpp +++ b/Engine/RotoContext.cpp @@ -36,8 +36,6 @@ #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF -// /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] -#include #include #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON diff --git a/Engine/RotoDrawableItem.cpp b/Engine/RotoDrawableItem.cpp index 21e83853f7..0631ff37de 100644 --- a/Engine/RotoDrawableItem.cpp +++ b/Engine/RotoDrawableItem.cpp @@ -37,8 +37,6 @@ #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF -// /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] -#include #include #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON diff --git a/Engine/RotoItem.cpp b/Engine/RotoItem.cpp index a8aa606b33..777560a39c 100644 --- a/Engine/RotoItem.cpp +++ b/Engine/RotoItem.cpp @@ -36,8 +36,6 @@ #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF -// /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] -#include #include #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON diff --git a/Engine/RotoLayer.cpp b/Engine/RotoLayer.cpp index bdf961040d..979b78ac47 100644 --- a/Engine/RotoLayer.cpp +++ b/Engine/RotoLayer.cpp @@ -36,8 +36,6 @@ #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF -// /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] -#include #include #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON diff --git a/Engine/RotoStrokeItem.cpp b/Engine/RotoStrokeItem.cpp index 9f72d57733..11b7c97a0c 100644 --- a/Engine/RotoStrokeItem.cpp +++ b/Engine/RotoStrokeItem.cpp @@ -36,8 +36,6 @@ #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF -// /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] -#include #include #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON diff --git a/Engine/TrackerContext.cpp b/Engine/TrackerContext.cpp index b1939bdfa2..c5d2d5992a 100644 --- a/Engine/TrackerContext.cpp +++ b/Engine/TrackerContext.cpp @@ -28,6 +28,13 @@ #include #include // stringstream +#if !defined(SBK_RUN) && !defined(Q_MOC_RUN) +GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] +#include +GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON +#endif + CLANG_DIAG_OFF(deprecated) CLANG_DIAG_OFF(uninitialized) #include @@ -52,6 +59,8 @@ CLANG_DIAG_ON(uninitialized) #include "Engine/TrackerSerialization.h" #include "Engine/ViewerInstance.h" +using namespace boost::placeholders; + #define NATRON_TRACKER_REPORT_PROGRESS_DELTA_MS 200 NATRON_NAMESPACE_ENTER diff --git a/Engine/TrackerContextPrivate.cpp b/Engine/TrackerContextPrivate.cpp index aab3e40dee..5017c31169 100644 --- a/Engine/TrackerContextPrivate.cpp +++ b/Engine/TrackerContextPrivate.cpp @@ -31,6 +31,13 @@ #include #endif +#if !defined(SBK_RUN) && !defined(Q_MOC_RUN) +GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] +#include +GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON +#endif + #include #include "Engine/AppInstance.h" @@ -45,6 +52,8 @@ #include "Engine/TrackerNode.h" #include "Engine/TrackerContext.h" +using namespace boost::placeholders; + #ifdef DEBUG //#define TRACKER_GENERATE_DATA_SEQUENTIALLY diff --git a/Engine/TrackerContextPrivate.h b/Engine/TrackerContextPrivate.h index 5872690559..f3e290d8c3 100644 --- a/Engine/TrackerContextPrivate.h +++ b/Engine/TrackerContextPrivate.h @@ -58,8 +58,6 @@ GCC_DIAG_ON(maybe-uninitialized) #include #include -#include - #include "Engine/CreateNodeArgs.h" #include "Engine/NodeSerialization.h" #include "Engine/RectD.h" diff --git a/Engine/ViewerInstance.cpp b/Engine/ViewerInstance.cpp index 558bcf92bb..9260825b5c 100644 --- a/Engine/ViewerInstance.cpp +++ b/Engine/ViewerInstance.cpp @@ -37,7 +37,7 @@ #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF // /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] -#include +#include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON CLANG_DIAG_OFF(deprecated) @@ -74,6 +74,7 @@ CLANG_DIAG_ON(deprecated) #include "Engine/Utils.h" #include "Engine/ViewIdx.h" +using namespace boost::placeholders; #ifndef M_LN2 #define M_LN2 0.693147180559945309417232121458176568 /* loge(2) */ diff --git a/Gui/CurveWidget.cpp b/Gui/CurveWidget.cpp index 2824a94e3f..03d2d09041 100644 --- a/Gui/CurveWidget.cpp +++ b/Gui/CurveWidget.cpp @@ -1398,8 +1398,6 @@ CurveWidget::wheelEvent(QWheelEvent* e) return; } - double zoomFactor; - double par; double scaleFactor = std::pow( NATRON_WHEEL_ZOOM_PER_DELTA, e->delta() ); QPointF zoomCenter = _imp->zoomCtx.toZoomCoordinates( e->x(), e->y() ); diff --git a/Gui/MultiInstancePanel.cpp b/Gui/MultiInstancePanel.cpp index f23f46141c..0e2e4edb67 100644 --- a/Gui/MultiInstancePanel.cpp +++ b/Gui/MultiInstancePanel.cpp @@ -57,10 +57,6 @@ CLANG_DIAG_OFF(uninitialized) CLANG_DIAG_ON(deprecated) CLANG_DIAG_ON(uninitialized) -GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF -// /usr/local/include/boost/bind/arg.hpp:37:9: warning: unused typedef 'boost_static_assert_typedef_37' [-Wunused-local-typedef] -#include -GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #include #include