Skip to content

Commit

Permalink
Merge 546490e into f9ada53
Browse files Browse the repository at this point in the history
  • Loading branch information
pnoltes authored Jun 10, 2023
2 parents f9ada53 + 546490e commit 3a0661c
Show file tree
Hide file tree
Showing 14 changed files with 666 additions and 11 deletions.
32 changes: 32 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
BasedOnStyle: LLVM
Language: Cpp
IndentWidth: 4
AllowShortIfStatementsOnASingleLine: false
AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: false
BinPackParameters: false
ColumnLimit: 120
DerivePointerAlignment: false
KeepEmptyLinesAtTheStartOfBlocks: false
PointerAlignment: Left
SpacesBeforeTrailingComments: 1
SortIncludes: true
---
#Include regroup disabled by default.
#IncludeBlocks: Regroup
#IncludeCategories:
##gtest headers
# - Regex: '^((<|")gtest/)'
# Priority: 1
##stdlib C++ headers
# - Regex: '^<([^.])*>'
# Priority: 2
##external headers
# - Regex: '^<([^.])*\.h>'
# Priority: 3
##celix C API
# - Regex: '^(<|")celix_.*'
# Priority: 4
##celix C++ API
# - Regex: '^(<|")celix/.*'
# Priority: 5
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ if (ENABLE_TESTING)
endif ()

# Set C specific flags
set(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=gnu99 -fPIC ${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=c99 -fPIC ${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "-Wall -Werror -Wformat -Wno-error=deprecated-declarations ${CMAKE_C_FLAGS}")

# Set C++ specific flags
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/

#include "RemoteServiceAdmin.h"

#include "celix/BundleContext.h"
#include "celix/rsa/RemoteConstants.h"

Expand Down
1 change: 1 addition & 0 deletions documents/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,4 @@ bundles contains binaries depending on the stdlibc++ library.
* [Apache Celix Patterns](patterns.md)
* [Apache Celix CMake Commands](cmake_commands)
* [Apache Celix Sub Projects](subprojects.md)
* [Apache Celix Coding Conventions Guide](development/README.md)
Loading

0 comments on commit 3a0661c

Please sign in to comment.