Skip to content

Commit 54ef103

Browse files
committed
[io] rename CINT to Cling
1 parent 3d6897b commit 54ef103

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

io/io/inc/TGenCollectionProxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class TGenCollectionProxy
4242
#endif
4343

4444
enum {
45-
// Those 'bits' are used in conjunction with CINT's bit to store the 'type'
45+
// Those 'bits' are used in conjunction with Cling's bit to store the 'type'
4646
// info into one int
4747
kBIT_ISSTRING = 0x20000000, // We can optimized a value operation when the content are strings
4848
kBIT_ISTSTRING = 0x40000000

io/io/inc/TMapFile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ friend class TMapRec;
7676
public:
7777
enum { kDefaultMapSize = 0x80000 }; // default size of mapped heap is 500 KB
7878

79-
// Should both be protected (waiting for cint)
79+
// TODO: Should both be protected
8080
~TMapFile() override;
8181
void *operator new(size_t sz) { return TObject::operator new(sz); }
8282
void *operator new[](size_t sz) { return TObject::operator new[](sz); }

io/io/src/TBufferFile.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3433,7 +3433,7 @@ Int_t TBufferFile::ReadClassEmulated(const TClass *cl, void *object, const TClas
34333433
/// Deserialize information from a buffer into an object.
34343434
///
34353435
/// Note: This function is called by the xxx::Streamer() functions in
3436-
/// rootcint-generated dictionaries.
3436+
/// rootcling-generated dictionaries.
34373437
/// This function assumes that the class version and the byte count
34383438
/// information have been read.
34393439
///
@@ -3535,7 +3535,7 @@ Int_t TBufferFile::ReadClassBuffer(const TClass *cl, void *pointer, Int_t versio
35353535
/// Deserialize information from a buffer into an object.
35363536
///
35373537
/// Note: This function is called by the xxx::Streamer()
3538-
/// functions in rootcint-generated dictionaries.
3538+
/// functions in rootcling-generated dictionaries.
35393539
///
35403540

35413541
Int_t TBufferFile::ReadClassBuffer(const TClass *cl, void *pointer, const TClass *onFileClass)

io/io/src/TBufferText.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ Int_t TBufferText::WriteClassBuffer(const TClass *cl, void *pointer)
224224
/// Deserialize information from a buffer into an object.
225225
///
226226
/// Note: This function is called by the xxx::Streamer() functions in
227-
/// rootcint-generated dictionaries.
227+
/// rootcling-generated dictionaries.
228228
/// This function assumes that the class version and the byte count
229229
/// information have been read.
230230
///
@@ -321,7 +321,7 @@ Int_t TBufferText::ReadClassBuffer(const TClass *cl, void *pointer, Int_t versio
321321
/// Deserialize information from a buffer into an object.
322322
///
323323
/// Note: This function is called by the xxx::Streamer()
324-
/// functions in rootcint-generated dictionaries.
324+
/// functions in rootcling-generated dictionaries.
325325
///
326326

327327
Int_t TBufferText::ReadClassBuffer(const TClass *cl, void *pointer, const TClass *onFileClass)

io/io/src/TFile.cxx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,8 @@ TFile::~TFile()
596596
}
597597

598598
if (IsOnHeap()) {
599-
// Delete object from CINT symbol table so it can not be used anymore.
600-
// CINT object are always on the heap.
599+
// Delete object from Cling symbol table so it can not be used anymore.
600+
// Cling objects are always on the heap.
601601
gInterpreter->ResetGlobalVar(this);
602602
}
603603

@@ -2716,14 +2716,14 @@ void TFile::WriteHeader()
27162716
/// new (default) | A new directory dirname is created. If dirname already exist, an error message is printed and the function returns.
27172717
/// recreate | If dirname does not exist, it is created (like in "new"). If dirname already exist, all existing files in dirname are deleted before creating the new files.
27182718
/// update | New classes are added to the existing directory. Existing classes with the same name are replaced by the new definition. If the directory dirname doest not exist, same effect as "new".
2719-
/// genreflex | Use genreflex rather than rootcint to generate the dictionary.
2719+
/// genreflex | Use genreflex rather than rootcling to generate the dictionary.
27202720
/// par | Create a PAR file with the minimal set of code needed to read the content of the ROOT file. The name of the PAR file is basename(dirname), with extension '.par' enforced; the PAR file will be created at dirname(dirname).
27212721
///
27222722
/// If, in addition to one of the 3 above options, the option "+" is specified,
27232723
/// the function will generate:
27242724
/// - a script called MAKEP to build the shared lib
27252725
/// - a dirnameLinkDef.h file
2726-
/// - rootcint will be run to generate a dirnameProjectDict.cxx file
2726+
/// - rootcling will be run to generate a dirnameProjectDict.cxx file
27272727
/// - dirnameProjectDict.cxx will be compiled with the current options in compiledata.h
27282728
/// - a shared lib dirname.so will be created.
27292729
/// If the option "++" is specified, the generated shared lib is dynamically
@@ -2735,10 +2735,10 @@ void TFile::WriteHeader()
27352735
/// - creates a new directory demo unless it already exist
27362736
/// - clear the previous directory content
27372737
/// - generate the xxx.h files for all classes xxx found in this file
2738-
/// and not yet known to the CINT dictionary.
2738+
/// and not yet known to the Cling dictionary.
27392739
/// - creates the build script MAKEP
27402740
/// - creates a LinkDef.h file
2741-
/// - runs rootcint generating demoProjectDict.cxx
2741+
/// - runs rootcling generating demoProjectDict.cxx
27422742
/// - compiles demoProjectDict.cxx into demoProjectDict.o
27432743
/// - generates a shared lib demo.so
27442744
/// - dynamically links the shared lib demo.so to the executable
@@ -3005,7 +3005,7 @@ void TFile::MakeProject(const char *dirname, const char * /*classes*/,
30053005
return;
30063006
}
30073007

3008-
// Add rootcint/genreflex statement generating ProjectDict.cxx
3008+
// Add rootcling/genreflex statement generating ProjectDict.cxx
30093009
FILE *ifp = nullptr;
30103010
path.Form("%s/%sProjectInstances.h",clean_dirname.Data(),subdirname.Data());
30113011
#ifdef R__WINGCC
@@ -3026,7 +3026,7 @@ void TFile::MakeProject(const char *dirname, const char * /*classes*/,
30263026
fprintf(fpMAKE,"genreflex %sProjectHeaders.h -o %sProjectDict.cxx --comments --iocomments %s ",subdirname.Data(),subdirname.Data(),gSystem->GetIncludePath());
30273027
path.Form("%s/%sSelection.xml",clean_dirname.Data(),subdirname.Data());
30283028
} else {
3029-
fprintf(fpMAKE,"rootcint -v1 -f %sProjectDict.cxx %s ", subdirname.Data(), gSystem->GetIncludePath());
3029+
fprintf(fpMAKE,"rootcling -v1 -f %sProjectDict.cxx %s ", subdirname.Data(), gSystem->GetIncludePath());
30303030
path.Form("%s/%sLinkDef.h",clean_dirname.Data(),subdirname.Data());
30313031
}
30323032

io/io/src/TFileMerger.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ TClassRef R__TTree_Class("TTree");
5858
TClassRef R__RNTuple_Class("ROOT::RNTuple");
5959

6060
static const Int_t kCpProgress = BIT(14);
61-
static const Int_t kCintFileNumber = 100;
61+
static const Int_t kClingFileNumber = 100;
6262
////////////////////////////////////////////////////////////////////////////////
6363
/// Return the maximum number of allowed opened files minus some wiggle room
64-
/// for CINT or at least of the standard library (stdio).
64+
/// for Cling or at least of the standard library (stdio).
6565

6666
static Int_t R__GetSystemMaxOpenedFiles()
6767
{
@@ -77,8 +77,8 @@ static Int_t R__GetSystemMaxOpenedFiles()
7777
maxfiles = 512;
7878
}
7979
#endif
80-
if (maxfiles > kCintFileNumber) {
81-
return maxfiles - kCintFileNumber;
80+
if (maxfiles > kClingFileNumber) {
81+
return maxfiles - kClingFileNumber;
8282
} else if (maxfiles > 5) {
8383
return maxfiles - 5;
8484
} else {

io/io/src/TGenCollectionProxy.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ TGenCollectionProxy::Value::Value(const std::string& inside_type, Bool_t silent,
360360
// In the case where we have an emulated class,
361361
// if the class is nested (in a class or a namespace),
362362
// calling G__TypeInfo ti(inside.c_str());
363-
// might fail because CINT does not known the nesting
363+
// might fail because Cling does not know the nesting
364364
// scope, so let's first look for an emulated class:
365365

366366
fType = TClass::GetClass(intype.c_str(),kTRUE,silent, hint_pair_offset, hint_pair_size);

io/io/src/TStreamerInfo.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,7 @@ void TStreamerInfo::BuildCheck(TFile *file /* = 0 */, Bool_t load /* = kTRUE */)
11081108
// match in the 'current' in memory TStreamerInfo for
11091109
// a non foreign class (we can not get here if this is
11101110
// a foreign class so we do not need to test it),
1111-
// we need to add this one more test since the CINT behaviour
1111+
// we need to add this one more test since the Cling behaviour
11121112
// with enums changed over time, so verify the checksum ignoring
11131113
// members of type enum. We also used to not count the //[xyz] comment
11141114
// in the checksum, so test for that too.
@@ -1158,7 +1158,7 @@ void TStreamerInfo::BuildCheck(TFile *file /* = 0 */, Bool_t load /* = kTRUE */)
11581158
// match in the 'current' in memory TStreamerInfo for
11591159
// a non foreign class (we can not get here if this is
11601160
// a foreign class so we do not need to test it),
1161-
// we need to add this one more test since the CINT behaviour
1161+
// we need to add this one more test since the Cling behaviour
11621162
// with enums changed over time, so verify the checksum ignoring
11631163
// members of type enum. We also used to not count the //[xyz] comment
11641164
// in the checksum, so test for that too.

io/xml/src/TXMLFile.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
// The XML file is built in memory before being dumped to disk.
2525
//
2626
// Like for normal ROOT files, XML files use the same I/O mechanism
27-
// exploiting the ROOT/CINT dictionary. Any class having a dictionary
27+
// exploiting the ROOT/Cling dictionary. Any class having a dictionary
2828
// can be saved in XML format.
2929
//
3030
// This first implementation does not support subdirectories

0 commit comments

Comments
 (0)