[Cmake-commits] CMake branch, master, updated. v2.8.11.2-740-gaaadc28

[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, master has been updated
       via  aaadc280c94dc8b08395616dfa3fec573076676f (commit)
       via  6aa0c214054252d1fc94e5b8e6b6ffc3eae4c08b (commit)
       via  b86e37c84f9691cc122e838b653ae0f441c4d1e2 (commit)
       via  f9bb20fe2bf1d9154a3244579ea84400912473b4 (commit)
       via  05dad99f5a1ee781da52df0ccc61b236087bcd2d (commit)
       via  00ce12a3347d1fef25badff00c5abc3dc715f207 (commit)
       via  34b397e8dec04c55b415ee0e5f9172f624156d36 (commit)
       via  e43e207c7bbde2a9e0948da0d1e79879ccd5ce45 (commit)
       via  0d6acb1df8c20bb21f4d328cf2c35d0cbb6d7ea3 (commit)
       via  fc7c3b4dc8522ad489a6fb67ac6030f302c65df3 (commit)
      from  d422ee362db7f742930de5b2fafd9a3c30c52ef0 (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=aaadc280c94dc8b08395616dfa3fec573076676f
commit aaadc280c94dc8b08395616dfa3fec573076676f
Merge: d422ee3 6aa0c21
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 8 13:55:25 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 8 13:55:25 2013 -0400

    Merge topic 'dev/fix-variable-watch-crash'
    
    6aa0c21 variable_watch: Add test for watching a variable multiple times
    b86e37c variable_watch: Check newValue for NULL
    f9bb20f variable_watch: Don't share memory for callbacks
    05dad99 variable_watch: Fix a typo in the error message
    00ce12a variable_watch: Prevent making extra entries in the watch map
    34b397e variable_watch: Allow specifying the data to match in RemoveWatch
    e43e207 variable_watch: Match client_data when finding duplicates
    0d6acb1 variable_watch: Add a deleter for the client data
    fc7c3b4 variable_watch: Store client data as pointers


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

Summary of changes:
 Source/cmVariableWatch.cxx                         |   50 ++++++--
 Source/cmVariableWatch.h                           |   20 ++-
 Source/cmVariableWatchCommand.cxx                  |  141 ++++++++++++--------
 Source/cmVariableWatchCommand.h                    |   17 +--
 Tests/RunCMake/variable_watch/RunCMakeTest.cmake   |    1 +
 .../RunCMake/variable_watch/WatchTwice-stderr.txt  |    2 +
 Tests/RunCMake/variable_watch/WatchTwice.cmake     |   11 ++
 7 files changed, 156 insertions(+), 86 deletions(-)
 create mode 100644 Tests/RunCMake/variable_watch/WatchTwice-stderr.txt
 create mode 100644 Tests/RunCMake/variable_watch/WatchTwice.cmake


hooks/post-receive
-- 
CMake