[GRASS-SVN] r65279 - grass-addons/grass7/vector/v.delaunay3d

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-05-19 01:16:39 -0700 (Tue, 19 May 2015)
New Revision: 65279

Modified:
   grass-addons/grass7/vector/v.delaunay3d/main.cpp
   grass-addons/grass7/vector/v.delaunay3d/read.cpp
   grass-addons/grass7/vector/v.delaunay3d/write.cpp
Log:
v.delaunay3d: fix compilation issue - GRASS is using _n reserved word


Modified: grass-addons/grass7/vector/v.delaunay3d/main.cpp
===================================================================
--- grass-addons/grass7/vector/v.delaunay3d/main.cpp	2015-05-19 03:11:38 UTC (rev 65278)
+++ grass-addons/grass7/vector/v.delaunay3d/main.cpp	2015-05-19 08:16:39 UTC (rev 65279)
@@ -17,6 +17,11 @@
 #include <cstdlib>
 #include <vector>
 
+/* must be included before GRASS headers (GRASS is using _n reserved world) */
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Triangulation_3.h>
+#include <CGAL/Delaunay_triangulation_3.h>
+
 extern "C" {
 #include <grass/vector.h>
 #include <grass/glocale.h>

Modified: grass-addons/grass7/vector/v.delaunay3d/read.cpp
===================================================================
--- grass-addons/grass7/vector/v.delaunay3d/read.cpp	2015-05-19 03:11:38 UTC (rev 65278)
+++ grass-addons/grass7/vector/v.delaunay3d/read.cpp	2015-05-19 08:16:39 UTC (rev 65279)
@@ -1,3 +1,8 @@
+/* must be included before GRASS headers (GRASS is using _n reserved world) */
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Triangulation_3.h>
+#include <CGAL/Delaunay_triangulation_3.h>
+
 extern "C" {
 #include <grass/vector.h>
 #include <grass/glocale.h>

Modified: grass-addons/grass7/vector/v.delaunay3d/write.cpp
===================================================================
--- grass-addons/grass7/vector/v.delaunay3d/write.cpp	2015-05-19 03:11:38 UTC (rev 65278)
+++ grass-addons/grass7/vector/v.delaunay3d/write.cpp	2015-05-19 08:16:39 UTC (rev 65279)
@@ -1,3 +1,8 @@
+/* must be included before GRASS headers (GRASS is using _n reserved world) */
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Triangulation_3.h>
+#include <CGAL/Delaunay_triangulation_3.h>
+
 extern "C" {
 #include <grass/vector.h>
 #include <grass/glocale.h>