Mercurial > projects > dwt-linux

changeset 363:5f6d9bb33a53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Frank Benoit <benoit@tionex.de>
date Sat, 04 Apr 2009 21:38:37 +0200
parents 5b585873fec2 (diff) 4bffbf81e2d6 (current diff)
children 2bcb17ebe0be
files dwt/dwthelper/InflaterInputStream.d dwt/dwthelper/utils.d
diffstat 2 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/dwt/dwthelper/InflaterInputStream.d	Fri Mar 20 21:00:06 2009 +0100
+++ b/dwt/dwthelper/InflaterInputStream.d	Sat Apr 04 21:38:37 2009 +0200
@@ -11,11 +11,7 @@
         pragma(link,"zlib");
     }
 }
-version(TANGOSVN){
-    import tango.io.device.Conduit;
-} else {
-    import tango.io.Conduit;
-}
+import tango.io.device.Conduit;
 
 class InputStreamWrapper : tango.io.model.IConduit.InputStream {
 
--- a/dwt/dwthelper/utils.d	Fri Mar 20 21:00:06 2009 +0100
+++ b/dwt/dwthelper/utils.d	Sat Apr 04 21:38:37 2009 +0200
@@ -485,8 +485,8 @@
     return res.length;
 }
 
-alias tango.text.convert.Utf.toString16 toString16;
-alias tango.text.convert.Utf.toString toString;
+//alias tango.text.convert.Utf.toString16 toString16;
+//alias tango.text.convert.Utf.toString toString;
 
 int toAbsoluteCodePointStartOffset( String str, int index ){
     //getDwtLogger().trace( "str={}, str.length={}, index={}", str, str.length, index );