From 0c6505a26a537dc911b6566f82d759521e527c08 Mon Sep 17 00:00:00 2001
From: Alan Mishchenko <alanmi@berkeley.edu>
Date: Wed, 30 Jan 2008 20:01:00 -0800
Subject: Version abc80130_2

---
 src/bdd/reo/reo.h | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'src/bdd/reo/reo.h')

diff --git a/src/bdd/reo/reo.h b/src/bdd/reo/reo.h
index 7e4be855..1a31242a 100644
--- a/src/bdd/reo/reo.h
+++ b/src/bdd/reo/reo.h
@@ -19,10 +19,16 @@
 #ifndef __REO_H__
 #define __REO_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "extra.h"
 
+//#pragma warning( disable : 4514 )
+
 ////////////////////////////////////////////////////////////////////////
 ///                     MACRO DEFINITIONS                            ///
 ////////////////////////////////////////////////////////////////////////
@@ -87,9 +93,9 @@ struct _reo_plane
 struct _reo_hash
 {
     int         Sign;            // signature of the current cache operation
-    unsigned    Arg1;            // the first argument
-    unsigned    Arg2;            // the second argument
-    unsigned    Arg3;            // the second argument
+    reo_unit *  Arg1;            // the first argument
+    reo_unit *  Arg2;            // the second argument
+    reo_unit *  Arg3;            // the third argument
 };
 
 struct _reo_man
@@ -166,8 +172,8 @@ struct _reo_man
 
 // used to manipulate units
 #define Unit_Regular(u)     ((reo_unit *)((unsigned long)(u) & ~01))
-#define Unit_Not(u)         ((reo_unit *)((long)(u) ^ 01))
-#define Unit_NotCond(u,c)   ((reo_unit *)((long)(u) ^ (c)))
+#define Unit_Not(u)         ((reo_unit *)((unsigned long)(u) ^ 01))
+#define Unit_NotCond(u,c)   ((reo_unit *)((unsigned long)(u) ^ (c)))
 #define Unit_IsConstant(u)  ((int)((u)->lev == REO_CONST_LEVEL))
 
 ////////////////////////////////////////////////////////////////////////
@@ -215,8 +221,12 @@ extern DdNode *   Extra_ReorderCudd( DdManager * dd, DdNode * aFunc, int pPermut
 extern int        Extra_bddReorderTest( DdManager * dd, DdNode * bF ); 
 extern int        Extra_addReorderTest( DdManager * dd, DdNode * aF ); 
 
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
 ////////////////////////////////////////////////////////////////////////
 ///                         END OF FILE                              ///
 ////////////////////////////////////////////////////////////////////////
-
-#endif
-- 
cgit v1.2.3