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
4ce64b16
Commit
4ce64b16
authored
3 years ago
by
Daniel Hornung
Browse files
Options
Downloads
Patches
Plain Diff
STY: Formatting.
parent
bf3f8314
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!19
Switch integer values to int32
Pipeline
#12633
passed
3 years ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest
#12635
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/ccaosdb.h
+3
-3
3 additions, 3 deletions
include/ccaosdb.h
src/caosdb/entity.cpp
+5
-5
5 additions, 5 deletions
src/caosdb/entity.cpp
src/ccaosdb.cpp
+5
-2
5 additions, 2 deletions
src/ccaosdb.cpp
with
13 additions
and
10 deletions
include/ccaosdb.h
+
3
−
3
View file @
4ce64b16
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
*
*
*/
*/
#include
<cstdint>
// for uint32_t
#include
<cstdint>
// for uint32_t
#ifdef __cplusplus
#ifdef __cplusplus
extern
"C"
{
extern
"C"
{
...
@@ -462,8 +462,8 @@ int caosdb_entity_property_set_int_value(caosdb_entity_property *property, const
...
@@ -462,8 +462,8 @@ int caosdb_entity_property_set_int_value(caosdb_entity_property *property, const
int
caosdb_entity_property_set_double_value
(
caosdb_entity_property
*
property
,
const
double
value
);
int
caosdb_entity_property_set_double_value
(
caosdb_entity_property
*
property
,
const
double
value
);
int
caosdb_entity_property_set_boolean_value
(
caosdb_entity_property
*
property
,
const
bool
value
);
int
caosdb_entity_property_set_boolean_value
(
caosdb_entity_property
*
property
,
const
bool
value
);
int
caosdb_entity_property_set_string_value
(
caosdb_entity_property
*
property
,
const
char
*
value
);
int
caosdb_entity_property_set_string_value
(
caosdb_entity_property
*
property
,
const
char
*
value
);
int
caosdb_entity_property_set_int_list_value
(
caosdb_entity_property
*
property
,
const
int32_t
*
value
,
int
caosdb_entity_property_set_int_list_value
(
caosdb_entity_property
*
property
,
const
int
length
);
const
int32_t
*
value
,
const
int
length
);
int
caosdb_entity_property_set_double_list_value
(
caosdb_entity_property
*
property
,
int
caosdb_entity_property_set_double_list_value
(
caosdb_entity_property
*
property
,
const
double
*
value
,
const
int
length
);
const
double
*
value
,
const
int
length
);
int
caosdb_entity_property_set_boolean_list_value
(
caosdb_entity_property
*
property
,
int
caosdb_entity_property_set_boolean_list_value
(
caosdb_entity_property
*
property
,
...
...
This diff is collapsed.
Click to expand it.
src/caosdb/entity.cpp
+
5
−
5
View file @
4ce64b16
...
@@ -20,13 +20,13 @@
...
@@ -20,13 +20,13 @@
*
*
*/
*/
#include
"caosdb/entity.h"
#include
"caosdb/entity.h"
#include
"caosdb/data_type.h"
// for DataType
#include
"caosdb/data_type.h"
// for DataType
#include
"caosdb/entity/v1alpha1/main.pb.h"
// for Messages
#include
"caosdb/entity/v1alpha1/main.pb.h"
// for Messages
#include
"caosdb/exceptions.h"
#include
"caosdb/exceptions.h"
#include
"caosdb/logging.h"
// for CAOSDB_LOG_TRACE
#include
"caosdb/logging.h"
// for CAOSDB_LOG_TRACE
#include
"caosdb/protobuf_helper.h"
// for get_arena
#include
"caosdb/protobuf_helper.h"
// for get_arena
#include
"caosdb/utility.h"
#include
"caosdb/utility.h"
#include
"caosdb/value.h"
// for Value
#include
"caosdb/value.h"
// for Value
#include
<boost/algorithm/string.hpp>
#include
<boost/algorithm/string.hpp>
#include
<google/protobuf/arena.h>
// for Arena
#include
<google/protobuf/arena.h>
// for Arena
#include
<google/protobuf/generated_message_util.h>
// for Arena::Create...
#include
<google/protobuf/generated_message_util.h>
// for Arena::Create...
...
...
This diff is collapsed.
Click to expand it.
src/ccaosdb.cpp
+
5
−
2
View file @
4ce64b16
...
@@ -640,7 +640,9 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
...
@@ -640,7 +640,9 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
return
0
;
return
0
;
})
})
ERROR_RETURN_CODE
(
GENERIC_ERROR
,
ERROR_RETURN_CODE
(
GENERIC_ERROR
,
int
caosdb_entity_entity_get_int_value
(
caosdb_entity_entity
*
entity
,
int32_t
*
out
),
{
int
caosdb_entity_entity_get_int_value
(
caosdb_entity_entity
*
entity
,
int32_t
*
out
),
{
auto
*
wrapped_entity
=
WRAPPED_ENTITY_CAST
(
entity
);
auto
*
wrapped_entity
=
WRAPPED_ENTITY_CAST
(
entity
);
*
out
=
wrapped_entity
->
GetValue
().
AsInteger
();
*
out
=
wrapped_entity
->
GetValue
().
AsInteger
();
return
0
;
return
0
;
...
@@ -1077,7 +1079,8 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
...
@@ -1077,7 +1079,8 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
ERROR_RETURN_CODE
(
GENERIC_ERROR
,
ERROR_RETURN_CODE
(
GENERIC_ERROR
,
int
caosdb_entity_entity_set_int_list_value
(
caosdb_entity_entity
*
entity
,
int
caosdb_entity_entity_set_int_list_value
(
caosdb_entity_entity
*
entity
,
const
int32_t
*
value
,
const
int
length
),
const
int32_t
*
value
,
const
int
length
),
{
{
auto
*
wrapped_entity
=
auto
*
wrapped_entity
=
static_cast
<
caosdb
::
entity
::
Entity
*>
(
entity
->
wrapped_entity
);
static_cast
<
caosdb
::
entity
::
Entity
*>
(
entity
->
wrapped_entity
);
...
...
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