diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/Converters.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/Converters.cxx index 639d08c3a3d2e..dc1b002708e01 100644 --- a/bindings/pyroot/cppyy/CPyCppyy/src/Converters.cxx +++ b/bindings/pyroot/cppyy/CPyCppyy/src/Converters.cxx @@ -2502,7 +2502,7 @@ bool CPyCppyy::InstanceArrayConverter::ToMemory( } //___________________________________________________________________________ -// CLING WORKAROUND -- classes for STL iterators are completely undefined in that +// Cling WORKAROUND -- classes for STL iterators are completely undefined in that // they come in a bazillion different guises, so just do whatever bool CPyCppyy::STLIteratorConverter::SetArg( PyObject* pyobject, Parameter& para, CallContext* /* ctxt */) @@ -2516,7 +2516,7 @@ bool CPyCppyy::STLIteratorConverter::SetArg( para.fTypeCode = 'V'; return true; } -// -- END CLING WORKAROUND +// -- END Cling WORKAROUND //---------------------------------------------------------------------------- bool CPyCppyy::VoidPtrRefConverter::SetArg( @@ -3348,12 +3348,12 @@ CPyCppyy::Converter* CPyCppyy::CreateConverter(const std::string& fullType, cdim } if (!result) { - // CLING WORKAROUND -- special case for STL iterators + // Cling WORKAROUND -- special case for STL iterators if (Utility::IsSTLIterator(realType)) { static STLIteratorConverter c; result = &c; } else - // -- CLING WORKAROUND + // -- Cling WORKAROUND result = selectInstanceCnv(klass, cpd, dims, isConst, control); } } else { diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/DeclareConverters.h b/bindings/pyroot/cppyy/CPyCppyy/src/DeclareConverters.h index f8932cd295209..e634acedede33 100644 --- a/bindings/pyroot/cppyy/CPyCppyy/src/DeclareConverters.h +++ b/bindings/pyroot/cppyy/CPyCppyy/src/DeclareConverters.h @@ -334,13 +334,13 @@ class ComplexDConverter: public InstanceConverter { }; -// CLING WORKAROUND -- classes for STL iterators are completely undefined in that +// Cling WORKAROUND -- classes for STL iterators are completely undefined in that // they come in a bazillion different guises, so just do whatever class STLIteratorConverter : public Converter { public: bool SetArg(PyObject*, Parameter&, CallContext* = nullptr) override; }; -// -- END CLING WORKAROUND +// -- END Cling WORKAROUND class VoidPtrRefConverter : public Converter { diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/PyResult.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/PyResult.cxx index 7abcc9699058c..08775bd0dfa70 100644 --- a/bindings/pyroot/cppyy/CPyCppyy/src/PyResult.cxx +++ b/bindings/pyroot/cppyy/CPyCppyy/src/PyResult.cxx @@ -143,7 +143,7 @@ CPyCppyy::PyResult::operator double() const CPyCppyy::PyResult::operator void*() const { // Cast python return value to C++ object with dictionary (may fail; note that -// you have to use the void* converter, as CINT will not call any other). +// you have to use the void* converter, as Cling will not call any other). if (fPyObject == Py_None) return nullptr; diff --git a/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx b/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx index 6343d2bc16b72..820556f9fa739 100644 --- a/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx +++ b/bindings/pyroot/cppyy/cppyy-backend/clingwrapper/src/clingwrapper.cxx @@ -2417,12 +2417,12 @@ intptr_t Cppyy::GetDatamemberOffset(TCppScope_t scope, TCppIndex_t idata) if (m->Property() & kIsStatic) { if (strchr(cr->GetName(), '<')) gInterpreter->ProcessLine(((std::string)cr->GetName()+"::"+m->GetName()+";").c_str()); - offset = (intptr_t)m->GetOffsetCint(); // yes, CINT (GetOffset() is both wrong + offset = (intptr_t)m->GetOffsetCint(); // yes, Cling (GetOffset() is both wrong // and caches that wrong result! if (offset == (intptr_t)-1) return (intptr_t)gInterpreter->ProcessLine((std::string("&")+cr->GetName()+"::"+m->GetName()+";").c_str()); } else - offset = (intptr_t)m->GetOffsetCint(); // yes, CINT, see above + offset = (intptr_t)m->GetOffsetCint(); // yes, Cling, see above return offset; } diff --git a/bindings/pyroot/cppyy/cppyy/doc/source/history.rst b/bindings/pyroot/cppyy/cppyy/doc/source/history.rst index ed166a4be33b5..fa07428f59720 100644 --- a/bindings/pyroot/cppyy/cppyy/doc/source/history.rst +++ b/bindings/pyroot/cppyy/cppyy/doc/source/history.rst @@ -48,5 +48,5 @@ Mid 2018, version 1.0 was released. .. _`boost.python`: https://wiki.python.org/moin/boost.python/GettingStarted .. _`sprint at CERN`: https://morepypy.blogspot.com/2010/07/cern-sprint-report-wrapping-c-libraries.html .. _`PyPy`: https://www.pypy.org/ -.. _`Cling`: https://github.com/vgvassilev/cling +.. _`Cling`: https://github.com/root-project/cling .. _`PyPI`: https://pypi.org/ diff --git a/bindings/pyroot/cppyy/patches/using-data-members.patch b/bindings/pyroot/cppyy/patches/using-data-members.patch index 13dca65d036f6..5aeb2dd84a785 100644 --- a/bindings/pyroot/cppyy/patches/using-data-members.patch +++ b/bindings/pyroot/cppyy/patches/using-data-members.patch @@ -74,7 +74,7 @@ index ae52fbe635..d2faa2472c 100644 if (cr.GetClass()) { - TDataMember* m = (TDataMember*)cr->GetListOfDataMembers()->At((int)idata); + TDataMember* m = GetDataMemberByIndex(cr, (int)idata); - // CLING WORKAROUND: the following causes templates to be instantiated first within the proper + // Cling WORKAROUND: the following causes templates to be instantiated first within the proper // scope, making the lookup succeed and preventing spurious duplicate instantiations later. Also, // if the variable is not yet loaded, pull it in through gInterpreter. @@ -1944,6 +1963,10 @@ Cppyy::TCppIndex_t Cppyy::GetDatamemberIndex(TCppScope_t scope, const std::strin diff --git a/bindings/pyroot/pythonizations/src/TPyDispatcher.cxx b/bindings/pyroot/pythonizations/src/TPyDispatcher.cxx index 5c3cbd33c45a0..bdb01d04eafa4 100644 --- a/bindings/pyroot/pythonizations/src/TPyDispatcher.cxx +++ b/bindings/pyroot/pythonizations/src/TPyDispatcher.cxx @@ -26,7 +26,7 @@ // ========================== // // The TPyDispatcher class acts as a functor that can be used for TFn's and GUIs -// to install callbacks from CINT. +// to install callbacks from Cling. //- constructors/destructor -------------------------------------------------- TPyDispatcher::TPyDispatcher(PyObject *callable) : fCallable(0) diff --git a/cmake/modules/CTestCustom.cmake b/cmake/modules/CTestCustom.cmake index d5f57db9d5d05..78582ec2c91e4 100644 --- a/cmake/modules/CTestCustom.cmake +++ b/cmake/modules/CTestCustom.cmake @@ -22,9 +22,9 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION} "note: variable tracking size limit exceeded" # vc/tests/sse_blend.cpp "warning is a GCC extension" "bug in GCC 4.8.1" - "warning: please use fgets or getline instead" # deprecated use of std functions cint/ROOT - "is dangerous, better use" # deprecated use of std functions cint/ROOT - "function is dangerous and should not be used" # deprecated use of std functions cint/ROOT + "warning: please use fgets or getline instead" # deprecated use of std functions Cling/ROOT + "is dangerous, better use" # deprecated use of std functions Cling/ROOT + "function is dangerous and should not be used" # deprecated use of std functions Cling/ROOT ) set(CTEST_CUSTOM_ERROR_EXCEPTION ${CTEST_CUSTOM_ERROR_EXCEPTION} "fatal error: cannot open file" diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake index 77eac67ebe68d..de28aadda41ec 100644 --- a/cmake/modules/RootConfiguration.cmake +++ b/cmake/modules/RootConfiguration.cmake @@ -17,7 +17,6 @@ foreach(v 0 OFF NO FALSE N IGNORE off no false n ignore) set(value${v} no) endforeach() -set(ROOT_DICTTYPE cint) #set(ROOT_CONFIGARGS "") set(top_srcdir ${CMAKE_SOURCE_DIR}) set(top_builddir ${CMAKE_BINARY_DIR}) @@ -105,11 +104,6 @@ if(IS_ABSOLUTE ${CMAKE_INSTALL_ICONDIR}) else() set(iconpath ${prefix}/${CMAKE_INSTALL_ICONDIR}) endif() -if(IS_ABSOLUTE ${CMAKE_INSTALL_CINTINCDIR}) - set(cintincdir ${CMAKE_INSTALL_CINTINCDIR}) -else() - set(cintincdir ${prefix}/${CMAKE_INSTALL_CINTINCDIR}) -endif() if(IS_ABSOLUTE ${CMAKE_INSTALL_DOCDIR}) set(docdir ${CMAKE_INSTALL_DOCDIR}) else() @@ -280,7 +274,6 @@ set(curseslib ${CURSES_LIBRARIES}) set(curseshdr ${CURSES_HEADER_FILE}) set(buildeditline ${value${editline}}) set(cppunit) -set(dicttype ${ROOT_DICTTYPE}) find_program(PERL_EXECUTABLE perl) diff --git a/cmake/modules/RootInstallDirs.cmake b/cmake/modules/RootInstallDirs.cmake index 087e99b8a36bb..554d661c8d2d9 100644 --- a/cmake/modules/RootInstallDirs.cmake +++ b/cmake/modules/RootInstallDirs.cmake @@ -14,7 +14,6 @@ # DATADIR - read-only architecture-independent data (DATAROOTDIR/root) # MANDIR - man documentation (DATAROOTDIR/man) # MACRODIR - ROOT macros (DATAROOTDIR/macros) -# CINTINCDIR - CINT include files (LIBDIR/cint) # ICONDIR - icons (DATAROOTDIR/icons) # SRCDIR - sources (DATAROOTDIR/src) # FONTDIR - fonts (DATAROOTDIR/fonts) @@ -93,15 +92,6 @@ endif() # the cache and store the defaults in local variables if the cache values are # not set explicitly. This auto-updates the defaults as DATAROOTDIR changes. -if(NOT CMAKE_INSTALL_CINTINCDIR) - if(gnuinstall) - set(CMAKE_INSTALL_CINTINCDIR "" CACHE PATH "cint includes and libraries libraries (LIBDIR/cint)") - set(CMAKE_INSTALL_CINTINCDIR "${CMAKE_INSTALL_LIBDIR}/cint") - else() - set(CMAKE_INSTALL_CINTINCDIR "cint" CACHE PATH "cint includes and libraries libraries (cint)") - endif() -endif() - if(NOT CMAKE_INSTALL_DATADIR) set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)/root") if(gnuinstall) @@ -213,7 +203,6 @@ mark_as_advanced( CMAKE_INSTALL_DATAROOTDIR CMAKE_INSTALL_DATADIR CMAKE_INSTALL_MACRODIR - CMAKE_INSTALL_CINTINCDIR CMAKE_INSTALL_ICONDIR CMAKE_INSTALL_FONTDIR CMAKE_INSTALL_SRCDIR @@ -233,7 +222,6 @@ foreach(dir BINDIR DATAROOTDIR DATADIR MACRODIR - CINTINCDIR ICONDIR FONTDIR SRCDIR diff --git a/cmake/modules/RootMacros.cmake b/cmake/modules/RootMacros.cmake index 32efce70e5fef..f782d97223025 100644 --- a/cmake/modules/RootMacros.cmake +++ b/cmake/modules/RootMacros.cmake @@ -627,7 +627,7 @@ function(ROOT_GENERATE_DICTIONARY dictionary) #---what rootcling command to use-------------------------- if(ARG_STAGE1) set(command $) - set(ROOTCINTDEP rconfigure) + set(ROOTCLINGDEP rconfigure) set(pcm_name) else() if(CMAKE_PROJECT_NAME STREQUAL ROOT) @@ -636,7 +636,7 @@ function(ROOT_GENERATE_DICTIONARY dictionary) else() set(command ${CMAKE_COMMAND} -E env "ROOTIGNOREPREFIX=1" $ -rootbuild) # Modules need RConfigure.h copied into include/. - set(ROOTCINTDEP rootcling rconfigure) + set(ROOTCLINGDEP rootcling rconfigure) endif() elseif(TARGET ROOT::rootcling) set(command $) @@ -694,7 +694,7 @@ function(ROOT_GENERATE_DICTIONARY dictionary) ROOT_PCM_FILENAME "${cpp_module_file}") endif() - #---call rootcint------------------------------------------ + #---call rootcling------------------------------------------ add_custom_command( OUTPUT ${dictionary}.cxx ${pcm_name} ${rootmap_name} ${cpp_module_file} COMMAND ${command} -v2 -f ${dictionary}.cxx ${newargs} ${excludepathsargs} ${rootmapargs} @@ -709,7 +709,7 @@ function(ROOT_GENERATE_DICTIONARY dictionary) # dictionaries will be rebuilt if the C++ standard is changed in an incremental build. -DR__DUMMY_CXX_STANDARD_${CMAKE_CXX_STANDARD} IMPLICIT_DEPENDS ${_implicitdeps} - DEPENDS ${_list_of_header_dependencies} ${_linkdef} ${ROOTCINTDEP} + DEPENDS ${_list_of_header_dependencies} ${_linkdef} ${ROOTCLINGDEP} ${pcm_dependencies} ${MODULE_LIB_DEPENDENCY} ${ARG_EXTRA_DEPENDENCIES} ${runtime_cxxmodule_dependencies} diff --git a/config/rootrc.in b/config/rootrc.in index b1ef456a3af79..71fb8ab96edff 100644 --- a/config/rootrc.in +++ b/config/rootrc.in @@ -352,7 +352,7 @@ Rint.History: $(HOME)/.root_hist # Rint.WelcomeLite: no # When the interactive ROOT starts, it can automatically load some frequently # used includes. However, this introduces several overheads -# - A long list of CINT and system files will be kept open during the session +# - A long list of Cling and system files will be kept open during the session # - The initialisation takes more time (noticeable when using gdb or valgrind) # - Memory overhead of about 5 Mbytes (1/3 of the base ROOT executable) when # including diff --git a/etc/gdb-backtrace.sh b/etc/gdb-backtrace.sh index 7fd8572e99d4f..94291670c478c 100755 --- a/etc/gdb-backtrace.sh +++ b/etc/gdb-backtrace.sh @@ -108,11 +108,11 @@ fi # The recommendations are based on the following assumptions: # * More often than not, the crash is caused by user code. # * The crash can be caused by the user's interpreted code, -# in which case sighandler() is called from CINT (G__...) +# in which case sighandler() is called from Cling (G__...) # * The crash can be called by the user's library code, -# in which case sighandler() is called from non-CINT and +# in which case sighandler() is called from non-Cling and # it's worth dumping the stack frames. -# * The user doesn't call CINT directly, so whenever we reach +# * The user doesn't call Cling directly, so whenever we reach # a stack frame with "G__" we can stop. # * The crash is caused by only one thread, the one which # invokes sighandler() diff --git a/misc/win/makelib.sh b/misc/win/makelib.sh index 5ba09a9647ba5..3e8e0c58f82da 100755 --- a/misc/win/makelib.sh +++ b/misc/win/makelib.sh @@ -73,9 +73,6 @@ if [ "$R__PLATFORM" = "win32" ]; then cmd="$R__LD $R__SOFLAGS $R__LDFLAGS -o $dlldir/${name}.dll $R__OBJS \ $libdir/${name}.exp $R__EXTRA $syslibs" else - if [ "$(bin/root-config --dicttype)" != "cint" ]; then - needReflex="lib/libCintex.lib lib/libReflex.lib" - fi cmd="$R__LD $R__SOFLAGS $R__LDFLAGS -o $dlldir/${name}.dll $R__OBJS \ $libdir/${name}.exp $R__EXTRA \ $needReflex lib/libCore.lib lib/libCint.lib \