-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11 from moja-global/develop
Clean up and formatting
- Loading branch information
Showing
382 changed files
with
26,087 additions
and
26,594 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# Use the Google style in this project. | ||
BasedOnStyle: Google | ||
|
||
DerivePointerAlignment: false | ||
PointerAlignment: Left | ||
ColumnLimit: 120 | ||
IndentWidth: 3 | ||
Standard: Cpp11 | ||
Cpp11BracedListStyle: true | ||
|
||
IncludeBlocks: Regroup | ||
IncludeCategories: | ||
- Regex: '^\"moja/*' | ||
Priority: 100 | ||
- Regex: '^\"' | ||
Priority: 200 | ||
- Regex: '^<moja/flint/configuration/*' | ||
Priority: 350 | ||
- Regex: '^<moja/flint/*' | ||
Priority: 250 | ||
- Regex: '^<moja/datarepository/*' | ||
Priority: 300 | ||
- Regex: '^<moja/test/*' | ||
Priority: 375 | ||
- Regex: '^<moja/*' | ||
Priority: 400 | ||
- Regex: '^<poco/*' | ||
Priority: 500 | ||
- Regex: '^<boost/*' | ||
Priority: 600 | ||
- Regex: '^<.*/.*' | ||
Priority: 700 | ||
- Regex: '^<[^/]*>' | ||
Priority: 800 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,7 @@ | |
*.user | ||
*.sln.docstates | ||
.DS_Store | ||
.vs/ | ||
|
||
# Python env folder | ||
[Ee]nv/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
#ifndef MOJA_CORE_ALIGNMENT_H_ | ||
#define MOJA_CORE_ALIGNMENT_H_ | ||
|
||
#include <string> | ||
#include <cstddef> | ||
#include <string> | ||
#include <type_traits> | ||
|
||
#endif // MOJA_CORE_ALIGNMENT_H_ | ||
#endif // MOJA_CORE_ALIGNMENT_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.