Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Sbalzarini Lab
S
Software
P
Parallel Computing
OpenFPM
openfpm_data
Commits
dfaf8538
Commit
dfaf8538
authored
Jun 07, 2017
by
incardon
Browse files
Fixing gcc-4.8
parent
2c313203
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/NN/CellList/CellList.hpp
View file @
dfaf8538
...
...
@@ -836,7 +836,7 @@ public:
* \return The element value
*
*/
inline
auto
get
(
size_t
cell
,
size_t
ele
)
const
->
const
decltype
(
this
->
Mem_type
::
get
(
cell
,
ele
))
inline
auto
get
(
size_t
cell
,
size_t
ele
)
const
->
decltype
(
this
->
Mem_type
::
get
(
cell
,
ele
))
{
return
Mem_type
::
get
(
cell
,
ele
);
}
...
...
src/NN/CellList/MemBalanced.hpp
View file @
dfaf8538
...
...
@@ -91,7 +91,7 @@ public:
return
cl_base
.
get
(
cell
).
get
(
ele
);
}
inline
auto
get
(
size_t
cell
,
size_t
ele
)
const
->
const
decltype
(
cl_base
.
get
(
0
).
get
(
0
))
&
inline
auto
get
(
size_t
cell
,
size_t
ele
)
const
->
decltype
(
cl_base
.
get
(
0
).
get
(
0
))
&
{
return
cl_base
.
get
(
cell
).
get
(
ele
);
}
...
...
src/NN/CellList/MemFast.hpp
View file @
dfaf8538
...
...
@@ -110,7 +110,7 @@ protected:
return
cl_base
.
get
(
cell
*
slot
+
ele
);
}
inline
auto
get
(
size_t
cell
,
size_t
ele
)
const
->
const
decltype
(
cl_base
.
get
(
cell
*
slot
+
ele
))
&
inline
auto
get
(
size_t
cell
,
size_t
ele
)
const
->
decltype
(
cl_base
.
get
(
cell
*
slot
+
ele
))
&
{
return
cl_base
.
get
(
cell
*
slot
+
ele
);
}
...
...
src/NN/CellList/MemMemoryWise.hpp
View file @
dfaf8538
...
...
@@ -103,7 +103,7 @@ public:
return
it
->
second
;
}
inline
auto
get
(
size_t
cell
,
size_t
ele
)
const
->
const
decltype
(
cl_base
.
find
(
cell
)
->
second
.
get
(
0
))
&
inline
auto
get
(
size_t
cell
,
size_t
ele
)
const
->
decltype
(
cl_base
.
find
(
cell
)
->
second
.
get
(
0
))
&
{
auto
it
=
cl_base
.
find
(
cell
);
if
(
it
==
cl_base
.
end
())
...
...
src/Space/Ghost.hpp
View file @
dfaf8538
...
...
@@ -96,7 +96,7 @@ public:
*
*/
template
<
unsigned
int
dim
>
class
Padding
:
public
Ghost
<
dim
,
size_
t
>
class
Padding
:
public
Ghost
<
dim
,
long
in
t
>
{
public:
/*! \brief Constructor from initializer list
...
...
@@ -105,9 +105,9 @@ public:
* \param p2 Padding right, initialized as a list example {1.0,1.0,1.0}
*
*/
Padding
(
std
::
initializer_list
<
size_
t
>
p1
,
std
::
initializer_list
<
size_
t
>
p2
)
Padding
(
std
::
initializer_list
<
long
in
t
>
p1
,
std
::
initializer_list
<
long
in
t
>
p2
)
{
Box
<
dim
,
size_
t
>::
set
(
p1
,
p2
);
Box
<
dim
,
long
in
t
>::
set
(
p1
,
p2
);
}
};
...
...
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