[Cmake-commits] CMake branch, next, updated. v3.5.2-1144-gd16ef75

Brad King brad.king at kitware.com
Thu Apr 28 13:40:25 EDT 2016


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  d16ef7569c910e139befe1b80aa5971388afcd12 (commit)
       via  79599bc076f9c1248fdf427a8fd2022a81cd1356 (commit)
      from  9f725d26ed2f94a036bb95b51d851f56b234afe2 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d16ef7569c910e139befe1b80aa5971388afcd12
commit d16ef7569c910e139befe1b80aa5971388afcd12
Merge: 9f725d2 79599bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 28 13:40:24 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 28 13:40:24 2016 -0400

    Merge topic 'clang-format-include-order' into next
    
    79599bc0 fixup! Format include directive blocks and ordering with clang-format


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79599bc076f9c1248fdf427a8fd2022a81cd1356
commit 79599bc076f9c1248fdf427a8fd2022a81cd1356
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 28 13:39:17 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 28 13:39:55 2016 -0400

    fixup! Format include directive blocks and ordering with clang-format

diff --git a/Tests/MFC/mfc1/ChildFrm.cpp b/Tests/MFC/mfc1/ChildFrm.cpp
index 7027c13..889cceb 100644
--- a/Tests/MFC/mfc1/ChildFrm.cpp
+++ b/Tests/MFC/mfc1/ChildFrm.cpp
@@ -1,8 +1,10 @@
 // ChildFrm.cpp : implementation of the CChildFrame class
 //
-#include "mfc1.h"
+
 #include "stdafx.h"
 
+#include "mfc1.h"
+
 #include "ChildFrm.h"
 
 #ifdef _DEBUG
diff --git a/Tests/MFC/mfc1/MainFrm.cpp b/Tests/MFC/mfc1/MainFrm.cpp
index 522cbfc..222c3da 100644
--- a/Tests/MFC/mfc1/MainFrm.cpp
+++ b/Tests/MFC/mfc1/MainFrm.cpp
@@ -1,9 +1,10 @@
 // MainFrm.cpp : implementation of the CMainFrame class
 //
 
-#include "mfc1.h"
 #include "stdafx.h"
 
+#include "mfc1.h"
+
 #include "MainFrm.h"
 
 #ifdef _DEBUG
diff --git a/Tests/MFC/mfc1/mfc1.cpp b/Tests/MFC/mfc1/mfc1.cpp
index 3490080..057e1d5 100644
--- a/Tests/MFC/mfc1/mfc1.cpp
+++ b/Tests/MFC/mfc1/mfc1.cpp
@@ -1,9 +1,10 @@
 // mfc1.cpp : Defines the class behaviors for the application.
 //
 
+#include "stdafx.h"
+
 #include "mfc1.h"
 #include "MainFrm.h"
-#include "stdafx.h"
 
 #include "ChildFrm.h"
 #include "mfc1Doc.h"
diff --git a/Tests/MFC/mfc1/mfc1Doc.cpp b/Tests/MFC/mfc1/mfc1Doc.cpp
index af4fa43..db76b06 100644
--- a/Tests/MFC/mfc1/mfc1Doc.cpp
+++ b/Tests/MFC/mfc1/mfc1Doc.cpp
@@ -1,9 +1,10 @@
 // mfc1Doc.cpp : implementation of the Cmfc1Doc class
 //
 
-#include "mfc1.h"
 #include "stdafx.h"
 
+#include "mfc1.h"
+
 #include "mfc1Doc.h"
 
 #ifdef _DEBUG
diff --git a/Tests/MFC/mfc1/mfc1View.cpp b/Tests/MFC/mfc1/mfc1View.cpp
index 0c0a9b6..8000302 100644
--- a/Tests/MFC/mfc1/mfc1View.cpp
+++ b/Tests/MFC/mfc1/mfc1View.cpp
@@ -1,9 +1,10 @@
 // mfc1View.cpp : implementation of the Cmfc1View class
 //
 
-#include "mfc1.h"
 #include "stdafx.h"
 
+#include "mfc1.h"
+
 #include "mfc1Doc.h"
 #include "mfc1View.h"
 

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

Summary of changes:
 Tests/MFC/mfc1/ChildFrm.cpp |    4 +++-
 Tests/MFC/mfc1/MainFrm.cpp  |    3 ++-
 Tests/MFC/mfc1/mfc1.cpp     |    3 ++-
 Tests/MFC/mfc1/mfc1Doc.cpp  |    3 ++-
 Tests/MFC/mfc1/mfc1View.cpp |    3 ++-
 5 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list