Commit dfaf8538 authored by incardon's avatar incardon
Browse files

Fixing gcc-4.8

parent 2c313203
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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())
......
......@@ -96,7 +96,7 @@ public:
*
*/
template<unsigned int dim>
class Padding : public Ghost<dim,size_t>
class Padding : public Ghost<dim,long int>
{
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 int> p1, std::initializer_list<long int> p2)
{
Box<dim,size_t>::set(p1,p2);
Box<dim,long int>::set(p1,p2);
}
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment