diff options
author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-06-23 14:42:59 +0200 |
---|---|---|
committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-06-23 14:42:59 +0200 |
commit | fea6c1cf8c4d120fd01a45bee3d6d36ea38e00e1 (patch) | |
tree | 60089fccebbd73a4033e04147ead3a5eb6f3b3ed /src/shared/cplusplus | |
parent | da817310c2c07a107d21e743370a09d4adfc4852 (diff) | |
download | qt-creator-fea6c1cf8c4d120fd01a45bee3d6d36ea38e00e1.tar.gz |
Renamed LambdaCapture::default_capture.
Diffstat (limited to 'src/shared/cplusplus')
-rw-r--r-- | src/shared/cplusplus/AST.cpp | 8 | ||||
-rw-r--r-- | src/shared/cplusplus/AST.h | 4 | ||||
-rw-r--r-- | src/shared/cplusplus/Parser.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/shared/cplusplus/AST.cpp b/src/shared/cplusplus/AST.cpp index 753a2178d0..34d2491ffe 100644 --- a/src/shared/cplusplus/AST.cpp +++ b/src/shared/cplusplus/AST.cpp @@ -2518,8 +2518,8 @@ unsigned LambdaIntroducerAST::lastToken() const unsigned LambdaCaptureAST::firstToken() const { - if (default_capture) - return default_capture; + if (default_capture_token) + return default_capture_token; else if (capture_list) return capture_list->firstToken(); @@ -2533,8 +2533,8 @@ unsigned LambdaCaptureAST::lastToken() const if (capture_list) return capture_list->lastToken(); - else if (default_capture) - return default_capture + 1; + else if (default_capture_token) + return default_capture_token + 1; // assert? return 0; diff --git a/src/shared/cplusplus/AST.h b/src/shared/cplusplus/AST.h index 73452ae778..5eaa6624e5 100644 --- a/src/shared/cplusplus/AST.h +++ b/src/shared/cplusplus/AST.h @@ -4153,12 +4153,12 @@ protected: class LambdaCaptureAST: public AST { public: - unsigned default_capture; + unsigned default_capture_token; CaptureListAST *capture_list; public: LambdaCaptureAST() - : default_capture(0) + : default_capture_token(0) , capture_list(0) {} diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp index 47128a4d06..b86af9e7c5 100644 --- a/src/shared/cplusplus/Parser.cpp +++ b/src/shared/cplusplus/Parser.cpp @@ -5722,7 +5722,7 @@ bool Parser::parseLambdaCapture(LambdaCaptureAST *&node) } LambdaCaptureAST *ast = new (_pool) LambdaCaptureAST; - ast->default_capture = default_capture; + ast->default_capture_token = default_capture; ast->capture_list = capture_list; node = ast; |