[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-389-ge8815ce

[Daniel Pfeifer]

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  e8815ce7d7e0d22b759627bd5c97ee46b83d05dc (commit)
       via  a1ae0230af90ee6d08664413e7dd1c4848880f65 (commit)
      from  ef86b0e3e0337d502fa49ed8a0778668ba27a07e (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=e8815ce7d7e0d22b759627bd5c97ee46b83d05dc
commit e8815ce7d7e0d22b759627bd5c97ee46b83d05dc
Merge: ef86b0e a1ae023
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Jun 17 14:51:22 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 17 14:51:22 2016 -0400

    Merge topic 'cmDependsJavaParserHelper-dangling-ptr' into next
    
    a1ae0230 fixup! cmDependsJavaParserHelper: fix dangling pointer


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1ae0230af90ee6d08664413e7dd1c4848880f65
commit a1ae0230af90ee6d08664413e7dd1c4848880f65
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Jun 17 20:49:13 2016 +0200
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Fri Jun 17 20:49:13 2016 +0200

    fixup! cmDependsJavaParserHelper: fix dangling pointer
    
    Revert the changes on the #includes.  They will be done with the rest of
    the iwyu cleanup.

diff --git a/Source/cmDependsJavaParserHelper.cxx b/Source/cmDependsJavaParserHelper.cxx
index 52072d4..238e7a1 100644
--- a/Source/cmDependsJavaParserHelper.cxx
+++ b/Source/cmDependsJavaParserHelper.cxx
@@ -13,12 +13,7 @@
 
 #include "cmDependsJavaLexer.h"
 #include "cmSystemTools.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <cmsys/FStream.hxx>
-#include <iostream>
 
 int cmDependsJava_yyparse(yyscan_t yyscanner);
 
diff --git a/Source/cmDependsJavaParserHelper.h b/Source/cmDependsJavaParserHelper.h
index 731bbcc..6ff0245 100644
--- a/Source/cmDependsJavaParserHelper.h
+++ b/Source/cmDependsJavaParserHelper.h
@@ -12,10 +12,7 @@
 #ifndef cmDependsJavaParserHelper_h
 #define cmDependsJavaParserHelper_h
 
-#include <cmConfigure.h> // IWYU pragma: keep
-
-#include <string>
-#include <vector>
+#include "cmStandardIncludes.h"
 
 #define YYSTYPE cmDependsJavaParserHelper::ParserType
 #define YYSTYPE_IS_DECLARED

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

Summary of changes:
 Source/cmDependsJavaParserHelper.cxx |    5 -----
 Source/cmDependsJavaParserHelper.h   |    5 +----
 2 files changed, 1 insertion(+), 9 deletions(-)


hooks/post-receive
-- 
CMake