diff options
| author | Volodymyr Sapsai <vsapsai@users.noreply.github.com> | 2014-01-21 17:04:31 +0000 |
|---|---|---|
| committer | Volodymyr Sapsai <vsapsai@users.noreply.github.com> | 2014-01-21 17:04:31 +0000 |
| commit | e4f1b1998294aa5054dee52cd67f837397eeb33d (patch) | |
| tree | 970dda8aa3e9a8407b37e8fbb0c37bd62927d2e3 | |
| parent | 2dcf849ee308dc64b782dd60f8a549986197ee8c (diff) | |
Tag Clang 3.4 release branch.clang_3.4
| -rw-r--r-- | iwyu.cc | 3 | ||||
| -rw-r--r-- | iwyu_preprocessor.cc | 4 | ||||
| -rw-r--r-- | iwyu_preprocessor.h | 4 | ||||
| -rwxr-xr-x | iwyu_test_util.py | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | make_readme.py | 0 |
5 files changed, 4 insertions, 8 deletions
@@ -1912,9 +1912,6 @@ class IwyuBaseAstVisitor : public BaseAstVisitor<Derived> { case clang::CK_ReinterpretMemberPointer: case clang::CK_BuiltinFnToFnPtr: case clang::CK_ZeroToOCLEvent: // OpenCL event_t is a built-in type. - case clang::CK_AddressSpaceConversion: // Address spaces are associated - // with pointers, so no need for - // the full type. break; // We shouldn't be seeing any of these kinds. diff --git a/iwyu_preprocessor.cc b/iwyu_preprocessor.cc index 8a8547b..b338b80 100644 --- a/iwyu_preprocessor.cc +++ b/iwyu_preprocessor.cc @@ -565,7 +565,7 @@ void IwyuPreprocessorInfo::MacroDefined(const Token& id, } void IwyuPreprocessorInfo::If(SourceLocation loc, SourceRange condition_range, - ConditionValueKind condition_value) { + bool condition_value) { ERRSYM(GetFileEntry(condition_range.getBegin())) << " [ #if ] " << PrintableSourceRange(condition_range) << "\n"; @@ -574,7 +574,7 @@ void IwyuPreprocessorInfo::If(SourceLocation loc, SourceRange condition_range, void IwyuPreprocessorInfo::Elif(SourceLocation loc, SourceRange condition_range, - ConditionValueKind condition_value, + bool condition_value, SourceLocation if_loc) { ERRSYM(GetFileEntry(condition_range.getBegin())) << " [ #elif ] " diff --git a/iwyu_preprocessor.h b/iwyu_preprocessor.h index 92f4841..cceaa6f 100644 --- a/iwyu_preprocessor.h +++ b/iwyu_preprocessor.h @@ -180,10 +180,10 @@ class IwyuPreprocessorInfo : public clang::PPCallbacks, virtual void If(clang::SourceLocation loc, clang::SourceRange condition_range, - ConditionValueKind condition_value) IWYU_OVERRIDE; + bool condition_value) IWYU_OVERRIDE; virtual void Elif(clang::SourceLocation loc, clang::SourceRange condition_range, - ConditionValueKind condition_value, + bool condition_value, clang::SourceLocation if_loc) IWYU_OVERRIDE; virtual void Ifdef(clang::SourceLocation loc, const clang::Token& id, diff --git a/iwyu_test_util.py b/iwyu_test_util.py index b05d884..29fd1ca 100755 --- a/iwyu_test_util.py +++ b/iwyu_test_util.py @@ -103,7 +103,6 @@ def _GetCommandOutput(command): stdout=subprocess.PIPE, stderr=subprocess.STDOUT) lines = [line.decode("utf-8") for line in p.stdout.readlines()] - lines = [line.replace(os.linesep, '\n') for line in lines] return lines diff --git a/make_readme.py b/make_readme.py index e737892..e737892 100755..100644 --- a/make_readme.py +++ b/make_readme.py |