songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6316 from sloriot/CGAL-boost_progress 

Use non-deprecated API for boost progress
This commit is contained in:
Laurent Rineau 2022-02-22 18:24:47 +01:00
parent 1af882bd4c 0dca23cbf8
commit 6d28829737
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
GraphicsView/demo/Segment_Delaunay_graph_2/include/CGAL/Constraints_loader.h
View File

@ -9,7 +9,14 @@
#include <utility> #include <utility>
#include <iostream> #include <iostream>
#include <boost/version.hpp>
#if BOOST_VERSION < 107200
#include <boost/progress.hpp> #include <boost/progress.hpp>
using boost::progress_display;
#else
#include <boost/timer/progress_display.hpp>
using boost::timer::progress_display;
#endif
namespace CGAL { namespace CGAL {
@ -118,7 +125,7 @@ class Constraints_loader {
std::cerr << " done (" << timer.time() << "s)\n"; std::cerr << " done (" << timer.time() << "s)\n";
std::cerr << "Inserting constraints...\n"; std::cerr << "Inserting constraints...\n";
boost::progress_display show_progress(constraints.size(), progress_display show_progress(constraints.size(),
std::cerr, std::cerr,
""); "");
timer.reset(); timer.reset();

9
GraphicsView/demo/Segment_Delaunay_graph_Linf_2/include/CGAL/Constraints_loader.h
View File

@ -9,7 +9,14 @@
#include <utility> #include <utility>
#include <iostream> #include <iostream>
#include <boost/version.hpp>
#if BOOST_VERSION < 107200
#include <boost/progress.hpp> #include <boost/progress.hpp>
using boost::progress_display;
#else
#include <boost/timer/progress_display.hpp>
using boost::timer::progress_display;
#endif
namespace CGAL { namespace CGAL {
@ -118,7 +125,7 @@ class Constraints_loader {
std::cerr << " done (" << timer.time() << "s)\n"; std::cerr << " done (" << timer.time() << "s)\n";
std::cerr << "Inserting constraints...\n"; std::cerr << "Inserting constraints...\n";
boost::progress_display show_progress(constraints.size(), progress_display show_progress(constraints.size(),
std::cerr, std::cerr,
""); "");
timer.reset(); timer.reset();

10
Spatial_searching/benchmark/Spatial_searching/Compare_ANN_STANN_CGAL.cpp
View File

@ -5,7 +5,15 @@
#include <CGAL/point_generators_3.h> #include <CGAL/point_generators_3.h>
#include <CGAL/iterator.h> #include <CGAL/iterator.h>
#include <CGAL/Timer.h> #include <CGAL/Timer.h>
#include <boost/version.hpp>
#if BOOST_VERSION < 107200
#include <boost/progress.hpp> #include <boost/progress.hpp>
using boost::progress_display;
#else
#include <boost/timer/progress_display.hpp>
using boost::timer::progress_display;
#endif
#include <CGAL/Orthogonal_k_neighbor_search.h> #include <CGAL/Orthogonal_k_neighbor_search.h>
#include <CGAL/K_neighbor_search.h> #include <CGAL/K_neighbor_search.h>
@ -115,7 +123,7 @@ int main(int argc,char** argv)
double OK_tree=time.time(); double OK_tree=time.time();
time.reset(); time.reset();
boost::progress_display show_progress( nb_queries ); progress_display show_progress( nb_queries );
//running NN algorithms //running NN algorithms
for (std::vector<Point_3>::const_iterator it=queries.begin();it!=queries.end();++it) for (std::vector<Point_3>::const_iterator it=queries.begin();it!=queries.end();++it)