ROOT: headers diff between 5.30.04 and 5.30.06 versions

	Bits.h	Bits.h

	/* @(#)root/zip:$Id: Bits.h 40084 2011-06-29 16:25:31Z pcanal $ */	/* @(#)root/zip:$Id: Bits.h 42194 2011-11-23 14:02:02Z axel $ */
	/* Author: */	/* Author: */
	/*	/*

	Copyright (C) 1990-1993 Mark Adler, Richard B. Wales, Jean-loup Gailly,	Copyright (C) 1990-1993 Mark Adler, Richard B. Wales, Jean-loup Gailly,
	Kai Uwe Rommel and Igor Mandrichenko.	Kai Uwe Rommel and Igor Mandrichenko.
	For conditions of distribution and use, see copyright notice in zlib.h	For conditions of distribution and use, see copyright notice in zlib.h

	*/	*/
	/*	/*
	* Changed for ROOT. Functions names have a R__ prepended to differentiate	* Changed for ROOT. Functions names have a R__ prepended to differentiate

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	G__ci.h	G__ci.h

	skipping to change at line 755	skipping to change at line 755
	*	*
	* CAUTION:	* CAUTION:
	* Among constants below, changing following parameter cause DLL binary	* Among constants below, changing following parameter cause DLL binary
	* incompatibility.	* incompatibility.
	*	*
	* G__MAXFUNCPARA	* G__MAXFUNCPARA
	*	*
	* Other parameters can be changed while keeping DLL binary compatibility.	* Other parameters can be changed while keeping DLL binary compatibility.
	*	*
	**************************************************************************/	**************************************************************************/


		#ifdef G__LONGLINE
		#define G__ONELINE G__LONGLINE /* Length of subexpression,parameter,ar
		gument */
		#define G__ONELINEDICT 8 /* Length of subexpression,parameter,argument
		*/
		#define G__MAXNAME G__LONGLINE /* Variable name */
		#else
	#ifdef G__LONGBUF	#ifdef G__LONGBUF
	#define G__LONGLINE 4096 /* Length of expression */	#define G__LONGLINE 4096 /* Length of expression */
	#define G__ONELINE 4096 /* Length of subexpression,parameter,argument */	#define G__ONELINE 4096 /* Length of subexpression,parameter,argument */
	#define G__ONELINEDICT 8 /* Length of subexpression,parameter,argument */	#define G__ONELINEDICT 8 /* Length of subexpression,parameter,argument */
	#define G__MAXNAME 4096 /* Variable name */	#define G__MAXNAME 4096 /* Variable name */
	#else	#else
	#define G__LONGLINE 2048 /* Length of expression */	#define G__LONGLINE 2048 /* Length of expression */
	#define G__ONELINE 1024 /* Length of subexpression,parameter,argument */	#define G__ONELINE 1024 /* Length of subexpression,parameter,argument */
	#define G__MAXNAME 512 /* Variable name */	#define G__MAXNAME 512 /* Variable name */
	#define G__ONELINEDICT 8 /* Length of subexpression,parameter,argument */	#define G__ONELINEDICT 8 /* Length of subexpression,parameter,argument */
	#endif	#endif

		#endif

	#define G__LARGEBUF 6000 /* big temp buffer */	#define G__LARGEBUF 6000 /* big temp buffer */
	#define G__MAXFILE 2000 /* Max interpreted source file */	#define G__MAXFILE 2000 /* Max interpreted source file */
	#define G__MAXFILENAME 1024 /* Max interpreted source file name length */	#define G__MAXFILENAME 1024 /* Max interpreted source file name length */
	#define G__MAXPARA 100 /* Number of argument for G__main(argc,argv) */	#define G__MAXPARA 100 /* Number of argument for G__main(argc,argv) */
	#define G__MAXARG 100 /* Number of argument for G__init_cint(char ) /	#define G__MAXARG 100 /* Number of argument for G__init_cint(char ) /
	#define G__MAXFUNCPARA 40 /* Function argument */	#define G__MAXFUNCPARA 40 /* Function argument */
	#define G__MAXVARDIM 10 /* Array dimension */	#define G__MAXVARDIM 10 /* Array dimension */
	#define G__LENPOST 10 /* length of file name extention */	#define G__LENPOST 10 /* length of file name extention */
	#define G__MAXBASE 50 /* maximum inheritable class */	#define G__MAXBASE 50 /* maximum inheritable class */
	#define G__TAGNEST 20 /* depth of nested class */	#define G__TAGNEST 20 /* depth of nested class */


		#ifndef G__MAXSTRUCT
	#ifdef G__WIN32	#ifdef G__WIN32
	#if defined(_MSC_VER) && (_MSC_VER>1300)	#if defined(_MSC_VER) && (_MSC_VER>1300)
	#define G__MAXSTRUCT 24000 /* struct table */	#define G__MAXSTRUCT 24000 /* struct table */

	#define G__MAXTYPEDEF 24000 /* typedef table */
	#else	#else
	#define G__MAXSTRUCT 4000 /* struct table */	#define G__MAXSTRUCT 4000 /* struct table */

	#define G__MAXTYPEDEF 8000 /* typedef table */
	#endif	#endif
	#else	#else
	#define G__MAXSTRUCT 24000 /* struct table */	#define G__MAXSTRUCT 24000 /* struct table */

		#endif
		#endif

		#ifndef G__MAXTYPEDEF
		#ifdef G__WIN32
		#if defined(_MSC_VER) && (_MSC_VER>1300)
	#define G__MAXTYPEDEF 24000 /* typedef table */	#define G__MAXTYPEDEF 24000 /* typedef table */

		#else
		#define G__MAXTYPEDEF 8000 /* typedef table */
		#endif
		#else
		#define G__MAXTYPEDEF 24000 /* typedef table */
		#endif
	#endif	#endif

	/* G__MAXIFUNC and G__MEMDEPTH are not real limit	/* G__MAXIFUNC and G__MEMDEPTH are not real limit
	* They are depth of one page of function or variable list	* They are depth of one page of function or variable list
	* If the page gets full, more table is allocated. */	* If the page gets full, more table is allocated. */
	#define G__MAXIFUNC 1	#define G__MAXIFUNC 1
	#define G__MEMDEPTH 1	#define G__MEMDEPTH 1

	/* #define G__HIST 1 */	/* #define G__HIST 1 */


End of changes. 7 change blocks.
	2 lines changed or deleted	23 lines changed or added

	RVersion.h	RVersion.h

	skipping to change at line 17	skipping to change at line 17
	* These macros can be used in the following way:	* These macros can be used in the following way:
	*	*
	* #if ROOT_VERSION_CODE >= ROOT_VERSION(2,23,4)	* #if ROOT_VERSION_CODE >= ROOT_VERSION(2,23,4)
	* #include <newheader.h>	* #include <newheader.h>
	* #else	* #else
	* #include <oldheader.h>	* #include <oldheader.h>
	* #endif	* #endif
	*	*
	*/	*/


	#define ROOT_RELEASE "5.30/04"	#define ROOT_RELEASE "5.30/06"
	#define ROOT_RELEASE_DATE "Nov 8 2011"	#define ROOT_RELEASE_DATE "Jan 10 2012"
	#define ROOT_RELEASE_TIME "14:00:45"	#define ROOT_RELEASE_TIME "15:46:02"
	#define ROOT_SVN_REVISION 41803	#define ROOT_SVN_REVISION 42572
	#define ROOT_SVN_BRANCH "branches/v5-30-00-patches"	#define ROOT_SVN_BRANCH "branches/v5-30-00-patches"

	#define ROOT_VERSION_CODE 335364	#define ROOT_VERSION_CODE 335366
	#define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))	#define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))

	#endif	#endif

End of changes. 2 change blocks.
	5 lines changed or deleted	5 lines changed or added

	TBranch.h	TBranch.h

	// @(#)root/tree:$Id: TBranch.h 41699 2011-11-01 21:38:19Z pcanal $	// @(#)root/tree:$Id: TBranch.h 42194 2011-11-23 14:02:02Z axel $
	// Author: Rene Brun 12/01/96	// Author: Rene Brun 12/01/96

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TFileMerger.h	TFileMerger.h

	// @(#)root/io:$Id: TFileMerger.h 41699 2011-11-01 21:38:19Z pcanal $	// @(#)root/io:$Id: TFileMerger.h 42194 2011-11-23 14:02:02Z axel $
	// Author: Andreas Peters + Fons Rademakers 26/5/2005	// Author: Andreas Peters + Fons Rademakers 26/5/2005

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2005, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2005, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TSchemaRuleProcessor.h	TSchemaRuleProcessor.h

	// @(#)root/core:$Id: TSchemaRuleProcessor.h 40664 2011-08-22 22:59:25Z pca nal $	// @(#)root/core:$Id: TSchemaRuleProcessor.h 42194 2011-11-23 14:02:02Z axe l $
	// author: Lukasz Janyst <ljanyst@cern.ch>	// author: Lukasz Janyst <ljanyst@cern.ch>

	#ifndef ROOT_TSchemaRuleProcessor	#ifndef ROOT_TSchemaRuleProcessor
	#define ROOT_TSchemaRuleProcessor	#define ROOT_TSchemaRuleProcessor

	#if !defined(__CINT__)	#if !defined(__CINT__)
	// Do no clutter the dictionary (in particular with STL containers)	// Do no clutter the dictionary (in particular with STL containers)

	#include <stdlib.h>	#include <stdlib.h>
	#include <string>	#include <string>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	TVirtualArray.h	TVirtualArray.h

	// @(#)root/io:$Id: TVirtualArray.h 41699 2011-11-01 21:38:19Z pcanal $	// @(#)root/io:$Id: TVirtualArray.h 42194 2011-11-23 14:02:02Z axel $
	// Author: Philippe Canal July, 2008	// Author: Philippe Canal July, 2008

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	************************************************************************* /	************************************************************************* /


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	ToyMCSamplerOld.h	ToyMCSamplerOld.h

	// @(#)root/roostats:$Id: ToyMCSamplerOld.h 40961 2011-09-20 17:08:56Z mone ta $	// @(#)root/roostats:$Id: ToyMCSamplerOld.h 42194 2011-11-23 14:02:02Z axel $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	// Additions and modifications by Mario Pelliccioni	// Additions and modifications by Mario Pelliccioni
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/

	TGeoScaledShape.h	TGeoScaledShape.h

	// @(#)root/geom:$Id: TGeoScaledShape.h 21425 2007-12-17 15:59:27Z brun $	// @(#)root/geom:$Id: TGeoScaledShape.h 42572 2012-01-05 15:04:42Z agheata $
	// Author: Andrei Gheata 26/09/05	// Author: Andrei Gheata 26/09/05

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 62	skipping to change at line 62
	Double_t step=TGeoShape::Big(), Double_t *safe=0) const;	Double_t step=TGeoShape::Big(), Double_t *safe=0) const;
	virtual TGeoVolume Divide(TGeoVolume voldiv, const char *divname, In t_t iaxis, Int_t ndiv,	virtual TGeoVolume Divide(TGeoVolume voldiv, const char *divname, In t_t iaxis, Int_t ndiv,
	Double_t start, Double_t step);	Double_t start, Double_t step);
	virtual TGeoShape GetMakeRuntimeShape(TGeoShape mother, TGeoMatrix *mat) const;	virtual TGeoShape GetMakeRuntimeShape(TGeoShape mother, TGeoMatrix *mat) const;
	virtual const TBuffer3D &GetBuffer3D(Int_t reqSections, Bool_t localFram e) const;	virtual const TBuffer3D &GetBuffer3D(Int_t reqSections, Bool_t localFram e) const;
	virtual void GetMeshNumbers(Int_t &nvert, Int_t &nsegs, Int_t & npols) const;	virtual void GetMeshNumbers(Int_t &nvert, Int_t &nsegs, Int_t & npols) const;
	virtual Int_t GetNmeshVertices() const {return fShape->GetNmeshV ertices();}	virtual Int_t GetNmeshVertices() const {return fShape->GetNmeshV ertices();}
	TGeoShape *GetShape() const {return fShape;}	TGeoShape *GetShape() const {return fShape;}
	TGeoScale *GetScale() const {return fScale;}	TGeoScale *GetScale() const {return fScale;}
	virtual void InspectShape() const;	virtual void InspectShape() const;

		virtual Bool_t IsAssembly() const;
	virtual Bool_t IsCylType() const {return fShape->IsCylType();}	virtual Bool_t IsCylType() const {return fShape->IsCylType();}
	virtual Bool_t IsReflected() const;	virtual Bool_t IsReflected() const;
	virtual TBuffer3D *MakeBuffer3D() const;	virtual TBuffer3D *MakeBuffer3D() const;
	static TGeoShape MakeScaledShape(const char name, TGeoShape shape , TGeoScale scale);	static TGeoShape MakeScaledShape(const char name, TGeoShape shape , TGeoScale scale);
	virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const;	virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const;
	virtual void SavePrimitive(ostream &out, Option_t *option = "") ;	virtual void SavePrimitive(ostream &out, Option_t *option = "") ;
	void SetScale(TGeoScale *scale) {fScale = scale;}	void SetScale(TGeoScale *scale) {fScale = scale;}
	virtual void SetPoints(Double_t *points) const;	virtual void SetPoints(Double_t *points) const;
	virtual void SetPoints(Float_t *points) const;	virtual void SetPoints(Float_t *points) const;
	virtual void SetSegsAndPols(TBuffer3D &buffer) const;	virtual void SetSegsAndPols(TBuffer3D &buffer) const;

End of changes. 2 change blocks.
	1 lines changed or deleted	2 lines changed or added

	TGeoVolume.h	TGeoVolume.h

	// @(#)root/geom:$Id: TGeoVolume.h 39018 2011-04-25 09:38:31Z agheata $	// @(#)root/geom:$Id: TGeoVolume.h 42572 2012-01-05 15:04:42Z agheata $
	// Author: Andrei Gheata 30/05/02	// Author: Andrei Gheata 30/05/02

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/
	// Author : date : Wed 24 Oct 2001 01:39:36 PM CEST	// Author : date : Wed 24 Oct 2001 01:39:36 PM CEST

	skipping to change at line 115	skipping to change at line 115
	void ClearNodes() {fNodes = 0;}	void ClearNodes() {fNodes = 0;}
	void ClearShape();	void ClearShape();
	void CleanAll();	void CleanAll();
	virtual TGeoVolume *CloneVolume() const;	virtual TGeoVolume *CloneVolume() const;
	void CloneNodesAndConnect(TGeoVolume *newmother) const;	void CloneNodesAndConnect(TGeoVolume *newmother) const;
	void CheckGeometry(Int_t nrays=1, Double_t startx=0, Double_t starty=0, Double_t startz=0) const;	void CheckGeometry(Int_t nrays=1, Double_t startx=0, Double_t starty=0, Double_t startz=0) const;
	void CheckOverlaps(Double_t ovlp=0.1, Option_t option="") co nst; // MENU*	void CheckOverlaps(Double_t ovlp=0.1, Option_t option="") co nst; // MENU*
	void CheckShape(Int_t testNo, Int_t nsamples=10000, Option_t option=""); // MENU*	void CheckShape(Int_t testNo, Int_t nsamples=10000, Option_t option=""); // MENU*
	Int_t CountNodes(Int_t nlevels=1000, Int_t option=0);	Int_t CountNodes(Int_t nlevels=1000, Int_t option=0);
	Bool_t Contains(Double_t *point) const {return fShape->Contains (point);}	Bool_t Contains(Double_t *point) const {return fShape->Contains (point);}

	virtual Bool_t IsAssembly() const {return kFALSE;}	virtual Bool_t IsAssembly() const;
	virtual Bool_t IsFolder() const;	virtual Bool_t IsFolder() const;
	Bool_t IsRunTime() const {return fShape->IsRunTimeShape();}	Bool_t IsRunTime() const {return fShape->IsRunTimeShape();}
	virtual Bool_t IsVolumeMulti() const {return kFALSE;}	virtual Bool_t IsVolumeMulti() const {return kFALSE;}
	virtual void AddNode(const TGeoVolume vol, Int_t copy_no, TGeoMatrix mat=0, Option_t *option=""); // most general case	virtual void AddNode(const TGeoVolume vol, Int_t copy_no, TGeoMatrix mat=0, Option_t *option=""); // most general case
	void AddNodeOffset(const TGeoVolume vol, Int_t copy_no, Doub le_t offset=0, Option_t option="");	void AddNodeOffset(const TGeoVolume vol, Int_t copy_no, Doub le_t offset=0, Option_t option="");
	virtual void AddNodeOverlap(const TGeoVolume vol, Int_t copy_no, TGe oMatrix mat=0, Option_t *option="");	virtual void AddNodeOverlap(const TGeoVolume vol, Int_t copy_no, TGe oMatrix mat=0, Option_t *option="");

	virtual TGeoVolume Divide(const char divname, Int_t iaxis, Int_t ndiv, Double_t start, Double_t step, Int_t numed=0, Option_t *option="");	virtual TGeoVolume Divide(const char divname, Int_t iaxis, Int_t ndiv, Double_t start, Double_t step, Int_t numed=0, Option_t *option="");
	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
	virtual void Draw(Option_t option=""); // MENU*	virtual void Draw(Option_t option=""); // MENU*

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added