portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-14 01:35:36 +00:00
Code Releases Activity

Change to make NVCC happy

Browse Source
This commit is contained in:
paboyle 2018-01-24 13:32:02 +00:00
parent ee16f62322
commit b5a947dd79
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/json/json.hpp
View File

@ -3640,12 +3640,13 @@ This class implements a both iterators (iterator and const_iterator) for the
@since version 1.0.0, simplified in version 2.0.9 @since version 1.0.0, simplified in version 2.0.9
*/ */
template<typename BasicJsonType> template<typename BasicJsonType>
class iter_impl : public std::iterator<std::random_access_iterator_tag, BasicJsonType> class iter_impl : public std::iterator<std::random_access_iterator_tag, BasicJsonType>
{ {
/// allow basic_json to access private members /// allow basic_json to access private members
friend iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>; friend iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
friend BasicJsonType; // friend class BasicJsonType;
friend iteration_proxy<iter_impl>; friend iteration_proxy<iter_impl>;
using object_t = typename BasicJsonType::object_t; using object_t = typename BasicJsonType::object_t;