[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2739-g0fa034f

[Ben Boeckel]

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  0fa034f4df204a58bb4a6278308589ec29fe2cb0 (commit)
       via  32c8dc2f6be632b5bcf8eb6d2edab82dc6b3e2a6 (commit)
      from  0035ef18b224c7f57efcf81e7185c62f8ad2bc9b (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=0fa034f4df204a58bb4a6278308589ec29fe2cb0
commit 0fa034f4df204a58bb4a6278308589ec29fe2cb0
Merge: 0035ef1 32c8dc2
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri May 2 14:56:34 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 2 14:56:34 2014 -0400

    Merge topic 'dev/refactor-source-depends-in-ninja' into next
    
    32c8dc2f Fix 'using' statement


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32c8dc2f6be632b5bcf8eb6d2edab82dc6b3e2a6
commit 32c8dc2f6be632b5bcf8eb6d2edab82dc6b3e2a6
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri May 2 15:02:23 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri May 2 15:02:23 2014 -0400

    Fix 'using' statement

diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 27a76cd..0601245 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -169,7 +169,7 @@ public:
 
   // append flags to a string
   virtual void AppendFlags(std::string& flags, const std::string& newFlags);
-  using cmMakefile::AppendFlags;
+  using cmLocalGenerator::AppendFlags;
 
   // append an echo command
   enum EchoColor { EchoNormal, EchoDepend, EchoBuild, EchoLink,

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

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


hooks/post-receive
-- 
CMake