|
|
|
@ -1,16 +1,3 @@ |
|
|
|
|
diff --git a/core/base/inc/ROOT/StringConv.hxx b/core/base/inc/ROOT/StringConv.hxx
|
|
|
|
|
index 629fc18..4efa54a 100644
|
|
|
|
|
--- a/core/base/inc/ROOT/StringConv.hxx
|
|
|
|
|
+++ b/core/base/inc/ROOT/StringConv.hxx
|
|
|
|
|
@@ -89,7 +89,7 @@ EFromHumanReadableSize FromHumanReadableSize(std::string_view str, T &value)
|
|
|
|
|
size_t size = str.size();
|
|
|
|
|
size_t cur;
|
|
|
|
|
// Parse leading numeric factor
|
|
|
|
|
- const double coeff = stod(str, &cur);
|
|
|
|
|
+ const double coeff = stod(static_cast<std::string>(str), &cur);
|
|
|
|
|
|
|
|
|
|
// Skip any intermediate white space
|
|
|
|
|
while (cur<size && isspace(str[cur])) ++cur;
|
|
|
|
|
diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx
|
|
|
|
|
index d71cb74..076facb 100644
|
|
|
|
|
--- a/core/metacling/src/TCling.cxx
|
|
|
|
@ -186,15 +173,3 @@ index 94a8b28..0b67867 100644 |
|
|
|
|
DataInfo(), "" );
|
|
|
|
|
|
|
|
|
|
MethodBase *method = (dynamic_cast<MethodBase*>(im));
|
|
|
|
|
diff -aru a/core/base/inc/TString.h b/core/base/inc/TString.h
|
|
|
|
|
--- a/core/base/inc/TString.h
|
|
|
|
|
+++ b/core/base/inc/TString.h
|
|
|
|
|
@@ -106,7 +106,7 @@
|
|
|
|
|
char operator[](Ssiz_t i) const; // Index with bounds checking
|
|
|
|
|
|
|
|
|
|
operator std::string_view() const { return std::string_view(Data(),fExtent); }
|
|
|
|
|
- operator std::string() const { return std::string_view(Data(),fExtent).to_string(); }
|
|
|
|
|
+ operator std::string() const { return static_cast<std::string>(std::string_view(Data(),fExtent)); }
|
|
|
|
|
|
|
|
|
|
const char *Data() const;
|
|
|
|
|
Ssiz_t Length() const { return fExtent; }
|
|
|
|
|