summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2019-09-30 14:46:28 (GMT)
committerBrad King <brad.king@kitware.com>2019-10-01 16:26:36 (GMT)
commited98209ddc8d5e9f5b20cd010c69a25d553b2654 (patch)
treebacc6e66e49837c6bbe02996caf360e1e9fbc211 /Utilities
parent185fe49f29f6632a3c26c376fcb4934e91092ff7 (diff)
downloadCMake-ed98209ddc8d5e9f5b20cd010c69a25d553b2654.zip
CMake-ed98209ddc8d5e9f5b20cd010c69a25d553b2654.tar.gz
CMake-ed98209ddc8d5e9f5b20cd010c69a25d553b2654.tar.bz2
Revise include order using clang-format-6.0
Run the `clang-format.bash` script to update our C and C++ code to a new include order `.clang-format`. Use `clang-format` version 6.0.
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp6
-rw-r--r--Utilities/std/cm/bits/string_view.cxx4
2 files changed, 5 insertions, 5 deletions
diff --git a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
index 593822a..4ced987 100644
--- a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
+++ b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
@@ -1,11 +1,11 @@
+#include <string>
+#include <vector>
+
#include <windows.h>
#include <msi.h>
#include <msiquery.h>
-#include <string>
-#include <vector>
-
std::wstring get_property(MSIHANDLE msi_handle, std::wstring const& name)
{
DWORD size = 0;
diff --git a/Utilities/std/cm/bits/string_view.cxx b/Utilities/std/cm/bits/string_view.cxx
index 3b283da..e345fd3 100644
--- a/Utilities/std/cm/bits/string_view.cxx
+++ b/Utilities/std/cm/bits/string_view.cxx
@@ -5,12 +5,12 @@
#ifndef CMake_HAVE_CXX_STRING_VIEW
-# include "cm_kwiml.h"
-
# include <algorithm>
# include <ostream>
# include <stdexcept>
+# include "cm_kwiml.h"
+
namespace cm {
string_view::const_reference string_view::at(size_type pos) const