[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-256-g2a0c400

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2a0c400fafb2a45a452e249a134fe3ffc9bb92d8 (commit)
       via  7b4b6e82de18ab6fc8156f047f900b57fd3c4fff (commit)
      from  f3a1b9ac463d290948700ae3e2ebf8a74cb31d44 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a0c400fafb2a45a452e249a134fe3ffc9bb92d8
commit 2a0c400fafb2a45a452e249a134fe3ffc9bb92d8
Merge: f3a1b9a 7b4b6e8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 12 15:57:28 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 12 15:57:28 2016 -0400

    Merge topic 'clean-up-Parser' into next
    
    7b4b6e82 fix error


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b4b6e82de18ab6fc8156f047f900b57fd3c4fff
commit 7b4b6e82de18ab6fc8156f047f900b57fd3c4fff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 12 21:57:15 2016 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 12 21:57:15 2016 +0200

    fix error

diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 52b18f8..5e512e2 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -47,7 +47,7 @@ cmListFileParser::cmListFileParser(cmListFile* lf, cmMakefile* mf,
                                    const char* filename)
   : ListFile(lf)
   , Makefile(mf)
-  , Backtrace(this->Makefile->GetBacktrace())
+  , Backtrace(mf->GetBacktrace())
   , FileName(filename)
   , Lexer(cmListFileLexer_New())
 {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmListFileCache.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake