Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review 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
mantidproject
mantid
Commits
a204ebd8
Commit
a204ebd8
authored
7 years ago
by
Miller, Ross
Browse files
Options
Downloads
Patches
Plain Diff
Fix clang-format complaints
Fixed a couple of minor formatting issues. Refs #20681
parent
e149a937
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/LiveData/src/SNSLiveEventDataListener.cpp
+12
-12
12 additions, 12 deletions
Framework/LiveData/src/SNSLiveEventDataListener.cpp
with
12 additions
and
12 deletions
Framework/LiveData/src/SNSLiveEventDataListener.cpp
+
12
−
12
View file @
a204ebd8
...
...
@@ -773,15 +773,15 @@ bool SNSLiveEventDataListener::rxPacket(const ADARA::RunStatusPkt &pkt) {
setRunDetails
(
pkt
);
}
}
else
if
(
pkt
.
status
()
==
ADARA
::
RunStatus
::
STATE
&&
!
haveRunNumber
)
{
// A packet status of STATE and no run number means we've just connected
// to the SMS. Specifically, this is the RunStatus packet that SMS
// initially sends out when a client hasn't set the flag to request
// historical data. We may or may not actually be in a run right now.
// If we are, then we need to set the run details. If not, there's
// nothing we need to do with this packet.
if
(
pkt
.
runNumber
()
!=
0
)
{
setRunDetails
(
pkt
);
}
// A packet status of STATE and no run number means we've just connected
// to the SMS. Specifically, this is the RunStatus packet that SMS
// initially sends out when a client hasn't set the flag to request
// historical data. We may or may not actually be in a run right now.
// If we are, then we need to set the run details. If not, there's
// nothing we need to do with this packet.
if
(
pkt
.
runNumber
()
!=
0
)
{
setRunDetails
(
pkt
);
}
}
// Note: all other possibilities for pkt.status() can be ignored
...
...
@@ -1086,9 +1086,9 @@ bool SNSLiveEventDataListener::rxPacket(const ADARA::DeviceDescriptorPkt &pkt) {
prop
=
new
TimeSeriesProperty
<
std
::
string
>
(
pvName
);
}
else
{
// invalid type string
g_log
.
warning
()
<<
"Ignoring process variable "
<<
pvName
<<
" because it had an unrecognized type ("
<<
pvType
<<
").
\n
"
;
g_log
.
warning
()
<<
"Ignoring process variable "
<<
pvName
<<
" because it had an unrecognized type ("
<<
pvType
<<
").
\n
"
;
}
if
(
prop
)
{
...
...
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