From 46903e449434499105d88e202757522ae7930a2a Mon Sep 17 00:00:00 2001 From: Mark Berrill Date: Thu, 5 Mar 2015 15:04:22 -0500 Subject: [PATCH] Fixing some compile errors with clang --- IO/Mesh.cpp | 12 ++++++------ IO/MeshDatabase.cpp | 4 ++-- IO/Writer.cpp | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/IO/Mesh.cpp b/IO/Mesh.cpp index 77a5d8f0..1ca81a28 100644 --- a/IO/Mesh.cpp +++ b/IO/Mesh.cpp @@ -300,11 +300,11 @@ shared_ptr getPointList( shared_ptr mesh ) shared_ptr getTriMesh( shared_ptr mesh ) { shared_ptr mesh2; - if ( dynamic_pointer_cast(mesh) != NULL ) { + if ( dynamic_pointer_cast(mesh).get() != NULL ) { mesh2 = dynamic_pointer_cast(mesh); - } else if ( dynamic_pointer_cast(mesh) != NULL ) { + } else if ( dynamic_pointer_cast(mesh).get() != NULL ) { shared_ptr trilist = dynamic_pointer_cast(mesh); - ASSERT(trilist!=NULL); + ASSERT(trilist.get()!=NULL); mesh2.reset( new TriMesh(*trilist) ); } return mesh2; @@ -312,11 +312,11 @@ shared_ptr getTriMesh( shared_ptr mesh ) shared_ptr getTriList( shared_ptr mesh ) { shared_ptr mesh2; - if ( dynamic_pointer_cast(mesh) != NULL ) { + if ( dynamic_pointer_cast(mesh).get() != NULL ) { mesh2 = dynamic_pointer_cast(mesh); - } else if ( dynamic_pointer_cast(mesh) != NULL ) { + } else if ( dynamic_pointer_cast(mesh).get() != NULL ) { shared_ptr trimesh = dynamic_pointer_cast(mesh); - ASSERT(trimesh!=NULL); + ASSERT(trimesh.get()!=NULL); mesh2.reset( new TriList(*trimesh) ); } return mesh2; diff --git a/IO/MeshDatabase.cpp b/IO/MeshDatabase.cpp index f31f3a90..74d51fd9 100644 --- a/IO/MeshDatabase.cpp +++ b/IO/MeshDatabase.cpp @@ -402,9 +402,9 @@ std::vector read( const std::string& filename ) IO::MeshType meshType( shared_ptr mesh ) { IO::MeshType type = IO::Unknown; - if ( dynamic_pointer_cast(mesh)!=NULL ) { + if ( dynamic_pointer_cast(mesh).get()!=NULL ) { type = IO::PointMesh; - } else if ( dynamic_pointer_cast(mesh)!=NULL || dynamic_pointer_cast(mesh)!=NULL ) { + } else if ( dynamic_pointer_cast(mesh).get()!=NULL || dynamic_pointer_cast(mesh).get()!=NULL ) { type = IO::SurfaceMesh; } else { ERROR("Unknown mesh"); diff --git a/IO/Writer.cpp b/IO/Writer.cpp index d244d746..455f13a6 100644 --- a/IO/Writer.cpp +++ b/IO/Writer.cpp @@ -42,7 +42,7 @@ static std::vector writeMeshesOrigFormat( const std::vectorname ); } - if ( dynamic_pointer_cast(mesh)!=NULL ) { + if ( dynamic_pointer_cast(mesh).get()!=NULL ) { // List of points shared_ptr pointlist = dynamic_pointer_cast(mesh); const std::vector& P = pointlist->points; @@ -51,7 +51,7 @@ static std::vector writeMeshesOrigFormat( const std::vector(mesh)!=NULL || dynamic_pointer_cast(mesh)!=NULL ) { + } else if ( dynamic_pointer_cast(mesh).get()!=NULL || dynamic_pointer_cast(mesh).get()!=NULL ) { // Triangle mesh shared_ptr trilist = IO::getTriList(mesh); const std::vector& A = trilist->A;