X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Futils.h;h=2f7eb26f70a1b2bdc1d8ce7dd6612291c7bc8204;hp=a4af3300e38d8c9d45370a30d908513a6759c6f2;hb=e08cda1854bdb82f6706ec269233577690ae00e4;hpb=83a7ee99a947cbbf331018b803ad6be43a9ccd45

diff --git a/ginac/utils.h b/ginac/utils.h
index a4af3300..2f7eb26f 100644
--- a/ginac/utils.h
+++ b/ginac/utils.h
@@ -4,7 +4,7 @@
  *  of any interest to the user of the library. */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2010 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,15 +21,19 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_UTILS_H__
-#define __GINAC_UTILS_H__
+#ifndef GINAC_UTILS_H
+#define GINAC_UTILS_H
 
+#include "assertion.h"
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
-#include <string>
 #include <functional>
-
-#include "assertion.h"
+#ifdef HAVE_STDINT_H
+#include <stdint.h> // for uintptr_t
+#endif
+#include <string>
 
 namespace GiNaC {
 
@@ -65,12 +69,8 @@ inline int compare_pointers(const T * a, const T * b)
 	return 0;
 }
 
-#if SIZEOF_VOID_P == SIZEOF_INT
-typedef unsigned int p_int;
-#elif SIZEOF_VOID_P == SIZEOF_LONG
-typedef unsigned long p_int;
-#elif SIZEOF_VOID_P == SIZEOF_LONG_LONG
-typedef unsigned long long p_int;
+#ifdef HAVE_STDINT_H
+typedef uintptr_t p_int;
 #else
 typedef unsigned long p_int;
 #endif
@@ -80,24 +80,26 @@ inline unsigned golden_ratio_hash(p_int n)
 {
 	// This function works much better when fast arithmetic with at
 	// least 64 significant bits is available.
-#if SIZEOF_LONG >= 8
+	if (sizeof(long) >= 8) {
 	// So 'long' has 64 bits.  Excellent!  We prefer it because it might be
 	// more efficient than 'long long'.
 	unsigned long l = n * 0x4f1bbcddUL;
 	return (unsigned)l;
-#elif SIZEOF_LONG_LONG >= 8
+	}
+#ifdef HAVE_LONG_LONG
+	else if (sizeof(long long) >= 8) {
 	// This requires 'long long' (or an equivalent 64 bit type)---which is,
 	// unfortunately, not ANSI-C++-compliant.
 	// (Yet C99 demands it, which is reason for hope.)
 	unsigned long long l = n * 0x4f1bbcddULL;
 	return (unsigned)l;
-#else
+	}
+#endif
 	// Without a type with 64 significant bits do the multiplication manually
 	// by splitting n up into the lower and upper two bytes.
 	const unsigned n0 = (n & 0x0000ffffU);
 	const unsigned n1 = (n & 0xffff0000U) >> 16;
 	return (n0 * 0x0000bcddU) + ((n1 * 0x0000bcddU + n0 * 0x00004f1bU) << 16);
-#endif
 }
 
 /* Compute the sign of a permutation of a container, with and without an
@@ -126,7 +128,9 @@ int permutation_sign(It first, It last)
 				sign = -sign;
 			} else if (!(*other < *i))
 				return 0;
-			--i; --other;
+			--i;
+			if (i != first)
+				--other;
 		}
 		if (!swapped)
 			return sign;
@@ -145,7 +149,9 @@ int permutation_sign(It first, It last)
 				sign = -sign;
 			} else if (!(*i < *other))
 				return 0;
-			++i; ++other;
+			++i;
+			if (i != last)
+				++other;
 		}
 		if (!swapped)
 			return sign;
@@ -179,7 +185,9 @@ int permutation_sign(It first, It last, Cmp comp, Swap swapit)
 				sign = -sign;
 			} else if (!comp(*other, *i))
 				return 0;
-			--i; --other;
+			--i;
+			if (i != first)
+				--other;
 		}
 		if (!swapped)
 			return sign;
@@ -198,7 +206,9 @@ int permutation_sign(It first, It last, Cmp comp, Swap swapit)
 				sign = -sign;
 			} else if (!comp(*i, *other))
 				return 0;
-			++i; ++other;
+			++i; 
+			if (i != last)
+				++other;
 		}
 		if (!swapped)
 			return sign;
@@ -230,7 +240,9 @@ void shaker_sort(It first, It last, Cmp comp, Swap swapit)
 				flag = other;
 				swapped = true;
 			}
-			--i; --other;
+			--i;
+			if (i != first)
+				--other;
 		}
 		if (!swapped)
 			return;
@@ -247,7 +259,9 @@ void shaker_sort(It first, It last, Cmp comp, Swap swapit)
 				flag = other;
 				swapped = true;
 			}
-			++i; ++other;
+			++i;
+			if (i != last)
+				++other;
 		}
 		if (!swapped)
 			return;
@@ -402,21 +416,7 @@ extern const ex _ex120;
 // Helper macros for class implementations (mostly useful for trivial classes)
 
 #define DEFAULT_CTOR(classname) \
-classname::classname() : inherited(&classname::tinfo_static) { setflag(status_flags::evaluated | status_flags::expanded); }
-
-#define DEFAULT_UNARCHIVE(classname) \
-ex classname::unarchive(const archive_node &n, lst &sym_lst) \
-{ \
-	return (new classname(n, sym_lst))->setflag(status_flags::dynallocated); \
-}
-
-#define DEFAULT_ARCHIVING(classname) \
-classname::classname(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) {} \
-DEFAULT_UNARCHIVE(classname) \
-void classname::archive(archive_node &n) const \
-{ \
-	inherited::archive(n); \
-}
+classname::classname() { setflag(status_flags::evaluated | status_flags::expanded); }
 
 #define DEFAULT_COMPARE(classname) \
 int classname::compare_same_type(const basic & other) const \
@@ -440,5 +440,4 @@ void classname::do_print_latex(const print_latex & c, unsigned level) const \
 
 } // namespace GiNaC
 
-
-#endif // ndef __GINAC_UTILS_H__
+#endif // ndef GINAC_UTILS_H