From c2f34283738e5e50ff60af70e076c5eddc84f1c8 Mon Sep 17 00:00:00 2001
From: Lev Nachmanson <levnach@hotmail.com>
Date: Thu, 28 Jun 2018 15:02:23 -0700
Subject: [PATCH] name change

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
---
 src/util/mpz.cpp | 24 ++++++++++++------------
 src/util/mpz.h   |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/util/mpz.cpp b/src/util/mpz.cpp
index 37f80d14f..1cac358de 100644
--- a/src/util/mpz.cpp
+++ b/src/util/mpz.cpp
@@ -237,7 +237,7 @@ void mpz_manager<SYNCH>::set_big_i64(mpz & c, int64_t v) {
         c.m_ptr = allocate(m_init_cell_capacity);
         c.m_owner = mpz_self;        
     }
-    c.m_kind = mpz_ptr;
+    c.m_kind = mpz_ptr_k;
     SASSERT(capacity(c) >= m_init_cell_capacity);
     uint64_t _v;
     if (v < 0) {
@@ -293,7 +293,7 @@ void mpz_manager<SYNCH>::set_big_ui64(mpz & c, uint64_t v) {
         c.m_ptr = allocate(m_init_cell_capacity);
         c.m_owner = mpz_self;
     }
-    c.m_kind = mpz_ptr;
+    c.m_kind = mpz_ptr_k;
     SASSERT(capacity(c) >= m_init_cell_capacity);
     c.m_val = 1;
     if (sizeof(digit_t) == sizeof(uint64_t)) {
@@ -368,7 +368,7 @@ void mpz_manager<SYNCH>::set(mpz_cell& src, mpz & a, int sign, unsigned sz) {
     set_digits(a, i, src.m_digits);
     a.m_val = sign;
     
-    SASSERT(a.m_kind == mpz_ptr);
+    SASSERT(a.m_kind == mpz_ptr_k);
 }
 #endif
 
@@ -413,7 +413,7 @@ void mpz_manager<SYNCH>::set_digits(mpz & target, unsigned sz, digit_t const * d
             target.m_ptr             = allocate(c);
             target.m_ptr->m_size     = sz;
             target.m_ptr->m_capacity = c;
-            target.m_kind            = mpz_ptr;
+            target.m_kind            = mpz_ptr_k;
             target.m_owner           = mpz_self;
             memcpy(target.m_ptr->m_digits, digits, sizeof(digit_t) * sz);
         }
@@ -426,14 +426,14 @@ void mpz_manager<SYNCH>::set_digits(mpz & target, unsigned sz, digit_t const * d
             deallocate(target);
             target.m_val    = 1;
             target.m_ptr    = ptr;
-            target.m_kind   = mpz_ptr;
+            target.m_kind   = mpz_ptr_k;
             target.m_owner  = mpz_self;
         }
         else {
             target.m_ptr->m_size = sz;
             if (target.m_ptr->m_digits != digits)
                 memcpy(target.m_ptr->m_digits, digits, sizeof(digit_t) * sz);
-            target.m_kind        = mpz_ptr;
+            target.m_kind        = mpz_ptr_k;
         }
 #else
         mk_big(target);
@@ -1453,7 +1453,7 @@ void mpz_manager<SYNCH>::big_set(mpz & target, mpz const & source) {
         target.m_ptr = allocate(capacity(source));
         target.m_ptr->m_size     = size(source);
         target.m_ptr->m_capacity = capacity(source);
-        target.m_kind = mpz_ptr;
+        target.m_kind = mpz_ptr_k;
         target.m_owner = mpz_self;
         memcpy(target.m_ptr->m_digits, source.m_ptr->m_digits, sizeof(digit_t) * size(source));
     }
@@ -1462,14 +1462,14 @@ void mpz_manager<SYNCH>::big_set(mpz & target, mpz const & source) {
         target.m_ptr = allocate(capacity(source));
         target.m_ptr->m_size     = size(source);
         target.m_ptr->m_capacity = capacity(source);
-        target.m_kind = mpz_ptr;
+        target.m_kind = mpz_ptr_k;
         target.m_owner = mpz_self;
         memcpy(target.m_ptr->m_digits, source.m_ptr->m_digits, sizeof(digit_t) * size(source));
     }
     else {
         target.m_ptr->m_size = size(source);
         memcpy(target.m_ptr->m_digits, source.m_ptr->m_digits, sizeof(digit_t) * size(source));
-        target.m_kind = mpz_ptr;
+        target.m_kind = mpz_ptr_k;
     }
 #else
     // GMP version
@@ -1736,7 +1736,7 @@ void mpz_manager<SYNCH>::power(mpz const & a, unsigned p, mpz & b) {
                     b.m_ptr->m_digits[i] = 0;
                 b.m_ptr->m_digits[sz-1] = 1 << shift;
                 b.m_val = 1;
-                b.m_kind = mpz_ptr;
+                b.m_kind = mpz_ptr_k;
             }
             return;
         }
@@ -1822,7 +1822,7 @@ void mpz_manager<SYNCH>::ensure_capacity(mpz & a, unsigned capacity) {
     if (a.m_ptr == nullptr) {
         a.m_ptr = allocate(capacity);
         a.m_owner = mpz_self;
-        a.m_kind  = mpz_ptr;
+        a.m_kind  = mpz_ptr_k;
         SASSERT(a.m_ptr->m_capacity == capacity);
         if (a.m_val == INT_MIN) {
             unsigned intmin_sz = m_int_min.m_ptr->m_size;
@@ -1852,7 +1852,7 @@ void mpz_manager<SYNCH>::ensure_capacity(mpz & a, unsigned capacity) {
         deallocate(a);
         a.m_ptr = new_cell;
         a.m_owner = mpz_self;
-        a.m_kind = mpz_ptr;
+        a.m_kind = mpz_ptr_k;
     }
 }
 
diff --git a/src/util/mpz.h b/src/util/mpz.h
index 967ed6026..6f4232d8e 100644
--- a/src/util/mpz.h
+++ b/src/util/mpz.h
@@ -79,7 +79,7 @@ class mpz_cell {
                            under winodws, m_ptr points to a mpz_cell that store the value. 
 */
 
-enum mpz_kind { mpz_small = 0, mpz_ptr = 1};
+enum mpz_kind { mpz_small = 0, mpz_ptr_k = 1};
 enum mpz_owner { mpz_self = 0, mpz_ext = 1};
 
 class mpz {
@@ -172,7 +172,7 @@ class mpz_manager {
         if (n.m_ptr == nullptr || capacity(n) < c) {
             deallocate(n);
             n.m_val             = 1;
-            n.m_kind            = mpz_ptr;
+            n.m_kind            = mpz_ptr_k;
             n.m_owner           = mpz_self;
             n.m_ptr             = allocate(c);
         }