diff --git a/CMakeLists.txt b/CMakeLists.txt index fac894bb990490bc45a4de1877a1d9b072a1d658..e41c542cfbda158ea45d65784a4ee5f82aa2a529 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -option(BUILD_SHARED_LIBRARY "Build using shared libraries" ON) +option(BUILD_SHARED_LIBS "Build using shared libraries" ON) set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) @@ -251,9 +251,8 @@ function(add_compiler_flag flag) endfunction() - option(LINTING "Enable linting with clang-tidy and iwyu when in non-Debug build-type" OFF) -if (clang_tidy AND ("${CMAKE_BUILD_TYPE}" MATCHES "Debug" OR LINTING)) +if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug" OR LINTING) set(_LINTING ON) endif() option(SKIP_LINTING "Skip linting even when in Debug build-type" OFF) @@ -336,6 +335,8 @@ if (_LINTING) C_CLANG_TIDY "${_CMAKE_C_CLANG_TIDY};${_CMAKE_C_CLANG_TIDY_CHECKS}" ) endif() +else() + message(STATUS "HEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEERE 5") endif() diff --git a/include/caosdb/transaction.h b/include/caosdb/transaction.h index adcbfcb00a61dd23881f40b3dfc98f9721a272a1..19afde62f7020d3004dd7a4def58cb6330a92599 100644 --- a/include/caosdb/transaction.h +++ b/include/caosdb/transaction.h @@ -91,11 +91,11 @@ return StatusCode::TRANSACTION_STATUS_ERROR; \ } \ switch (this->transaction_type) { \ - case TransactionType::NONE: \ - this->transaction_type = TransactionType::DELETE_ONLY; \ - case TransactionType::DELETE_ONLY: \ - case TransactionType::MIXED_WRITE: \ - case TransactionType::MIXED_READ_AND_WRITE: \ + case TransactionType::NONE: \ + this->transaction_type = TransactionType::DELETE_ONLY; \ + case TransactionType::DELETE_ONLY: \ + case TransactionType::MIXED_WRITE: \ + case TransactionType::MIXED_READ_AND_WRITE: \ break; \ default: \ CAOSDB_LOG_ERROR_AND_RETURN_STATUS( \ @@ -114,8 +114,8 @@ } \ switch (this->transaction_type) { \ case TransactionType::NONE: \ - this->transaction_type = TransactionType::INSERT_ONLY; \ - case TransactionType::INSERT_ONLY: \ + this->transaction_type = TransactionType::INSERT_ONLY; \ + case TransactionType::INSERT_ONLY: \ case TransactionType::MIXED_WRITE: \ case TransactionType::MIXED_READ_AND_WRITE: \ break; \ @@ -136,8 +136,8 @@ } \ switch (this->transaction_type) { \ case TransactionType::NONE: \ - this->transaction_type = TransactionType::UPDATE_ONLY; \ - case TransactionType::UPDATE_ONLY: \ + this->transaction_type = TransactionType::UPDATE_ONLY; \ + case TransactionType::UPDATE_ONLY: \ case TransactionType::MIXED_WRITE: \ case TransactionType::MIXED_READ_AND_WRITE: \ break; \ @@ -288,9 +288,9 @@ public: enum TransactionType { NONE, //!< Unspecified or not specified yet. READ_ONLY, //!< Only retrievals (by id, by query) - INSERT_ONLY, //!< Only insertions - UPDATE_ONLY, //!< Only updates - DELETE_ONLY, //!< Only deletions + INSERT_ONLY, //!< Only insertions + UPDATE_ONLY, //!< Only updates + DELETE_ONLY, //!< Only deletions MIXED_WRITE, //!< Only insertions, deletions, updates MIXED_READ_AND_WRITE //!< all kind of transaction. };