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

Use boost::shared_ptr instead of tr1::shared_ptr

This commit is contained in:
Philipp Möller 2015-04-10 14:35:20 +02:00
parent ee412c3f24
commit 370a7da94b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Mesh_3/applications/mesher_tester.h
View File

@ -15,7 +15,7 @@
#include <sstream>
#include <stdlib.h>
#include <algorithm>
#include <boost/tr1/memory.hpp>
#include <boost/shared_ptr.hpp>
#include "thread_queue.h"
@ -51,7 +51,7 @@ template <class C3T3, class Domain> struct Optimizer;
template <class C3T3, class MeshCriteria, class Domain>
struct Mesher
{
Mesher(const std::tr1::shared_ptr<Domain_builder<Domain> >& pdomain_builder,
Mesher(const boost::shared_ptr<Domain_builder<Domain> >& pdomain_builder,
const int mesh_nb,
const std::string& filename,
const std::string& output,
@ -95,7 +95,7 @@ struct Mesher
timer.start();
// we keep c3t3 between lines
std::tr1::shared_ptr<C3T3> pc3t3_save (new C3T3());
boost::shared_ptr<C3T3> pc3t3_save (new C3T3());
// Generate Mesh
file_out << "Generate mesh...";
@ -183,7 +183,7 @@ private:
}
private:
std::tr1::shared_ptr<Domain_builder<Domain> > pdomain_builder_;
boost::shared_ptr<Domain_builder<Domain> > pdomain_builder_;
int mesh_nb_;
std::string filename_;
std::string output_prefix_;
@ -196,8 +196,8 @@ private:
template <class C3T3, class Domain>
struct Optimizer
{
Optimizer(const std::tr1::shared_ptr<C3T3>& pc3t3,
const std::tr1::shared_ptr<Domain_builder<Domain> >& pdomain_builder,
Optimizer(const boost::shared_ptr<C3T3>& pc3t3,
const boost::shared_ptr<Domain_builder<Domain> >& pdomain_builder,
const int mesh_nb,
const std::string& output,
const std::string& command_line)
@ -339,8 +339,8 @@ private:
private:
std::tr1::shared_ptr<C3T3> pc3t3_;
std::tr1::shared_ptr<Domain_builder<Domain> > pdomain_builder_;
boost::shared_ptr<C3T3> pc3t3_;
boost::shared_ptr<Domain_builder<Domain> > pdomain_builder_;
std::string mesh_nb_;
std::string output_prefix_;
std::string command_line_;
@ -571,7 +571,7 @@ void mesh(const std::string& data, const std::string& output_dir, const int nb_t
//Load the domain
std::stringstream cout_loc;
cout_loc << "+ [" << filename << "] Create domain...";
std::tr1::shared_ptr<Domain_builder<Domain> > pdomain_builder(new Domain_builder<Domain>(it->path().string()));
boost::shared_ptr<Domain_builder<Domain> > pdomain_builder(new Domain_builder<Domain>(it->path().string()));
cout_loc << "done (" << timer.time() << "s)\n";
std::cout << cout_loc.str();