From 64ad00e99c940030216e85be8ee66d7ede3d017d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20Simb=C3=BCrger?= <simbuerg@fim.uni-passau.de>
Date: Fri, 2 Apr 2010 20:18:12 +0200
Subject: [PATCH]  Rename members of cloogblock to match CLooG master  Fix
 accessor functions.

---
 include/cloog/block.h | 38 +++++++++++++++++++-------------------
 source/block.c        |  8 ++++----
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/include/cloog/block.h b/include/cloog/block.h
index f1c805c..ba03b4e 100644
--- a/include/cloog/block.h
+++ b/include/cloog/block.h
@@ -57,12 +57,12 @@ extern "C"
  * the active reference counter and actually free it if its value is zero.
  */
 struct cloogblock
-{ CloogStatement * _statement ;  /**< The list of statements in the block. */
-  int  _nb_scaldims ;            /**< Number of scalar dimensions. */
+{ CloogStatement * statement ;  /**< The list of statements in the block. */
+  int  nb_scaldims ;            /**< Number of scalar dimensions. */
   Value * scaldims ;            /**< Scalar dimension values. */
-  int _depth ;                   /**< Original block depth (outer loop number).*/
-  int _references ;              /**< Number of references to this structure. */
-  void * _usr;		        /**< User field, for library user convenience.
+  int depth ;                   /**< Original block depth (outer loop number).*/
+  int references ;              /**< Number of references to this structure. */
+  void * usr ;		        /**< User field, for library user convenience.
 				 *   This pointer is not freed when the
 				 *   CloogBlock structure is freed.
 			         */
@@ -71,22 +71,22 @@ typedef struct cloogblock CloogBlock ;
 
 static inline CloogStatement *cloog_block_stmt (CloogBlock *b)
 {
-  return b->_statement;
+  return b->statement;
 }
 
 static inline void cloog_block_set_stmt (CloogBlock *b, CloogStatement *s)
 {
-  b->_statement = s;
+  b->statement = s;
 }
 
 static inline int cloog_block_nb_scaldims (CloogBlock *b)
 {
-  return b->_nb_scaldims;
+  return b->nb_scaldims;
 }
 
 static inline void cloog_block_set_nb_scaldims (CloogBlock *b, int n)
 {
-  b->_nb_scaldims = n;
+  b->nb_scaldims = n;
 }
 
 static inline Value *cloog_block_scaldims (CloogBlock *b)
@@ -101,22 +101,22 @@ static inline void cloog_block_set_scaldims (CloogBlock *b, Value *s)
 
 static inline int cloog_block_depth (CloogBlock *b)
 {
-  return b->_depth;
+  return b->depth;
 }
 
 static inline void cloog_block_set_depth (CloogBlock *b, int n)
 {
-  b->_depth = n;
+  b->depth = n;
 }
 
 static inline void *cloog_block_usr (CloogBlock *b)
 {
-  return b->_usr;
+  return b->usr;
 }
 
 static inline void cloog_block_set_usr (CloogBlock *b, void *u)
 {
-  b->_usr = u;
+  b->usr = u;
 }
 
 
@@ -125,29 +125,29 @@ static inline void cloog_block_set_usr (CloogBlock *b, void *u)
  * this structure reprensents a node of a linked list of CloogBlock structures.
  */
 struct cloogblocklist
-{ CloogBlock * _block ;          /**< An element of the list. */
-  struct cloogblocklist * _next ;/**< Pointer to the next element of the list.*/
+{ CloogBlock * block ;          /**< An element of the list. */
+  struct cloogblocklist * next ;/**< Pointer to the next element of the list.*/
 } ;
 typedef struct cloogblocklist CloogBlockList ;
 
 static inline CloogBlockList *cloog_block_list_next (CloogBlockList *s)
 {
-  return s->_next;
+  return s->next;
 }
 
 static inline void cloog_block_list_set_next (CloogBlockList *s, CloogBlockList *n)
 {
-  s->_next = n;
+  s->next = n;
 }
 
 static inline CloogBlock *cloog_block_list_block (CloogBlockList *s)
 {
-  return s->_block;
+  return s->block;
 }
 
 static inline void cloog_block_list_set_block (CloogBlockList *s, CloogBlock *n)
 {
-  s->_block = n;
+  s->block = n;
 }
 
 
diff --git a/source/block.c b/source/block.c
index 37f6f12..bbc53d2 100644
--- a/source/block.c
+++ b/source/block.c
@@ -77,22 +77,22 @@ static void cloog_block_leak_down (void)
 
 static inline int cloog_block_references (CloogBlock *b)
 {
-  return b->_references;
+  return b->references;
 }
 
 static inline void cloog_block_init_references (CloogBlock *b)
 {
-  b->_references = 1;
+  b->references = 1;
 }
 
 static inline void cloog_block_inc_references (CloogBlock *b)
 {
-  b->_references++;
+  b->references++;
 }
 
 static inline void cloog_block_dec_references (CloogBlock *b)
 {
-  b->_references--;
+  b->references--;
 }
 
 
-- 
2.11.4.GIT