Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-cpplib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-cpplib
Commits
db245fef
Verified
Commit
db245fef
authored
3 years ago
by
Timm Fitschen
Browse files
Options
Downloads
Patches
Plain Diff
WIP: consolidation
parent
ed3d916a
No related branches found
No related tags found
1 merge request
!12
F consolidation
Pipeline
#11905
failed
3 years ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
conanfile.py
+1
-1
1 addition, 1 deletion
conanfile.py
proto
+1
-1
1 addition, 1 deletion
proto
src/caosdb/entity.cpp
+1
-3
1 addition, 3 deletions
src/caosdb/entity.cpp
with
4 additions
and
6 deletions
CMakeLists.txt
+
1
−
1
View file @
db245fef
...
...
@@ -20,7 +20,7 @@
cmake_minimum_required
(
VERSION 3.13
)
set
(
libcaosdb_VERSION 0.0.1
0
)
set
(
libcaosdb_VERSION 0.0.1
3
)
set
(
libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR 0
)
set
(
libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR 5
)
set
(
libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH 0
)
...
...
This diff is collapsed.
Click to expand it.
conanfile.py
+
1
−
1
View file @
db245fef
...
...
@@ -3,7 +3,7 @@ from conans import ConanFile, CMake, tools
class
CaosdbConan
(
ConanFile
):
name
=
"
caosdb
"
version
=
"
0.0.1
0
"
version
=
"
0.0.1
3
"
license
=
"
AGPL-3.0-or-later
"
author
=
"
Timm C. Fitschen <t.fitschen@indiscale.com>
"
url
=
"
https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git
"
...
...
This diff is collapsed.
Click to expand it.
proto
@
41afd366
Compare
4ce7460f
...
41afd366
Subproject commit 4
ce7460ff869422c419623c8d0cee0459ce6d6dc
Subproject commit 4
1afd36643c0d88aaa104c26c1c6de3c8567e817
This diff is collapsed.
Click to expand it.
src/caosdb/entity.cpp
+
1
−
3
View file @
db245fef
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment