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
a67d0f38
Commit
a67d0f38
authored
6 years ago
by
Neil Vaytet
Browse files
Options
Downloads
Patches
Plain Diff
Refs #20443 : fixing compilation warnings
parent
ff00ce5c
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/Kernel/inc/MantidKernel/Strings.h
+8
-8
8 additions, 8 deletions
Framework/Kernel/inc/MantidKernel/Strings.h
with
8 additions
and
8 deletions
Framework/Kernel/inc/MantidKernel/Strings.h
+
8
−
8
View file @
a67d0f38
...
...
@@ -105,29 +105,29 @@ join(ITERATOR_TYPE begin, ITERATOR_TYPE end, const std::string &separator,
std
::
random_access_iterator_tag
>::
value
)
>::
type
*
=
nullptr
)
{
// Get the distance between begining and end
long
in
t
dist
=
std
::
distance
(
begin
,
end
);
size_
t
dist
=
std
::
distance
(
begin
,
end
);
// Get max number of threads and allocate vector speace
in
t
nmax
_t
hreads
=
PARALLEL_GET_MAX_THREADS
;
std
::
vector
<
std
::
ostringstream
>
output
(
nmax
_t
hreads
);
size_
t
nmax
T
hreads
=
size_t
(
PARALLEL_GET_MAX_THREADS
)
;
std
::
vector
<
std
::
ostringstream
>
output
(
nmax
T
hreads
);
// Actual number of threads in the current region
in
t
nThreads
=
1
;
size_
t
nThreads
=
1
;
#pragma omp parallel
{
nThreads
=
PARALLEL_NUMBER_OF_THREADS
;
in
t
idThread
=
PARALLEL_THREAD_NUMBER
;
nThreads
=
size_t
(
PARALLEL_NUMBER_OF_THREADS
)
;
size_
t
idThread
=
size_t
(
PARALLEL_THREAD_NUMBER
)
;
ITERATOR_TYPE
it
;
#pragma omp for
for
(
in
t
i
=
0
;
i
<
dist
;
i
++
)
{
for
(
size_
t
i
=
0
;
i
<
dist
;
i
++
)
{
// Write to stringstream
output
[
idThread
]
<<
separator
<<
*
(
begin
+
i
);
}
}
// Flush all buffers into the first one
for
(
in
t
i
=
1
;
i
<
nThreads
;
i
++
)
{
for
(
size_
t
i
=
1
;
i
<
nThreads
;
i
++
)
{
output
[
0
]
<<
output
[
i
].
str
();
}
...
...
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