diff options
| author | David Cole <david.cole@kitware.com> | 2012-12-04 19:37:41 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2012-12-04 19:37:41 (GMT) |
| commit | a74bd470a4d01cfa06710d039bb435b02682ac3f (patch) | |
| tree | fe47d14e7ad5fb6edfe993511ab6fa79d0276c56 /Source/CPack/WiX/cmCPackWIXGenerator.h | |
| parent | ad0f73573fcc59c7c428ef5e529f8fec6a1cfbe6 (diff) | |
| download | CMake-a74bd470a4d01cfa06710d039bb435b02682ac3f.zip CMake-a74bd470a4d01cfa06710d039bb435b02682ac3f.tar.gz CMake-a74bd470a4d01cfa06710d039bb435b02682ac3f.tar.bz2 | |
CPack: Fix dashboard errors and warnings (#11575)
...revealed by the Nightly dashboard runs last night.
Use "size_t" instead of "std::size_t" so that it compiles with
Visual Studio 6, too.
Fix warnings about shadowed "tmp" local variable and ordering of
member variables vs. lines of code in the constructor initializer
list.
Diffstat (limited to 'Source/CPack/WiX/cmCPackWIXGenerator.h')
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h index 9fc9093..0e95d70 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.h +++ b/Source/CPack/WiX/cmCPackWIXGenerator.h @@ -82,8 +82,8 @@ private: cmWIXSourceWriter& directoryDefinitions, cmWIXSourceWriter& fileDefinitions, cmWIXSourceWriter& featureDefinitions, - std::size_t& directoryCounter, - std::size_t& fileCounter); + size_t& directoryCounter, + size_t& fileCounter); bool RequireOption(const std::string& name, std::string& value) const; |