Changeset 974aa2 in git


Ignore:
Timestamp:
Jan 8, 2014, 9:24:49 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
7ddcb2bda36848984bc2ae47b759ed070d799240
Parents:
933be85ceaea1bf014a474707bd09e82af0a8bde
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-08 21:24:49+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-08 21:41:33+01:00
Message:
Fix warning "C++ deprecated conversion from string constant to 'char*'"

due to http://stackoverflow.com/questions/1524356/c-deprecated-conversion-from-string-constant-to-char
Location:
libpolys/tests
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • libpolys/tests/polys_test.h

    r933be8 r974aa2  
    187187  TS_ASSERT( p_EqualPolys(ss, s, r) );
    188188
    189   TODO(somebody, fix the delete method!);
     189//   TODO(somebody, fix the delete method!);
    190190
    191191  Delete(sum1, r);
    … …  
    18431843    clog << "Creating  Z/13[t]: " << endl;
    18441844
    1845     char* n[] = {"t"};
     1845    char* n[] = {(char*)"t"};
    18461846    ring r = rDefault( 13, 1, n);
    18471847    TS_ASSERT_DIFFERS( r, NULLp );
    … …  
    18671867    clog << "Creating  Q[s]: " << endl;
    18681868
    1869     char* n[] = {"s"};
     1869    char* n[] = {(char*)"s"};
    18701870    ring r = rDefault( 0, 1, n);
    18711871    TS_ASSERT_DIFFERS( r, NULLp );
    … …  
    18901890     clog << "Creating  Z/11[x, y, z]: " << endl;
    18911891
    1892      char* n[] = {"x", "y", "z"};
     1892     char* n[] = {(char*)"x", (char*)"y", (char*)"z"};
    18931893     ring r = rDefault( 11, 3, n);
    18941894     TS_ASSERT_DIFFERS( r, NULLp );
    … …  
    19131913     clog << "Creating  QQ[x, y, z, u]: " << endl;
    19141914
    1915      char* n[] = {"x", "y", "z", "u"};
     1915     char* n[] = {(char*)"x", (char*)"y", (char*)"z", (char*)"u"};
    19161916     ring r = rDefault( 0, 4, n);
    19171917     TS_ASSERT_DIFFERS( r, NULLp );
    … …  
    19371937     clog << "Creating  GF[t]: " << endl;
    19381938
    1939      char* n[] = {"t"};
     1939     char* n[] = {(char*)"t"};
    19401940
    19411941     GFInfo param;
    … …  
    19791979    clog << "Start by creating Q[a]..." << endl;
    19801980
    1981     char* n[] = {"a"};
     1981    char* n[] = {(char*)"a"};
    19821982    ring r = rDefault( 0, 1, n);   // Q[a]
    19831983    TS_ASSERT_DIFFERS( r, NULLp );
    … …  
    20352035         << endl;
    20362036
    2037     char* m[] = {"x", "y"};
     2037    char* m[] = {(char*)"x", (char*)"y"};
    20382038    ring s = rDefault(cf, 2, m);   // (Q[a]/<a2+1>)[x, y]
    20392039    TS_ASSERT_DIFFERS(s, NULLp);
    … …  
    20802080    clog << "Start by creating Q[b]..." << endl;
    20812081
    2082     char* n[] = {"b"};
     2082    char* n[] = {(char*)"b"};
    20832083    ring r = rDefault( 0, 1, n);   // Q[b]
    20842084    TS_ASSERT_DIFFERS( r, NULLp );
    … …  
    21362136         << endl;
    21372137
    2138     char* m[] = {"u", "v", "w"};
     2138    char* m[] = {(char*)"u", (char*)"v", (char*)"w"};
    21392139    ring s = rDefault(cf, 3, m);   // (Q[b]/<b^7+17>)[u, v, w]
    21402140    TS_ASSERT_DIFFERS(s, NULLp);
    … …  
    22252225    clog << "Start by creating Z_17[a]..." << endl;
    22262226
    2227     char* n[] = {"a"};
     2227    char* n[] = {(char*)"a"};
    22282228    ring r = rDefault( 17, 1, n);   // Z/17Z[a]
    22292229    TS_ASSERT_DIFFERS( r, NULLp );
    … …  
    22812281         << endl;
    22822282
    2283     char* m[] = {"u", "v", "w"};
     2283    char* m[] = {(char*)"u", (char*)"v", (char*)"w"};
    22842284    ring s = rDefault(cf, 3, m);   // (Z_17[a]/<a^2+3>)[u, v, w]
    22852285    TS_ASSERT_DIFFERS(s, NULLp);
    … …  
    23052305    clog << "Start by creating Q[s, t]..." << endl;
    23062306
    2307     char* n[] = {"s", "t"};
     2307    char* n[] = {(char*)"s", (char*)"t"};
    23082308    ring r = rDefault( 0, 2, n);   // Q[s, t]
    23092309    TS_ASSERT_DIFFERS( r, NULLp );
    … …  
    23542354         << endl;
    23552355
    2356     char* m[] = {"x", "y", "z"};
     2356    char* m[] = {(char*)"x", (char*)"y", (char*)"z"};
    23572357    ring s = rDefault(cf, 3, m);   // Q(s, t)[x, y, z]
    23582358    TS_ASSERT_DIFFERS(s, NULLp);
    … …  
    24162416    clog << "Start by creating Q[q]..." << endl;
    24172417
    2418     char* n[] = {"q"};
     2418    char* n[] = {(char*)"q"};
    24192419    ring r = rDefault( 0, 1, n);   // Q[q]
    24202420    r->order[0] = ringorder_dp;
    … …  
    24662466         << endl;
    24672467
    2468     char* m[] = {"t"};
     2468    char* m[] = {(char*)"t"};
    24692469    ring s = rDefault(cf, 1, m);   // Q(q)[t]
    24702470    s->order[0] = ringorder_dp;
    … …  
    25372537    clog << "Start by creating Q[s, t]..." << endl;
    25382538
    2539     char* n[] = {"s", "t"};
     2539    char* n[] = {(char*)"s", (char*)"t"};
    25402540    ring r = rDefault( 0, 2, n);   // Q[s, t]
    25412541    TS_ASSERT_DIFFERS( r, NULLp );
    … …  
    25782578         << endl;
    25792579
    2580     char* m[] = {"x", "y", "z"};
     2580    char* m[] = {(char*)"x", (char*)"y", (char*)"z"};
    25812581    ring s = rDefault(cf, 3, m);   // Q(s, t)[x, y, z]
    25822582    TS_ASSERT_DIFFERS(s, NULLp);

  • libpolys/tests/rings_test.h

    r933be8 r974aa2  
    7474    clog << "Creating  Z/13[t]: " << endl;
    7575
    76     char* n[] = {"t"};
     76    char* n[] = { (char*)"t"};
    7777    ring r = rDefault( 13, 1, n);     
    7878    TS_ASSERT_DIFFERS( r, NULLp );
    … …  
    9898    clog << "Creating  Q[s]: " << endl;
    9999
    100     char* n[] = {"s"};
     100    char* n[] = {(char*)"s"};
    101101    ring r = rDefault( 0, 1, n);     
    102102    TS_ASSERT_DIFFERS( r, NULLp );
    … …  
    121121     clog << "Creating  Z/11[x, y, z]: " << endl;
    122122     
    123      char* n[] = {"x", "y", "z"};
     123     char* n[] = {(char*)"x", (char*)"y", (char*)"z"};
    124124     ring r = rDefault( 11, 3, n);     
    125125     TS_ASSERT_DIFFERS( r, NULLp );
    … …  
    145145     clog << "Creating  QQ[x, y, z, u]: " << endl;
    146146
    147      char* n[] = {"x", "y", "z", "u"};
     147     char* n[] = {(char*)"x", (char*)"y", (char*)"z", (char*)"u"};
    148148     ring r = rDefault( 0, 4, n);     
    149149     TS_ASSERT_DIFFERS( r, NULLp );
    … …  
    169169     clog << "Creating  GF[t]: " << endl;
    170170
    171      char* n[] = {"t"};
     171     char* n[] = {(char*)"t"};
    172172
    173173     GFInfo param;
    … …  
    213213
    214214     const int N = 4;
    215      char* n[N] = {"x", "y", "z", "u"};
     215     char* n[N] = {(char*)"x", (char*)"y", (char*)"z", (char*)"u"};
    216216
    217217
Note: See TracChangeset for help on using the changeset viewer.