Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenWalnut Modules
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenWalnut
OpenWalnut Modules
Commits
39b39372
Commit
39b39372
authored
Jul 20, 2017
by
Alexander Wiebel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FIX] In C++11, shared_ptr can't be implicitly converted to a bool
parent
7187115b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
FiberClusteringToolbox/src/gaussProcesses/detTract2GPConvert/WMDetTract2GPConvert.cpp
...aussProcesses/detTract2GPConvert/WMDetTract2GPConvert.cpp
+1
-1
TransferCalcToolbox/src/transferCalc/WMTransferCalc.cpp
TransferCalcToolbox/src/transferCalc/WMTransferCalc.cpp
+6
-6
Unmaintained/src/sliceContext/WMSliceContext.cpp
Unmaintained/src/sliceContext/WMSliceContext.cpp
+1
-1
No files found.
FiberClusteringToolbox/src/gaussProcesses/detTract2GPConvert/WMDetTract2GPConvert.cpp
View file @
39b39372
...
...
@@ -90,7 +90,7 @@ void WMDetTract2GPConvert::moduleMain()
boost
::
shared_ptr
<
WDataSetDTI
>
tensors
=
m_tensorIC
->
getData
();
// Demain Wasserman said, using tensors is not realy worth its effort
// bool dataValid = tracts && tensors;
bool
dataValid
=
tracts
;
bool
dataValid
=
static_cast
<
bool
>
(
tracts
)
;
if
(
!
dataValid
)
{
continue
;
...
...
TransferCalcToolbox/src/transferCalc/WMTransferCalc.cpp
View file @
39b39372
...
...
@@ -378,14 +378,14 @@ void WMTransferCalc::moduleMain()
bool
dataChanged
=
(
m_inputData
->
getData
()
!=
m_dataSet
);
bool
additionalData
=
(
m_inputFA
->
getData
()
!=
m_FAdataSet
);
bool
newDerivative
=
(
m_inputDerivation
->
getData
()
!=
m_deriDataSet
);
bool
dataValid
=
(
m_dataSet
);
m_DeriIsValid
=
(
m_deriDataSet
);
m_FAisValid
=
(
m_FAdataSet
);
bool
dataValid
=
static_cast
<
bool
>
(
m_dataSet
);
m_DeriIsValid
=
static_cast
<
bool
>
(
m_deriDataSet
);
m_FAisValid
=
static_cast
<
bool
>
(
m_FAdataSet
);
if
(
dataChanged
)
// main data, compulsory
{
m_dataSet
=
m_inputData
->
getData
();
dataValid
=
(
m_dataSet
);
dataValid
=
static_cast
<
bool
>
(
m_dataSet
);
debugLog
()
<<
"New Data!"
;
if
(
!
dataValid
)
...
...
@@ -409,7 +409,7 @@ void WMTransferCalc::moduleMain()
if
(
newDerivative
)
// optional: dataset with derivated data
{
m_deriDataSet
=
m_inputDerivation
->
getData
();
m_DeriIsValid
=
(
m_deriDataSet
);
m_DeriIsValid
=
static_cast
<
bool
>
(
m_deriDataSet
);
debugLog
()
<<
"New Derivated Data!"
;
if
(
!
m_DeriIsValid
)
...
...
@@ -444,7 +444,7 @@ void WMTransferCalc::moduleMain()
if
(
additionalData
)
// optional: fractional anisotropy data
{
m_FAdataSet
=
m_inputFA
->
getData
();
m_FAisValid
=
(
m_FAdataSet
);
m_FAisValid
=
static_cast
<
bool
>
(
m_FAdataSet
);
debugLog
()
<<
"New FA Data!"
;
if
(
!
m_FAisValid
)
...
...
Unmaintained/src/sliceContext/WMSliceContext.cpp
View file @
39b39372
...
...
@@ -126,7 +126,7 @@ void WMSliceContext::moduleMain()
// To query whether an input was updated, simply ask the input:
bool
dataUpdated
=
m_fiberInput
->
updated
();
boost
::
shared_ptr
<
const
WDataSetFibers
>
fibers
(
m_fiberInput
->
getData
()
);
bool
dataValid
=
fibers
;
bool
dataValid
=
static_cast
<
bool
>
(
fibers
)
;
if
(
!
(
dataValid
&&
dataUpdated
)
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment