🔨 some clean up

This commit is contained in:
Niels Lohmann 2018-01-10 10:18:31 +01:00
parent ce53537ba2
commit 85173f5627
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
21 changed files with 58 additions and 178 deletions

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_ADL_SERIALIZER_HPP
#define NLOHMANN_JSON_ADL_SERIALIZER_HPP
#pragma once
#include <utility>
@ -44,5 +43,3 @@ struct adl_serializer
}
};
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_CONVERSIONS_FROM_JSON_HPP
#define NLOHMANN_JSON_DETAIL_CONVERSIONS_FROM_JSON_HPP
#pragma once
#include <algorithm> // transform
#include <array> // array
@ -314,5 +313,3 @@ namespace
constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value;
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_CONVERSIONS_TO_JSON_HPP
#define NLOHMANN_JSON_DETAIL_CONVERSIONS_TO_JSON_HPP
#pragma once
#include <ciso646> // or, and, not
#include <iterator> // begin, end
@ -337,5 +336,3 @@ namespace
constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_ITERATORS_INTERNAL_ITERATOR_HPP
#define NLOHMANN_JSON_DETAIL_ITERATORS_INTERNAL_ITERATOR_HPP
#pragma once
#include "detail/iterators/primitive_iterator.hpp"
@ -24,5 +23,3 @@ template<typename BasicJsonType> struct internal_iterator
};
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_ITERATORS_ITER_IMPL_HPP
#define NLOHMANN_JSON_DETAIL_ITERATORS_ITER_IMPL_HPP
#pragma once
#include <ciso646> // not
#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
@ -613,5 +612,3 @@ class iter_impl
};
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_ITERATORS_ITERATION_PROXY_HPP
#define NLOHMANN_JSON_DETAIL_ITERATORS_ITERATION_PROXY_HPP
#pragma once
#include <cstddef> // size_t
#include <string> // string, to_string
@ -97,5 +96,3 @@ template<typename IteratorType> class iteration_proxy
};
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_ITERATORS_JSON_REVERSE_ITERATOR_HPP
#define NLOHMANN_JSON_DETAIL_ITERATORS_JSON_REVERSE_ITERATOR_HPP
#pragma once
#include <cstddef> // ptrdiff_t
#include <iterator> // reverse_iterator
@ -118,5 +117,3 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
};
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_ITERATORS_PRIMITIVE_ITERATOR_HPP
#define NLOHMANN_JSON_DETAIL_ITERATORS_PRIMITIVE_ITERATOR_HPP
#pragma once
#include <ciso646> // not
#include <cstddef> // ptrdiff_t
@ -127,5 +126,3 @@ class primitive_iterator_t
};
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_JSON_REF_HPP
#define NLOHMANN_JSON_DETAIL_JSON_REF_HPP
#pragma once
#include <initializer_list>
#include <utility>
@ -62,5 +61,3 @@ class json_ref
};
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_MACRO_SCOPE_HPP
#define NLOHMANN_JSON_MACRO_SCOPE_HPP
#pragma once
#include <ciso646> // not
@ -102,5 +101,3 @@ contains a `mapped_type`, whereas `std::vector` fails the test.
static constexpr bool value = \
std::is_integral<decltype(detect(std::declval<T>()))>::value; \
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_MACRO_UNSCOPE_HPP
#define NLOHMANN_JSON_DETAIL_MACRO_UNSCOPE_HPP
#pragma once
// restore GCC/clang diagnostic settings
#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
@ -21,5 +20,3 @@
#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
#undef NLOHMANN_BASIC_JSON_TPL
#undef NLOHMANN_JSON_HAS_HELPER
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_META_HPP
#define NLOHMANN_JSON_DETAIL_META_HPP
#pragma once
#include <ciso646> // not
#include <cstddef> // size_t
@ -233,5 +232,3 @@ template<typename T>
constexpr T static_const<T>::value;
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_PARSING_BINARY_READER_HPP
#define NLOHMANN_JSON_DETAIL_PARSING_BINARY_READER_HPP
#pragma once
#include <algorithm> // generate_n
#include <array> // array
@ -1089,5 +1088,3 @@ class binary_reader
};
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_PARSING_BINARY_WRITER_HPP
#define NLOHMANN_JSON_DETAIL_PARSING_BINARY_WRITER_HPP
#pragma once
#include <algorithm> // reverse
#include <array> // array
@ -554,5 +553,3 @@ class binary_writer
};
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_PARSING_INPUT_ADAPTERS_HPP
#define NLOHMANN_JSON_DETAIL_PARSING_INPUT_ADAPTERS_HPP
#pragma once
#include <algorithm> // min
#include <array> // array
@ -261,5 +260,3 @@ class input_adapter
};
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_PARSING_LEXER_HPP
#define NLOHMANN_JSON_DETAIL_PARSING_LEXER_HPP
#pragma once
#include <clocale> // localeconv
#include <cstddef> // size_t
@ -1275,5 +1274,3 @@ scan_number_done:
};
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_PARSING_OUTPUT_ADAPTERS_HPP
#define NLOHMANN_JSON_DETAIL_PARSING_OUTPUT_ADAPTERS_HPP
#pragma once
#include <algorithm> // copy
#include <cstddef> // size_t
@ -112,5 +111,3 @@ class output_adapter
};
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_PARSING_PARSER_HPP
#define NLOHMANN_JSON_DETAIL_PARSING_PARSER_HPP
#pragma once
#include <cassert> // assert
#include <cmath> // isfinite
@ -588,5 +587,3 @@ class parser
};
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_SERIALIZER_HPP
#define NLOHMANN_JSON_DETAIL_SERIALIZER_HPP
#pragma once
#include <algorithm> // reverse, remove, fill, find, none_of
#include <array> // array
@ -793,5 +792,3 @@ class serializer
};
}
}
#endif

View file

@ -1,5 +1,4 @@
#ifndef NLOHMANN_JSON_DETAIL_VALUE_T_HPP
#define NLOHMANN_JSON_DETAIL_VALUE_T_HPP
#pragma once
#include <array> // array
#include <ciso646> // and
@ -75,5 +74,3 @@ inline bool operator<(const value_t lhs, const value_t rhs) noexcept
}
}
}
#endif