Skip to content

Commit 0dc8d3c

Browse files
dcwhitedcwhite
committed
Start of boost-related changes + resharper stuff
1 parent cf8f108 commit 0dc8d3c

19 files changed

+10
-192
lines changed

‎src/Core/Algorithms/DataIO/EigenMatrixFromScirunAsciiFormatConverter.cc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
*/
2727

2828

29-
#include <boost/timer.hpp>
3029
#include <boost/scoped_ptr.hpp>
3130
#include <boost/regex.hpp>
3231
#include <boost/lexical_cast.hpp>
@@ -35,7 +34,6 @@
3534

3635
#include <iostream>
3736
#include <fstream>
38-
#include <streambuf>
3937

4038
#include <Core/Algorithms/DataIO/EigenMatrixFromScirunAsciiFormatConverter.h>
4139
#include <Core/Algorithms/Base/AlgorithmPreconditions.h>

‎src/Core/Algorithms/Legacy/Inverse/SolveInverseProblemWithStandardTikhonovImpl.cc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,16 @@
2929
*/
3030

3131

32-
#include <boost/bind.hpp>
33-
#include <boost/lexical_cast.hpp>
34-
3532
#include <Core/Algorithms/Legacy/Inverse/TikhonovAlgoAbstractBase.h>
3633
#include <Core/Algorithms/Legacy/Inverse/SolveInverseProblemWithStandardTikhonovImpl.h>
3734

38-
#include <Core/Datatypes/Matrix.h>
3935
#include <Core/Datatypes/DenseMatrix.h>
4036
#include <Core/Datatypes/DenseColumnMatrix.h>
4137
#include <Core/Datatypes/SparseRowMatrix.h>
4238
#include <Core/Datatypes/MatrixTypeConversions.h>
4339

4440
#include <Core/Algorithms/Base/AlgorithmPreconditions.h>
4541

46-
#include <Core/Logging/LoggerInterface.h>
4742
#include <Core/Utils/Exception.h>
4843

4944
using namespace SCIRun;

‎src/Core/Algorithms/Legacy/Inverse/SolveInverseProblemWithTSVD_impl.cc‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,10 @@
2929
*/
3030

3131

32-
// SCIRUN lybraries
33-
#include <boost/bind.hpp>
34-
#include <boost/lexical_cast.hpp>
35-
#include <Core/Datatypes/Matrix.h>
3632
#include <Core/Datatypes/DenseMatrix.h>
3733
#include <Core/Datatypes/DenseColumnMatrix.h>
3834
#include <Core/Datatypes/SparseRowMatrix.h>
39-
#include <Core/Datatypes/MatrixTypeConversions.h>
40-
#include <Core/Algorithms/Base/AlgorithmPreconditions.h>
4135
#include <Core/Logging/LoggerInterface.h>
42-
#include <Core/Utils/Exception.h>
4336

4437
// Tikhonov inverse libraries
4538
#include <Core/Algorithms/Legacy/Inverse/TikhonovAlgoAbstractBase.h>

‎src/Core/Algorithms/Legacy/Inverse/SolveInverseProblemWithTikhonovSVD_impl.cc‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,14 @@
2929
*/
3030

3131

32-
// SCIRUN lybraries
33-
#include <boost/bind.hpp>
34-
#include <boost/lexical_cast.hpp>
3532
#include <Core/Datatypes/Matrix.h>
3633
#include <Core/Datatypes/DenseMatrix.h>
3734
#include <Core/Datatypes/DenseColumnMatrix.h>
38-
#include <Core/Datatypes/SparseRowMatrix.h>
39-
#include <Core/Datatypes/MatrixTypeConversions.h>
40-
#include <Core/Algorithms/Base/AlgorithmPreconditions.h>
4135
#include <Core/Logging/LoggerInterface.h>
42-
#include <Core/Utils/Exception.h>
4336

4437
// Tikhonov inverse libraries
45-
#include <Core/Algorithms/Legacy/Inverse/TikhonovAlgoAbstractBase.h>
4638
#include <Core/Algorithms/Legacy/Inverse/SolveInverseProblemWithTikhonovSVD_impl.h>
4739

48-
// EIGEN LIBRARY
4940
#include <Eigen/Eigen>
5041
#include <Eigen/SVD>
5142

‎src/Core/Algorithms/Legacy/Inverse/TikhonovAlgoAbstractBase.cc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
*/
3030

3131

32-
#include <boost/bind.hpp>
33-
#include <boost/lexical_cast.hpp>
34-
3532
// Tikhonov specific headers
3633
#include <Core/Algorithms/Legacy/Inverse/TikhonovAlgoAbstractBase.h>
3734
#include <Core/Algorithms/Legacy/Inverse/TikhonovImpl.h>
@@ -43,15 +40,13 @@
4340
#include <Core/Datatypes/Matrix.h>
4441
#include <Core/Datatypes/DenseMatrix.h>
4542
#include <Core/Datatypes/DenseColumnMatrix.h>
46-
#include <Core/Datatypes/SparseRowMatrix.h>
4743
#include <Core/Datatypes/MatrixTypeConversions.h>
4844
#include <Core/Math/MiscMath.h>
4945
#include <unsupported/Eigen/Splines>
5046

5147
// SCIRun structural
5248
#include <Core/Algorithms/Base/AlgorithmPreconditions.h>
5349
#include <Core/Algorithms/Base/AlgorithmVariableNames.h>
54-
#include <Core/Logging/LoggerInterface.h>
5550
#include <Core/Logging/Log.h>
5651
#include <Core/Utils/Exception.h>
5752

‎src/Core/Parser/ArrayMathInterpreter.cc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include <Core/Datatypes/Legacy/Field/FieldInformation.h>
3434
#include <Core/Datatypes/Legacy/Field/VField.h>
3535
#include <Core/Thread/Parallel.h>
36-
#include <boost/bind.hpp>
3736

3837
using namespace SCIRun;
3938
using namespace SCIRun::Core::Datatypes;
@@ -1515,7 +1514,7 @@ ArrayMathProgram::run_sequential(size_t& error_line)
15151514
error_line_.resize(num_proc_,0);
15161515
success_.resize(num_proc_,true);
15171516

1518-
Parallel::RunTasks(boost::bind(&ArrayMathProgram::run_parallel, this, _1), num_proc_);
1517+
Parallel::RunTasks([this](int i) { run_parallel(i); }, num_proc_);
15191518

15201519
for (int j=0; j<num_proc_; j++)
15211520
{

‎src/Dataflow/Network/Module.cc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828

2929
#include <memory>
3030
#include <numeric>
31-
#include <boost/lexical_cast.hpp>
32-
#include <boost/bind.hpp>
3331
#include <boost/date_time/posix_time/posix_time.hpp>
3432
#include <chrono>
3533
#include <atomic>
@@ -961,7 +959,7 @@ void ModuleWithAsyncDynamicPorts::execute()
961959
size_t ModuleWithAsyncDynamicPorts::add_input_port(InputPortHandle h)
962960
{
963961
if (h->isDynamic())
964-
h->connectDataOnPortHasChanged(boost::bind(&ModuleWithAsyncDynamicPorts::asyncExecute, this, _1, _2));
962+
h->connectDataOnPortHasChanged([this](const PortId& pid, DatatypeHandle data) { asyncExecute(pid, data); });
965963
return Module::add_input_port(h);
966964
}
967965

‎src/Interface/Application/Connection.cc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727

2828

2929
#include <iostream>
30-
#include <stdexcept>
3130
#include <Interface/qt_include.h>
32-
#include <boost/bind.hpp>
3331
#include <Core/Application/Application.h>
3432
#include <Dataflow/Engine/Controller/NetworkEditorController.h>
3533
#include <Interface/Application/Connection.h>

‎src/Interface/Application/ModuleWidget.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,11 @@
3333
#ifndef Q_MOC_RUN
3434
#include <boost/shared_ptr.hpp>
3535
#include <boost/scoped_ptr.hpp>
36-
#include <boost/timer.hpp>
3736
#include <boost/bimap.hpp>
38-
#include <set>
3937
#include <deque>
4038
#include <atomic>
4139
#include <Interface/Application/Note.h>
4240
#include <Interface/Application/HasNotes.h>
43-
#include <Interface/Application/PositionProvider.h>
4441

4542
#include <Dataflow/Network/NetworkFwd.h>
4643
#include <Dataflow/Network/ExecutableObject.h>
@@ -262,7 +259,7 @@ private Q_SLOTS:
262259
ModuleWidgetDisplayPtr fullWidgetDisplay_;
263260
private:
264261
boost::shared_ptr<PortWidgetManager> ports_;
265-
boost::timer timer_;
262+
//boost::timer timer_;
266263
bool deletedFromGui_, colorLocked_;
267264
bool executedOnce_, skipExecuteDueToFatalError_, disabled_, programmablePortEnabled_{false};
268265
std::atomic<bool> errored_;

‎src/Interface/Application/NetworkEditor.cc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@
5252
#include <Dataflow/Engine/Python/NetworkEditorPythonAPI.h>
5353
#endif
5454

55-
#include <boost/bind.hpp>
56-
#include <boost/lambda/lambda.hpp>
5755
#include <boost/algorithm/string/find.hpp>
5856

5957
using namespace SCIRun;
@@ -1288,7 +1286,7 @@ void NetworkEditor::centerView()
12881286
}
12891287

12901288
ModulePositions positions;
1291-
fillModulePositionMap(positions, boost::lambda::constant(true));
1289+
fillModulePositionMap(positions, []() { return true; });
12921290
centerOn(findCenterOfNetwork(positions));
12931291
}
12941292

0 commit comments

Comments
 (0)