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.

Sign up for GitHub

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] Remove backports of C++17 features #13993

Merged
merged 4 commits into from
Nov 1, 2023
Merged

[core] Remove backports of C++17 features #13993

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1734d4
[core] Remove `std::string_view` backport
guitargeek Nov 1, 2023
991b1fa
[core] Remove `std::apply` backport
guitargeek Nov 1, 2023
d70dfbc
[cmake] Remove unused checks for C++ features
guitargeek Nov 1, 2023
4f5cbf8
[core] Replace usage of `ROOT/RStringView.hxx` header inside ROOT
guitargeek Nov 1, 2023
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
Prev Previous commit
[core] Replace usage of ROOT/RStringView.hxx header inside ROOT 
Since C++17 is now the minimum standard, we can use `<string_view>`.
  • Loading branch information
@guitargeek
guitargeek committed Nov 1, 2023
commit 4f5cbf8ac90b81fd8aa5fac01cc54f0a5bfaf578
2 changes: 1 addition & 1 deletion bindings/pyroot/cppyy/CPyCppyy/src/Converters.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#if __cplusplus > 201402L
#include <cstddef>
#endif
#include "ROOT/RStringView.hxx"
#include <string_view>

#define UNKNOWN_SIZE -1
#define UNKNOWN_ARRAY_SIZE -2
Expand Down
2 changes: 1 addition & 1 deletion bindings/pyroot/cppyy/CPyCppyy/src/DeclareConverters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <string>

// ROOT
#include "ROOT/RStringView.hxx"
#include <string_view>
#include "TString.h"


Expand Down
2 changes: 1 addition & 1 deletion core/base/inc/ROOT/StringConv.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#define ROOT_StringConv


#include "ROOT/RStringView.hxx"
#include <string_view>
#include "Rtypes.h"
#include "RConfigure.h"
#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion core/base/inc/TString.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "Rtypes.h"

#include "TMathBase.h"
#include "ROOT/RStringView.hxx"
#include <string_view>
#include "ROOT/TypeTraits.hxx"
#include "snprintf.h"

Expand Down
2 changes: 1 addition & 1 deletion core/base/v7/inc/ROOT/RDirectory.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <type_traits>
#include <unordered_map>
#include <string>
#include <ROOT/RStringView.hxx>
#include <string_view>

namespace ROOT {
namespace Experimental {
Expand Down
2 changes: 1 addition & 1 deletion core/foundation/inc/ROOT/StringUtils.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#ifndef ROOT_StringUtils
#define ROOT_StringUtils

#include "ROOT/RStringView.hxx"
#include <string_view>

#include <string>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion core/foundation/inc/TClassEdit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ namespace ROOT {
class TNormalizedCtxt;
}
}
#include "ROOT/RStringView.hxx"
#include <string_view>

// TClassEdit is used to manipulate class and type names.
//
Expand Down
2 changes: 1 addition & 1 deletion core/foundation/src/TClassEdit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <stack>
// for shared_ptr
#include <memory>
#include "ROOT/RStringView.hxx"
#include <string_view>
#include <algorithm>

#include "TSpinLockGuard.h"
Expand Down
2 changes: 1 addition & 1 deletion graf2d/gpadv7/inc/ROOT/RPalette.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef ROOT7_RPalette
#define ROOT7_RPalette

#include <ROOT/RStringView.hxx>
#include <string_view>
#include <ROOT/RColor.hxx>

#include <utility>
Expand Down
2 changes: 1 addition & 1 deletion hist/histv7/inc/ROOT/RAxis.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <vector>

#include "ROOT/RAxisConfig.hxx"
#include "ROOT/RStringView.hxx"
#include <string_view>
#include "ROOT/RLogger.hxx"

namespace ROOT {
Expand Down
2 changes: 1 addition & 1 deletion hist/histv7/inc/ROOT/RAxisConfig.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <utility>
#include <vector>

#include "ROOT/RStringView.hxx"
#include <string_view>

namespace ROOT {
namespace Experimental {
Expand Down
2 changes: 1 addition & 1 deletion io/io/inc/ROOT/RRawFile.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#ifndef ROOT_RRawFile
#define ROOT_RRawFile

#include <ROOT/RStringView.hxx>
#include <string_view>

#include <cstddef>
#include <cstdint>
Expand Down
2 changes: 1 addition & 1 deletion io/io/inc/ROOT/RRawFileUnix.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#define ROOT_RRawFileUnix

#include <ROOT/RRawFile.hxx>
#include <ROOT/RStringView.hxx>
#include <string_view>

#include <cstddef>
#include <cstdint>
Expand Down
2 changes: 1 addition & 1 deletion io/io/inc/ROOT/RRawFileWin.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#define ROOT_RRawFileWin

#include <ROOT/RRawFile.hxx>
#include <ROOT/RStringView.hxx>
#include <string_view>

#include <cstddef>
#include <cstdint>
Expand Down
2 changes: 1 addition & 1 deletion io/io/v7/inc/ROOT/RFile.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define ROOT7_RFile

#include "ROOT/RDirectory.hxx"
#include "ROOT/RStringView.hxx"
#include <string_view>

#include "TClass.h"
#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion net/davix/inc/ROOT/RRawFileDavix.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#define ROOT_RRawFileDavix

#include <ROOT/RRawFile.hxx>
#include <ROOT/RStringView.hxx>
#include <string_view>

#include <cstddef>
#include <cstdint>
Expand Down
2 changes: 1 addition & 1 deletion roofit/hs3/src/JSONIOUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef JSONIOUtils_h
#define JSONIOUtils_h

#include <ROOT/RStringView.hxx>
#include <string_view>
#include <RooFit/Detail/JSONInterface.h>

bool startsWith(std::string_view str, std::string_view prefix);
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooAbsDataStore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "RooArgSet.h"
#include "RooAbsData.h"

#include "ROOT/RStringView.hxx"
#include <string_view>
#include "TNamed.h"

#include <list>
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooDataHist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "RooDirItem.h"
#include "RooArgSet.h"

#include "ROOT/RStringView.hxx"
#include <string_view>
#include "Rtypes.h"

#include <map>
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooDataSet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class TDirectory;
#include "RooAbsData.h"
#include "RooDirItem.h"

#include "ROOT/RStringView.hxx"
#include <string_view>

#include <list>

Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooStringView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#ifndef roofit_roofitcore_RooStringView_h
#define roofit_roofitcore_RooStringView_h

#include <ROOT/RStringView.hxx>
#include <string_view>
#include <TString.h>

#include <string>
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooTreeDataStore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include "RooAbsDataStore.h"

#include "ROOT/RStringView.hxx"
#include <string_view>

#include <vector>
#include <list>
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooVectorDataStore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "RooChangeTracker.h"
#include "RooRealVar.h"

#include "ROOT/RStringView.hxx"
#include <string_view>
#include "Rtypes.h"

#include <list>
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/src/RooFit/BatchModeDataHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <RooFit/Detail/DataMap.h>

#include <ROOT/RSpan.hxx>
#include <ROOT/RStringView.hxx>
#include <string_view>

#include <functional>
#include <map>
Expand Down
2 changes: 1 addition & 1 deletion tmva/tmva/inc/TMVA/RStandardScaler.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <TFile.h>

#include <TMVA/RTensor.hxx>
#include <ROOT/RStringView.hxx>
#include <string_view>

#include <cmath>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDF/ActionHelpers.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#define ROOT_RDFOPERATIONS

#include "Compression.h"
#include "ROOT/RStringView.hxx"
#include <string_view>
#include "ROOT/RVec.hxx"
#include "ROOT/TBufferMerger.hxx" // for SnapshotHelper
#include "ROOT/RDF/RCutFlowReport.hxx"
Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDF/GraphNode.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <string>
#include <memory>
#include <vector>
#include "ROOT/RStringView.hxx"
#include <string_view>

#include <iostream>

Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDF/InterfaceUtils.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <ROOT/RDF/RJittedFilter.hxx>
#include <ROOT/RDF/RJittedVariation.hxx>
#include <ROOT/RDF/RLoopManager.hxx>
#include <ROOT/RStringView.hxx>
#include <string_view>
#include <ROOT/RDF/RVariation.hxx>
#include <ROOT/TypeTraits.hxx>
#include <TError.h> // gErrorIgnoreLevel
Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDF/RCutFlowReport.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#ifndef ROOT_RCUTFLOWREPORT
#define ROOT_RCUTFLOWREPORT

#include "ROOT/RStringView.hxx"
#include <string_view>
#include "RtypesCore.h"

#include <string>
Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDF/RDefine.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "ROOT/RDF/RDefineBase.hxx"
#include "ROOT/RDF/RLoopManager.hxx"
#include "ROOT/RDF/Utils.hxx"
#include "ROOT/RStringView.hxx"
#include <string_view>
#include "ROOT/TypeTraits.hxx"
#include "RtypesCore.h"

Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDF/RInterface.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "ROOT/RDF/RVariationsDescription.hxx"
#include "ROOT/RResultPtr.hxx"
#include "ROOT/RSnapshotOptions.hxx"
#include "ROOT/RStringView.hxx"
#include <string_view>
#include "ROOT/RVec.hxx"
#include "ROOT/TypeTraits.hxx"
#include "RtypesCore.h" // for ULong64_t
Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDF/RInterfaceBase.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <ROOT/RDF/RLoopManager.hxx>
#include <ROOT/RDataSource.hxx>
#include <ROOT/RResultPtr.hxx>
#include <ROOT/RStringView.hxx>
#include <string_view>
#include <TError.h> // R__ASSERT

#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDF/RJittedDefine.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "ROOT/RDF/RDefineBase.hxx"
#include "ROOT/RDF/RSampleInfo.hxx"
#include "ROOT/RDF/Utils.hxx" // TypeName2TypeID
#include "ROOT/RStringView.hxx"
#include <string_view>
#include "RtypesCore.h"

#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDF/RJittedFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "ROOT/RDF/GraphNode.hxx"
#include "ROOT/RDF/RFilterBase.hxx"
#include "ROOT/RDF/RLoopManager.hxx"
#include "ROOT/RStringView.hxx"
#include <string_view>
#include "RtypesCore.h"

#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDF/RJittedVariation.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define ROOT_RJITTEDVARIATION

#include "ROOT/RDF/RVariationBase.hxx"
#include "ROOT/RStringView.hxx"
#include <string_view>

#include <memory>

Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDF/RSampleInfo.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define ROOT_RDF_RSAMPLEINFO

#include <ROOT/RDF/RSample.hxx>
#include <ROOT/RStringView.hxx>
#include <string_view>
#include <Rtypes.h>

#include <functional>
Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDF/RVariation.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "RLoopManager.hxx"
#include "RVariationBase.hxx"

#include <ROOT/RStringView.hxx>
#include <string_view>
#include <ROOT/TypeTraits.hxx>
#include <Rtypes.h> // R__CLING_PTRCHECK, Long64_t

Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDF/Utils.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define ROOT_RDFUTILS

#include "ROOT/RSpan.hxx"
#include "ROOT/RStringView.hxx"
#include <string_view>
#include "ROOT/RVec.hxx"
#include "ROOT/TypeTraits.hxx"
#include "Rtypes.h"
Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDataFrame.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ROOT's RDataFrame allows to analyse data stored in TTrees with a high level inte
#include "ROOT/RDF/RDatasetSpec.hxx"
#include "ROOT/RDF/RInterface.hxx"
#include "ROOT/RDF/Utils.hxx"
#include "ROOT/RStringView.hxx"
#include <string_view>
#include "RtypesCore.h"

#include <initializer_list>
Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RDataSource.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define ROOT_RDATASOURCE

#include "RDF/RColumnReaderBase.hxx"
#include "ROOT/RStringView.hxx"
#include <string_view>
#include "RtypesCore.h" // ULong64_t
#include "TString.h"

Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RNTupleDS.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <ROOT/RDataFrame.hxx>
#include <ROOT/RDataSource.hxx>
#include <ROOT/RNTupleUtil.hxx>
#include <ROOT/RStringView.hxx>
#include <string_view>

#include <cstdint>
#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RSnapshotOptions.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define ROOT_RSNAPSHOTOPTIONS

#include <Compression.h>
#include <ROOT/RStringView.hxx>
#include <string_view>
#include <string>

namespace ROOT {
Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/inc/ROOT/RSqliteDS.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include "ROOT/RDataFrame.hxx"
#include "ROOT/RDataSource.hxx"
#include "ROOT/RStringView.hxx"
#include <string_view>

#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/src/RDFInterfaceUtils.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <ROOT/RDF/RLoopManager.hxx>
#include <ROOT/RDF/RNodeBase.hxx>
#include <ROOT/RDF/Utils.hxx>
#include <ROOT/RStringView.hxx>
#include <string_view>
#include <TBranch.h>
#include <TClass.h>
#include <TClassEdit.h>
Expand Down
Loading
Loading