[Cmake-commits] [cmake-commits] king committed cmMakefile.h 1.248 1.249

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv22753/Source

Modified Files:
	cmMakefile.h 
Log Message:
ENH: Make policy push/pop methods private

This makes cmMakefile::PushPolicy and cmMakefile::PopPolicy private so
that any outside place that uses them needs to use the PolicyPushPop
helper in an automatic variable.  We grant an exception to
cmCMakePolicyCommand so it can implement cmake_policy(PUSH) and
cmake_policy(POP).


Index: cmMakefile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.h,v
retrieving revision 1.248
retrieving revision 1.249
diff -C 2 -d -r1.248 -r1.249
*** cmMakefile.h	22 Jan 2009 15:56:50 -0000	1.248
--- cmMakefile.h	22 Jan 2009 15:57:09 -0000	1.249
***************
*** 45,48 ****
--- 45,49 ----
  class cmake;
  class cmMakefileCall;
+ class cmCMakePolicyCommand;
  
  /** \class cmMakefile
***************
*** 342,347 ****
    bool SetPolicy(const char *id, cmPolicies::PolicyStatus status);
    cmPolicies::PolicyStatus GetPolicyStatus(cmPolicies::PolicyID id);
-   bool PushPolicy();
-   bool PopPolicy(bool reportError = true);
    bool SetPolicyVersion(const char *version);
    //@}
--- 343,346 ----
***************
*** 942,946 ****
    std::vector<cmTarget*> ImportedTargetsOwned;
    std::map<cmStdString, cmTarget*> ImportedTargets;
!   
    // stack of policy settings
    struct PolicyStackEntry: public cmPolicies::PolicyMap
--- 941,950 ----
    std::vector<cmTarget*> ImportedTargetsOwned;
    std::map<cmStdString, cmTarget*> ImportedTargets;
! 
!   // Internal policy stack management.
!   bool PushPolicy();
!   bool PopPolicy(bool reportError = true);
!   friend class cmCMakePolicyCommand;
! 
    // stack of policy settings
    struct PolicyStackEntry: public cmPolicies::PolicyMap