--- a/ClassBuilder.st	Thu Dec 20 11:48:59 2012 +0000
+++ b/ClassBuilder.st	Sat Jan 19 01:30:00 2013 +0000
@@ -284,19 +284,7 @@
 
     |privateClassNames|
 
-    "JV@2012-10-31: Caching disable as it sometimes does not
-     work. I dunno why - looks like synchronization problem
-     or something. If I put breakpoint here, it works. If I don't
-     it doesn't.
-
-     Temporarily disabled to allow expecco a CellStore development,
-
-     !!!!!! SHOULD NOT BE MERGED TO UPSTREAM !!!!!!    
-
-    "
-
-"/    aNamespace name = LastNamespaceName ifTrue:[
-    false ifTrue:[
+    aNamespace name = LastNamespaceName ifTrue:[
         privateClassNames := LastClassNamesInNameSpace
     ] ifFalse:[
         privateClassNames := aNamespace allPrivateClasses 
@@ -333,7 +321,6 @@
     ].
 
     "Modified: / 24-08-2011 / 13:32:22 / cg"
-    "Modified: / 31-10-2012 / 17:23:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 recompileMachineCodeMethodsIn:aClass
@@ -2043,20 +2030,7 @@
     superClass isNil ifTrue:[
         superFlags := 0
     ] ifFalse:[
-        | flags |
-
-        "JV@2012-09-07: Certain classes define class method #flags which
-         returns something different than behavior's flag bits.
-         Obtaing superclass's flags by
-
-            superClass flags
-
-          won't then work as expected. Ask JV for details
-
-          Hence this hack :-(
-         "
-        flags := (Behavior compiledMethodAt: #flags) valueWithReceiver: superClass arguments: #().
-        superFlags := flags bitAnd:(Behavior maskIndexType bitInvert). "preserve other bits"
+        superFlags := superClass flags bitAnd:(Behavior maskIndexType bitInvert). "preserve other bits"
     ].
 
     oldClass notNil ifTrue:[
@@ -2075,7 +2049,6 @@
     ].
     oldClass notNil ifTrue:[
         "/ setting first will make new class clear obsolete classvars
-        newClass setLookupObject: (oldClass lookupObject).
         newClass setClassVariableString:(oldClass classVariableString).
         newClass setSharedPoolNames:(oldClass sharedPoolNames).
         newClass setClassFilename:(oldClass getClassFilename).
@@ -2086,7 +2059,6 @@
     newClass setClassVariableString:classVariableNames.
 
     "Modified: / 18-01-2011 / 20:44:04 / cg"
-    "Modified: / 07-09-2012 / 13:44:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !ClassBuilder methodsFor:'checks'!
@@ -2376,10 +2348,10 @@
         conflicts := classVarNames intersect:privateClassNames.
         conflicts notEmpty ifTrue:[
             conflicts size == 1 ifTrue:[
-                self warn:('Class variable "%1"\conflicts with corresponding private classes name.'
+                self warn:('Class variable "%1"\conflicts with corresponding private classes name.\The name will refer to the class variable.'
                             bindWith:conflicts first) withCRs.
             ] ifFalse:[
-                self warn:('Some class variables conflict with corresponding private classes name.').
+                self warn:('Some class variables conflict with corresponding private classes name.\Names will refer to the class variable.').
             ].
             ^ true.
         ]
@@ -2387,22 +2359,18 @@
 
     ^ true
 
-    "Created: 8.1.1997 / 21:09:14 / cg"
-    "Modified: 9.1.1997 / 02:10:02 / cg"
+    "Created: / 08-01-1997 / 21:09:14 / cg"
+    "Modified: / 11-05-2012 / 09:26:27 / cg"
 ! !
 
 !ClassBuilder class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassBuilder.st 10859 2012-10-31 17:41:30Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ClassBuilder.st,v 1.117 2012-10-25 12:15:54 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libbasic/ClassBuilder.st,v 1.117 2012/10/25 12:15:54 cg Exp §'
-!
-
-version_SVN
-    ^ '$Id: ClassBuilder.st 10859 2012-10-31 17:41:30Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ClassBuilder.st,v 1.117 2012-10-25 12:15:54 cg Exp $'
 ! !
 
 ClassBuilder initialize!