Skip to content

Remove unnecessary and bogus include.(ROOT-5123). #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FonsRademakers merged 1 commit into from
May 22, 2014
Merged

Remove unnecessary and bogus include.(ROOT-5123). #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions core/base/src/TROOT.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,6 @@
#include "TListOfFunctions.h"
#include "TListOfFunctionTemplates.h"
#include "TFunctionTemplate.h"
#include "TGClient.h"
#include "X3DBuffer.h"
#include "TFile.h"
#include "TVirtualGL.h"

#include <string>
namespace std {} using namespace std;
Expand Down
12 changes: 12 additions & 0 deletions core/base/src/TVirtualGL.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,24 @@

#include "TVirtualGL.h"
#include "TROOT.h"
#include "TGlobal.h"


ClassImp(TGLManager)

TGLManager * (*gPtr2GLManager)() = 0;

namespace {
static struct AddPseudoGlobals {
AddPseudoGlobals() {
// User "gCling" as synonym for "libCore static initialization has happened".
// This code here must not trigger it.
TGlobalMappedFunction::Add(new TGlobalMappedFunction("gGLManager", "TVirtualGL*",
(TGlobalMappedFunction::GlobalFunc_t)&gGLManager));
}
} gAddPseudoGlobals;
}

//____________________________________________________________________________
TGLManager::TGLManager() : TNamed("gGLManager", "")
{
Expand Down
4 changes: 3 additions & 1 deletion gui/gui/src/TGClient.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ static TGClient *gClientGlobal = 0;
namespace {
static struct AddPseudoGlobals {
AddPseudoGlobals() {
gROOT->GetListOfGlobals()->Add(new TGlobalMappedFunction("gClient", "TGClient*",
// User "gCling" as synonym for "libCore static initialization has happened".
// This code here must not trigger it.
TGlobalMappedFunction::Add(new TGlobalMappedFunction("gClient", "TGClient*",
(TGlobalMappedFunction::GlobalFunc_t)&TGClient::Instance));
}
} gAddPseudoGlobals;
Expand Down