From 001026187ab44f28822c4bf2ab570376aecf73a0 Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Tue, 23 Jan 2007 10:07:43 +0000
Subject: [PATCH] Remove dependency from TFile (thanks to new function
TBuffer::GetVersionOwner)
git-svn-id: http://root.cern.ch/svn/root/trunk@17460 27541ba8-7e3a-0410-8455-c3a389f83636
---
hist/src/TH3.cxx | 15 +++++----------
table/src/TTable.cxx | 3 +--
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/hist/src/TH3.cxx b/hist/src/TH3.cxx
index c135b089a3e..b2b3f9f9e9b 100644
--- a/hist/src/TH3.cxx
+++ b/hist/src/TH3.cxx
@@ -1,4 +1,4 @@
-// @(#)root/hist:$Name: $:$Id: TH3.cxx,v 1.86 2007/01/09 17:01:34 brun Exp $
+// @(#)root/hist:$Name: $:$Id: TH3.cxx,v 1.87 2007/01/15 16:10:10 brun Exp $
// Author: Rene Brun 27/10/95
/*************************************************************************
@@ -17,7 +17,6 @@
#include "TVirtualPad.h"
#include "THLimitsFinder.h"
#include "TRandom.h"
-#include "TFile.h"
#include "TError.h"
#include "TMath.h"
#include "TObjString.h"
@@ -2581,8 +2580,7 @@ void TH3C::Streamer(TBuffer &R__b)
if (R__b.IsReading()) {
UInt_t R__s, R__c;
- TFile *file = (TFile*)R__b.GetParent();
- if (file && file->GetVersion() < 22300) return;
+ if (R__b.GetVersionOwner() < 22300) return;
Version_t R__v = R__b.ReadVersion(&R__s, &R__c);
if (R__v > 2) {
TH3C::Class()->ReadBuffer(R__b, this, R__v, R__s, R__c);
@@ -2826,8 +2824,7 @@ void TH3S::Streamer(TBuffer &R__b)
if (R__b.IsReading()) {
UInt_t R__s, R__c;
- TFile *file = (TFile*)R__b.GetParent();
- if (file && file->GetVersion() < 22300) return;
+ if (R__b.GetVersionOwner() < 22300) return;
Version_t R__v = R__b.ReadVersion(&R__s, &R__c);
if (R__v > 2) {
TH3S::Class()->ReadBuffer(R__b, this, R__v, R__s, R__c);
@@ -3262,8 +3259,7 @@ void TH3F::Streamer(TBuffer &R__b)
if (R__b.IsReading()) {
UInt_t R__s, R__c;
- TFile *file = (TFile*)R__b.GetParent();
- if (file && file->GetVersion() < 22300) return;
+ if (R__b.GetVersionOwner() < 22300) return;
Version_t R__v = R__b.ReadVersion(&R__s, &R__c);
if (R__v > 2) {
TH3F::Class()->ReadBuffer(R__b, this, R__v, R__s, R__c);
@@ -3487,8 +3483,7 @@ void TH3D::Streamer(TBuffer &R__b)
if (R__b.IsReading()) {
UInt_t R__s, R__c;
- TFile *file = (TFile*)R__b.GetParent();
- if (file && file->GetVersion() < 22300) return;
+ if (R__b.GetVersionOwner() < 22300) return;
Version_t R__v = R__b.ReadVersion(&R__s, &R__c);
if (R__v > 2) {
TH3D::Class()->ReadBuffer(R__b, this, R__v, R__s, R__c);
diff --git a/table/src/TTable.cxx b/table/src/TTable.cxx
index dac8232031d..4a819b20b67 100644
--- a/table/src/TTable.cxx
+++ b/table/src/TTable.cxx
@@ -1,4 +1,4 @@
-// @(#)root/table:$Name: $:$Id: TTable.cxx,v 1.18 2006/12/13 21:28:14 brun Exp $
+// @(#)root/table:$Name: $:$Id: TTable.cxx,v 1.19 2007/01/09 05:35:29 brun Exp $
// Author: Valery Fine(fine@bnl.gov) 03/07/98
/*************************************************************************
@@ -150,7 +150,6 @@
#include "TTable.h"
#include "TTableDescriptor.h"
#include "TColumnView.h"
-#include "TFile.h"
#include "TGaxis.h"
#include "TH1.h"
--
GitLab