Skip to content

Commit

Permalink
Merge pull request #11 from moja-global/develop
Browse files Browse the repository at this point in the history
Clean up and formatting
  • Loading branch information
malfrancis authored Jul 25, 2019
2 parents 22db564 + 5363150 commit 5703211
Show file tree
Hide file tree
Showing 382 changed files with 26,087 additions and 26,594 deletions.
34 changes: 34 additions & 0 deletions .clang-format
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*.user
*.sln.docstates
.DS_Store
.vs/

# Python env folder
[Ee]nv/
Expand Down
4 changes: 2 additions & 2 deletions Source/moja.core/include/moja/alignment.h
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_
7 changes: 3 additions & 4 deletions Source/moja.core/include/moja/coreexceptions.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@

#include <boost/exception/all.hpp>

#include <string>
#include <stdexcept>

#include <string>

namespace moja {

Expand All @@ -25,6 +24,6 @@ typedef boost::error_info<struct tag_message, std::string> Message;
struct CORE_API CoreUnhandledType : virtual CoreException {};
typedef boost::error_info<struct tag_message, std::string> TypeErrorMsg;

} // namespace moja
} // namespace moja

#endif // MOJA_CORE_COREEXCEPTIONS_H_
#endif // MOJA_CORE_COREEXCEPTIONS_H_
Loading

0 comments on commit 5703211

Please sign in to comment.