X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Futils.cpp;h=390036c5d495cfb0e4940a044cf933940ca336d3;hp=6e34832d0c7a39bf2ebd6e81ce8e944d7dec2957;hb=56f1beacac549ea8a66d46bffc6e0b3d8047d5c5;hpb=6d225ee55693c0617d254e6fa283c00c71bd2919 diff --git a/ginac/utils.cpp b/ginac/utils.cpp index 6e34832d..390036c5 100644 --- a/ginac/utils.cpp +++ b/ginac/utils.cpp @@ -44,8 +44,6 @@ int pole_error::degree() const return deg; } -// some compilers (e.g. cygwin) define a macro log2, causing confusion -#ifndef log2 /** Integer binary logarithm */ unsigned log2(unsigned n) { @@ -54,7 +52,6 @@ unsigned log2(unsigned n) ++k; return k; } -#endif ////////// @@ -316,56 +313,56 @@ const ex _ex120 = _num120; library_init::library_init() { if (count++==0) { - _num_120_p= reinterpret_cast(&((new numeric(-120))->setflag(status_flags::dynallocated))); - _num_60_p = reinterpret_cast(&((new numeric(-60))->setflag(status_flags::dynallocated))); - _num_48_p = reinterpret_cast(&((new numeric(-48))->setflag(status_flags::dynallocated))); - _num_30_p = reinterpret_cast(&((new numeric(-30))->setflag(status_flags::dynallocated))); - _num_25_p = reinterpret_cast(&((new numeric(-25))->setflag(status_flags::dynallocated))); - _num_24_p = reinterpret_cast(&((new numeric(-24))->setflag(status_flags::dynallocated))); - _num_20_p = reinterpret_cast(&((new numeric(-20))->setflag(status_flags::dynallocated))); - _num_18_p = reinterpret_cast(&((new numeric(-18))->setflag(status_flags::dynallocated))); - _num_15_p = reinterpret_cast(&((new numeric(-15))->setflag(status_flags::dynallocated))); - _num_12_p = reinterpret_cast(&((new numeric(-12))->setflag(status_flags::dynallocated))); - _num_11_p = reinterpret_cast(&((new numeric(-11))->setflag(status_flags::dynallocated))); - _num_10_p = reinterpret_cast(&((new numeric(-10))->setflag(status_flags::dynallocated))); - _num_9_p = reinterpret_cast(&((new numeric(-9))->setflag(status_flags::dynallocated))); - _num_8_p = reinterpret_cast(&((new numeric(-8))->setflag(status_flags::dynallocated))); - _num_7_p = reinterpret_cast(&((new numeric(-7))->setflag(status_flags::dynallocated))); - _num_6_p = reinterpret_cast(&((new numeric(-6))->setflag(status_flags::dynallocated))); - _num_5_p = reinterpret_cast(&((new numeric(-5))->setflag(status_flags::dynallocated))); - _num_4_p = reinterpret_cast(&((new numeric(-4))->setflag(status_flags::dynallocated))); - _num_3_p = reinterpret_cast(&((new numeric(-3))->setflag(status_flags::dynallocated))); - _num_2_p = reinterpret_cast(&((new numeric(-2))->setflag(status_flags::dynallocated))); - _num_1_p = reinterpret_cast(&((new numeric(-1))->setflag(status_flags::dynallocated))); - _num_1_2_p= reinterpret_cast(&((new numeric(-1,2))->setflag(status_flags::dynallocated))); - _num_1_3_p= reinterpret_cast(&((new numeric(-1,3))->setflag(status_flags::dynallocated))); - _num_1_4_p= reinterpret_cast(&((new numeric(-1,4))->setflag(status_flags::dynallocated))); - _num0_p = reinterpret_cast(&((new numeric(0))->setflag(status_flags::dynallocated))); - _num0_bp = _num0_p; - _num1_4_p = reinterpret_cast(&((new numeric(1,4))->setflag(status_flags::dynallocated))); - _num1_3_p = reinterpret_cast(&((new numeric(1,3))->setflag(status_flags::dynallocated))); - _num1_2_p = reinterpret_cast(&((new numeric(1,2))->setflag(status_flags::dynallocated))); - _num1_p = reinterpret_cast(&((new numeric(1))->setflag(status_flags::dynallocated))); - _num2_p = reinterpret_cast(&((new numeric(2))->setflag(status_flags::dynallocated))); - _num3_p = reinterpret_cast(&((new numeric(3))->setflag(status_flags::dynallocated))); - _num4_p = reinterpret_cast(&((new numeric(4))->setflag(status_flags::dynallocated))); - _num5_p = reinterpret_cast(&((new numeric(5))->setflag(status_flags::dynallocated))); - _num6_p = reinterpret_cast(&((new numeric(6))->setflag(status_flags::dynallocated))); - _num7_p = reinterpret_cast(&((new numeric(7))->setflag(status_flags::dynallocated))); - _num8_p = reinterpret_cast(&((new numeric(8))->setflag(status_flags::dynallocated))); - _num9_p = reinterpret_cast(&((new numeric(9))->setflag(status_flags::dynallocated))); - _num10_p = reinterpret_cast(&((new numeric(10))->setflag(status_flags::dynallocated))); - _num11_p = reinterpret_cast(&((new numeric(11))->setflag(status_flags::dynallocated))); - _num12_p = reinterpret_cast(&((new numeric(12))->setflag(status_flags::dynallocated))); - _num15_p = reinterpret_cast(&((new numeric(15))->setflag(status_flags::dynallocated))); - _num18_p = reinterpret_cast(&((new numeric(18))->setflag(status_flags::dynallocated))); - _num20_p = reinterpret_cast(&((new numeric(20))->setflag(status_flags::dynallocated))); - _num24_p = reinterpret_cast(&((new numeric(24))->setflag(status_flags::dynallocated))); - _num25_p = reinterpret_cast(&((new numeric(25))->setflag(status_flags::dynallocated))); - _num30_p = reinterpret_cast(&((new numeric(30))->setflag(status_flags::dynallocated))); - _num48_p = reinterpret_cast(&((new numeric(48))->setflag(status_flags::dynallocated))); - _num60_p = reinterpret_cast(&((new numeric(60))->setflag(status_flags::dynallocated))); - _num120_p = reinterpret_cast(&((new numeric(120))->setflag(status_flags::dynallocated))); + _num_120_p= static_cast(&((new numeric(-120))->setflag(status_flags::dynallocated))); + _num_60_p = static_cast(&((new numeric(-60))->setflag(status_flags::dynallocated))); + _num_48_p = static_cast(&((new numeric(-48))->setflag(status_flags::dynallocated))); + _num_30_p = static_cast(&((new numeric(-30))->setflag(status_flags::dynallocated))); + _num_25_p = static_cast(&((new numeric(-25))->setflag(status_flags::dynallocated))); + _num_24_p = static_cast(&((new numeric(-24))->setflag(status_flags::dynallocated))); + _num_20_p = static_cast(&((new numeric(-20))->setflag(status_flags::dynallocated))); + _num_18_p = static_cast(&((new numeric(-18))->setflag(status_flags::dynallocated))); + _num_15_p = static_cast(&((new numeric(-15))->setflag(status_flags::dynallocated))); + _num_12_p = static_cast(&((new numeric(-12))->setflag(status_flags::dynallocated))); + _num_11_p = static_cast(&((new numeric(-11))->setflag(status_flags::dynallocated))); + _num_10_p = static_cast(&((new numeric(-10))->setflag(status_flags::dynallocated))); + _num_9_p = static_cast(&((new numeric(-9))->setflag(status_flags::dynallocated))); + _num_8_p = static_cast(&((new numeric(-8))->setflag(status_flags::dynallocated))); + _num_7_p = static_cast(&((new numeric(-7))->setflag(status_flags::dynallocated))); + _num_6_p = static_cast(&((new numeric(-6))->setflag(status_flags::dynallocated))); + _num_5_p = static_cast(&((new numeric(-5))->setflag(status_flags::dynallocated))); + _num_4_p = static_cast(&((new numeric(-4))->setflag(status_flags::dynallocated))); + _num_3_p = static_cast(&((new numeric(-3))->setflag(status_flags::dynallocated))); + _num_2_p = static_cast(&((new numeric(-2))->setflag(status_flags::dynallocated))); + _num_1_p = static_cast(&((new numeric(-1))->setflag(status_flags::dynallocated))); + _num_1_2_p= static_cast(&((new numeric(-1,2))->setflag(status_flags::dynallocated))); + _num_1_3_p= static_cast(&((new numeric(-1,3))->setflag(status_flags::dynallocated))); + _num_1_4_p= static_cast(&((new numeric(-1,4))->setflag(status_flags::dynallocated))); + _num0_p = static_cast(&((new numeric(0))->setflag(status_flags::dynallocated))); + _num0_bp = _num0_p; // Cf. class ex default ctor. + _num1_4_p = static_cast(&((new numeric(1,4))->setflag(status_flags::dynallocated))); + _num1_3_p = static_cast(&((new numeric(1,3))->setflag(status_flags::dynallocated))); + _num1_2_p = static_cast(&((new numeric(1,2))->setflag(status_flags::dynallocated))); + _num1_p = static_cast(&((new numeric(1))->setflag(status_flags::dynallocated))); + _num2_p = static_cast(&((new numeric(2))->setflag(status_flags::dynallocated))); + _num3_p = static_cast(&((new numeric(3))->setflag(status_flags::dynallocated))); + _num4_p = static_cast(&((new numeric(4))->setflag(status_flags::dynallocated))); + _num5_p = static_cast(&((new numeric(5))->setflag(status_flags::dynallocated))); + _num6_p = static_cast(&((new numeric(6))->setflag(status_flags::dynallocated))); + _num7_p = static_cast(&((new numeric(7))->setflag(status_flags::dynallocated))); + _num8_p = static_cast(&((new numeric(8))->setflag(status_flags::dynallocated))); + _num9_p = static_cast(&((new numeric(9))->setflag(status_flags::dynallocated))); + _num10_p = static_cast(&((new numeric(10))->setflag(status_flags::dynallocated))); + _num11_p = static_cast(&((new numeric(11))->setflag(status_flags::dynallocated))); + _num12_p = static_cast(&((new numeric(12))->setflag(status_flags::dynallocated))); + _num15_p = static_cast(&((new numeric(15))->setflag(status_flags::dynallocated))); + _num18_p = static_cast(&((new numeric(18))->setflag(status_flags::dynallocated))); + _num20_p = static_cast(&((new numeric(20))->setflag(status_flags::dynallocated))); + _num24_p = static_cast(&((new numeric(24))->setflag(status_flags::dynallocated))); + _num25_p = static_cast(&((new numeric(25))->setflag(status_flags::dynallocated))); + _num30_p = static_cast(&((new numeric(30))->setflag(status_flags::dynallocated))); + _num48_p = static_cast(&((new numeric(48))->setflag(status_flags::dynallocated))); + _num60_p = static_cast(&((new numeric(60))->setflag(status_flags::dynallocated))); + _num120_p = static_cast(&((new numeric(120))->setflag(status_flags::dynallocated))); // Initialize print context class info (this is not strictly necessary // but we do it anyway to make print_context_class_info::dump_hierarchy()