[Cmake-commits] CMake branch, next, updated. v2.8.5-1662-ge4b8ee7

[David Cole]

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  e4b8ee7f5660fbc97e1279789997c5b10dba463a (commit)
       via  920a046015799a14374e5c69072aa14f2723fda0 (commit)
      from  743d11b885d92631f0b6ae0f033cc9d1d0941353 (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=e4b8ee7f5660fbc97e1279789997c5b10dba463a
commit e4b8ee7f5660fbc97e1279789997c5b10dba463a
Merge: 743d11b 920a046
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 19 14:19:58 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 19 14:19:58 2011 -0400

    Merge topic 'AutomocForQt' into next
    
    920a046 QtAutomoc: Eliminate compiler warning


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=920a046015799a14374e5c69072aa14f2723fda0
commit 920a046015799a14374e5c69072aa14f2723fda0
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 19 14:16:53 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Aug 19 14:18:11 2011 -0400

    QtAutomoc: Eliminate compiler warning

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index e5dc3df..ff96e5b 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -519,7 +519,7 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
   const std::string absPath = cmsys::SystemTools::GetFilenamePath(
                    cmsys::SystemTools::GetRealPath(absFilename.c_str())) + '/';
 
-  long matchOffset = 0;
+  std::string::size_type matchOffset = 0;
   if (!mocIncludeRegExp.find(contentsString.c_str()))
     {
     // no moc #include, look whether we need to create a moc from

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

Summary of changes:
 Source/cmQtAutomoc.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake