mirror of
https://github.com/ToruNiina/toml11.git
synced 2024-11-21 20:10:05 +00:00
Fix for case when vector iterator is raw pointer
We are using patched libc++ which uses raw pointers for vector itrators to improve code compilation speed. This commit fixed two compilation issues in toml11: * location::const_iterator deinition assumes that vector const_iterator is struct or class type rather than raw pointer. * `const const_itetr foo()` triggers `-Wignored-qualifiers` for primitive types and `void` which breaks `-Wextra -Werror` compilation.
This commit is contained in:
parent
86eefc7255
commit
78ae165096
@ -70,7 +70,7 @@ struct region_base
|
||||
struct location final : public region_base
|
||||
{
|
||||
using const_iterator = typename std::vector<char>::const_iterator;
|
||||
using difference_type = typename const_iterator::difference_type;
|
||||
using difference_type = typename std::iterator_traits<const_iterator>::difference_type;
|
||||
using source_ptr = std::shared_ptr<const std::vector<char>>;
|
||||
|
||||
location(std::string source_name, std::vector<char> cont)
|
||||
@ -92,7 +92,7 @@ struct location final : public region_base
|
||||
char front() const noexcept override {return *iter_;}
|
||||
|
||||
// this const prohibits codes like `++(loc.iter())`.
|
||||
const const_iterator iter() const noexcept {return iter_;}
|
||||
std::add_const<const_iterator>::type iter() const noexcept {return iter_;}
|
||||
|
||||
const_iterator begin() const noexcept {return source_->cbegin();}
|
||||
const_iterator end() const noexcept {return source_->cend();}
|
||||
|
Loading…
Reference in New Issue
Block a user