[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6153-g5a1184b

[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  5a1184bd28543d56e583e3eeee0e6509c891e2fa (commit)
       via  179313cb370550a236daf25315a2f3eb2916b7bd (commit)
      from  8de2b07c14c1e1a6d7fea6473be4c31b67f9088f (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a1184bd28543d56e583e3eeee0e6509c891e2fa
commit 5a1184bd28543d56e583e3eeee0e6509c891e2fa
Merge: 8de2b07 179313c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 11 03:36:05 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 11 03:36:05 2013 -0500

    Merge topic 'GenerateExportHeader-tests' into next
    
    179313c std::getline.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=179313cb370550a236daf25315a2f3eb2916b7bd
commit 179313cb370550a236daf25315a2f3eb2916b7bd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 11 09:35:30 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Dec 11 09:35:30 2013 +0100

    std::getline.

diff --git a/Tests/Module/GenerateExportHeader/exportheader_test.cpp b/Tests/Module/GenerateExportHeader/exportheader_test.cpp
index ad6f351..d82d02e 100644
--- a/Tests/Module/GenerateExportHeader/exportheader_test.cpp
+++ b/Tests/Module/GenerateExportHeader/exportheader_test.cpp
@@ -37,8 +37,8 @@ void compare(const char* refName, const char* testName)
     {
     std::string refLine;
     std::string testLine;
-    getline(ref, refLine);
-    getline(test, testLine);
+    std::getline(ref, refLine);
+    std::getline(test, testLine);
     if (testLine.size() && testLine[testLine.size()-1] == ' ')
       {
       testLine = testLine.substr(0, testLine.size() - 1);

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

Summary of changes:
 .../GenerateExportHeader/exportheader_test.cpp     |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake