[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6792-gc482a66

[Brad King]

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  c482a6693ff5e8016920ba31bda502355a6a4a7a (commit)
       via  bf305c1c13925c202e1421101a537b0868e0cd91 (commit)
      from  4d84dc83173f623f39134de6d839a4fb873a6523 (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=c482a6693ff5e8016920ba31bda502355a6a4a7a
commit c482a6693ff5e8016920ba31bda502355a6a4a7a
Merge: 4d84dc8 bf305c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 7 09:27:02 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 7 09:27:02 2014 -0500

    Merge topic 'unicode-fstream' into next
    
    bf305c1 cmListFileLexer: Restore 'bracket' member type


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf305c1c13925c202e1421101a537b0868e0cd91
commit bf305c1c13925c202e1421101a537b0868e0cd91
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 7 09:26:32 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 7 09:27:15 2014 -0500

    cmListFileLexer: Restore 'bracket' member type
    
    Using yy_size_t mismatches the sign in comparisons in our code.
    Restore use of 'int'.

diff --git a/Source/cmListFileLexer.c b/Source/cmListFileLexer.c
index cc18cd7..bfa388e 100644
--- a/Source/cmListFileLexer.c
+++ b/Source/cmListFileLexer.c
@@ -583,7 +583,7 @@ Modify cmListFileLexer.c:
 struct cmListFileLexer_s
 {
   cmListFileLexer_Token token;
-  yy_size_t bracket;
+  int bracket;
   int comment;
   int line;
   int column;
diff --git a/Source/cmListFileLexer.in.l b/Source/cmListFileLexer.in.l
index 47aa576..ed4bf6b 100644
--- a/Source/cmListFileLexer.in.l
+++ b/Source/cmListFileLexer.in.l
@@ -45,7 +45,7 @@ Modify cmListFileLexer.c:
 struct cmListFileLexer_s
 {
   cmListFileLexer_Token token;
-  yy_size_t bracket;
+  int bracket;
   int comment;
   int line;
   int column;

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

Summary of changes:
 Source/cmListFileLexer.c    |    2 +-
 Source/cmListFileLexer.in.l |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake