update uncrustify.cfg for v0.80 and reformat code

Author: d99kris

src/rapidcsv.h

@@ -304,7 +304,7 @@ namespace rapidcsv
   }
 
   template<typename T>
-  using ConvFunc = std::function<void (const std::string & pStr, T & pVal)>;
+  using ConvFunc = std::function<void (const std::string& pStr, T& pVal)>;
 
   /**
    * @brief     Datastructure holding parameters controlling which row and column should be
@@ -1803,19 +1803,22 @@ namespace rapidcsv
 
     size_t GetDataColumnCount() const
     {
-      const size_t firstDataRow = static_cast<size_t>((mLabelParams.mColumnNameIdx >= 0) ? mLabelParams.mColumnNameIdx : 0);
+      const size_t firstDataRow =
+        static_cast<size_t>((mLabelParams.mColumnNameIdx >= 0) ? mLabelParams.mColumnNameIdx : 0);
       return (mData.size() > firstDataRow) ? mData.at(firstDataRow).size() : 0;
     }
 
     inline size_t GetDataRowIndex(const size_t pRowIdx) const
     {
-      const size_t firstDataRow = static_cast<size_t>((mLabelParams.mColumnNameIdx + 1 >= 0) ? mLabelParams.mColumnNameIdx + 1 : 0);
+      const size_t firstDataRow =
+        static_cast<size_t>((mLabelParams.mColumnNameIdx + 1 >= 0) ? mLabelParams.mColumnNameIdx + 1 : 0);
       return pRowIdx + firstDataRow;
     }
 
     inline size_t GetDataColumnIndex(const size_t pColumnIdx) const
     {
-      const size_t firstDataColumn = static_cast<size_t>((mLabelParams.mRowNameIdx + 1 >= 0) ? mLabelParams.mRowNameIdx + 1 : 0);
+      const size_t firstDataColumn =
+        static_cast<size_t>((mLabelParams.mRowNameIdx + 1 >= 0) ? mLabelParams.mRowNameIdx + 1 : 0);
       return pColumnIdx + firstDataColumn;
     }
 

tests/ptest001.cpp

@@ -24,9 +24,9 @@ int main()
       timer.Stop();
 
       // dummy usage of variables
-      (void) column;
-      (void) row;
-      (void) cell;
+      (void)column;
+      (void)row;
+      (void)cell;
     }
 
     timer.ReportMedian();

tests/test057.cpp

@@ -18,7 +18,7 @@ int main()
   };
   const unsigned int u16le_len = 58;
 
-  std::string csv(reinterpret_cast<const char *>(u16le), u16le_len);
+  std::string csv(reinterpret_cast<const char*>(u16le), u16le_len);
   // "-,A,B,C\n"
   // "1,3,9,81\n"
   // "2,4,16,256\n"

tests/test058.cpp

@@ -18,7 +18,7 @@ int main()
   };
   const unsigned int u16be_len = 58;
 
-  std::string csv(reinterpret_cast<const char *>(u16be), u16be_len);
+  std::string csv(reinterpret_cast<const char*>(u16be), u16be_len);
   // "-,A,B,C\n"
   // "1,3,9,81\n"
   // "2,4,16,256\n"

tests/test059.cpp

@@ -18,7 +18,7 @@ int main()
   };
   const unsigned int refu16le_len = 58;
 
-  std::string csvref(reinterpret_cast<const char *>(refu16le), refu16le_len);
+  std::string csvref(reinterpret_cast<const char*>(refu16le), refu16le_len);
   // "-,A,B,C\n"
   // "1,3,9,81\n"
   // "2,4,16,256\n"
@@ -33,7 +33,7 @@ int main()
   };
   const unsigned int u16le_len = 50;
 
-  std::string csv(reinterpret_cast<const char *>(u16le), u16le_len);
+  std::string csv(reinterpret_cast<const char*>(u16le), u16le_len);
   // "-,A,B,C\n"
   // "1,0,0,0\n"
   // "2,0,0,0\n"

tests/test060.cpp

@@ -18,7 +18,7 @@ int main()
   };
   const unsigned int refu16be_len = 58;
 
-  std::string csvref(reinterpret_cast<const char *>(refu16be), refu16be_len);
+  std::string csvref(reinterpret_cast<const char*>(refu16be), refu16be_len);
   // "-,A,B,C\n"
   // "1,3,9,81\n"
   // "2,4,16,256\n"
@@ -33,7 +33,7 @@ int main()
   };
   const unsigned int u16be_len = 50;
 
-  std::string csv(reinterpret_cast<const char *>(u16be), u16be_len);
+  std::string csv(reinterpret_cast<const char*>(u16be), u16be_len);
   // "-,A,B,C\n"
   // "1,0,0,0\n"
   // "2,0,0,0\n"

tests/test098.cpp

@@ -15,7 +15,7 @@ int main()
         ",\n"
         ",\n"
         ","
-        ;
+      ;
 
       std::istringstream sstream(csv);
       rapidcsv::Document doc(sstream, rapidcsv::LabelParams(-1, -1));
@@ -34,7 +34,7 @@ int main()
         ",\n"
         ",\n"
         ",\n"
-        ;
+      ;
 
       std::istringstream sstream(csv);
       rapidcsv::Document doc(sstream, rapidcsv::LabelParams(-1, -1));

tests/unittest.h

@@ -15,6 +15,7 @@
 #define ExpectEqual(t, a, b) ExpectEqualFun<t>(a, b, #a, #b, __FILE__, __LINE__)
 #define ExpectTrue(a) ExpectTrueFun(a, #a, __FILE__, __LINE__)
 
+// *INDENT-OFF*
 #define ExpectException(expr, excp)                                                           \
   do                                                                                          \
   {                                                                                           \
@@ -90,6 +91,7 @@
     }                                                                                         \
   }                                                                                           \
   while (0)
+// *INDENT-ON*
 
 
 namespace unittest