export for templates does not make sense, formatting correctins, doc

gabyx · Feb 25, 2018 · 2d5a3d5 · 2d5a3d5
1 parent d001130
commit 2d5a3d5
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 147 deletions.
diff --git a/.clang-format b/.clang-format
@@ -32,23 +32,33 @@ BraceWrapping:
   BeforeCatch:     true
   BeforeElse:      true
   IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
 BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: true
+BreakConstructorInitializers: BeforeComma
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
 ColumnLimit:     0
-CommentPragmas:  '^ IWYU pragma:' 
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
 DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories:
+FixNamespaceComments: true
+ForEachMacros:   
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories: 
   - Regex:           '^<.*>'
     Priority:        1
   - Regex:           '^".*"'
@@ -57,8 +67,11 @@ IncludeCategories:
     Priority:        3
 IncludeIsMainRegex: '([-_](test|unittest))?$'
 IndentCaseLabels: true
+IndentPPDirectives: AfterHash
 IndentWidth:     4
 IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
@@ -67,16 +80,21 @@ NamespaceIndentation: All
 ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: false
-IndentPPDirectives: AfterHash
+PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 1
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
+RawStringFormats: 
+  - Delimiter:       pb
+    Language:        TextProto
+    BasedOnStyle:    google
 ReflowComments:  true
 SortIncludes:    true
+SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: false
 SpaceBeforeAssignmentOperators: true

diff --git a/example/kdTreeFiltering/src/main.cpp b/example/kdTreeFiltering/src/main.cpp
@@ -13,8 +13,8 @@
 
 #include "ApproxMVBB/Config/Config.hpp"
 #include ApproxMVBB_TypeDefs_INCLUDE_FILE
-#include "ApproxMVBB/KdTree.hpp"
 #include "ApproxMVBB/Common/CPUTimer.hpp"
+#include "ApproxMVBB/KdTree.hpp"
 
 #ifdef ApproxMVBB_XMLSUPPORT
 #    include "ApproxMVBB/KdTreeXml.hpp"

diff --git a/include/ApproxMVBB/Common/LogDefines.hpp b/include/ApproxMVBB/Common/LogDefines.hpp
@@ -15,25 +15,11 @@
 
 #include "ApproxMVBB/Config/Config.hpp"
 
-#define ApproxMVBB_LOG(message) \
-    {                           \
-        std::cout << message;   \
-    }
+#define ApproxMVBB_LOG(message) std::cout << message;
 #define ApproxMVBB_LOGLEVEL(level, setlevel, message) \
+    if(level <= setlevel)                             \
     {                                                 \
-        if(level <= setlevel)                         \
-        {                                             \
-            ApproxMVBB_LOG(message);                  \
-        }                                             \
-    }
-#define ApproxMVBB_LOGLEVEL_SCOPE(level) \
-    {                                    \
-        if(level <= setlevel)            \
-        {                                \
-        }
-#define ApproxMVBB_LOGLEVEL_SCOPE_END \
-    {                                 \
-    }                                 \
+        ApproxMVBB_LOG(message);                      \
     }
 
 // Message Log
@@ -49,18 +35,9 @@
 #    endif
 #endif
 
-#define ApproxMVBB_MSGLOG_L1(message)                            \
-    {                                                            \
-        ApproxMVBB_LOGLEVEL(1, ApproxMVBB_MSGLOG_LEVEL, message) \
-    }
-#define ApproxMVBB_MSGLOG_L2(message)                            \
-    {                                                            \
-        ApproxMVBB_LOGLEVEL(2, ApproxMVBB_MSGLOG_LEVEL, message) \
-    }
-#define ApproxMVBB_MSGLOG_L3(message)                            \
-    {                                                            \
-        ApproxMVBB_LOGLEVEL(3, ApproxMVBB_MSGLOG_LEVEL, message) \
-    }
-// ==============================================================================================
+#define ApproxMVBB_MSGLOG_L1(message) ApproxMVBB_LOGLEVEL(1, ApproxMVBB_MSGLOG_LEVEL, message)
+#define ApproxMVBB_MSGLOG_L2(message) ApproxMVBB_LOGLEVEL(2, ApproxMVBB_MSGLOG_LEVEL, message)
+#define ApproxMVBB_MSGLOG_L3(message) ApproxMVBB_LOGLEVEL(3, ApproxMVBB_MSGLOG_LEVEL, message)
+// ==================================================================================
 
 #endif
diff --git a/include/ApproxMVBB/Common/MyMatrixTypeDefs.hpp b/include/ApproxMVBB/Common/MyMatrixTypeDefs.hpp
@@ -21,9 +21,9 @@
 namespace ApproxMVBB
 {
     // ================================================================================================
-    /** @brief This
- *	These are some small matrix definitions.
- */
+    /*! @brief This
+     	These are some small matrix definitions.
+    */
 
     namespace MyMatrix
     {