COMP/CMSDIST/root-5.27-06b-r38248-r38252-r38259-r38264-r38265-r38267.patch

diff -Naur orig.root/cint/reflex/inc/Reflex/Builder/ClassBuilder.h root/cint/reflex/inc/Reflex/Builder/ClassBuilder.h
--- orig.root/cint/reflex/inc/Reflex/Builder/ClassBuilder.h     2010-11-05 15:46:26.000000000 +0100
+++ root/cint/reflex/inc/Reflex/Builder/ClassBuilder.h  2011-03-04 19:52:28.000000000 +0100
@@ -23,6 +23,34 @@
 namespace Cint { namespace Internal {} }
 
 namespace Reflex {
+
+/* Helper class to avoid compiler warning about casting function pointer
+** to void pointer.
+*/
+class BuilderFunc2Void {
+   typedef void (*funcptr_t)();
+
+   union funcptr_and_voidptr {
+      typedef void (*funcptr_t)();
+
+      funcptr_and_voidptr(void *val) : _read(val) {}
+
+      void *_read;
+      funcptr_t _write;
+   };
+
+   funcptr_and_voidptr _tmp;
+public:
+   template <typename T>
+   BuilderFunc2Void( T vfp ) : _tmp(0) {
+      _tmp._write = ( funcptr_t )vfp;
+   }
+
+   operator void*() const {
+      return _tmp._read;
+   }
+};
+
 // forward declarations
 class Class;
 class ClassBuilder;
diff -Naur orig.root/cint/reflex/python/genreflex/gendict.py root/cint/reflex/python/genreflex/gendict.py
--- orig.root/cint/reflex/python/genreflex/gendict.py   2010-11-05 15:46:26.000000000 +0100
+++ root/cint/reflex/python/genreflex/gendict.py        2011-03-04 19:52:31.000000000 +0100
@@ -576,6 +576,11 @@
     #------------------------------------------------------------------------------
     classDefImpl = ClassDefImplementation(selclasses, self)
 
+    #------------------------------------------------------------------------------
+    # Process Class_Version implementation before writing: sets 'extra' properties
+    #------------------------------------------------------------------------------
+    Class_VersionImplementation(selclasses,self)
+
     f_buffer = ''
     # Need to specialize templated class's functions (e.g. A<T>::Class())
     # before first instantiation (stubs), so classDefImpl before stubs.
@@ -895,7 +900,7 @@
         sc += '  rule->fSource      = "%s";\n' % (attrs['source'],)
         
       if rule.has_key( 'funcname' ):
-        sc += '  rule->fFunctionPtr = (void *)%s;\n' % (rule['funcname'],)
+        sc += '  rule->fFunctionPtr = Reflex::BuilderFunc2Void(%s);\n' % (rule['funcname'],)
         sc += '  rule->fCode        = "%s";\n' % (rule['code'].replace( '\n', '\\n' ), )
 
       if attrs.has_key( 'version' ):
@@ -975,6 +980,7 @@
       # Initialize the structure - to  be changed later
       #---------------------------------------------------------------------------
       for member in source:
+        if member[0] == '': continue;
         sc += '  static Long_t offset_Onfile_' + mappedName
         sc += '_' + member[1] + ' = oldObj->GetClass()->GetDataMemberOffset("'
         sc += member[1] +'");\n';
@@ -1034,7 +1040,9 @@
         sc += 'void %s( char *target, TVirtualObject *oldObj )\n' % (funcname,)
         sc += '{\n'
         sc += self.processIOAutoVariables( cl, clt, sourceMembersSpl, targetMembers, memTypes )
-        sc += '  %s* newObj = (%s*)target;\n' % (cl, cl)
+        #to avoid compiler warnings about unused variables only declare newObj if user actually uses it
+        if -1 != rule['code'].find('newObj'):
+           sc += '  %s* newObj = (%s*)target;\n' % (cl, cl)
         sc += '  //--- User\'s code ---\n'
         sc += rule['code'].strip('\n')
         sc += '\n}\n\n'
@@ -2124,7 +2132,12 @@
     if sys.platform != 'win32':
         static = 'static '
         dtorscope = '::' + cl + '::'
-    return '%svoid destructor%s(void*, void * o, const std::vector<void*>&, void *) {\n  (((::%s*)o)->%s~%s)();\n}' % ( static, attrs['id'], cl, dtorscope, attrs['name'] )
+    dtorimpl = '%svoid destructor%s(void*, void * o, const std::vector<void*>&, void *) {\n' % ( static, attrs['id'])
+    if (attrs['name'][0] != '.'):
+      return dtorimpl + '(((::%s*)o)->%s~%s)();\n}' % ( cl, dtorscope, attrs['name'] )
+    else:
+      # unnamed; can't call.
+      return dtorimpl + '  // unnamed, cannot call destructor\n}'
 #----------------------------------------------------------------------------------
   def genDestructorBuild(self, attrs, childs):
     if self.isUnnamedType(self.xref[attrs['context']]['attrs'].get('demangled')) or \
@@ -2756,3 +2769,31 @@
   if haveClassDef == 1 :
     return "} // unnamed namespace\n\n" + returnValue + "\nnamespace {\n"
   return ""
+
+#--------------------------------------------------------------------------------------
+# If Class_Version is a member function of the class, use it to set ClassVersion
+def Class_VersionImplementation(selclasses, self):
+  for attrs in selclasses :
+    #if ClassVersion was already set, do not change
+    if attrs.has_key('extra') and 'ClassVersion' in attrs['extra']:
+        continue
+    
+    members = attrs.get('members','')
+    membersList = members.split()
+
+    hasClass_Version = False
+    for ml in membersList:
+      memAttrs = self.xref[ml]['attrs']
+      if ml[1].isdigit() and memAttrs.has_key('name') and memAttrs['name'] == "Class_Version":
+        if memAttrs.get('access') not in ('protected', 'private') and 'static' in memAttrs:         
+            hasClass_Version = True
+        else:
+            print "--->> genreflex: ERROR: class %s's method Class_Version() must be both 'static' and 'public'." % attrs['fullname']
+        break
+
+    if hasClass_Version:
+      clname = '::' + attrs['fullname']
+      if attrs.has_key('extra'):
+        attrs['extra']['ClassVersion'] = '!RAW!' + clname + '::Class_Version()'
+      else:
+        attrs['extra']={'ClassVersion' : '!RAW!' + clname + '::Class_Version()'}
#	Content
1	diff -Naur orig.root/cint/reflex/inc/Reflex/Builder/ClassBuilder.h root/cint/reflex/inc/Reflex/Builder/ClassBuilder.h
2	--- orig.root/cint/reflex/inc/Reflex/Builder/ClassBuilder.h 2010-11-05 15:46:26.000000000 +0100
3	+++ root/cint/reflex/inc/Reflex/Builder/ClassBuilder.h 2011-03-04 19:52:28.000000000 +0100
4	@@ -23,6 +23,34 @@
5	namespace Cint { namespace Internal {} }
6
7	namespace Reflex {
8	+
9	+/* Helper class to avoid compiler warning about casting function pointer
10	+** to void pointer.
11	+*/
12	+class BuilderFunc2Void {
13	+ typedef void (*funcptr_t)();
14	+
15	+ union funcptr_and_voidptr {
16	+ typedef void (*funcptr_t)();
17	+
18	+ funcptr_and_voidptr(void *val) : _read(val) {}
19	+
20	+ void *_read;
21	+ funcptr_t _write;
22	+ };
23	+
24	+ funcptr_and_voidptr _tmp;
25	+public:
26	+ template <typename T>
27	+ BuilderFunc2Void( T vfp ) : _tmp(0) {
28	+ _tmp._write = ( funcptr_t )vfp;
29	+ }
30	+
31	+ operator void*() const {
32	+ return _tmp._read;
33	+ }
34	+};
35	+
36	// forward declarations
37	class Class;
38	class ClassBuilder;
39	diff -Naur orig.root/cint/reflex/python/genreflex/gendict.py root/cint/reflex/python/genreflex/gendict.py
40	--- orig.root/cint/reflex/python/genreflex/gendict.py 2010-11-05 15:46:26.000000000 +0100
41	+++ root/cint/reflex/python/genreflex/gendict.py 2011-03-04 19:52:31.000000000 +0100
42	@@ -576,6 +576,11 @@
43	#------------------------------------------------------------------------------
44	classDefImpl = ClassDefImplementation(selclasses, self)
45
46	+ #------------------------------------------------------------------------------
47	+ # Process Class_Version implementation before writing: sets 'extra' properties
48	+ #------------------------------------------------------------------------------
49	+ Class_VersionImplementation(selclasses,self)
50	+
51	f_buffer = ''
52	# Need to specialize templated class's functions (e.g. A<T>::Class())
53	# before first instantiation (stubs), so classDefImpl before stubs.
54	@@ -895,7 +900,7 @@
55	sc += ' rule->fSource = "%s";\n' % (attrs['source'],)
56
57	if rule.has_key( 'funcname' ):
58	- sc += ' rule->fFunctionPtr = (void *)%s;\n' % (rule['funcname'],)
59	+ sc += ' rule->fFunctionPtr = Reflex::BuilderFunc2Void(%s);\n' % (rule['funcname'],)
60	sc += ' rule->fCode = "%s";\n' % (rule['code'].replace( '\n', '\\n' ), )
61
62	if attrs.has_key( 'version' ):
63	@@ -975,6 +980,7 @@
64	# Initialize the structure - to be changed later
65	#---------------------------------------------------------------------------
66	for member in source:
67	+ if member[0] == '': continue;
68	sc += ' static Long_t offset_Onfile_' + mappedName
69	sc += '_' + member[1] + ' = oldObj->GetClass()->GetDataMemberOffset("'
70	sc += member[1] +'");\n';
71	@@ -1034,7 +1040,9 @@
72	sc += 'void %s( char target, TVirtualObject oldObj )\n' % (funcname,)
73	sc += '{\n'
74	sc += self.processIOAutoVariables( cl, clt, sourceMembersSpl, targetMembers, memTypes )
75	- sc += ' %s* newObj = (%s*)target;\n' % (cl, cl)
76	+ #to avoid compiler warnings about unused variables only declare newObj if user actually uses it
77	+ if -1 != rule['code'].find('newObj'):
78	+ sc += ' %s* newObj = (%s*)target;\n' % (cl, cl)
79	sc += ' //--- User\'s code ---\n'
80	sc += rule['code'].strip('\n')
81	sc += '\n}\n\n'
82	@@ -2124,7 +2132,12 @@
83	if sys.platform != 'win32':
84	static = 'static '
85	dtorscope = '::' + cl + '::'
86	- return '%svoid destructor%s(void, void o, const std::vector<void>&, void ) {\n (((::%s*)o)->%s~%s)();\n}' % ( static, attrs['id'], cl, dtorscope, attrs['name'] )
87	+ dtorimpl = '%svoid destructor%s(void, void o, const std::vector<void>&, void ) {\n' % ( static, attrs['id'])
88	+ if (attrs['name'][0] != '.'):
89	+ return dtorimpl + '(((::%s*)o)->%s~%s)();\n}' % ( cl, dtorscope, attrs['name'] )
90	+ else:
91	+ # unnamed; can't call.
92	+ return dtorimpl + ' // unnamed, cannot call destructor\n}'
93	#----------------------------------------------------------------------------------
94	def genDestructorBuild(self, attrs, childs):
95	if self.isUnnamedType(self.xref[attrs['context']]['attrs'].get('demangled')) or \
96	@@ -2756,3 +2769,31 @@
97	if haveClassDef == 1 :
98	return "} // unnamed namespace\n\n" + returnValue + "\nnamespace {\n"
99	return ""
100	+
101	+#--------------------------------------------------------------------------------------
102	+# If Class_Version is a member function of the class, use it to set ClassVersion
103	+def Class_VersionImplementation(selclasses, self):
104	+ for attrs in selclasses :
105	+ #if ClassVersion was already set, do not change
106	+ if attrs.has_key('extra') and 'ClassVersion' in attrs['extra']:
107	+ continue
108	+
109	+ members = attrs.get('members','')
110	+ membersList = members.split()
111	+
112	+ hasClass_Version = False
113	+ for ml in membersList:
114	+ memAttrs = self.xref[ml]['attrs']
115	+ if ml[1].isdigit() and memAttrs.has_key('name') and memAttrs['name'] == "Class_Version":
116	+ if memAttrs.get('access') not in ('protected', 'private') and 'static' in memAttrs:
117	+ hasClass_Version = True
118	+ else:
119	+ print "--->> genreflex: ERROR: class %s's method Class_Version() must be both 'static' and 'public'." % attrs['fullname']
120	+ break
121	+
122	+ if hasClass_Version:
123	+ clname = '::' + attrs['fullname']
124	+ if attrs.has_key('extra'):
125	+ attrs['extra']['ClassVersion'] = '!RAW!' + clname + '::Class_Version()'
126	+ else:
127	+ attrs['extra']={'ClassVersion' : '!RAW!' + clname + '::Class_Version()'}