Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions README/ReleaseNotes/v642/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ For more information, see:

[http://root.cern](http://root.cern)

The following people have contributed to this new version:

The following people have contributed to this new version:

Bertrand Bellenot, CERN/EP-SFT,\
Expand Down Expand Up @@ -66,8 +64,9 @@ Users are encouraged to export their models to ONNX and use the retained ONNX pa
* The **RooStats::DebuggingSampler** and **RooStats::DebuggingTestStat** classes are removed. They were mock implementations of the `TestStatSampler` and `TestStatistic` interfaces that returned uniform random numbers independent of the data, only meant for debugging the RooStats framework itself during its initial development.
* The `RooTrace` class is deprecated and will be removed in ROOT 6.44. It was a RooFit-specific memory tracer whose instrumentation hooks are compiled out by default, so it has been inert and untested for years. For memory debugging, please use general-purpose tools such as AddressSanitizer or Valgrind instead.
* Support for the AIX operating system has been removed from the codebase. This support has not been tested since the late v5 releases and the LLVM JIT is not yet supporting AIX.
* The headers Htypes.h and Gtypes.h that were deprecated in ROOT 6.20 will now emit warnings and will be fully removed in ROOT 6.44.
* The header GLConstants.h is no longer part of ROOT installed headers.
* The headers `Htypes.h` and `Gtypes.h` that were deprecated in ROOT 6.20 will now emit warnings and will be fully removed in ROOT 6.44.
* The header `GLConstants.h` is no longer part of ROOT installed headers.
* Including `RConfig.h` and `RVersion.h` is now deprecated and will be removed in 6.46, use instead `ROOT/RConfig.hxx` and `ROOT/RVersion.hxx`.

## Build System

Expand Down
4 changes: 1 addition & 3 deletions cmake/unix/module.modulemap
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ module ROOT_Foundation_C {
// supposed to be textually expanded in each TU.
module ROOT_Config {
// These headers are supposed to be only textually expanded for each TU.
module "RVersion.h" { textual header "RVersion.h" export * }
module "RConfig.h" { header "RConfig.h" export * }
module "ROOT/RConfig.h" { header "ROOT/RConfig.h" export * }
module "ROOT/RVersion.hxx" { textual header "ROOT/RVersion.hxx" export * }
module "ROOT/RConfig.hxx" { textual header "ROOT/RConfig.hxx" export * }
module "RConfigure.h" { textual header "RConfigure.h" export * }
// FIXME: There is little benefit in keeping DllImport as a separate header.
Expand Down
5 changes: 3 additions & 2 deletions core/base/inc/RConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@

/*************************************************************************
* *
* Old RConfig.h forwarding to ROOT/RConfig.hxx *
* Old RConfig.h forwarding to ROOT/RConfig.hxx *
* *
* Please #include ROOT/RConfig.hxx instead, e.g. to avoid clashes with *
* Please #include ROOT/RConfig.hxx instead, e.g. to avoid clashes with *
* R's Rconfig.h *
* *
*************************************************************************/
#warning "RConfig.h is deprecated and will be removed in a future release, please include ROOT/RConfig.hxx instead"

#include <ROOT/RConfig.hxx>

Expand Down
2 changes: 1 addition & 1 deletion core/base/inc/TROOT.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ friend TROOT *ROOT::Internal::GetROOT2();
TString fConfigFeatures; ///< ROOT ./configure detected build features
TString fVersion; ///< ROOT version as TString, example: 0.05.01
Int_t fVersionInt = 0; ///< ROOT version in integer format (501)
Int_t fVersionCode = 0; ///< ROOT version code as used in RVersion.h
Int_t fVersionCode = 0; ///< ROOT version code as used in ROOT/RVersion.hxx
Int_t fVersionDate = 0; ///< Date of ROOT version (ex 951226)
Int_t fVersionTime = 0; ///< Time of ROOT version (ex 1152)
Int_t fBuiltDate = 0; ///< Date of ROOT built
Expand Down
2 changes: 1 addition & 1 deletion core/base/inc/TVersionCheck.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#ifndef ROOT_TVersionCheck
#define ROOT_TVersionCheck

#include "RVersion.h"
#include "ROOT/RVersion.hxx"

/** \class TVersionCheck
\ingroup Base
Expand Down
4 changes: 2 additions & 2 deletions core/base/src/TROOT.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -3101,7 +3101,7 @@ Int_t TROOT::ConvertVersionCode2Int(Int_t code)
}

////////////////////////////////////////////////////////////////////////////////
/// Convert version as an integer to version code as used in RVersion.h.
/// Convert version as an integer to version code as used in ROOT/RVersion.hxx.

Int_t TROOT::ConvertVersionInt2Code(Int_t v)
{
Expand All @@ -3112,7 +3112,7 @@ Int_t TROOT::ConvertVersionInt2Code(Int_t v)
}

////////////////////////////////////////////////////////////////////////////////
/// Return ROOT version code as defined in RVersion.h.
/// Return ROOT version code as defined in ROOT/RVersion.hxx.

Int_t TROOT::RootVersionCode()
{
Expand Down
3 changes: 1 addition & 2 deletions core/base/src/TSystem.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -2700,8 +2700,7 @@ static void R__WriteDependencyFile(const TString & build_loc, const TString &dep
}
#endif
{
constexpr const char *dictHeaders[] = {"RVersion.h",
"ROOT/RConfig.hxx",
constexpr const char *dictHeaders[] = {"ROOT/RConfig.hxx",
"TClass.h",
"TDictAttributeMap.h",
"TInterpreter.h",
Expand Down
2 changes: 2 additions & 0 deletions core/foundation/inc/ROOT/RConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
* *
*************************************************************************/

#warning "RConfig.h is deprecated and will be removed in a future release, please include ROOT/RConfig.hxx instead"

#include <ROOT/RConfig.hxx>

#endif // ROOT_RConfig_fwd
2 changes: 1 addition & 1 deletion core/foundation/inc/ROOT/RConfig.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* *
*************************************************************************/

#include "../RVersion.h"
#include "RVersion.hxx"
#include "RConfigure.h"


Expand Down
3 changes: 3 additions & 0 deletions core/foundation/inc/ROOT/RVersion.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
#define ROOT_VERSION_PATCH 1 // When changing the version number here, never add leading zeroes!
#define ROOT_RELEASE_DATE "Apr 23 2026"

/* not updated anymore */
#define ROOT_RELEASE_TIME "00:00:00"

/* Don't change the lines below. */

/*
Expand Down
4 changes: 2 additions & 2 deletions core/foundation/inc/RVersion.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef ROOT_RVersion
#define ROOT_RVersion

#include "ROOT/RVersion.hxx"
#warning "RVersion.h is deprecated and will be removed in a future release, please include ROOT/RVersion.hxx instead"

#define ROOT_RELEASE_TIME "00:00:00" /* not updated anymore */
#include "ROOT/RVersion.hxx"

#endif
2 changes: 1 addition & 1 deletion core/winnt/src/Win32Splash.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*************************************************************************/

#ifdef WIN32
#include "RVersion.h"
#include "ROOT/RVersion.hxx"
#include "strlcpy.h"
#include <wincodec.h>
#include <tchar.h>
Expand Down
2 changes: 1 addition & 1 deletion hist/unfold/src/TUnfoldSys.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ INCLUDED in the methods provided by the base class TUnfold.
#include <TMath.h>
#include <TObjString.h>
#include <TSortedList.h>
#include <RVersion.h>
#include <ROOT/RVersion.hxx>
#include <cmath>

#include "TUnfoldSys.h"
Expand Down
2 changes: 1 addition & 1 deletion io/io/src/RRawFile.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

#include <ROOT/RConfig.h>
#include <ROOT/RConfig.hxx>
#include <ROOT/RRawFile.hxx>
#ifdef _WIN32
#include <ROOT/RRawFileWin.hxx>
Expand Down
2 changes: 1 addition & 1 deletion math/mathcore/test/fit/testMinim.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "TRandom3.h"
#include "TMath.h"

#include "RVersion.h"
#include "ROOT/RVersion.hxx"
#include "RConfigure.h"

//#define DEBUG
Expand Down
2 changes: 1 addition & 1 deletion misc/win/makeresource.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ GITDATE="`cat etc/gitinfo.txt|tail -n1`"
GITYEARCOMMA=`echo $GITDATE|cut -d' ' -f3`

# Can't do that inside the .rc file: FILEVERSION doesn't evaluate a>>b
VERSION=`grep "ROOT_RELEASE " include/RVersion.h | sed 's,^.*"\([^"]*\)".*$,\1,' | sed 's,[^[:digit:]], ,g'`
VERSION=`grep "ROOT_RELEASE " include/ROOT/RVersion.hxx | sed 's,^.*"\([^"]*\)".*$,\1,' | sed 's,[^[:digit:]], ,g'`
VER1=`echo $VERSION| cut -d ' ' -f 1| sed 's,^0,,'`
VER2=`echo $VERSION| cut -d ' ' -f 2| sed 's,^0,,'`
VER3=`echo $VERSION| cut -d ' ' -f 3| sed 's,^0,,'`
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooFit/Evaluator.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <RooAbsReal.h>
#include <RooFit/EvalContext.h>

#include <RConfig.h>
#include <ROOT/RConfig.hxx>

#include <memory>

Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooFitResult.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "RooDirItem.h"
#include "RooArgList.h"

#include "RVersion.h"
#include "ROOT/RVersion.hxx"
#include "TMatrixFfwd.h"
#include "TMatrixDSym.h"
#include "TList.h"
Expand Down
2 changes: 1 addition & 1 deletion roofit/xroofit/src/xRooFit.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* listed in LICENSE (http://roofit.sourceforge.net/license.txt)
*/

#include "RVersion.h"
#include "ROOT/RVersion.hxx"

// #define private public
// #include "Minuit2/Minuit2Minimizer.h"
Expand Down
2 changes: 1 addition & 1 deletion roofit/xroofit/src/xRooNLLVar.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This xRooNLLVar object has several special methods, e.g. for fitting and toy dat

*/

#include "RVersion.h"
#include "ROOT/RVersion.hxx"

#if ROOT_VERSION_CODE < ROOT_VERSION(6, 27, 00)
#define protected public
Expand Down
2 changes: 1 addition & 1 deletion roofit/xroofit/src/xRooNode.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ exploring the content are:

*/

#include "RVersion.h"
#include "ROOT/RVersion.hxx"

#if ROOT_VERSION_CODE < ROOT_VERSION(6, 27, 00)

Expand Down
2 changes: 1 addition & 1 deletion roottest/cling/dict/mapTest.C
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <map>
#include "MyTemplateTestClass.h"
#include "RConfig.h"
#include "ROOT/RConfig.hxx"

void mapTest()
{
Expand Down
2 changes: 1 addition & 1 deletion roottest/root/io/newstl/versions.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef VERSION_H
#define VERSION_H

#include "RVersion.h"
#include "ROOT/RVersion.hxx"
#include "TFile.h"
#include "TestOutput.h"

Expand Down
2 changes: 1 addition & 1 deletion roottest/root/meta/dictSelection/DictSelection.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This test has been provided by Attila Krasznahorkay.
#define DICTRULES_DICTSELECTION_H

// Get the active ROOT version:
#include <RVersion.h>
#include <ROOT/RVersion.hxx>

// Include the correct header:
#if ROOT_VERSION_CODE < ROOT_VERSION( 5, 99, 00 )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
// Define a portable macro for c++11 in COOL (only for COOL290 and ROOT6!)
#ifdef COOL290
#if defined(__GXX_EXPERIMENTAL_CXX0X) || __cplusplus >= 201103L
#include "RVersion.h"
#include "ROOT/RVersion.hxx"
#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
#define COOL_HAS_CPP11 1
#else
Expand Down
2 changes: 1 addition & 1 deletion roottest/root/meta/genreflex/ROOT-5768/PyCool.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "CoolKernel/VersionInfo.h"

// Port to ROOT6 (bug #102630) - remove Reflex dependency
#include "RVersion.h"
#include "ROOT/RVersion.hxx"

// Disable vector payload in PyCool for ROOT6 (workaround for bug #103017)
//#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
Expand Down
2 changes: 1 addition & 1 deletion test/Event.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
//
////////////////////////////////////////////////////////////////////////

#include "RVersion.h"
#include "ROOT/RVersion.hxx"
#include "TRandom.h"
#include "TDirectory.h"
#include "TProcessID.h"
Expand Down
2 changes: 1 addition & 1 deletion tmva/tmvagui/inc/TMVA/tmvaglob.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "TText.h"
#include "TLegend.h"

#include "RVersion.h"
#include "ROOT/RVersion.hxx"

namespace TMVA{

Expand Down
2 changes: 1 addition & 1 deletion tree/ntuple/src/RNTupleSerialize.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include <ROOT/RNTupleTypes.hxx>
#include <ROOT/RNTupleUtils.hxx>
#include <ROOT/BitUtils.hxx>
#include <ROOT/RVersion.hxx>

#include <RVersion.h>
#include <TBufferFile.h>
#include <TClass.h>
#include <TList.h>
Expand Down
2 changes: 1 addition & 1 deletion tree/ntuple/src/RPageStorageDaos.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#include <ROOT/RPagePool.hxx>
#include <ROOT/RDaos.hxx>
#include <ROOT/RPageStorageDaos.hxx>
#include <ROOT/RVersion.hxx>

#include <RVersion.h>
#include <TError.h>

#include <algorithm>
Expand Down
2 changes: 1 addition & 1 deletion tree/ntuple/src/RPageStorageFile.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include <ROOT/RRawFileTFile.hxx>
#include <ROOT/RNTupleTypes.hxx>
#include <ROOT/RNTupleUtils.hxx>
#include <ROOT/RVersion.hxx>

#include <RVersion.h>
#include <TDirectory.h>
#include <TError.h>
#include <TVirtualStreamerInfo.h>
Expand Down
Loading