diff options
| author | Zachary Turner <zturner@google.com> | 2016-11-21 22:47:23 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2016-11-21 22:47:23 +0000 |
| commit | 54fa41b99c7f9d6e042cd61ebe9dc30aab7693cc (patch) | |
| tree | 03f2763acbd434f167c7cef72049c6a2faf5382b /llvm | |
| parent | c0bba1a96dd40b02ae3eff265664276d4033ee8b (diff) | |
| download | bcm5719-llvm-54fa41b99c7f9d6e042cd61ebe9dc30aab7693cc.tar.gz bcm5719-llvm-54fa41b99c7f9d6e042cd61ebe9dc30aab7693cc.zip | |
Remove LLVM_NODISCARD from getAsInteger().
llvm-svn: 287589
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm/ADT/StringRef.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/llvm/include/llvm/ADT/StringRef.h b/llvm/include/llvm/ADT/StringRef.h index 0cbb79f8d2e..cb2b310d6e4 100644 --- a/llvm/include/llvm/ADT/StringRef.h +++ b/llvm/include/llvm/ADT/StringRef.h @@ -493,9 +493,8 @@ namespace llvm { /// this returns true to signify the error. The string is considered /// erroneous if empty or if it overflows T. template <typename T> - LLVM_NODISCARD - typename std::enable_if<std::numeric_limits<T>::is_signed, bool>::type - getAsInteger(unsigned Radix, T &Result) const { + typename std::enable_if<std::numeric_limits<T>::is_signed, bool>::type + getAsInteger(unsigned Radix, T &Result) const { long long LLVal; if (getAsSignedInteger(*this, Radix, LLVal) || static_cast<T>(LLVal) != LLVal) @@ -505,9 +504,8 @@ namespace llvm { } template <typename T> - LLVM_NODISCARD - typename std::enable_if<!std::numeric_limits<T>::is_signed, bool>::type - getAsInteger(unsigned Radix, T &Result) const { + typename std::enable_if<!std::numeric_limits<T>::is_signed, bool>::type + getAsInteger(unsigned Radix, T &Result) const { unsigned long long ULLVal; // The additional cast to unsigned long long is required to avoid the // Visual C++ warning C4805: '!=' : unsafe mix of type 'bool' and type |
