Skip to content

Commit 3992859

Browse files
committed
Revert "[net] deprecate TGridCollection"
This reverts commit 18c9e6e.
1 parent f406c77 commit 3992859

3 files changed

Lines changed: 2 additions & 11 deletions

File tree

net/net/inc/LinkDef.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,11 @@
3636
#pragma link C++ class TGridJob+;
3737
#pragma link C++ class TGridJobStatus+;
3838
#pragma link C++ class TGridJobStatusList+;
39-
#pragma link C++ class ROOT::Deprecated::TGridCollection+;
39+
#pragma link C++ class TGridCollection+;
4040
#pragma link C++ class TFileStager;
4141
#pragma link C++ class TApplicationRemote;
4242
#pragma link C++ class TApplicationServer;
4343
#pragma link C++ class TUDPSocket;
4444
#pragma link C++ class TParallelMergingFile+;
4545

46-
#pragma read sourceClass="TGridCollection" version="[-1]" targetClass="ROOT::Deprecated::TGridCollection"
47-
4846
#endif

net/net/inc/TGrid.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,11 @@
3737
class TGridResult;
3838
class TGridJDL;
3939
class TGridJob;
40+
class TGridCollection;
4041
class TGridJobStatusList;
4142

4243
namespace ROOT::Deprecated {
4344

44-
class TGridCollection;
45-
4645
class TGrid : public TObject {
4746

4847
protected:

net/net/inc/TGridCollection.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ class TDSet;
3030
class TGridResult;
3131
class TFileCollection;
3232

33-
namespace ROOT::Deprecated {
3433

3534
class TGridCollection : public TObject {
3635
public:
@@ -116,9 +115,4 @@ class TGridCollection : public TObject {
116115
ClassDefOverride(TGridCollection,1) // ABC managing collection of files on the Grid
117116
};
118117

119-
} // namespace ROOT::Deprecated
120-
121-
using TGridCollection R__DEPRECATED(6, 42, "TGridCollection is expected to be unused and thus deprecated") =
122-
ROOT::Deprecated::TGridCollection;
123-
124118
#endif

0 commit comments

Comments
 (0)