Merge pull request #28 from lysevi/dev

Dev

.travis.yml

@@ -145,15 +145,15 @@ script:
   - echo "TSAN_OPTIONS => " ${TSAN_OPTIONS}
   - |
     if [[ "${HAS_TSAN}" = "true" ]];  then 
-      cmake -Dsolidarity_ENABLE_TESTS=ON -Dsolidarity_ENABLE_EXAMPLES=ON -Dsolidarity_ENABLE_DOUBLECHECKS=ON -DCMAKE_BUILD_TYPE=Debug   -DCMAKE_CXX_FLAGS="${CXX_FLAGS} -g  -O1 -fsanitize=thread -fPIE" -DCMAKE_BUILD_TYPE=Debug ..
+      cmake -Dsolidarity_ENABLE_TESTS=ON -Dsolidarity_ENABLE_BENCHMARKS=OFF -Dsolidarity_ENABLE_EXAMPLES=ON -Dsolidarity_ENABLE_DOUBLECHECKS=ON -DCMAKE_BUILD_TYPE=Debug   -DCMAKE_CXX_FLAGS="${CXX_FLAGS} -g  -O1 -fsanitize=thread -fPIE" -DCMAKE_BUILD_TYPE=Debug ..
       make -k -j2 
       ctest -j2 -C Debug .  --verbose || exit 1
       exit
     fi
   
   - |
     if [[ "${HAS_UBSAN}" = "true" ]];  then 
-      cmake -Dsolidarity_ENABLE_TESTS=ON -Dsolidarity_ENABLE_EXAMPLES=ON -Dsolidarity_ENABLE_DOUBLECHECKS=ON -DCMAKE_BUILD_TYPE=Debug   -DCMAKE_CXX_FLAGS="${CXX_FLAGS} -g  -O1 -fsanitize=undefined -fno-omit-frame-pointer"  -DCMAKE_BUILD_TYPE=Debug .. 
+      cmake -Dsolidarity_ENABLE_TESTS=ON -Dsolidarity_ENABLE_BENCHMARKS=OFF -Dsolidarity_ENABLE_EXAMPLES=ON -Dsolidarity_ENABLE_DOUBLECHECKS=ON -DCMAKE_BUILD_TYPE=Debug   -DCMAKE_CXX_FLAGS="${CXX_FLAGS} -g  -O1 -fsanitize=undefined -fno-omit-frame-pointer"  -DCMAKE_BUILD_TYPE=Debug .. 
       make -k -j2 
       ctest -j2 -C Debug .  --verbose || exit 1 
       exit 
@@ -162,12 +162,12 @@ script:
   
   - |
     if [[ "${HAS_ASAN}" = "true" ]];  then 
-      cmake -Dsolidarity_ENABLE_TESTS=ON -Dsolidarity_ENABLE_EXAMPLES=ON -Dsolidarity_ENABLE_DOUBLECHECKS=ON -DCMAKE_BUILD_TYPE=Debug   -DCMAKE_CXX_FLAGS="${CXX_FLAGS} -g  -O1 -fsanitize=address -fno-omit-frame-pointer"  -DCMAKE_BUILD_TYPE=Debug ..
+      cmake -Dsolidarity_ENABLE_TESTS=ON -Dsolidarity_ENABLE_BENCHMARKS=OFF -Dsolidarity_ENABLE_EXAMPLES=ON -Dsolidarity_ENABLE_DOUBLECHECKS=ON -DCMAKE_BUILD_TYPE=Debug   -DCMAKE_CXX_FLAGS="${CXX_FLAGS} -g  -O1 -fsanitize=address -fno-omit-frame-pointer"  -DCMAKE_BUILD_TYPE=Debug ..
       make -k -j2
       ctest -j2 -C Debug .  --verbose || exit 1 
       exit 
     fi
 
-  - cmake -Dsolidarity_ENABLE_TESTS=ON -Dsolidarity_ENABLE_EXAMPLES=ON -Dsolidarity_ENABLE_DOUBLECHECKS=ON ..
+  - cmake -Dsolidarity_ENABLE_TESTS=ON -Dsolidarity_ENABLE_BENCHMARKS=OFF -Dsolidarity_ENABLE_EXAMPLES=ON -Dsolidarity_ENABLE_DOUBLECHECKS=ON ..
   - make -k -j 2
 

README.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="artwork/logo.small.png"></p>
+<p align="left"><img src="artwork/logo.small.png"></p>
 <b>
 <table>
     <tr>
@@ -39,13 +39,14 @@
 </b>
 
 # SOLIDarity 
+C++ implementation of raft consensus.
 
 ## Dependencies
 ---
 * Boost 1.69.0 or higher: system, asio, stacktrace, datetime.
-* cmake 3.10 or higher
+* cmake 3.14 or higher
 * conan.io 
-* c++ 17 compiler (MSVC 2017, gcc 7.0)
+* c++ 17 compiler (MSVC 2017, gcc 7.0,gcc 8.0, clang++ 8)
 
 ## Building
 ---

cmake/CompillerSettings.cmake

@@ -20,7 +20,7 @@ if(MSVC)
   add_definitions(-D_ENABLE_ATOMIC_ALIGNMENT_FIX)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=0x0501 /permissive /WX -W4 /MP")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=0x0501 /permissive /WX -W4 /MP /wd4701")
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox /GT /Ot -DNDEBUG")
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oy") #-fno-omit-frame-pointer analog
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -D_DEBUG")