Skip to content
Snippets Groups Projects
Verified Commit db245fef authored by Timm Fitschen's avatar Timm Fitschen
Browse files

WIP: consolidation

parent ed3d916a
No related branches found
No related tags found
1 merge request!12F consolidation
Pipeline #11905 failed
......@@ -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)
......
......@@ -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"
......
Subproject commit 4ce7460ff869422c419623c8d0cee0459ce6d6dc
Subproject commit 41afd36643c0d88aaa104c26c1c6de3c8567e817
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment