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
498863ea
Commit
498863ea
authored
3 years ago
by
Daniel Hornung
Browse files
Options
Downloads
Patches
Plain Diff
DOC: README_SETUP.md updated, some formatting.
parent
120bd912
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!19
Switch integer values to int32
Pipeline
#12636
passed
3 years ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest
#12637
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
doc/README_SETUP.md
+1
-1
1 addition, 1 deletion
doc/README_SETUP.md
include/caosdb/transaction.h
+2
-2
2 additions, 2 deletions
include/caosdb/transaction.h
test/test_issues.cpp
+7
-7
7 additions, 7 deletions
test/test_issues.cpp
with
10 additions
and
10 deletions
doc/README_SETUP.md
+
1
−
1
View file @
498863ea
...
@@ -50,7 +50,7 @@ as compiler. We use [cmake](https://cmake.org/download/) as build tool.
...
@@ -50,7 +50,7 @@ as compiler. We use [cmake](https://cmake.org/download/) as build tool.
### Creating a Local Conan Package ##
### 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.
For MacOS, you probably should adjust the option as mentioned above.
...
...
This diff is collapsed.
Click to expand it.
include/caosdb/transaction.h
+
2
−
2
View file @
498863ea
...
@@ -366,8 +366,8 @@ public:
...
@@ -366,8 +366,8 @@ public:
[[
nodiscard
]]
inline
auto
GetResultSet
()
const
noexcept
->
const
ResultSet
&
{
[[
nodiscard
]]
inline
auto
GetResultSet
()
const
noexcept
->
const
ResultSet
&
{
if
(
!
this
->
result_set
)
{
if
(
!
this
->
result_set
)
{
this
->
result_set
=
std
::
make_unique
<
MultiResultSet
>
(
this
->
result_set
=
std
::
move
(
std
::
vector
<
std
::
unique_ptr
<
Entity
>>
()));
std
::
make_unique
<
MultiResultSet
>
(
std
::
move
(
std
::
vector
<
std
::
unique_ptr
<
Entity
>>
()));
}
}
return
*
(
this
->
result_set
.
get
());
return
*
(
this
->
result_set
.
get
());
}
}
...
...
This diff is collapsed.
Click to expand it.
test/test_issues.cpp
+
7
−
7
View file @
498863ea
...
@@ -17,14 +17,14 @@
...
@@ -17,14 +17,14 @@
* You should have received a copy of the GNU Affero General Public License
* 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/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
*/
#include
"caosdb/configuration.h"
// for InsecureConnectionConfig...
#include
"caosdb/configuration.h"
// for InsecureConnectionConfig...
#include
"caosdb/connection.h"
// for Connection
#include
"caosdb/connection.h"
// for Connection
#include
"caosdb/exceptions.h"
// for ConnectionError
#include
"caosdb/exceptions.h"
// for ConnectionError
#include
"caosdb/status_code.h"
#include
"caosdb/status_code.h"
#include
"caosdb/transaction.h"
// for Transaction
#include
"caosdb/transaction.h"
// for Transaction
#include
<gtest/gtest-message.h>
// for Message
#include
<gtest/gtest-message.h>
// for Message
#include
<gtest/gtest-test-part.h>
// for SuiteApiResolver, TestPa...
#include
<gtest/gtest-test-part.h>
// for SuiteApiResolver, TestPa...
#include
<gtest/gtest_pred_impl.h>
// for Test, TestInfo, TEST
#include
<gtest/gtest_pred_impl.h>
// for Test, TestInfo, TEST
namespace
caosdb
::
transaction
{
namespace
caosdb
::
transaction
{
using
caosdb
::
configuration
::
InsecureConnectionConfiguration
;
using
caosdb
::
configuration
::
InsecureConnectionConfiguration
;
...
...
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