Skip to content
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.

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

[core] Replace CINT with CLING #15513

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

Conversation

dpiparo
Copy link
Member

@dpiparo dpiparo commented May 14, 2024

in preprocessor statements.

Fixes #10058

in preprocessor statements.

Fixes root-project#10058
@guitargeek
Copy link
Contributor

Thank you for the initiative!

You're also replacing __MAKECINT__ with __MAKECLING__, but I'm not sure we should do this. In the guide, it reads that the __MAKECINT__ macro is deprecated:
documentation/users-guide/Cling.md

Maybe @pcanal can confirm, but from that paragraph I understand that the replacement for __MAKECING__ in __ROOTCLING__, and not __MAKECLING__.

Copy link

Test Results

    10 files      10 suites   1d 18h 30m 11s ⏱️
 2 635 tests  2 633 ✅ 0 💤  2 ❌
24 868 runs  24 857 ✅ 0 💤 11 ❌

For more details on these failures, see this check.

Results for commit ede7404.

Comment on lines -1808 to -1809
if (strstr(cs, "#ifndef__CINT__") ||
strstr(cs, "#if!defined(__CINT__)"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to check here for both, __CINT__ and __CLING__?

Copy link
Contributor

@guitargeek guitargeek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See my comment before

@@ -9,7 +9,7 @@
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

#ifdef __CINT__
#ifdef __CLING__
Copy link
Member

@pcanal pcanal May 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A more semantically accurate replacement within a LinkDef file is:

Suggested change
#ifdef __CLING__
#ifdef __ROOTCLING__

(i.e. needed only during dictionary generation and not during interpretation)

@@ -926,7 +926,7 @@ class MakeHilbert : public TElementPosActionD {
MakeHilbert() { }
};

#if !defined (__CINT__) || defined (__MAKECINT__)
#if !defined (__CLING__) || defined (__MAKECLING__)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#if !defined (__CLING__) || defined (__MAKECLING__)
#if !defined (__CLING__) || defined (__ROOTCLING__)

@@ -16,7 +16,7 @@
/// code, this script must also be compiled to work correctly.
///
/// ~~~{.cpp}
/// #if defined(__CINT__) && !defined(__MAKECINT__)
/// #if defined(__CLING__) && !defined(__MAKECLING__)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/// #if defined(__CLING__) && !defined(__MAKECLING__)
/// #if defined(__CLING__) && !defined(__ROOTCLING__)

@@ -101,7 +101,7 @@ void read() {

void runIt() {

#if defined(__CINT__) && !defined(__MAKECINT__)
#if defined(__CLING__) && !defined(__MAKECLING__)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#if defined(__CLING__) && !defined(__MAKECLING__)
#if defined(__CLING__) && !defined(__ROOTCLING__)

@@ -116,7 +116,7 @@ void runIt() {
}

void mathcoreVectorFloatIO() {
#if defined(__CINT__) && !defined(__MAKECINT__)
#if defined(__CLING__) && !defined(__MAKECLING__)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#if defined(__CLING__) && !defined(__MAKECLING__)
#if defined(__CLING__) && !defined(__ROOTCLING__)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CINT still around
4 participants