Skip to content

[roottest][cling/python] Rename CINT to CLING and MAKECINT to ROOTCLING [part 3] #20612

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

Open
ferdymercury wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[roottest][cling/python] Rename CINT to CLING and MAKECINT to ROOTCLING [part 3] #20612

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
6 changes: 3 additions & 3 deletions roottest/cling/const/constissue.C
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
int get_histogram(char const* , char const* ){return 0; }
template<class T> void get_histogram(T const & t, char const * name);
#ifdef __CINT__
#ifdef __CLING__
// Can't remember what this is actually testing but it should not do
// any harm anyway!
#pragma link C++ function get_histogram;
Expand All @@ -16,8 +16,8 @@ class TriggerCharacterizer {
trigger_counting_map m_map;
};

#ifdef __CINT__
//#ifdef __CLING__
//#pragma link C++ class TriggerCharacterizer::trigger_counting_map;
#endif
//#endif

void constissue() {}
6 changes: 0 additions & 6 deletions roottest/cling/dict/algebra3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

namespace aux {

#ifndef __CINT__
using std::size_t;
using std::complex;
using std::istream;
Expand All @@ -32,7 +31,6 @@ namespace aux {
using std::sin;
// using std::conj;
using std::norm;
#endif /* __CINT__ */

/* ****************** algebra3.h begins here ****************** */

Expand Down Expand Up @@ -710,7 +708,6 @@ namespace aux {
// Implementation
//

#ifndef __CINT__

/****************************************************************
* *
Expand Down Expand Up @@ -1999,7 +1996,6 @@ namespace aux {
((_Tp)0), ((_Tp)0), ((_Tp)1), ((_Tp)0),
((_Tp)0), ((_Tp)0), ((_Tp)1) / d, ((_Tp)0)); }

#endif /* __CINT__ */

/* ******************* algebra3.h ends here ******************* */

Expand Down Expand Up @@ -2041,7 +2037,6 @@ namespace aux {
template<typename _Tp> mat3<_Tp> ExtractRotation(const mat4<_Tp>& pose); // extract rotation matrix from transformation matrix
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)

#ifndef __CINT__

//
// rotation2D -- convert 2x2 rotation matrix to 3x3
Expand Down Expand Up @@ -2176,7 +2171,6 @@ namespace aux {
return dist;
}

#endif /* __CINT__ */

#ifdef fmin
#undef fmin // allow as function names
Expand Down
6 changes: 3 additions & 3 deletions roottest/cling/dict/operators_dict.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "operators.h"

#ifdef __MAKECINT__
#ifdef __ROOTCLING__
#pragma link C++ class myiterator;
#pragma link C++ operators myiterator;
#endif
Expand All @@ -12,14 +12,14 @@ namespace enclosing {
#include "operators.h"
}

#ifdef __MAKECINT__
#ifdef __ROOTCLING__
#pragma link C++ class enclosing::myiterator;
#pragma link C++ operators enclosing::myiterator;
#endif
#endif

#include <vector>
#ifdef __MAKECINT__
#ifdef __ROOTCLING__
#pragma link C++ class vector<myiterator>;
#pragma link C++ class vector<myiterator>::const_iterator;
#pragma link C++ class vector<myiterator>::iterator;
Expand Down
Loading
Loading