Skip to content

Commit

Permalink
"#pragma warning" is MSVC preprocessor code
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://svn.pointclouds.org/pcl/trunk@8737 a9d63959-f2ad-4865-b262-bf0e56cfafb6
  • Loading branch information
jkammerl committed Feb 25, 2013
1 parent d91ee01 commit d00d6de
Show file tree
Hide file tree
Showing 9 changed files with 78 additions and 23 deletions.
8 changes: 6 additions & 2 deletions common/include/pcl/point_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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_
15 changes: 12 additions & 3 deletions gpu/octree/test/perfomance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,26 @@
* Author: Anatoly Baskeheev, Itseez Ltd, ([email protected])
*/

#pragma warning (disable : 4996 4530)
#if defined _MSC_VER
#pragma warning (disable : 4996 4530)
#endif

#include <gtest/gtest.h>

#include<iostream>
#include<algorithm>

#pragma warning (disable: 4521)
#if defined _MSC_VER
#pragma warning (disable: 4521)
#endif

#include <pcl/point_cloud.h>
#include <pcl/octree/octree.h>
#pragma warning (default: 4521)

#if defined _MSC_VER
#pragma warning (default: 4521)
#endif


#include <pcl/gpu/octree/octree.hpp>
#include <pcl/gpu/containers/device_array.h>
Expand Down
12 changes: 9 additions & 3 deletions gpu/octree/test/test_approx_nearest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,24 @@
* Author: Anatoly Baskeheev, Itseez Ltd, ([email protected])
*/

#pragma warning (disable : 4996 4530)
#if defined _MSC_VER
#pragma warning (disable : 4996 4530)
#endif

#include <gtest/gtest.h>

#include<iostream>
#include<fstream>
#include<algorithm>

#pragma warning (disable: 4521)
#if defined _MSC_VER
#pragma warning (disable: 4521)
#endif
#include <pcl/point_cloud.h>
#include <pcl/octree/octree.h>
#pragma warning (default: 4521)
#if defined _MSC_VER
#pragma warning (default: 4521)
#endif

#include <pcl/gpu/octree/octree.hpp>
#include <pcl/gpu/containers/device_array.h>
Expand Down
10 changes: 8 additions & 2 deletions gpu/octree/test/test_bfrs_gpu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,16 @@
#include <iostream>
#include <numeric>

#pragma warning (disable: 4521)
#if defined _MSC_VER
#pragma warning (disable: 4521)
#endif

#include <pcl/point_cloud.h>
#include <pcl/octree/octree.h>
#pragma warning (default: 4521)

#if defined _MSC_VER
#pragma warning (default: 4521)
#endif

#include <pcl/gpu/octree/octree.hpp>
#include <pcl/gpu/containers/device_array.h>
Expand Down
10 changes: 8 additions & 2 deletions gpu/octree/test/test_host_radius_search.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,17 @@

#include <gtest/gtest.h>

#pragma warning (disable: 4521)
#if defined _MSC_VER
#pragma warning (disable: 4521)
#endif

#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/octree/octree.h>
#pragma warning (default: 4521)

#if defined _MSC_VER
#pragma warning (default: 4521)
#endif

#include <pcl/gpu/octree/octree.hpp>
#include <pcl/gpu/containers/device_array.h>
Expand Down
12 changes: 9 additions & 3 deletions gpu/octree/test/test_knn_search.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,24 @@
* Author: Anatoly Baskeheev, Itseez Ltd, ([email protected])
*/

#pragma warning (disable : 4996 4530)
#if defined _MSC_VER
#pragma warning (disable : 4996 4530)
#endif

#include <gtest/gtest.h>

#include<iostream>
#include<fstream>
#include<algorithm>

#pragma warning (disable: 4521)
#if defined _MSC_VER
#pragma warning (disable: 4521)
#endif
#include <pcl/point_cloud.h>
#include <pcl/octree/octree.h>
#pragma warning (default: 4521)
#if defined _MSC_VER
#pragma warning (default: 4521)
#endif

#include <pcl/gpu/octree/octree.hpp>
#include <pcl/gpu/containers/device_array.h>
Expand Down
10 changes: 8 additions & 2 deletions gpu/octree/test/test_radius_search.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,16 @@
#include <fstream>
#include <numeric>

#pragma warning (disable: 4521)
#if defined _MSC_VER
#pragma warning (disable: 4521)
#endif

#include <pcl/point_cloud.h>
#include <pcl/octree/octree.h>
#pragma warning (default: 4521)

#if defined _MSC_VER
#pragma warning (default: 4521)
#endif

#include <pcl/gpu/octree/octree.hpp>
#include <pcl/gpu/containers/device_array.h>
Expand Down
14 changes: 11 additions & 3 deletions gpu/surface/test/test_pseudo_convex_hull.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,25 @@
* Author: Anatoly Baskeheev, Itseez Ltd, ([email protected])
*/

#pragma warning (disable : 4996 4530)
#if defined _MSC_VER
#pragma warning (disable : 4996 4530)
#endif

#include <gtest/gtest.h>

#include<iostream>
#include<fstream>
#include<algorithm>

#pragma warning (disable: 4521)
#if defined _MSC_VER
#pragma warning (disable: 4521)
#endif

#include <pcl/point_cloud.h>
#pragma warning (default: 4521)

#if defined _MSC_VER
#pragma warning (default: 4521)
#endif


#include <pcl/gpu/surface/convex_hull.h>
Expand Down
10 changes: 7 additions & 3 deletions outofcore/include/pcl/outofcore/impl/octree_base.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

////////////////////////////////////////////////////////////////////////////////
Expand Down

0 comments on commit d00d6de

Please sign in to comment.