[Bf-blender-cvs] [dfbaf967532] master: Revert "Disable clang-format for objective-C bits in GHOST."

Campbell Barton noreply at git.blender.org
Mon Mar 22 04:40:19 CET 2021


Commit: dfbaf967532cb4a20b348e7fb2947dbae13917e5
Author: Campbell Barton
Date:   Mon Mar 22 14:38:05 2021 +1100
Branches: master
https://developer.blender.org/rBdfbaf967532cb4a20b348e7fb2947dbae13917e5

Revert "Disable clang-format for objective-C bits in GHOST."

This reverts commit 1cb9612d736f8513d7d4cfc01da6c4e386efcc4f.

We can now rely on the clang-format version as it's distributed
with pre-compiled binaries.

===================================================================

M	intern/ghost/intern/GHOST_SystemCocoa.mm
M	intern/ghost/intern/GHOST_WindowCocoa.mm

===================================================================

diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 9c28449a4e5..050c90097c5 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -357,7 +357,6 @@ extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG])
   }
 }
 
-/* clang-format off */
 #pragma mark Cocoa objects
 
 /**
@@ -500,8 +499,6 @@ extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG])
 
 #pragma mark initialization/finalization
 
-/* clang-format on */
-
 GHOST_SystemCocoa::GHOST_SystemCocoa()
 {
   int mib[2];
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index add7962d924..7998991dc8d 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -34,8 +34,6 @@
 
 #include <sys/sysctl.h>
 
-/* clang-format off */
-
 #pragma mark Cocoa window delegate object
 
 @interface CocoaWindowDelegate : NSObject <NSWindowDelegate>
@@ -288,8 +286,6 @@
 
 #pragma mark initialization / finalization
 
-/* clang-format on */
-
 GHOST_WindowCocoa::GHOST_WindowCocoa(GHOST_SystemCocoa *systemCocoa,
                                      const char *title,
                                      GHOST_TInt32 left,



More information about the Bf-blender-cvs mailing list