From 9f6aa6b120334204dc00813b866c4f0fc8d80de5 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Sun, 10 May 2009 13:27:08 +0000 Subject: [PATCH] Explicitly qualify shared_ptr with boost::, otherwise there is a conflict with std::shared_ptr in C++0x mode. --- .../aux_edge_collapse_test_Polyhedron_3.cpp | 2 +- .../check_audit_edge_collapse_visitor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Surface_mesh_simplification/test/Surface_mesh_simplification/aux_edge_collapse_test_Polyhedron_3.cpp b/Surface_mesh_simplification/test/Surface_mesh_simplification/aux_edge_collapse_test_Polyhedron_3.cpp index d6c3481c014..7ac97a6b94c 100644 --- a/Surface_mesh_simplification/test/Surface_mesh_simplification/aux_edge_collapse_test_Polyhedron_3.cpp +++ b/Surface_mesh_simplification/test/Surface_mesh_simplification/aux_edge_collapse_test_Polyhedron_3.cpp @@ -128,7 +128,7 @@ string edge2str ( E const& e ) } template -string audit2str ( shared_ptr const& d ) +string audit2str ( boost::shared_ptr const& d ) { ostringstream ss ; ss << "[id:" << d->id ; diff --git a/Surface_mesh_simplification/test/Surface_mesh_simplification/check_audit_edge_collapse_visitor.cpp b/Surface_mesh_simplification/test/Surface_mesh_simplification/check_audit_edge_collapse_visitor.cpp index 95b0eca3eaf..d39b5c38b74 100644 --- a/Surface_mesh_simplification/test/Surface_mesh_simplification/check_audit_edge_collapse_visitor.cpp +++ b/Surface_mesh_simplification/test/Surface_mesh_simplification/check_audit_edge_collapse_visitor.cpp @@ -19,7 +19,7 @@ private : optional cost ; optional placement ; } ; - typedef shared_ptr Data_ptr ; + typedef boost::shared_ptr Data_ptr ; typedef map Table ;