From ab1c5899e1f5f8bffc59235d2144b91ceba79385 Mon Sep 17 00:00:00 2001 From: Pierre Alliez Date: Wed, 20 Jun 2012 13:32:44 +0000 Subject: [PATCH] shut up warnings --- .../Surface_reconstruction_points_3/PS_demo_off_plugin.cpp | 2 +- .../Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp | 2 +- .../Surface_reconstruction_points_3/include/Point_set_3.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp index b92a3ead58e..f86efd726ce 100644 --- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp +++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp @@ -36,7 +36,7 @@ PS_demo_off_plugin::load(QFileInfo fileinfo) { // Check extension (quietly) std::string extension = fileinfo.suffix().toUtf8().data(); if (extension != "off" && extension != "OFF") - return false; + return NULL; // Open file std::ifstream in(fileinfo.filePath().toUtf8().data()); diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp index 6f4c8fffb81..28f95867d34 100644 --- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp +++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp @@ -37,7 +37,7 @@ PS_demo_xyz_plugin::load(QFileInfo fileinfo) std::string extension = fileinfo.suffix().toUtf8().data(); if (extension != "xyz" && extension != "XYZ" && extension != "pwn" && extension != "PWN") - return false; + return NULL; // Open file std::ifstream in(fileinfo.filePath().toUtf8().data()); diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/include/Point_set_3.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/include/Point_set_3.h index 4e2392b19df..bca6cbd0283 100644 --- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/include/Point_set_3.h +++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/include/Point_set_3.h @@ -102,9 +102,9 @@ public: // Repeat base class' public methods used below /// @cond SKIP_IN_MANUAL - Base::begin; - Base::end; - Base::size; + using Base::begin; + using Base::end; + using Base::size; /// @endcond /// Gets the number of selected points.