[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2425-g438debc

[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  438debcf540ce492e3545e7535accd8d0ed94f54 (commit)
       via  1d48470488e1c611c8ff1448bb8e4b6427643ddf (commit)
      from  51e3f6f33058409b8c755db7c9885f25dfa02c37 (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=438debcf540ce492e3545e7535accd8d0ed94f54
commit 438debcf540ce492e3545e7535accd8d0ed94f54
Merge: 51e3f6f 1d48470
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 16 16:18:08 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 16 16:18:08 2014 -0400

    Merge topic 'decay-language-version' into next
    
    1d484704 Fix iteration.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d48470488e1c611c8ff1448bb8e4b6427643ddf
commit 1d48470488e1c611c8ff1448bb8e4b6427643ddf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 16 22:15:10 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 16 22:15:10 2014 +0200

    Fix iteration.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 798264f..a29a0cd 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2164,8 +2164,9 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
   static std::map<std::string, std::vector<std::string> > langStdMap;
   if (langStdMap.empty())
     {
-    langStdMap["CXX"].push_back("98");
+    // Maintain sorted order, most recent first.
     langStdMap["CXX"].push_back("11");
+    langStdMap["CXX"].push_back("98");
     }
 
   std::string standard(standardProp);
@@ -2186,10 +2187,10 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
     }
   else
     {
-    defaultStdIt = stds.begin();
+    defaultStdIt = stds.end() - 1;
     }
 
-  for ( ; stdIt >= defaultStdIt; --stdIt)
+  for ( ; stdIt <= defaultStdIt; ++stdIt)
     {
     std::string option_flag =
               "CMAKE_" + lang + *stdIt

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

Summary of changes:
 Source/cmLocalGenerator.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake