From c00f46aa18ec16eabdbe1c0a7687b4e8b3219121 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Fri, 1 Dec 2006 11:50:14 +0000
Subject: [PATCH] cleanup.
git-svn-id: http://root.cern.ch/svn/root/trunk@17014 27541ba8-7e3a-0410-8455-c3a389f83636
---
base/inc/TROOT.h | 6 +--
base/src/TROOT.cxx | 127 +--------------------------------------------
2 files changed, 4 insertions(+), 129 deletions(-)
diff --git a/base/inc/TROOT.h b/base/inc/TROOT.h
index 7440d187aa2..23bc3c83528 100644
--- a/base/inc/TROOT.h
+++ b/base/inc/TROOT.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TROOT.h,v 1.54 2006/05/23 04:47:35 brun Exp $
+// @(#)root/base:$Name: $:$Id: TROOT.h,v 1.55 2006/08/06 02:04:12 rdm Exp $
// Author: Rene Brun 08/12/94
/*************************************************************************
@@ -68,8 +68,8 @@ private:
static Bool_t fgRootInit; //Singleton initialization flag
static Bool_t fgMemCheck; //Turn on memory leak checker
- TROOT(const TROOT&); //Directories cannot be copied
- TROOT& operator=(const TROOT&); //Directories cannot be copied
+ TROOT(const TROOT&); //not implemented
+ TROOT& operator=(const TROOT&); //not implemented
protected:
typedef ROOT::TMapTypeToTClass IdMap_t;
diff --git a/base/src/TROOT.cxx b/base/src/TROOT.cxx
index 42a1540c3fe..a361d5c21ec 100644
--- a/base/src/TROOT.cxx
+++ b/base/src/TROOT.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TROOT.cxx,v 1.191 2006/11/16 17:17:37 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TROOT.cxx,v 1.192 2006/11/25 09:07:59 brun Exp $
// Author: Rene Brun 08/12/94
/*************************************************************************
@@ -492,131 +492,6 @@ TROOT::TROOT(const char *name, const char *title, VoidFuncPtr_t *initfunc)
fgRootInit = kTRUE;
}
-#if 0
-//Directories cannot be copied
-//______________________________________________________________________________
-TROOT::TROOT(const TROOT& r) :
- TDirectory(r),
- fLineIsProcessing(r.fLineIsProcessing),
- fConfigOptions(r.fConfigOptions),
- fVersion(r.fVersion),
- fVersionInt(r.fVersionInt),
- fVersionDate(r.fVersionDate),
- fVersionTime(r.fVersionTime),
- fBuiltDate(r.fBuiltDate),
- fBuiltTime(r.fBuiltTime),
- fTimer(r.fTimer),
- fApplication(r.fApplication),
- fInterpreter(r.fInterpreter),
- fBatch(r.fBatch),
- fEditHistograms(r.fEditHistograms),
- fFromPopUp(r.fFromPopUp),
- fMustClean(r.fMustClean),
- fReadingObject(r.fReadingObject),
- fForceStyle(r.fForceStyle),
- fInterrupt(r.fInterrupt),
- fEscape(r.fEscape),
- fExecutingMacro(r.fExecutingMacro),
- fEditorMode(r.fEditorMode),
- fPrimitive(r.fPrimitive),
- fSelectPad(r.fSelectPad),
- fClasses(r.fClasses),
- fIdMap(r.fIdMap),
- fTypes(r.fTypes),
- fGlobals(r.fGlobals),
- fGlobalFunctions(r.fGlobalFunctions),
- fFiles(r.fFiles),
- fMappedFiles(r.fMappedFiles),
- fSockets(r.fSockets),
- fCanvases(r.fCanvases),
- fStyles(r.fStyles),
- fFunctions(r.fFunctions),
- fTasks(r.fTasks),
- fColors(r.fColors),
- fGeometries(r.fGeometries),
- fBrowsers(r.fBrowsers),
- fSpecials(r.fSpecials),
- fCleanups(r.fCleanups),
- fMessageHandlers(r.fMessageHandlers),
- fStreamerInfo(r.fStreamerInfo),
- fClassGenerators(r.fClassGenerators),
- fSecContexts(r.fSecContexts),
- fProofs(r.fProofs),
- fClipboard(r.fClipboard),
- fDataSets(r.fDataSets),
- fUUIDs(r.fUUIDs),
- fRootFolder(r.fRootFolder),
- fBrowsables(r.fBrowsables),
- fPluginManager(r.fPluginManager),
- fCutClassName(r.fCutClassName),
- fDefCanvasName(r.fDefCanvasName)
-{
- //copy constructor
-}
-
-//______________________________________________________________________________
-TROOT& TROOT::operator=(const TROOT& r)
-{
- //assignment operator
- if(this!=&r) {
- TDirectory::operator=(r);
- fLineIsProcessing=r.fLineIsProcessing;
- fConfigOptions=r.fConfigOptions;
- fVersion=r.fVersion;
- fVersionInt=r.fVersionInt;
- fVersionDate=r.fVersionDate;
- fVersionTime=r.fVersionTime;
- fBuiltDate=r.fBuiltDate;
- fBuiltTime=r.fBuiltTime;
- fTimer=r.fTimer;
- fApplication=r.fApplication;
- fInterpreter=r.fInterpreter;
- fBatch=r.fBatch;
- fEditHistograms=r.fEditHistograms;
- fFromPopUp=r.fFromPopUp;
- fMustClean=r.fMustClean;
- fReadingObject=r.fReadingObject;
- fForceStyle=r.fForceStyle;
- fInterrupt=r.fInterrupt;
- fEscape=r.fEscape;
- fExecutingMacro=r.fExecutingMacro;
- fEditorMode=r.fEditorMode;
- fPrimitive=r.fPrimitive;
- fSelectPad=r.fSelectPad;
- fClasses=r.fClasses;
- fIdMap=r.fIdMap;
- fTypes=r.fTypes;
- fGlobals=r.fGlobals;
- fGlobalFunctions=r.fGlobalFunctions;
- fFiles=r.fFiles;
- fMappedFiles=r.fMappedFiles;
- fSockets=r.fSockets;
- fCanvases=r.fCanvases;
- fStyles=r.fStyles;
- fFunctions=r.fFunctions;
- fTasks=r.fTasks;
- fColors=r.fColors;
- fGeometries=r.fGeometries;
- fBrowsers=r.fBrowsers;
- fSpecials=r.fSpecials;
- fCleanups=r.fCleanups;
- fMessageHandlers=r.fMessageHandlers;
- fStreamerInfo=r.fStreamerInfo;
- fClassGenerators=r.fClassGenerators;
- fSecContexts=r.fSecContexts;
- fProofs=r.fProofs;
- fClipboard=r.fClipboard;
- fDataSets=r.fDataSets;
- fUUIDs=r.fUUIDs;
- fRootFolder=r.fRootFolder;
- fBrowsables=r.fBrowsables;
- fPluginManager=r.fPluginManager;
- fCutClassName=r.fCutClassName;
- fDefCanvasName=r.fDefCanvasName;
- }
- return *this;
-}
-#endif
//______________________________________________________________________________
TROOT::~TROOT()
{
--
GitLab