[Cmake-commits] CMake branch, next, updated. v3.4.1-1829-gacd8471

[James Johnston]

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  acd84715b0e4cfabbb2dadb8e7941efb3fd8f96b (commit)
       via  d5eb7d8565d01af80e4ab0b08014e52286d43f95 (commit)
       via  4aff1650d698fe31dd5d1f1cfdd359737d16c727 (commit)
       via  f04a09d1bd7107b73d2063c1ac4de3080b21cea4 (commit)
      from  3f0725765641ba3dff41f135c5a23b089ac40e1b (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=acd84715b0e4cfabbb2dadb8e7941efb3fd8f96b
commit acd84715b0e4cfabbb2dadb8e7941efb3fd8f96b
Merge: 3f07257 d5eb7d8
Author:     James Johnston <johnstonj.public at codenest.com>
AuthorDate: Thu Dec 31 12:52:43 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 31 12:52:43 2015 -0500

    Merge topic 'fix-GenerateExportHeader-on-borland' into next
    
    d5eb7d85 GenerateExportHeader: Work around buggy std::getline behavior in BCB5.
    4aff1650 CMake Nightly Date Stamp
    f04a09d1 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5eb7d8565d01af80e4ab0b08014e52286d43f95
commit d5eb7d8565d01af80e4ab0b08014e52286d43f95
Author:     James Johnston <johnstonj.public at codenest.com>
AuthorDate: Thu Dec 31 17:45:34 2015 +0000
Commit:     James Johnston <johnstonj.public at codenest.com>
CommitDate: Thu Dec 31 17:45:34 2015 +0000

    GenerateExportHeader: Work around buggy std::getline behavior in BCB5.

diff --git a/Tests/Module/GenerateExportHeader/exportheader_test.cpp b/Tests/Module/GenerateExportHeader/exportheader_test.cpp
index 146374a..4f45f37 100644
--- a/Tests/Module/GenerateExportHeader/exportheader_test.cpp
+++ b/Tests/Module/GenerateExportHeader/exportheader_test.cpp
@@ -39,6 +39,18 @@ void compare(const char* refName, const char* testName)
     std::string testLine;
     std::getline(ref, refLine);
     std::getline(test, testLine);
+    // Some very old Borland runtimes (C++ Builder 5 WITHOUT Update 1) add a
+    // trailing null to the string that we need to strip before testing for a
+    // trailing space.
+    if (refLine.size() && refLine[refLine.size()-1] == 0)
+      {
+      refLine = refLine.substr(0, refLine.size() - 1);
+      }
+    if (testLine.size() && testLine[testLine.size()-1] == 0)
+      {
+      testLine = testLine.substr(0, testLine.size() - 1);
+      }
+    // The reference files never have trailing spaces:
     if (testLine.size() && testLine[testLine.size()-1] == ' ')
       {
       testLine = testLine.substr(0, testLine.size() - 1);

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

Summary of changes:
 Source/CMakeVersion.cmake                               |    2 +-
 Tests/Module/GenerateExportHeader/exportheader_test.cpp |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake