Skip to content

Commit

Permalink
Merge pull request freesurfer#158 from cthla/gcc-update-20171005
Browse files Browse the repository at this point in the history
GCC warnings removal in utils + Clang-format
  • Loading branch information
ahoopes authored Oct 11, 2017
2 parents a9e4268 + 2824137 commit bc9a574
Show file tree
Hide file tree
Showing 202 changed files with 200,124 additions and 261,814 deletions.
42 changes: 42 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Base style on something sane, then customize. WebKit looks like a good choice..
BasedOnStyle: Google

# readability
#AlignConsecutiveAssignments: true
#AlignConsecutiveDeclarations: true
AlignTrailingComments: true
AlignOperands: true

# Align arguments after round, angle and square brackets
AlignAfterOpenBracket: Align

# Newline all arguments and parameters consistently when not fitting onto a single line
BinPackArguments: false
BinPackParameters: false

# Use customized breaks for braces to conform with old FS coding patterns
#BreakBeforeBraces: Custom
#BraceWrapping:
# AfterClass: true
# AfterControlStatement: true
# AfterEnum: true
# AfterFunction: true
# AfterNamespace: true
# AfterObjCDeclaration: true
# AfterStruct: true
# AfterUnion: true
# BeforeCatch: true
# BeforeElse: true
# IndentBraces: false

# Enforce indentation, width and use of tabs/vs spaces
IndentWidth: 2
ColumnLimit: 120 # this is pretty conservative these days
UseTab: Never

# Force pointers to the type for C++.
DerivePointerAlignment: false
PointerAlignment: Right

# Ensure nested templates will compile by inserting spaces
SpacesInAngles: true
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# git ls-files --others --exclude-from=.git/info/exclude

.vscode/

# a bit more complicated for GEMS to go first so that
# later patterns pick up ignores as well:
GEMS/*
Expand Down
9 changes: 9 additions & 0 deletions GEMS2/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
CMakeCache.txt
CMakeFiles/
ITKIOFactoryRegistration/
Matlab/CMakeFiles/
Matlab/cmake_install.cmake
bin/
cmake_install.cmake
cuda/CMakeFiles/
cuda/cmake_install.cmake
1 change: 1 addition & 0 deletions utils/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test/mriBuildVoronoiDiagramFloat
Loading

0 comments on commit bc9a574

Please sign in to comment.