Skip to content

Commit 92d091c

Browse files
committed
Revert "[net] deprecate TGridJob"
This reverts commit 12fec18.
1 parent cd4e849 commit 92d091c

5 files changed

Lines changed: 8 additions & 11 deletions

File tree

net/net/inc/LinkDef.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#pragma link C++ class ROOT::Deprecated::TGrid;
3434
#pragma link C++ class TGridResult+;
3535
#pragma link C++ class ROOT::Deprecated::TGridJDL+;
36-
#pragma link C++ class ROOT::Deprecated::TGridJob+;
36+
#pragma link C++ class TGridJob+;
3737
#pragma link C++ class TGridJobStatus+;
3838
#pragma link C++ class TGridJobStatusList+;
3939
#pragma link C++ class ROOT::Deprecated::TGridCollection+;
@@ -45,6 +45,5 @@
4545

4646
#pragma read sourceClass="TGridCollection" version="[-1]" targetClass="ROOT::Deprecated::TGridCollection"
4747
#pragma read sourceClass="TGridJDL" version="[-1]" targetClass="ROOT::Deprecated::TGridJDL"
48-
#pragma read sourceClass="TGridJob" version="[-1]" targetClass="ROOT::Deprecated::TGridJob"
4948

5049
#endif

net/net/inc/TGrid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
#include "TGridJob.h"
3636

3737
class TGridResult;
38+
class TGridJob;
3839
class TGridJobStatusList;
3940

4041
namespace ROOT::Deprecated {
4142

4243
class TGridCollection;
4344
class TGridJDL;
44-
class TGridJob;
4545

4646
class TGrid : public TObject {
4747

net/net/inc/TGridJob.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828

2929
class TGridJobStatus;
3030

31-
namespace ROOT::Deprecated {
32-
3331
class TGridJob : public TObject {
3432

3533
protected:
@@ -49,9 +47,4 @@ class TGridJob : public TObject {
4947
ClassDefOverride(TGridJob,1) // ABC defining interface to a GRID job
5048
};
5149

52-
} // namespace ROOT::Deprecated
53-
54-
using TGridJob R__DEPRECATED(6, 42, "TGridJob is expected to be unused and thus deprecated") =
55-
ROOT::Deprecated::TGridJob;
56-
5750
#endif

net/net/inc/TGridJobStatusList.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222

2323
#include "TList.h"
2424

25+
#include "TGridJob.h"
26+
27+
28+
class TGridJob;
29+
2530
class TGridJobStatusList : public TList {
2631

2732
protected:

net/net/src/TGridJob.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/// Must be implemented by actual GRID job implementation. Returns -1 in
2828
/// case of error, 0 otherwise.
2929

30-
Int_t ROOT::Deprecated::TGridJob::GetOutputSandbox(const char *, Option_t *)
30+
Int_t TGridJob::GetOutputSandbox(const char *, Option_t *)
3131
{
3232
MayNotUse("GetOutputSandbox");
3333
return -1;

0 commit comments

Comments
 (0)