synced to 1.0

diff --git a/ginac/numeric.cpp b/ginac/numeric.cpp
index 3ca0389d4e6fb92b158d8016ecd1a0fd5fc79edc..9eaa715b1cfdc36c32013e2f3e57fb7fae580eda 100644 (file)
--- a/ginac/numeric.cpp
+++ b/ginac/numeric.cpp
@@ -95,10 +95,10 @@ numeric::numeric(int i) : basic(TINFO_numeric)
        // emphasizes efficiency.  However, if the integer is small enough
        // we save space and dereferences by using an immediate type.
        // (C.f. <cln/object.h>)
-       if (i < (1U<<cl_value_len-1))
+       if (i < (1L << (cl_value_len-1)) && i >= -(1L << (cl_value_len-1)))
                value = cln::cl_I(i);
        else
-               value = cln::cl_I((long) i);
+               value = cln::cl_I(static_cast<long>(i));
        setflag(status_flags::evaluated | status_flags::expanded);
 }
 
@@ -110,10 +110,10 @@ numeric::numeric(unsigned int i) : basic(TINFO_numeric)
        // emphasizes efficiency.  However, if the integer is small enough
        // we save space and dereferences by using an immediate type.
        // (C.f. <cln/object.h>)
-       if (i < (1U<<cl_value_len-1))
+       if (i < (1U << (cl_value_len-1)))
                value = cln::cl_I(i);
        else
-               value = cln::cl_I((unsigned long) i);
+               value = cln::cl_I(static_cast<unsigned long>(i));
        setflag(status_flags::evaluated | status_flags::expanded);
 }
 
@@ -131,7 +131,8 @@ numeric::numeric(unsigned long i) : basic(TINFO_numeric)
        setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-/** Ctor for rational numerics a/b.
+
+/** Constructor for rational numerics a/b.
  *
  *  @exception overflow_error (division by zero) */
 numeric::numeric(long numer, long denom) : basic(TINFO_numeric)