From 498863ea1a74a2d4ee0e0e37993f390ef126e079 Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Thu, 26 Aug 2021 13:39:04 +0200
Subject: [PATCH] DOC: README_SETUP.md updated, some formatting.
---
doc/README_SETUP.md | 2 +-
include/caosdb/transaction.h | 4 ++--
test/test_issues.cpp | 14 +++++++-------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/doc/README_SETUP.md b/doc/README_SETUP.md
index 8549214..a5976af 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 f92cf28..6fd9d02 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 f4f560d..2b414a7 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;
--
GitLab