Skip to content
Merged
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
2 changes: 1 addition & 1 deletion core/base/inc/Byteswap.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#endif

#if defined(_WIN32) && (_MSC_VER >= 1300)
# include <stdlib.h>
# include <cstdlib>
# pragma intrinsic(_byteswap_ushort,_byteswap_ulong,_byteswap_uint64)
# define R__USEASMSWAP
#endif
Expand Down
2 changes: 1 addition & 1 deletion core/base/inc/Strlen.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <ROOT/RConfig.hxx>

#ifdef NEED_STRING
#include <string.h>
#include <cstring>
#endif

#endif
2 changes: 1 addition & 1 deletion core/base/inc/TException.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// //
//////////////////////////////////////////////////////////////////////////

#include <setjmp.h>
#include <csetjmp>

#include <ROOT/RConfig.hxx>
#include "DllImport.h"
Expand Down
2 changes: 1 addition & 1 deletion core/base/inc/TObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "TStorage.h"
#include "TVersionCheck.h"

#include <stdarg.h>
#include <cstdarg>
#include <string>
#include <iosfwd>

Expand Down
4 changes: 2 additions & 2 deletions core/base/inc/Varargs.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
# define va_arg(ap, mode) ((mode*) __builtin_va_arg_incr((mode*)ap))[0]
# define va_(arg) __builtin_va_alist

# include <stdio.h>
# include <cstdio>

extern "C" {
int vfprintf(FILE*, const char *fmt, va_list ap);
char *vsprintf(char*, const char *fmt, va_list ap);
};

#else
# include <stdarg.h>
# include <cstdarg>
# if defined(sparc) && !defined(__GNUG__) && !defined(__CC_SUN21__) && !defined(__SVR4)
# define va_(arg) __builtin_va_alist
# else
Expand Down
6 changes: 3 additions & 3 deletions core/base/src/Match.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
// //
//////////////////////////////////////////////////////////////////////////

#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include <cstdio>
#include <cctype>
#include <cstring>


#include "Match.h"
Expand Down
2 changes: 1 addition & 1 deletion core/base/src/TDatime.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ required, use TTimeStamp.

#ifdef WIN32
#include "Windows4Root.h"
#include <string.h>
#include <cstring>
#endif

#include "TBuffer.h"
Expand Down
4 changes: 2 additions & 2 deletions core/base/src/TMD5.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ array with the digest.
#include "TError.h"
#include "TSystem.h"
#include "Bytes.h"
#include <string.h>
#include <errno.h>
#include <cstring>
#include <cerrno>
#ifdef R__WIN32
#include <io.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion core/base/src/TMathBase.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ a stable file and used in place of TMath.h in the ROOT miniCore.
*/

#include "TMathBase.h"
#include <math.h>
#include <cmath>

////////////////////////////////////////////////////////////////////////////////
/// Return next prime number after x, unless x is a prime in which case
Expand Down
2 changes: 1 addition & 1 deletion core/base/src/TStorage.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Set the compile option R__NOSTATS to de-activate all memory checking
and statistics gathering in the system.
*/

#include <stdlib.h>
#include <cstdlib>

#include "TROOT.h"
#include "TObjectTable.h"
Expand Down
8 changes: 4 additions & 4 deletions core/base/src/TString.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ as a TString, construct a TString from it, eg:
*/

#include <ROOT/RConfig.hxx>
#include <stdlib.h>
#include <ctype.h>
#include <cstdlib>
#include <cctype>
#include <list>
#include <algorithm>

Expand Down Expand Up @@ -714,13 +714,13 @@ UInt_t TString::Hash(ECaseCompare cmp) const
typedef unsigned __int64 uint64_t;
#else // defined(_MSC_VER)
// Other compilers
#include <stdint.h>
#include <cstdint>
#endif // !defined(_MSC_VER)

// From MurmurHash.cpp:
#if defined(_MSC_VER)
// Microsoft Visual Studio
#include <stdlib.h>
#include <cstdlib>
#define ROTL64(x,y) _rotl64(x,y)
#define BIG_CONSTANT(x) (x)
#else // defined(_MSC_VER)
Expand Down
4 changes: 2 additions & 2 deletions core/base/src/TUUID.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ system clock catches up.
#include "Bytes.h"
#include "TVirtualMutex.h"
#include "ThreadLocalStorage.h"
#include <string.h>
#include <stdlib.h>
#include <cstring>
#include <cstdlib>
#ifdef R__WIN32
#include "Windows4Root.h"
#include <Iphlpapi.h>
Expand Down
2 changes: 1 addition & 1 deletion core/base/src/TUri.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ the different parts of an URI. The functionality is that of
a validating parser.
*/

#include <ctype.h> // for tolower()
#include <cctype> // for tolower()
#include "TUri.h"
#include "TObjArray.h"
#include "TObjString.h"
Expand Down
2 changes: 1 addition & 1 deletion core/base/src/TUrl.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ an URL. The supported url format is:
~~~
*/

#include <stdlib.h>
#include <cstdlib>
#include "TUrl.h"
#include "THashList.h"
#include "TObjArray.h"
Expand Down
2 changes: 1 addition & 1 deletion core/clingutils/src/RStl.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "TClingUtils.h"
using namespace TClassEdit;

#include <stdio.h>
#include <cstdio>

#include "clang/AST/Decl.h"
#include "clang/AST/DeclTemplate.h"
Expand Down
2 changes: 1 addition & 1 deletion core/cont/inc/TBits.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
//////////////////////////////////////////////////////////////////////////

#include "TObject.h"
#include <string.h>
#include <cstring>

class TBits : public TObject {

Expand Down
2 changes: 1 addition & 1 deletion core/cont/src/TBtree.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ item's own key).
#include "TBuffer.h"
#include "TObject.h"

#include <stdlib.h>
#include <cstdlib>


ClassImp(TBtree);
Expand Down
2 changes: 1 addition & 1 deletion core/cont/src/TExMap.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ method (linear probing).
#include "TBuffer.h"
#include "TError.h"
#include "TMathBase.h"
#include <string.h>
#include <cstring>


ClassImp(TExMap);
Expand Down
2 changes: 1 addition & 1 deletion core/cont/src/TObjArray.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ set to the owner of its own content.
#include "TROOT.h"
#include "TBuffer.h"
#include "TVirtualMutex.h"
#include <stdlib.h>
#include <cstdlib>

ClassImp(TObjArray);

Expand Down
4 changes: 2 additions & 2 deletions core/dictgen/res/OptionParser.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ Bugs Fixed 8-7-12:
*/


#include <stdio.h>
#include <stdlib.h>
#include <cstdio>
#include <cstdlib>

/**
* @file
Expand Down
4 changes: 2 additions & 2 deletions core/dictgen/res/cygpath.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*************************************************************************/

#ifndef ROOT_CygPath
#include <stdio.h>
#include <stdlib.h>
#include <cstdio>
#include <cstdlib>
#include <direct.h>
#include <string>

Expand Down
2 changes: 1 addition & 1 deletion core/dictgen/src/BaseSelectionRule.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "TClingUtils.h"

#include <iostream>
#include <string.h>
#include <cstring>
#include <cctype>

#include "clang/Basic/SourceLocation.h"
Expand Down
6 changes: 3 additions & 3 deletions core/dictgen/src/rootcling_impl.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <algorithm>
#include <cstdio>

#include <errno.h>
#include <cerrno>
#include <string>
#include <list>
#include <sstream>
Expand Down Expand Up @@ -64,7 +64,7 @@
#endif // R__FBSD

#if !defined(R__WIN32)
#include <limits.h>
#include <climits>
#include <unistd.h>
#endif

Expand Down Expand Up @@ -4463,7 +4463,7 @@ int RootClingMain(int argc,

if (!isGenreflex) { // rootcling
// ROOTCINT uses to define a few header implicitly, we need to do it explicitly.
if (interp.declare("#include <assert.h>\n"
if (interp.declare("#include <cassert>\n"
"#include \"Rtypes.h\"\n"
"#include \"TObject.h\"") != cling::Interpreter::kSuccess
) {
Expand Down
2 changes: 1 addition & 1 deletion core/foundation/inc/ROOT/RConfig.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
# endif
# else
# define R__SUN
# include <stdlib.h>
# include <cstdlib>
# endif
# define R__UNIX
# define NEED_STRING
Expand Down
2 changes: 1 addition & 1 deletion core/foundation/inc/TClassEdit.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include <ROOT/RConfig.hxx>
#include "RConfigure.h"
#include <stdlib.h>
#include <cstdlib>
#include <stdexcept>
#ifdef R__WIN32
#ifndef UNDNAME_COMPLETE
Expand Down
5 changes: 4 additions & 1 deletion core/foundation/inc/ThreadLocalStorage.h
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,11 @@ T &TTHREAD_TLS_INIT(ArgType arg) {
# define TTHREAD_TLS_FREE(name)

#elif defined(R__HAS_PTHREAD)

#ifdef __cplusplus
#include <cassert>
#else
#include <assert.h>
#endif
#include <pthread.h>

# define TTHREAD_TLS_DECLARE(type,name) \
Expand Down
4 changes: 2 additions & 2 deletions core/foundation/res/ROOT/RSha256.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#include "Rtypes.h"

#include <iostream>
#include <stdlib.h>
#include <stdint.h>
#include <cstdlib>
#include <cstdint>


namespace ROOT {
Expand Down
2 changes: 1 addition & 1 deletion core/meta/src/TBaseClass.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "TBuffer.h"
#include "TClass.h"
#include "TInterpreter.h"
#include <limits.h>
#include <climits>

#include "TVirtualMutex.h" // For R__LOCKGUARD

Expand Down
6 changes: 3 additions & 3 deletions core/metacling/src/TCling.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ clang/LLVM technology.
#include <map>
#include <set>
#include <stdexcept>
#include <stdint.h>
#include <cstdint>
#include <fstream>
#include <sstream>
#include <string>
Expand All @@ -153,8 +153,8 @@ clang/LLVM technology.
#define R__DLLEXPORT __attribute__ ((visibility ("default")))
#include <sys/stat.h>
#endif
#include <limits.h>
#include <stdio.h>
#include <climits>
#include <cstdio>

#ifdef __APPLE__
#include <dlfcn.h>
Expand Down
2 changes: 1 addition & 1 deletion core/multiproc/src/TMPClient.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "TSocket.h"
#include "TSystem.h" //gSystem
#include "TVirtualX.h" //gVirtualX
#include <errno.h> //errno, used by socketpair
#include <cerrno> //errno, used by socketpair
#include <memory> //unique_ptr
#include <sys/socket.h> //socketpair
#include <sys/wait.h> // waitpid
Expand Down
4 changes: 2 additions & 2 deletions core/newdelete/src/NewDelete.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
// //
//////////////////////////////////////////////////////////////////////////

#include <stdlib.h>
#include <errno.h>
#include <cstdlib>
#include <cerrno>

#include "TObjectTable.h"
#include "TError.h"
Expand Down
2 changes: 1 addition & 1 deletion core/rint/src/TRint.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include "snprintf.h"

#ifdef R__UNIX
#include <signal.h>
#include <csignal>
#include <unistd.h>
#endif

Expand Down
2 changes: 1 addition & 1 deletion core/textinput/src/textinput/History.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <sstream>

#ifdef WIN32
# include <stdio.h>
# include <cstdio>
extern "C" unsigned long __stdcall GetCurrentProcessId(void);
#else
# include <unistd.h>
Expand Down
2 changes: 1 addition & 1 deletion core/textinput/src/textinput/KeyBinding.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "textinput/KeyBinding.h"

#include <ctype.h>
#include <cctype>

namespace textinput {
KeyBinding::KeyBinding(): fEscPending(false), fEscCmdEnabled(false) {}
Expand Down
4 changes: 2 additions & 2 deletions core/textinput/src/textinput/StreamReaderUnix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
#include <sys/time.h>
#include <unistd.h>
#include <termios.h>
#include <stdio.h>
#include <cstdio>
#ifdef __APPLE__
#include <errno.h> // For EINTR
#include <cerrno> // For EINTR
#endif

#include <cctype>
Expand Down
Loading
Loading