Changeset 226
- Timestamp:
- 02/13/07 23:48:36 (2 years ago)
- Files:
-
- trunk/DerelictUtil/derelict/util/wrapper.d (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/DerelictUtil/derelict/util/wrapper.d
r224 r226 38 38 import tango.stdc.string; 39 39 import tango.text.Util; 40 import tango.stdc.stringz; 40 41 } 41 42 } … … 53 54 version(Tango) 54 55 { 55 return (str ~ "\0").ptr;56 toUtf8z(str); 56 57 } 57 58 else 58 59 { 59 return str.toStringz();60 return toStringz(str); 60 61 } 61 62 } … … 63 64 char[] toDString(char* cstr) 64 65 { 65 return (cstr is null) ? null : cstr[0 .. strlen(cstr)]; 66 version(Tango) 67 { 68 return fromUtf8z(cstr); 69 } 70 else 71 { 72 return toString(cstr); 73 } 66 74 } 67 75 … … 75 83 else 76 84 { 77 return str.find(match);85 return find(str, match); 78 86 } 79 87 } … … 81 89 char[][] splitStr(char[] str, char[] delim) 82 90 { 83 return split(str, delim); 91 version(Tango) 92 { 93 return demarcate(str, delim); 94 } 95 else 96 { 97 return split(str, delim); 98 } 84 99 } 85 100 … … 92 107 else 93 108 { 94 return str .strip();109 return strip(str); 95 110 } 96 111 }
