Mercurial > hg > ucx / changeset

     1.1 --- a/test/string_tests.c	Fri Oct 12 12:12:59 2012 +0200
     1.2 +++ b/test/string_tests.c	Fri Oct 12 12:46:54 2012 +0200
     1.3 @@ -5,8 +5,8 @@
     1.4  #include "string_tests.h"
     1.5  
     1.6  UCX_TEST_IMPLEMENT(test_sstr) {
     1.7 -    sstr_t s1 = sstr("1234");
     1.8 -    sstr_t s2 = sstrn("ab", 2);
     1.9 +    sstr_t s1 = sstr((char*)"1234");
    1.10 +    sstr_t s2 = sstrn((char*)"ab", 2);
    1.11      
    1.12      UCX_TEST_BEGIN
    1.13      
    1.14 @@ -17,9 +17,9 @@
    1.15  }
    1.16  
    1.17  UCX_TEST_IMPLEMENT(test_sstr_len_cat) {
    1.18 -    sstr_t s1 = sstr("1234");
    1.19 -    sstr_t s2 = sstr(".:.:.");
    1.20 -    sstr_t s3 = sstr("X");
    1.21 +    sstr_t s1 = S("1234");
    1.22 +    sstr_t s2 = S(".:.:.");
    1.23 +    sstr_t s3 = S("X");
    1.24      
    1.25      sstr_t cat;
    1.26      
    1.27 @@ -54,7 +54,7 @@
    1.28  UCX_TEST_IMPLEMENT(test_sstrsplit) {
    1.29  
    1.30      const char *original = "this,is,a,csv,string";
    1.31 -    sstr_t test = sstr("this,is,a,csv,string"); /* use copy of original here */
    1.32 +    sstr_t test = S("this,is,a,csv,string"); /* use copy of original here */
    1.33      size_t n;
    1.34      sstr_t *list;
    1.35  

     2.1 --- a/ucx/string.h	Fri Oct 12 12:12:59 2012 +0200
     2.2 +++ b/ucx/string.h	Fri Oct 12 12:46:54 2012 +0200
     2.3 @@ -12,8 +12,8 @@
     2.4  #include <stddef.h>
     2.5  
     2.6  /* use macros for literals only */
     2.7 -#define S(s) { s, sizeof(s)-1 }
     2.8 -#define ST(s) sstrn(s, sizeof(s)-1)
     2.9 +#define S(s) { (char*)s, sizeof(s)-1 }
    2.10 +#define ST(s) sstrn((char*)s, sizeof(s)-1)
    2.11  
    2.12  #ifdef	__cplusplus
    2.13  extern "C" {