Merge jv
authorMerge Script
Tue, 21 Jul 2015 06:55:26 +0200
branchjv
changeset 3587 11eacbaa5be8
parent 3584 42244e8d6f39 (current diff)
parent 3586 a6d20359cdf4 (diff)
child 3594 f2577133d3d2
Merge
--- a/FourByteString.st	Thu Jul 02 06:47:06 2015 +0200
+++ b/FourByteString.st	Tue Jul 21 06:55:26 2015 +0200
@@ -115,7 +115,7 @@
 utf8Encoded
     "Return my UTF-8 representation as a new String"
 
-    ^ self basicUtf8Encoded.
+    ^ CharacterEncoderImplementations::ISO10646_to_UTF8 new encodeString:self
 !
 
 utf8EncodedOn:aStream
@@ -140,7 +140,7 @@
 !FourByteString class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/FourByteString.st,v 1.4 2015-03-14 21:29:24 stefan Exp $'
+    ^ '$Header$'
 ! !
 
 
--- a/UUID.st	Thu Jul 02 06:47:06 2015 +0200
+++ b/UUID.st	Tue Jul 21 06:55:26 2015 +0200
@@ -551,6 +551,14 @@
     ^ bytes.
 !
 
+asString
+    ^ self printString
+
+    "
+        self genUUID asString
+    "
+!
+
 asUUID
     ^ self
 !
@@ -844,6 +852,7 @@
 
     "
      UUID genUUID printString 
+     UUID genUUID asString 
     "
 
 "/    d := self unsignedLongAt:1 bigEndian:true.
@@ -911,11 +920,11 @@
 !UUID class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/UUID.st,v 1.49 2015-05-07 22:37:29 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic2/UUID.st,v 1.49 2015-05-07 22:37:29 cg Exp $'
+    ^ '$Header$'
 ! !