fix warnings

MX-05 · Mar 30, 2021 · 205ba51 · 205ba51
1 parent 7822d44
commit 205ba51
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 34 deletions.
diff --git 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 <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 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
@@ -37,8 +37,6 @@
 #include <QtCore/QDebug>
 
 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 <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON

diff --git 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 <boost/bind.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/make_shared.hpp>

diff --git 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 <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 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
@@ -37,8 +37,6 @@
 
 #include <boost/scoped_ptr.hpp>
 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 <boost/bind.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
 

diff --git a/Engine/OfxHost.cpp b/Engine/OfxHost.cpp
@@ -53,7 +53,7 @@ CLANG_DIAG_ON(deprecated-register)
 #include <QtConcurrentMap> // 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 <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 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
@@ -39,12 +39,6 @@
 #include <QtConcurrentMap> // QtCore on Qt4, QtConcurrent on Qt5
 #include <QtConcurrentRun> // 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 <boost/bind.hpp>
-GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
-#endif
 
 #include <SequenceParsing.h> // for removePath
 

diff --git a/Engine/RotoContext.cpp b/Engine/RotoContext.cpp
@@ -36,8 +36,6 @@
 
 #include <boost/scoped_ptr.hpp>
 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 <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON

diff --git a/Engine/RotoDrawableItem.cpp b/Engine/RotoDrawableItem.cpp
@@ -37,8 +37,6 @@
 #include <QtCore/QDebug>
 
 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 <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON

diff --git a/Engine/RotoItem.cpp b/Engine/RotoItem.cpp
@@ -36,8 +36,6 @@
 #include <QtCore/QDebug>
 
 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 <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON

diff --git a/Engine/RotoLayer.cpp b/Engine/RotoLayer.cpp
@@ -36,8 +36,6 @@
 #include <QtCore/QDebug>
 
 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 <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON

diff --git a/Engine/RotoStrokeItem.cpp b/Engine/RotoStrokeItem.cpp
@@ -36,8 +36,6 @@
 #include <QtCore/QDebug>
 
 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 <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON

diff --git a/Engine/TrackerContext.cpp b/Engine/TrackerContext.cpp
@@ -28,6 +28,13 @@
 #include <set>
 #include <sstream> // 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 <boost/bind/bind.hpp>
+GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
+#endif
+
 CLANG_DIAG_OFF(deprecated)
 CLANG_DIAG_OFF(uninitialized)
 #include <QtCore/QWaitCondition>
@@ -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
@@ -31,6 +31,13 @@
 #include <omp.h>
 #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 <boost/bind/bind.hpp>
+GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
+#endif
+
 #include <QtCore/QThreadPool>
 
 #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
@@ -58,8 +58,6 @@ GCC_DIAG_ON(maybe-uninitialized)
 #include <QFutureWatcher>
 #include <QtConcurrentMap>
 
-#include <boost/bind.hpp>
-
 #include "Engine/CreateNodeArgs.h"
 #include "Engine/NodeSerialization.h"
 #include "Engine/RectD.h"

diff --git a/Engine/ViewerInstance.cpp b/Engine/ViewerInstance.cpp
@@ -37,7 +37,7 @@
 #include <boost/make_shared.hpp>
 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 <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 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
@@ -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
@@ -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 <boost/bind.hpp>
-GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
 #include <boost/weak_ptr.hpp>
 
 #include <ofxNatron.h>