projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apply clang-tidy modernize-use-override
[folly.git]
/
folly
/
FormatArg.h
diff --git
a/folly/FormatArg.h
b/folly/FormatArg.h
index 127745c47e16998faea7c5d639cf37c342d0cb8b..48311e3d4e7cd18a77aeacb553dd0d4c98fc7ee9 100644
(file)
--- a/
folly/FormatArg.h
+++ b/
folly/FormatArg.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
6
Facebook, Inc.
+ * Copyright 201
7
Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-14,8
+14,7
@@
* limitations under the License.
*/
* limitations under the License.
*/
-#ifndef FOLLY_FORMATARG_H_
-#define FOLLY_FORMATARG_H_
+#pragma once
#include <stdexcept>
#include <folly/Conv.h>
#include <stdexcept>
#include <folly/Conv.h>
@@
-212,7
+211,7
@@
inline std::string FormatArg::errorStr(Args&&... args) const {
}
template <typename... Args>
}
template <typename... Args>
-inline void FormatArg::error(Args&&... args) const {
+
[[noreturn]]
inline void FormatArg::error(Args&&... args) const {
throw BadFormatArg(errorStr(std::forward<Args>(args)...));
}
throw BadFormatArg(errorStr(std::forward<Args>(args)...));
}
@@
-244,10
+243,10
@@
inline StringPiece FormatArg::doSplitKey() {
const char* p;
if (e[-1] == ']') {
--e;
const char* p;
if (e[-1] == ']') {
--e;
- p = static_cast<const char*>(memchr(b, '[',
e - b
));
- enforce(p, "unmatched ']'");
+ p = static_cast<const char*>(memchr(b, '[',
size_t(e - b)
));
+ enforce(p
!= nullptr
, "unmatched ']'");
} else {
} else {
- p = static_cast<const char*>(memchr(b, '.',
e - b
));
+ p = static_cast<const char*>(memchr(b, '.',
size_t(e - b)
));
}
if (p) {
key_.assign(p + 1, e);
}
if (p) {
key_.assign(p + 1, e);
@@
-268,12
+267,10
@@
inline int FormatArg::splitIntKey() {
}
try {
return to<int>(doSplitKey<true>());
}
try {
return to<int>(doSplitKey<true>());
- } catch (const std::out_of_range&
e
) {
+ } catch (const std::out_of_range&) {
error("integer key required");
return 0; // unreached
}
}
} // namespace folly
error("integer key required");
return 0; // unreached
}
}
} // namespace folly
-
-#endif /* FOLLY_FORMATARG_H_ */