[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1126-g21d155f
Brad King
brad.king at kitware.com
Thu Dec 11 13:57:54 EST 2014
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 21d155f0cb279724c595f2ea8fcb0ceda6bce41d (commit)
via 111be1801fcf50412e702be2d5966dbf52926b94 (commit)
via 3171fe0afa7169c1e814a5c0e08b115002f0d3c3 (commit)
via a7d8345d8c2f319d44576b70481c7cf2e3528226 (commit)
from a660cdb10ece78f5d19456c07cce628ee47bdf0e (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=21d155f0cb279724c595f2ea8fcb0ceda6bce41d
commit 21d155f0cb279724c595f2ea8fcb0ceda6bce41d
Merge: a660cdb 111be18
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 11 13:57:53 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 11 13:57:53 2014 -0500
Merge topic 'drop-double-underscores' into next
111be180 Rename header guards to not start with double underscore
3171fe0a CMake Nightly Date Stamp
a7d8345d CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=111be1801fcf50412e702be2d5966dbf52926b94
commit 111be1801fcf50412e702be2d5966dbf52926b94
Author: Sean McBride <sean at rogue-research.com>
AuthorDate: Thu Dec 11 13:10:03 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 11 13:53:06 2014 -0500
Rename header guards to not start with double underscore
Use regex to find/replace:
__(cm.*_h)
\1
Then fix QCMake.h by hand.
diff --git a/Source/CursesDialog/cmCursesBoolWidget.h b/Source/CursesDialog/cmCursesBoolWidget.h
index d2a25ca..8a57c73 100644
--- a/Source/CursesDialog/cmCursesBoolWidget.h
+++ b/Source/CursesDialog/cmCursesBoolWidget.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cmCursesBoolWidget_h
-#define __cmCursesBoolWidget_h
+#ifndef cmCursesBoolWidget_h
+#define cmCursesBoolWidget_h
#include "cmCursesWidget.h"
class cmCursesMainForm;
@@ -37,4 +37,4 @@ protected:
};
-#endif // __cmCursesBoolWidget_h
+#endif // cmCursesBoolWidget_h
diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.h b/Source/CursesDialog/cmCursesCacheEntryComposite.h
index 98107cc..7cdf13b 100644
--- a/Source/CursesDialog/cmCursesCacheEntryComposite.h
+++ b/Source/CursesDialog/cmCursesCacheEntryComposite.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cmCursesCacheEntryComposite_h
-#define __cmCursesCacheEntryComposite_h
+#ifndef cmCursesCacheEntryComposite_h
+#define cmCursesCacheEntryComposite_h
#include "../cmCacheManager.h"
#include "cmCursesLabelWidget.h"
@@ -40,4 +40,4 @@ protected:
int EntryWidth;
};
-#endif // __cmCursesCacheEntryComposite_h
+#endif // cmCursesCacheEntryComposite_h
diff --git a/Source/CursesDialog/cmCursesDummyWidget.h b/Source/CursesDialog/cmCursesDummyWidget.h
index 9ac1365..2b3b9b5 100644
--- a/Source/CursesDialog/cmCursesDummyWidget.h
+++ b/Source/CursesDialog/cmCursesDummyWidget.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cmCursesDummyWidget_h
-#define __cmCursesDummyWidget_h
+#ifndef cmCursesDummyWidget_h
+#define cmCursesDummyWidget_h
#include "cmCursesWidget.h"
@@ -33,4 +33,4 @@ protected:
};
-#endif // __cmCursesDummyWidget_h
+#endif // cmCursesDummyWidget_h
diff --git a/Source/CursesDialog/cmCursesFilePathWidget.h b/Source/CursesDialog/cmCursesFilePathWidget.h
index 9d2972e..6c50dd4 100644
--- a/Source/CursesDialog/cmCursesFilePathWidget.h
+++ b/Source/CursesDialog/cmCursesFilePathWidget.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cmCursesFilePathWidget_h
-#define __cmCursesFilePathWidget_h
+#ifndef cmCursesFilePathWidget_h
+#define cmCursesFilePathWidget_h
#include "cmCursesPathWidget.h"
@@ -25,4 +25,4 @@ protected:
};
-#endif // __cmCursesFilePathWidget_h
+#endif // cmCursesFilePathWidget_h
diff --git a/Source/CursesDialog/cmCursesForm.h b/Source/CursesDialog/cmCursesForm.h
index f9317b9..9837f5a 100644
--- a/Source/CursesDialog/cmCursesForm.h
+++ b/Source/CursesDialog/cmCursesForm.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cmCursesForm_h
-#define __cmCursesForm_h
+#ifndef cmCursesForm_h
+#define cmCursesForm_h
#include "../cmStandardIncludes.h"
#include "cmCursesStandardIncludes.h"
@@ -73,4 +73,4 @@ protected:
FORM* Form;
};
-#endif // __cmCursesForm_h
+#endif // cmCursesForm_h
diff --git a/Source/CursesDialog/cmCursesLabelWidget.h b/Source/CursesDialog/cmCursesLabelWidget.h
index cc32d11..98170f5 100644
--- a/Source/CursesDialog/cmCursesLabelWidget.h
+++ b/Source/CursesDialog/cmCursesLabelWidget.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cmCursesLabelWidget_h
-#define __cmCursesLabelWidget_h
+#ifndef cmCursesLabelWidget_h
+#define cmCursesLabelWidget_h
#include "cmCursesWidget.h"
#include "cmCursesStandardIncludes.h"
@@ -35,4 +35,4 @@ protected:
void operator=(const cmCursesLabelWidget&);
};
-#endif // __cmCursesLabelWidget_h
+#endif // cmCursesLabelWidget_h
diff --git a/Source/CursesDialog/cmCursesLongMessageForm.h b/Source/CursesDialog/cmCursesLongMessageForm.h
index 1e86974..6e37eea 100644
--- a/Source/CursesDialog/cmCursesLongMessageForm.h
+++ b/Source/CursesDialog/cmCursesLongMessageForm.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cmCursesLongMessageForm_h
-#define __cmCursesLongMessageForm_h
+#ifndef cmCursesLongMessageForm_h
+#define cmCursesLongMessageForm_h
#include "../cmStandardIncludes.h"
#include "cmCursesForm.h"
@@ -55,4 +55,4 @@ protected:
};
-#endif // __cmCursesLongMessageForm_h
+#endif // cmCursesLongMessageForm_h
diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h
index fba9bc5..6455252 100644
--- a/Source/CursesDialog/cmCursesMainForm.h
+++ b/Source/CursesDialog/cmCursesMainForm.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cmCursesMainForm_h
-#define __cmCursesMainForm_h
+#ifndef cmCursesMainForm_h
+#define cmCursesMainForm_h
#include "../cmStandardIncludes.h"
#include "cmCursesForm.h"
@@ -161,4 +161,4 @@ protected:
bool SearchMode;
};
-#endif // __cmCursesMainForm_h
+#endif // cmCursesMainForm_h
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.h b/Source/CursesDialog/cmCursesOptionsWidget.h
index 5cee489..324014e 100644
--- a/Source/CursesDialog/cmCursesOptionsWidget.h
+++ b/Source/CursesDialog/cmCursesOptionsWidget.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cmCursesOptionsWidget_h
-#define __cmCursesOptionsWidget_h
+#ifndef cmCursesOptionsWidget_h
+#define cmCursesOptionsWidget_h
#include "cmCursesWidget.h"
class cmCursesMainForm;
@@ -36,4 +36,4 @@ protected:
std::vector<std::string>::size_type CurrentOption;
};
-#endif // __cmCursesOptionsWidget_h
+#endif // cmCursesOptionsWidget_h
diff --git a/Source/CursesDialog/cmCursesPathWidget.h b/Source/CursesDialog/cmCursesPathWidget.h
index 45c22a3..18d298a 100644
--- a/Source/CursesDialog/cmCursesPathWidget.h
+++ b/Source/CursesDialog/cmCursesPathWidget.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cmCursesPathWidget_h
-#define __cmCursesPathWidget_h
+#ifndef cmCursesPathWidget_h
+#define cmCursesPathWidget_h
#include "cmCursesStringWidget.h"
@@ -37,4 +37,4 @@ protected:
std::string::size_type CurrentIndex;
};
-#endif // __cmCursesPathWidget_h
+#endif // cmCursesPathWidget_h
diff --git a/Source/CursesDialog/cmCursesStringWidget.h b/Source/CursesDialog/cmCursesStringWidget.h
index dd8c02a..fc1b2ba 100644
--- a/Source/CursesDialog/cmCursesStringWidget.h
+++ b/Source/CursesDialog/cmCursesStringWidget.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cmCursesStringWidget_h
-#define __cmCursesStringWidget_h
+#ifndef cmCursesStringWidget_h
+#define cmCursesStringWidget_h
#include "cmCursesWidget.h"
@@ -73,4 +73,4 @@ protected:
bool Done;
};
-#endif // __cmCursesStringWidget_h
+#endif // cmCursesStringWidget_h
diff --git a/Source/CursesDialog/cmCursesWidget.h b/Source/CursesDialog/cmCursesWidget.h
index d91a0cb..7d82864 100644
--- a/Source/CursesDialog/cmCursesWidget.h
+++ b/Source/CursesDialog/cmCursesWidget.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cmCursesWidget_h
-#define __cmCursesWidget_h
+#ifndef cmCursesWidget_h
+#define cmCursesWidget_h
#include "../cmCacheManager.h"
#include "cmCursesStandardIncludes.h"
@@ -84,4 +84,4 @@ protected:
int Page;
};
-#endif // __cmCursesWidget_h
+#endif // cmCursesWidget_h
diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h
index bd82f0d..d910eb7 100644
--- a/Source/QtDialog/QCMake.h
+++ b/Source/QtDialog/QCMake.h
@@ -10,8 +10,8 @@
See the License for more information.
============================================================================*/
-#ifndef __QCMake_h
-#define __QCMake_h
+#ifndef QCMake_h
+#define QCMake_h
#ifdef _MSC_VER
#pragma warning ( disable : 4127 )
#pragma warning ( disable : 4512 )
@@ -152,5 +152,5 @@ protected:
QAtomicInt InterruptFlag;
};
-#endif // __QCMake_h
+#endif // QCMake_h
diff --git a/Source/cmDynamicLoader.h b/Source/cmDynamicLoader.h
index d038b5c..84bc9bc 100644
--- a/Source/cmDynamicLoader.h
+++ b/Source/cmDynamicLoader.h
@@ -15,8 +15,8 @@
// libraries into a process.
-#ifndef __cmDynamicLoader_h
-#define __cmDynamicLoader_h
+#ifndef cmDynamicLoader_h
+#define cmDynamicLoader_h
#include "cmStandardIncludes.h"
diff --git a/Utilities/cmThirdParty.h.in b/Utilities/cmThirdParty.h.in
index 726c843..b883284 100644
--- a/Utilities/cmThirdParty.h.in
+++ b/Utilities/cmThirdParty.h.in
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cmThirdParty_h
-#define __cmThirdParty_h
+#ifndef cmThirdParty_h
+#define cmThirdParty_h
/* Whether CMake is using its own utility libraries. */
#cmakedefine CMAKE_USE_SYSTEM_CURL
diff --git a/Utilities/cm_bzlib.h b/Utilities/cm_bzlib.h
index d1fffa1..5678025 100644
--- a/Utilities/cm_bzlib.h
+++ b/Utilities/cm_bzlib.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cm_bzlib_h
-#define __cm_bzlib_h
+#ifndef cm_bzlib_h
+#define cm_bzlib_h
/* Use the bzip2 library configured for CMake. */
#include "cmThirdParty.h"
diff --git a/Utilities/cm_curl.h b/Utilities/cm_curl.h
index a3b049b..c9835e7 100644
--- a/Utilities/cm_curl.h
+++ b/Utilities/cm_curl.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cm_curl_h
-#define __cm_curl_h
+#ifndef cm_curl_h
+#define cm_curl_h
/* Use the curl library configured for CMake. */
#include "cmThirdParty.h"
diff --git a/Utilities/cm_expat.h b/Utilities/cm_expat.h
index 91f4a7b..f361541 100644
--- a/Utilities/cm_expat.h
+++ b/Utilities/cm_expat.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cm_expat_h
-#define __cm_expat_h
+#ifndef cm_expat_h
+#define cm_expat_h
/* Use the expat library configured for CMake. */
#include "cmThirdParty.h"
diff --git a/Utilities/cm_libarchive.h b/Utilities/cm_libarchive.h
index 1469bae..0f18c91 100644
--- a/Utilities/cm_libarchive.h
+++ b/Utilities/cm_libarchive.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cm_libarchive_h
-#define __cm_libarchive_h
+#ifndef cm_libarchive_h
+#define cm_libarchive_h
/* Use the libarchive configured for CMake. */
#include "cmThirdParty.h"
diff --git a/Utilities/cm_lzma.h b/Utilities/cm_lzma.h
index c11c916..02d7e4f 100644
--- a/Utilities/cm_lzma.h
+++ b/Utilities/cm_lzma.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cm_lzma_h
-#define __cm_lzma_h
+#ifndef cm_lzma_h
+#define cm_lzma_h
/* Use the liblzma configured for CMake. */
#include "cmThirdParty.h"
diff --git a/Utilities/cm_xmlrpc.h b/Utilities/cm_xmlrpc.h
index a6b375d..ac461f9 100644
--- a/Utilities/cm_xmlrpc.h
+++ b/Utilities/cm_xmlrpc.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cm_xmlrpc_h
-#define __cm_xmlrpc_h
+#ifndef cm_xmlrpc_h
+#define cm_xmlrpc_h
/* Use the xmlrpc library configured for CMake. */
#include "cmThirdParty.h"
diff --git a/Utilities/cm_zlib.h b/Utilities/cm_zlib.h
index fb5832e..1b5c06e 100644
--- a/Utilities/cm_zlib.h
+++ b/Utilities/cm_zlib.h
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#ifndef __cm_zlib_h
-#define __cm_zlib_h
+#ifndef cm_zlib_h
+#define cm_zlib_h
/* Use the zlib library configured for CMake. */
#include "cmThirdParty.h"
diff --git a/Utilities/cmcompress/cmcompress.h b/Utilities/cmcompress/cmcompress.h
index fdb0d90..4cd3a1c 100644
--- a/Utilities/cmcompress/cmcompress.h
+++ b/Utilities/cmcompress/cmcompress.h
@@ -35,8 +35,8 @@
* SUCH DAMAGE.
*/
-#ifndef __cmcompress__h_
-#define __cmcompress__h_
+#ifndef cmcompress__h_
+#define cmcompress__h_
#include <stdio.h>
@@ -192,4 +192,4 @@ extern "C"
#endif
-#endif /* __cmcompress__h_ */
+#endif /* cmcompress__h_ */
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/CursesDialog/cmCursesBoolWidget.h | 6 +++---
Source/CursesDialog/cmCursesCacheEntryComposite.h | 6 +++---
Source/CursesDialog/cmCursesDummyWidget.h | 6 +++---
Source/CursesDialog/cmCursesFilePathWidget.h | 6 +++---
Source/CursesDialog/cmCursesForm.h | 6 +++---
Source/CursesDialog/cmCursesLabelWidget.h | 6 +++---
Source/CursesDialog/cmCursesLongMessageForm.h | 6 +++---
Source/CursesDialog/cmCursesMainForm.h | 6 +++---
Source/CursesDialog/cmCursesOptionsWidget.h | 6 +++---
Source/CursesDialog/cmCursesPathWidget.h | 6 +++---
Source/CursesDialog/cmCursesStringWidget.h | 6 +++---
Source/CursesDialog/cmCursesWidget.h | 6 +++---
Source/QtDialog/QCMake.h | 6 +++---
Source/cmDynamicLoader.h | 4 ++--
Utilities/cmThirdParty.h.in | 4 ++--
Utilities/cm_bzlib.h | 4 ++--
Utilities/cm_curl.h | 4 ++--
Utilities/cm_expat.h | 4 ++--
Utilities/cm_libarchive.h | 4 ++--
Utilities/cm_lzma.h | 4 ++--
Utilities/cm_xmlrpc.h | 4 ++--
Utilities/cm_zlib.h | 4 ++--
Utilities/cmcompress/cmcompress.h | 6 +++---
24 files changed, 61 insertions(+), 61 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list