Skip to content

Commit 1172b0f

Browse files
committed
[roottest][cling/python] rename CINT to CLING and ROOTCINT to MAKECLING
1 parent ad22457 commit 1172b0f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+243
-247
lines changed

roottest/cling/const/constissue.C

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
int get_histogram(char const* , char const* ){return 0; }
22
template<class T> void get_histogram(T const & t, char const * name);
3-
#ifdef __CINT__
3+
#ifdef __CLING__
44
// Can't remember what this is actually testing but it should not do
55
// any harm anyway!
66
#pragma link C++ function get_histogram;
@@ -16,8 +16,8 @@ class TriggerCharacterizer {
1616
trigger_counting_map m_map;
1717
};
1818

19-
#ifdef __CINT__
19+
//#ifdef __CLING__
2020
//#pragma link C++ class TriggerCharacterizer::trigger_counting_map;
21-
#endif
21+
//#endif
2222

2323
void constissue() {}

roottest/cling/dict/algebra3

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
namespace aux {
2020

21-
#ifndef __CINT__
2221
using std::size_t;
2322
using std::complex;
2423
using std::istream;
@@ -32,7 +31,6 @@ namespace aux {
3231
using std::sin;
3332
// using std::conj;
3433
using std::norm;
35-
#endif /* __CINT__ */
3634

3735
/* ****************** algebra3.h begins here ****************** */
3836

@@ -710,7 +708,6 @@ namespace aux {
710708
// Implementation
711709
//
712710

713-
#ifndef __CINT__
714711

715712
/****************************************************************
716713
* *
@@ -1999,7 +1996,6 @@ namespace aux {
19991996
((_Tp)0), ((_Tp)0), ((_Tp)1), ((_Tp)0),
20001997
((_Tp)0), ((_Tp)0), ((_Tp)1) / d, ((_Tp)0)); }
20011998

2002-
#endif /* __CINT__ */
20031999

20042000
/* ******************* algebra3.h ends here ******************* */
20052001

@@ -2041,7 +2037,6 @@ namespace aux {
20412037
template<typename _Tp> mat3<_Tp> ExtractRotation(const mat4<_Tp>& pose); // extract rotation matrix from transformation matrix
20422038
template<typename _Tp> typename rtti<_Tp>::value_type PointToPlane(const vec3<_Tp>& point, const vec4<_Tp>& plane); // unsigned distance from a point to a plane (3D)
20432039

2044-
#ifndef __CINT__
20452040

20462041
//
20472042
// rotation2D -- convert 2x2 rotation matrix to 3x3
@@ -2176,7 +2171,6 @@ namespace aux {
21762171
return dist;
21772172
}
21782173

2179-
#endif /* __CINT__ */
21802174

21812175
#ifdef fmin
21822176
#undef fmin // allow as function names

roottest/cling/dict/operators_dict.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "operators.h"
22

3-
#ifdef __MAKECINT__
3+
#ifdef __ROOTCLING__
44
#pragma link C++ class myiterator;
55
#pragma link C++ operators myiterator;
66
#endif
@@ -12,14 +12,14 @@ namespace enclosing {
1212
#include "operators.h"
1313
}
1414

15-
#ifdef __MAKECINT__
15+
#ifdef __ROOTCLING__
1616
#pragma link C++ class enclosing::myiterator;
1717
#pragma link C++ operators enclosing::myiterator;
1818
#endif
1919
#endif
2020

2121
#include <vector>
22-
#ifdef __MAKECINT__
22+
#ifdef __ROOTCLING__
2323
#pragma link C++ class vector<myiterator>;
2424
#pragma link C++ class vector<myiterator>::const_iterator;
2525
#pragma link C++ class vector<myiterator>::iterator;

0 commit comments

Comments
 (0)