diff --git a/doc/README_SETUP.md b/doc/README_SETUP.md index 8549214ec483acede205f7badf1b8184c01bd7ed..a5976af95de78a01e6ae174e39cc6a66881c28ac 100644 --- a/doc/README_SETUP.md +++ b/doc/README_SETUP.md @@ -50,7 +50,7 @@ as compiler. We use [cmake](https://cmake.org/download/) as build tool. ### Creating a Local Conan Package ## -Building and installing libcaosdb with Conan is just a single command: `make conan-install` +Building and installing libcaosdb with Conan is just a single command: `make conan` For MacOS, you probably should adjust the option as mentioned above. diff --git a/include/caosdb/transaction.h b/include/caosdb/transaction.h index f92cf28f8ed670177629f5534cb9777f25e1fa1b..6fd9d026a728990710973469887e19799c69fd81 100644 --- a/include/caosdb/transaction.h +++ b/include/caosdb/transaction.h @@ -366,8 +366,8 @@ public: [[nodiscard]] inline auto GetResultSet() const noexcept -> const ResultSet & { if (!this->result_set) { - this->result_set = std::make_unique<MultiResultSet>( - std::move(std::vector<std::unique_ptr<Entity>>())); + this->result_set = + std::make_unique<MultiResultSet>(std::move(std::vector<std::unique_ptr<Entity>>())); } return *(this->result_set.get()); } diff --git a/test/test_issues.cpp b/test/test_issues.cpp index f4f560dd7e60332e83843a26eb43a7ea2187474b..2b414a76a3ee122fe2d622bdf685262e2eb4e56b 100644 --- a/test/test_issues.cpp +++ b/test/test_issues.cpp @@ -17,14 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include "caosdb/configuration.h" // for InsecureConnectionConfig... -#include "caosdb/connection.h" // for Connection -#include "caosdb/exceptions.h" // for ConnectionError +#include "caosdb/configuration.h" // for InsecureConnectionConfig... +#include "caosdb/connection.h" // for Connection +#include "caosdb/exceptions.h" // for ConnectionError #include "caosdb/status_code.h" -#include "caosdb/transaction.h" // for Transaction -#include <gtest/gtest-message.h> // for Message -#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestPa... -#include <gtest/gtest_pred_impl.h> // for Test, TestInfo, TEST +#include "caosdb/transaction.h" // for Transaction +#include <gtest/gtest-message.h> // for Message +#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestPa... +#include <gtest/gtest_pred_impl.h> // for Test, TestInfo, TEST namespace caosdb::transaction { using caosdb::configuration::InsecureConnectionConfiguration;