COMP/CMSDIST/root-5.28-00d-r39759.patch

Index: branches/v5-28-00-patches/tree/tree/src/TTreeCloner.cxx
===================================================================
--- branches/v5-28-00-patches/tree/tree/src/TTreeCloner.cxx     (revision 39758)
+++ branches/v5-28-00-patches/tree/tree/src/TTreeCloner.cxx     (revision 39759)
@@ -267,6 +267,10 @@
    }
 
    fFromBranches.AddLast(from);
+   if (!from->TestBit(TBranch::kDoNotUseBufferMap)) {
+      // Make sure that we reset the Buffer's map if needed.
+      to->ResetBit(TBranch::kDoNotUseBufferMap);
+   }
    fToBranches.AddLast(to);
 
    numBaskets += from->GetWriteBasket();

Property changes on: branches/v5-28-00-patches/tree/tree/src/TTreeCloner.cxx
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/io/io/src/tree/tree/src/TTreeCloner.cxx:r38156
   Merged /branches/v5-28-00-patches/io/tree/src/TTreeCloner.cxx:r38059
   Merged /trunk/tree/tree/src/TTreeCloner.cxx:r37618,37641,37836,37906,37920-37921,37947,37950,37955,37965,37985,38059,38061,38080,38202,38205,38393,38554,38614,38743,38854,38869,39270,39755

Index: branches/v5-28-00-patches/tree/tree/inc/TBranch.h
===================================================================
--- branches/v5-28-00-patches/tree/tree/inc/TBranch.h   (revision 39758)
+++ branches/v5-28-00-patches/tree/tree/inc/TBranch.h   (revision 39759)
@@ -47,6 +47,7 @@
 class TDirectory;
 class TFile;
 class TClonesArray;
+class TTreeCloner;
 
    const Int_t kDoNotProcess = BIT(10); // Active bit for branches
    const Int_t kIsClone      = BIT(11); // to indicate a TBranchClones
@@ -57,6 +58,7 @@
 class TBranch : public TNamed , public TAttFill {
 
 protected:
+   friend class TTreeCloner;
    // TBranch status bits
    enum EStatusBits {
       kAutoDelete = BIT(15),

Property changes on: branches/v5-28-00-patches/tree/tree/inc/TBranch.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/tree/tree/inc/TBranch.h:r37618,37641,37836,37906,37920-37921,37955,37965,37985,38055,38059,38061,38403-38404,38462,38801,38803,38854,38869,39551,39642,39644,39757
   Merged /trunk/io/io/src/tree/tree/inc/TBranch.h:r38156
   Merged /branches/v5-28-00-patches/io/tree/inc/TBranch.h:r38059

#	Content
1	Index: branches/v5-28-00-patches/tree/tree/src/TTreeCloner.cxx
2	===================================================================
3	--- branches/v5-28-00-patches/tree/tree/src/TTreeCloner.cxx (revision 39758)
4	+++ branches/v5-28-00-patches/tree/tree/src/TTreeCloner.cxx (revision 39759)
5	@@ -267,6 +267,10 @@
6	}
7
8	fFromBranches.AddLast(from);
9	+ if (!from->TestBit(TBranch::kDoNotUseBufferMap)) {
10	+ // Make sure that we reset the Buffer's map if needed.
11	+ to->ResetBit(TBranch::kDoNotUseBufferMap);
12	+ }
13	fToBranches.AddLast(to);
14
15	numBaskets += from->GetWriteBasket();
16
17	Property changes on: branches/v5-28-00-patches/tree/tree/src/TTreeCloner.cxx
18	___________________________________________________________________
19	Added: svn:mergeinfo
20	Merged /trunk/io/io/src/tree/tree/src/TTreeCloner.cxx:r38156
21	Merged /branches/v5-28-00-patches/io/tree/src/TTreeCloner.cxx:r38059
22	Merged /trunk/tree/tree/src/TTreeCloner.cxx:r37618,37641,37836,37906,37920-37921,37947,37950,37955,37965,37985,38059,38061,38080,38202,38205,38393,38554,38614,38743,38854,38869,39270,39755
23
24	Index: branches/v5-28-00-patches/tree/tree/inc/TBranch.h
25	===================================================================
26	--- branches/v5-28-00-patches/tree/tree/inc/TBranch.h (revision 39758)
27	+++ branches/v5-28-00-patches/tree/tree/inc/TBranch.h (revision 39759)
28	@@ -47,6 +47,7 @@
29	class TDirectory;
30	class TFile;
31	class TClonesArray;
32	+class TTreeCloner;
33
34	const Int_t kDoNotProcess = BIT(10); // Active bit for branches
35	const Int_t kIsClone = BIT(11); // to indicate a TBranchClones
36	@@ -57,6 +58,7 @@
37	class TBranch : public TNamed , public TAttFill {
38
39	protected:
40	+ friend class TTreeCloner;
41	// TBranch status bits
42	enum EStatusBits {
43	kAutoDelete = BIT(15),
44
45	Property changes on: branches/v5-28-00-patches/tree/tree/inc/TBranch.h
46	___________________________________________________________________
47	Added: svn:mergeinfo
48	Merged /trunk/tree/tree/inc/TBranch.h:r37618,37641,37836,37906,37920-37921,37955,37965,37985,38055,38059,38061,38403-38404,38462,38801,38803,38854,38869,39551,39642,39644,39757
49	Merged /trunk/io/io/src/tree/tree/inc/TBranch.h:r38156
50	Merged /branches/v5-28-00-patches/io/tree/inc/TBranch.h:r38059
51