experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix clang-tidy warnings in logging.{cc,h}.

Browse Source 
PiperOrigin-RevId: 316773944
Change-Id: Ie35223f385d0e9038e0a0ea223825b5ea78f4769
This commit is contained in:
Mihai Maruseac 2020-06-16 15:51:18 -07:00 committed by TensorFlower Gardener
parent 31e83f2f68
commit 6b126156d9
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tensorflow/core/platform/default/logging.cc
View File

@ -303,7 +303,7 @@ void MakeCheckOpValueString(std::ostream* os, const char& v) {
if (v >= 32 && v <= 126) { if (v >= 32 && v <= 126) {
(*os) << "'" << v << "'"; (*os) << "'" << v << "'";
} else { } else {
(*os) << "char value " << static_cast<short>(v); (*os) << "char value " << static_cast<int16>(v);
} }
} }
@ -312,7 +312,7 @@ void MakeCheckOpValueString(std::ostream* os, const signed char& v) {
if (v >= 32 && v <= 126) { if (v >= 32 && v <= 126) {
(*os) << "'" << v << "'"; (*os) << "'" << v << "'";
} else { } else {
(*os) << "signed char value " << static_cast<short>(v); (*os) << "signed char value " << static_cast<int16>(v);
} }
} }
@ -321,13 +321,13 @@ void MakeCheckOpValueString(std::ostream* os, const unsigned char& v) {
if (v >= 32 && v <= 126) { if (v >= 32 && v <= 126) {
(*os) << "'" << v << "'"; (*os) << "'" << v << "'";
} else { } else {
(*os) << "unsigned char value " << static_cast<unsigned short>(v); (*os) << "unsigned char value " << static_cast<uint16>(v);
} }
} }
#if LANG_CXX11 #if LANG_CXX11
template <> template <>
void MakeCheckOpValueString(std::ostream* os, const std::nullptr_t& p) { void MakeCheckOpValueString(std::ostream* os, const std::nullptr_t& v) {
(*os) << "nullptr"; (*os) << "nullptr";
} }
#endif #endif

22
tensorflow/core/platform/default/logging.h
View File

@ -265,16 +265,12 @@ inline const T& GetReferenceableValue(const T& t) {
inline char GetReferenceableValue(char t) { return t; } inline char GetReferenceableValue(char t) { return t; }
inline unsigned char GetReferenceableValue(unsigned char t) { return t; } inline unsigned char GetReferenceableValue(unsigned char t) { return t; }
inline signed char GetReferenceableValue(signed char t) { return t; } inline signed char GetReferenceableValue(signed char t) { return t; }
inline short GetReferenceableValue(short t) { return t; } inline int16 GetReferenceableValue(int16 t) { return t; }
inline unsigned short GetReferenceableValue(unsigned short t) { return t; } inline uint16 GetReferenceableValue(uint16 t) { return t; }
inline int GetReferenceableValue(int t) { return t; } inline int GetReferenceableValue(int t) { return t; }
inline unsigned int GetReferenceableValue(unsigned int t) { return t; } inline unsigned int GetReferenceableValue(unsigned int t) { return t; }
inline long GetReferenceableValue(long t) { return t; } inline int64 GetReferenceableValue(int64 t) { return t; }
inline unsigned long GetReferenceableValue(unsigned long t) { return t; } inline uint64 GetReferenceableValue(uint64 t) { return t; }
inline long long GetReferenceableValue(long long t) { return t; }
inline unsigned long long GetReferenceableValue(unsigned long long t) {
return t;
}
// This formats a value for a failing CHECK_XX statement. Ordinarily, // This formats a value for a failing CHECK_XX statement. Ordinarily,
// it uses the definition for operator<<, with a few special cases below. // it uses the definition for operator<<, with a few special cases below.
@ -295,16 +291,16 @@ void MakeCheckOpValueString(std::ostream* os, const unsigned char& v);
#if LANG_CXX11 #if LANG_CXX11
// We need an explicit specialization for std::nullptr_t. // We need an explicit specialization for std::nullptr_t.
template <> template <>
void MakeCheckOpValueString(std::ostream* os, const std::nullptr_t& p); void MakeCheckOpValueString(std::ostream* os, const std::nullptr_t& v);
#endif #endif
// A container for a string pointer which can be evaluated to a bool - // A container for a string pointer which can be evaluated to a bool -
// true iff the pointer is non-NULL. // true iff the pointer is non-NULL.
struct CheckOpString { struct CheckOpString {
CheckOpString(string* str) : str_(str) {} explicit CheckOpString(string* str) : str_(str) {}
// No destructor: if str_ is non-NULL, we're about to LOG(FATAL), // No destructor: if str_ is non-NULL, we're about to LOG(FATAL),
// so there's no point in cleaning up str_. // so there's no point in cleaning up str_.
operator bool() const { return TF_PREDICT_FALSE(str_ != NULL); } explicit operator bool() const { return TF_PREDICT_FALSE(str_ != nullptr); }
string* str_; string* str_;
}; };
@ -394,11 +390,11 @@ TF_DEFINE_CHECK_OP_IMPL(Check_GT, >)
// In optimized mode, use CheckOpString to hint to compiler that // In optimized mode, use CheckOpString to hint to compiler that
// the while condition is unlikely. // the while condition is unlikely.
#define CHECK_OP_LOG(name, op, val1, val2) \ #define CHECK_OP_LOG(name, op, val1, val2) \
while (::tensorflow::internal::CheckOpString _result = \ while (::tensorflow::internal::CheckOpString _result{ \
::tensorflow::internal::name##Impl( \ ::tensorflow::internal::name##Impl( \
::tensorflow::internal::GetReferenceableValue(val1), \ ::tensorflow::internal::GetReferenceableValue(val1), \
::tensorflow::internal::GetReferenceableValue(val2), \ ::tensorflow::internal::GetReferenceableValue(val2), \
#val1 " " #op " " #val2)) \ #val1 " " #op " " #val2)}) \
::tensorflow::internal::LogMessageFatal(__FILE__, __LINE__) << *(_result.str_) ::tensorflow::internal::LogMessageFatal(__FILE__, __LINE__) << *(_result.str_)
#define CHECK_OP(name, op, val1, val2) CHECK_OP_LOG(name, op, val1, val2) #define CHECK_OP(name, op, val1, val2) CHECK_OP_LOG(name, op, val1, val2)