[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3309-g3c63170

[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  3c63170871fc5d7a13230da0b934e9089d4aa032 (commit)
       via  4f20b07548a6490e7fb625bcf1ea4f076f817533 (commit)
      from  ad20834344d28921a4d2c8435b559ae8a1447495 (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=3c63170871fc5d7a13230da0b934e9089d4aa032
commit 3c63170871fc5d7a13230da0b934e9089d4aa032
Merge: ad20834 4f20b07
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 22 10:35:36 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 22 10:35:36 2014 -0400

    Merge topic 'variable_watch-no-allowed-access' into next
    
    4f20b075 variable_watch: Revise wording of dropped access


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f20b07548a6490e7fb625bcf1ea4f076f817533
commit 4f20b07548a6490e7fb625bcf1ea4f076f817533
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 22 10:31:10 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 22 10:31:10 2014 -0400

    variable_watch: Revise wording of dropped access
    
    Also remove enumeration value for dropped access type.

diff --git a/Help/release/dev/variable_watch-no-allowed-access.rst b/Help/release/dev/variable_watch-no-allowed-access.rst
index 2ed2cca..ba7b4a5 100644
--- a/Help/release/dev/variable_watch-no-allowed-access.rst
+++ b/Help/release/dev/variable_watch-no-allowed-access.rst
@@ -2,7 +2,7 @@ variable_watch-no-allowed-access
 --------------------------------
 
 * Callbacks established by the :command:`variable_watch` command will no
-  longer receive the ``ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS`` access type when
+  longer receive the ``ALLOWED_UNKNOWN_READ_ACCESS`` access type when
   the undocumented ``CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS`` variable is
   set.  Uninitialized variable accesses will always be reported as
-  ``UNKNOWN_VARIABLE_READ_ACCESS``.
+  ``UNKNOWN_READ_ACCESS``.
diff --git a/Source/cmVariableWatch.cxx b/Source/cmVariableWatch.cxx
index 8ad6fce..cb6cb12 100644
--- a/Source/cmVariableWatch.cxx
+++ b/Source/cmVariableWatch.cxx
@@ -16,7 +16,6 @@ static const char* const cmVariableWatchAccessStrings[] =
     "READ_ACCESS",
     "UNKNOWN_READ_ACCESS",
     "UNKNOWN_DEFINED_ACCESS",
-    "ALLOWED_UNKNOWN_READ_ACCESS",
     "MODIFIED_ACCESS",
     "REMOVED_ACCESS",
     "NO_ACCESS"
diff --git a/Source/cmVariableWatch.h b/Source/cmVariableWatch.h
index c86fad0..0ca4a55 100644
--- a/Source/cmVariableWatch.h
+++ b/Source/cmVariableWatch.h
@@ -53,7 +53,6 @@ public:
     VARIABLE_READ_ACCESS = 0,
     UNKNOWN_VARIABLE_READ_ACCESS,
     UNKNOWN_VARIABLE_DEFINED_ACCESS,
-    ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS,
     VARIABLE_MODIFIED_ACCESS,
     VARIABLE_REMOVED_ACCESS,
     NO_ACCESS

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

Summary of changes:
 Help/release/dev/variable_watch-no-allowed-access.rst |    4 ++--
 Source/cmVariableWatch.cxx                            |    1 -
 Source/cmVariableWatch.h                              |    1 -
 3 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake