diff options
Diffstat (limited to 'lib/Sema')
| -rw-r--r-- | lib/Sema/SemaDeclAttr.cpp | 4 | ||||
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp index 1376472eec..3e1ced29a8 100644 --- a/lib/Sema/SemaDeclAttr.cpp +++ b/lib/Sema/SemaDeclAttr.cpp @@ -2552,7 +2552,7 @@ void Sema::HandleDelayedDeprecationCheck(DelayedDiagnostic &DD, return; DD.Triggered = true; - if (strlen(DD.DeprecationData.Message)) + if (DD.DeprecationData.Message) Diag(DD.Loc, diag::warn_deprecated_message) << DD.DeprecationData.Decl->getDeclName() << DD.DeprecationData.Message; @@ -2573,7 +2573,7 @@ void Sema::EmitDeprecationWarning(NamedDecl *D, const char * Message, // Otherwise, don't warn if our current context is deprecated. if (isDeclDeprecated(cast<Decl>(CurContext))) return; - if (strlen(Message)) + if (Message) Diag(Loc, diag::warn_deprecated_message) << D->getDeclName() << Message; else diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index d54a858221..fa1ce7a21c 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -59,7 +59,7 @@ bool Sema::DiagnoseUseOfDecl(NamedDecl *D, SourceLocation Loc) { // See if the decl is deprecated. if (const DeprecatedAttr *DA = D->getAttr<DeprecatedAttr>()) { const char *Message = - DA->getMessage().empty() ? "" : DA->getMessage().data(); + DA->getMessage().empty() ? 0 : DA->getMessage().data(); EmitDeprecationWarning(D, Message, Loc); } |