From db245fef3f3b9c95365e7b3ec136badafa02cbb1 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 12 Aug 2021 20:55:00 +0200
Subject: [PATCH] WIP: consolidation
---
CMakeLists.txt | 2 +-
conanfile.py | 2 +-
proto | 2 +-
src/caosdb/entity.cpp | 4 +---
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64fad32..5db236e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@
cmake_minimum_required(VERSION 3.13)
-set(libcaosdb_VERSION 0.0.10)
+set(libcaosdb_VERSION 0.0.13)
set(libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR 0)
set(libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR 5)
set(libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH 0)
diff --git a/conanfile.py b/conanfile.py
index 0e31f8d..7b34a06 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -3,7 +3,7 @@ from conans import ConanFile, CMake, tools
class CaosdbConan(ConanFile):
name = "caosdb"
- version = "0.0.10"
+ version = "0.0.13"
license = "AGPL-3.0-or-later"
author = "Timm C. Fitschen <t.fitschen@indiscale.com>"
url = "https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git"
diff --git a/proto b/proto
index 4ce7460..41afd36 160000
--- a/proto
+++ b/proto
@@ -1 +1 @@
-Subproject commit 4ce7460ff869422c419623c8d0cee0459ce6d6dc
+Subproject commit 41afd36643c0d88aaa104c26c1c6de3c8567e817
diff --git a/src/caosdb/entity.cpp b/src/caosdb/entity.cpp
index 67eade2..127ac01 100644
--- a/src/caosdb/entity.cpp
+++ b/src/caosdb/entity.cpp
@@ -190,9 +190,7 @@ auto Entity::CopyTo(ProtoEntity *target) -> void {
target->CopyFrom(*(this->wrapped));
}
-auto Entity::SetRole(Role role) -> void {
- this->wrapped->set_role(role);
-}
+auto Entity::SetRole(Role role) -> void { this->wrapped->set_role(role); }
auto Entity::SetName(const std::string &name) -> void {
this->wrapped->set_name(name);
--
GitLab