Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
ControlSystemAdapter-DoocsAdapter
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
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
ChimeraTK Mirror
ControlSystemAdapter-DoocsAdapter
Commits
09a93c29
Commit
09a93c29
authored
1 year ago
by
Martin Christoph Hierholzer
Browse files
Options
Downloads
Patches
Plain Diff
fix: compilation fails with new DOOCS
parent
53236f2d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/DoocsProcessArray.h
+0
-5
0 additions, 5 deletions
include/DoocsProcessArray.h
src/CSAdapterEqFct.cc
+2
-2
2 additions, 2 deletions
src/CSAdapterEqFct.cc
with
2 additions
and
7 deletions
include/DoocsProcessArray.h
+
0
−
5
View file @
09a93c29
...
...
@@ -113,11 +113,6 @@ namespace ChimeraTK {
// No cast necessary if types are identical.
dataPtr
=
processVector
.
data
();
}
else
if
constexpr
(
std
::
is_same
<
DOOCS_PRIMITIVE_T
,
int64_t
>::
value
&&
std
::
is_same
<
THE_DOOCS_TYPE
,
long
long
int
>::
value
)
{
// Cast from int64_t to long long int (which are different types!)
dataPtr
=
reinterpret_cast
<
long
long
int
*>
(
processVector
.
data
());
}
else
if
constexpr
(
std
::
is_same
<
DOOCS_PRIMITIVE_T
,
ChimeraTK
::
Boolean
>::
value
&&
std
::
is_same
<
THE_DOOCS_TYPE
,
bool
>::
value
)
{
// FIXME: Is it really ok to use reinterpret_cast here?
...
...
This diff is collapsed.
Click to expand it.
src/CSAdapterEqFct.cc
+
2
−
2
View file @
09a93c29
...
...
@@ -105,10 +105,10 @@ namespace ChimeraTK {
saveArray
<
unsigned
int
>
(
p
);
break
;
case
DATA_A_LONG
:
saveArray
<
long
long
>
(
p
);
saveArray
<
int64_t
>
(
p
);
break
;
case
DATA_A_ULONG
:
saveArray
<
u
nsigned
long
long
>
(
p
);
saveArray
<
u
int64_t
>
(
p
);
break
;
case
DATA_A_FLOAT
:
saveArray
<
float
>
(
p
);
...
...
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