[GRASS-SVN] r71268 - grass/branches/releasebranch_7_2/lib/vector/dglib

[svn_grass at osgeo.org]

Author: mmetz
Date: 2017-07-17 13:08:00 -0700 (Mon, 17 Jul 2017)
New Revision: 71268

Modified:
   grass/branches/releasebranch_7_2/lib/vector/dglib/graph_v1.h
   grass/branches/releasebranch_7_2/lib/vector/dglib/graph_v2.h
   grass/branches/releasebranch_7_2/lib/vector/dglib/tree.h
Log:
dglib: sync to trunk

Modified: grass/branches/releasebranch_7_2/lib/vector/dglib/graph_v1.h
===================================================================
--- grass/branches/releasebranch_7_2/lib/vector/dglib/graph_v1.h	2017-07-17 16:49:47 UTC (rev 71267)
+++ grass/branches/releasebranch_7_2/lib/vector/dglib/graph_v1.h	2017-07-17 20:08:00 UTC (rev 71268)
@@ -103,13 +103,13 @@
  * Node Buffer Utilities
  */
 #define DGL_NODEBUFFER_SHIFT_v1(pgrp,o)		((dglInt32_t*)((pgrp)->pNodeBuffer + (o)))
-#define DGL_NODEBUFFER_OFFSET_v1(pgrp,p)	((dglInt32_t)p - (dglInt32_t)(pgrp)->pNodeBuffer)
+#define DGL_NODEBUFFER_OFFSET_v1(pgrp,p)	((dglInt32_t)(p - (dglInt32_t *)(pgrp)->pNodeBuffer))
 
 /*
  * Edge Buffer Utilities
  */
 #define DGL_EDGEBUFFER_SHIFT_v1(pgrp,o)		((dglInt32_t*)((pgrp)->pEdgeBuffer + (o)))
-#define DGL_EDGEBUFFER_OFFSET_v1(pgrp,pl)	((dglInt32_t)pl - (dglInt32_t)(pgrp)->pEdgeBuffer)
+#define DGL_EDGEBUFFER_OFFSET_v1(pgrp,pl)	((dglInt32_t)(pl - (dglInt32_t *)(pgrp)->pEdgeBuffer))
 
 
 

Modified: grass/branches/releasebranch_7_2/lib/vector/dglib/graph_v2.h
===================================================================
--- grass/branches/releasebranch_7_2/lib/vector/dglib/graph_v2.h	2017-07-17 16:49:47 UTC (rev 71267)
+++ grass/branches/releasebranch_7_2/lib/vector/dglib/graph_v2.h	2017-07-17 20:08:00 UTC (rev 71268)
@@ -106,13 +106,13 @@
  * Node Buffer Utilities
  */
 #define DGL_NODEBUFFER_SHIFT_v2(pgrp,o)		((dglInt32_t*)((pgrp)->pNodeBuffer + (o)))
-#define DGL_NODEBUFFER_OFFSET_v2(pgrp,p)		((dglInt32_t)p - (dglInt32_t)(pgrp)->pNodeBuffer)
+#define DGL_NODEBUFFER_OFFSET_v2(pgrp,p)		((dglInt32_t)(p - (dglInt32_t *)(pgrp)->pNodeBuffer))
 
 /*
  * Edge Buffer Utilities
  */
 #define DGL_EDGEBUFFER_SHIFT_v2(pgrp,o)		((dglInt32_t*)((pgrp)->pEdgeBuffer + (o)))
-#define DGL_EDGEBUFFER_OFFSET_v2(pgrp,pl)		((dglInt32_t)pl - (dglInt32_t)(pgrp)->pEdgeBuffer)
+#define DGL_EDGEBUFFER_OFFSET_v2(pgrp,pl)		((dglInt32_t)(pl - (dglInt32_t *)(pgrp)->pEdgeBuffer))
 
 
 

Modified: grass/branches/releasebranch_7_2/lib/vector/dglib/tree.h
===================================================================
--- grass/branches/releasebranch_7_2/lib/vector/dglib/tree.h	2017-07-17 16:49:47 UTC (rev 71267)
+++ grass/branches/releasebranch_7_2/lib/vector/dglib/tree.h	2017-07-17 20:08:00 UTC (rev 71268)
@@ -22,13 +22,10 @@
 #ifndef _DGL_TREE_H_
 #define _DGL_TREE_H_
 
-#include "avl.h"
-#include "tavl.h"
-
-
 #define USE_THREADED_AVL
 
 #if defined(USE_THREADED_AVL)
+#include "tavl.h"
 #define avl_table tavl_table
 #define avl_traverser tavl_traverser
 #define avl_create tavl_create
@@ -51,6 +48,8 @@
 #define avl_t_prev tavl_t_prev
 #define avl_t_cur tavl_t_cur
 #define avl_t_replace tavl_t_replace
+#else
+#include "avl.h"
 #endif