Skip to content

Commit 94eeab1

Browse files
committed
Revert "[net] deprecate TGrid, gGrid"
This reverts commit af16dd6.
1 parent 85c7152 commit 94eeab1

3 files changed

Lines changed: 5 additions & 12 deletions

File tree

net/net/inc/LinkDef.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#pragma link C++ enum ESockOptions;
1515
#pragma link C++ enum ESendRecvOptions;
1616

17-
#pragma link C++ global ROOT::Deprecated::gGrid;
17+
#pragma link C++ global gGrid;
1818
#pragma link C++ global gGridJobStatusList;
1919

2020
#pragma link C++ class TServerSocket;
@@ -30,7 +30,7 @@
3030
#pragma link C++ class TSQLTableInfo;
3131
#pragma link C++ class TSQLColumnInfo;
3232
#pragma link C++ class TSQLMonitoringWriter;
33-
#pragma link C++ class ROOT::Deprecated::TGrid;
33+
#pragma link C++ class TGrid;
3434
#pragma link C++ class TGridResult+;
3535
#pragma link C++ class TGridJDL+;
3636
#pragma link C++ class TGridJob+;

net/net/inc/TGrid.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class TGridJob;
4040
class TGridCollection;
4141
class TGridJobStatusList;
4242

43-
namespace ROOT::Deprecated {
4443

4544
class TGrid : public TObject {
4645

@@ -128,9 +127,4 @@ class TGrid : public TObject {
128127

129128
R__EXTERN TGrid *gGrid;
130129

131-
} // namespace ROOT::Deprecated
132-
133-
using TGrid R__DEPRECATED(6, 42, "TGrid is expected to be unused and thus deprecated") = ROOT::Deprecated::TGrid;
134-
R__EXTERN ROOT::Deprecated::TGrid *&gGrid R__DEPRECATED(6, 42, "gGrid is expected to be unused and thus deprecated");
135-
136130
#endif

net/net/src/TGrid.cxx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
#include "TPluginManager.h"
3131
#include "TError.h"
3232

33-
ROOT::Deprecated::TGrid *ROOT::Deprecated::gGrid = 0;
34-
ROOT::Deprecated::TGrid *&gGrid = ROOT::Deprecated::gGrid;
33+
TGrid *gGrid = 0;
3534

3635

3736

@@ -46,8 +45,8 @@ ROOT::Deprecated::TGrid *&gGrid = ROOT::Deprecated::gGrid;
4645
/// -debug=`<debug level from 1 to 10>`
4746
/// Example: "-domain=cern.ch -debug=5"
4847

49-
ROOT::Deprecated::TGrid *
50-
ROOT::Deprecated::TGrid::Connect(const char *grid, const char *uid, const char *pw, const char *options)
48+
TGrid *TGrid::Connect(const char *grid, const char *uid, const char *pw,
49+
const char *options)
5150
{
5251
TPluginHandler *h;
5352
TGrid *g = 0;

0 commit comments

Comments
 (0)