From d00d6ded3531aa826cc32c29204ac2f078cfafdd Mon Sep 17 00:00:00 2001 From: Julius Kammerl Date: Mon, 25 Feb 2013 20:12:34 +0000 Subject: [PATCH] "#pragma warning" is MSVC preprocessor code git-svn-id: svn+ssh://svn.pointclouds.org/pcl/trunk@8737 a9d63959-f2ad-4865-b262-bf0e56cfafb6 --- common/include/pcl/point_types.h | 8 ++++++-- gpu/octree/test/perfomance.cpp | 15 ++++++++++++--- gpu/octree/test/test_approx_nearest.cpp | 12 +++++++++--- gpu/octree/test/test_bfrs_gpu.cpp | 10 ++++++++-- gpu/octree/test/test_host_radius_search.cpp | 10 ++++++++-- gpu/octree/test/test_knn_search.cpp | 12 +++++++++--- gpu/octree/test/test_radius_search.cpp | 10 ++++++++-- gpu/surface/test/test_pseudo_convex_hull.cpp | 14 +++++++++++--- .../include/pcl/outofcore/impl/octree_base.hpp | 10 +++++++--- 9 files changed, 78 insertions(+), 23 deletions(-) diff --git a/common/include/pcl/point_types.h b/common/include/pcl/point_types.h index 31ad57e8211..2ea9600666d 100644 --- a/common/include/pcl/point_types.h +++ b/common/include/pcl/point_types.h @@ -51,7 +51,9 @@ // We're doing a lot of black magic with Boost here, so disable warnings in Maintainer mode, as we will never // be able to fix them anyway -#pragma warning(disable: 4201) +#if defined _MSC_VER + #pragma warning(disable: 4201) +#endif //#pragma warning(push, 1) #if defined __GNUC__ # pragma GCC system_header @@ -647,7 +649,9 @@ namespace pcl }; } // namespace pcl -#pragma warning(default: 4201) +#if defined _MSC_VER + #pragma warning(default: 4201) +#endif //#pragma warning(pop) #endif //#ifndef PCL_DATA_TYPES_H_ diff --git a/gpu/octree/test/perfomance.cpp b/gpu/octree/test/perfomance.cpp index 4ca1b666d8b..e8bc6f3e837 100644 --- a/gpu/octree/test/perfomance.cpp +++ b/gpu/octree/test/perfomance.cpp @@ -34,17 +34,26 @@ * Author: Anatoly Baskeheev, Itseez Ltd, (myname.mysurname@mycompany.com) */ -#pragma warning (disable : 4996 4530) +#if defined _MSC_VER + #pragma warning (disable : 4996 4530) +#endif #include #include #include -#pragma warning (disable: 4521) +#if defined _MSC_VER + #pragma warning (disable: 4521) +#endif + #include #include -#pragma warning (default: 4521) + +#if defined _MSC_VER + #pragma warning (default: 4521) +#endif + #include #include diff --git a/gpu/octree/test/test_approx_nearest.cpp b/gpu/octree/test/test_approx_nearest.cpp index 6664d984c44..bd4e1245e25 100644 --- a/gpu/octree/test/test_approx_nearest.cpp +++ b/gpu/octree/test/test_approx_nearest.cpp @@ -34,7 +34,9 @@ * Author: Anatoly Baskeheev, Itseez Ltd, (myname.mysurname@mycompany.com) */ -#pragma warning (disable : 4996 4530) +#if defined _MSC_VER + #pragma warning (disable : 4996 4530) +#endif #include @@ -42,10 +44,14 @@ #include #include -#pragma warning (disable: 4521) +#if defined _MSC_VER + #pragma warning (disable: 4521) +#endif #include #include -#pragma warning (default: 4521) +#if defined _MSC_VER + #pragma warning (default: 4521) +#endif #include #include diff --git a/gpu/octree/test/test_bfrs_gpu.cpp b/gpu/octree/test/test_bfrs_gpu.cpp index cfc4060de40..f366807f8d8 100644 --- a/gpu/octree/test/test_bfrs_gpu.cpp +++ b/gpu/octree/test/test_bfrs_gpu.cpp @@ -39,10 +39,16 @@ #include #include -#pragma warning (disable: 4521) +#if defined _MSC_VER + #pragma warning (disable: 4521) +#endif + #include #include -#pragma warning (default: 4521) + +#if defined _MSC_VER + #pragma warning (default: 4521) +#endif #include #include diff --git a/gpu/octree/test/test_host_radius_search.cpp b/gpu/octree/test/test_host_radius_search.cpp index c87c8c653be..63451094bac 100644 --- a/gpu/octree/test/test_host_radius_search.cpp +++ b/gpu/octree/test/test_host_radius_search.cpp @@ -40,11 +40,17 @@ #include -#pragma warning (disable: 4521) +#if defined _MSC_VER + #pragma warning (disable: 4521) +#endif + #include #include #include -#pragma warning (default: 4521) + +#if defined _MSC_VER + #pragma warning (default: 4521) +#endif #include #include diff --git a/gpu/octree/test/test_knn_search.cpp b/gpu/octree/test/test_knn_search.cpp index 2839cad7b08..6eee6b6b59b 100644 --- a/gpu/octree/test/test_knn_search.cpp +++ b/gpu/octree/test/test_knn_search.cpp @@ -34,7 +34,9 @@ * Author: Anatoly Baskeheev, Itseez Ltd, (myname.mysurname@mycompany.com) */ -#pragma warning (disable : 4996 4530) +#if defined _MSC_VER + #pragma warning (disable : 4996 4530) +#endif #include @@ -42,10 +44,14 @@ #include #include -#pragma warning (disable: 4521) +#if defined _MSC_VER + #pragma warning (disable: 4521) +#endif #include #include -#pragma warning (default: 4521) +#if defined _MSC_VER + #pragma warning (default: 4521) +#endif #include #include diff --git a/gpu/octree/test/test_radius_search.cpp b/gpu/octree/test/test_radius_search.cpp index 8d0121a2e2d..491ac6d2cd9 100644 --- a/gpu/octree/test/test_radius_search.cpp +++ b/gpu/octree/test/test_radius_search.cpp @@ -40,10 +40,16 @@ #include #include -#pragma warning (disable: 4521) +#if defined _MSC_VER + #pragma warning (disable: 4521) +#endif + #include #include -#pragma warning (default: 4521) + +#if defined _MSC_VER + #pragma warning (default: 4521) +#endif #include #include diff --git a/gpu/surface/test/test_pseudo_convex_hull.cpp b/gpu/surface/test/test_pseudo_convex_hull.cpp index a225a86e920..436ff76edda 100644 --- a/gpu/surface/test/test_pseudo_convex_hull.cpp +++ b/gpu/surface/test/test_pseudo_convex_hull.cpp @@ -34,7 +34,9 @@ * Author: Anatoly Baskeheev, Itseez Ltd, (myname.mysurname@mycompany.com) */ -#pragma warning (disable : 4996 4530) +#if defined _MSC_VER + #pragma warning (disable : 4996 4530) +#endif #include @@ -42,9 +44,15 @@ #include #include -#pragma warning (disable: 4521) +#if defined _MSC_VER + #pragma warning (disable: 4521) +#endif + #include -#pragma warning (default: 4521) + +#if defined _MSC_VER + #pragma warning (default: 4521) +#endif #include diff --git a/outofcore/include/pcl/outofcore/impl/octree_base.hpp b/outofcore/include/pcl/outofcore/impl/octree_base.hpp index b761098170e..bc5709ed6ee 100644 --- a/outofcore/include/pcl/outofcore/impl/octree_base.hpp +++ b/outofcore/include/pcl/outofcore/impl/octree_base.hpp @@ -417,10 +417,14 @@ namespace pcl { boost::shared_lock < boost::shared_mutex > lock (read_write_mutex_); bin_name.clear (); -#pragma warning(push) -#pragma warning(disable : 4267) +#if defined _MSC_VER + #pragma warning(push) + #pragma warning(disable : 4267) +#endif root_node_->queryBBIntersects (min, max, query_depth, bin_name); -#pragma warning(pop) +#if defined _MSC_VER + #pragma warning(pop) +#endif } ////////////////////////////////////////////////////////////////////////////////