mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clang API function terminology got changed

Browse Source 
...at least in trunk 200400 towards Clang 3.5.

Change-Id: I6e295e3a4cf721fbda9df8e7c5bed3993ee78216
This commit is contained in:
Stephan Bergmann
2014-01-31 09:37:27 +01:00
parent 29b322ea0c
commit b21e3d16aa
2 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
compilerplugins/clang/implicitboolconversion.cxx
View File

@@ -15,6 +15,7 @@
#include <string>
#include <vector>
#include "compat.hxx"
#include "plugin.hxx"
template<> struct std::iterator_traits<ExprIterator> {
@@ -183,11 +184,11 @@ bool ImplicitBoolConversion::TraverseCallExpr(CallExpr * expr) {
} else {
std::ptrdiff_t n = j - expr->arg_begin();
assert(n >= 0);
assert(n < t->getNumArgs() || t->isVariadic());
if (n < t->getNumArgs()
&& !(t->getArgType(n)->isSpecificBuiltinType(
assert(n < compat::getNumParams(*t) || t->isVariadic());
if (n < compat::getNumParams(*t)
&& !(compat::getParamType(*t, n)->isSpecificBuiltinType(
BuiltinType::Int)
|| (t->getArgType(n)->isSpecificBuiltinType(
|| (compat::getParamType(*t, n)->isSpecificBuiltinType(
BuiltinType::UInt))))
{
reportWarning(i);
@@ -494,8 +495,10 @@ bool ImplicitBoolConversion::TraverseReturnStmt(ReturnStmt * stmt) {
bool ImplicitBoolConversion::TraverseFunctionDecl(FunctionDecl * decl) {
bool ext = hasCLanguageLinkageType(decl)
&& decl->isThisDeclarationADefinition()
&& (decl->getResultType()->isSpecificBuiltinType(BuiltinType::Int)
|| decl->getResultType()->isSpecificBuiltinType(BuiltinType::UInt));
&& (compat::getReturnType(*decl)->isSpecificBuiltinType(
BuiltinType::Int)
|| compat::getReturnType(*decl)->isSpecificBuiltinType(
BuiltinType::UInt));
if (ext) {
assert(!externCIntFunctionDefinition);
externCIntFunctionDefinition = true;