tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-26 23:34:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the warnings issue during Scintilla's compiling

Browse Source 
Remove std::iterator from Boost Regex search code:
std::iterator was deprecated in C++17.
Remove it to fix the warnings and avoid other issues.

Fix #10035, close #10036
This commit is contained in:
mere-human 2021-06-19 12:04:27 +03:00 committed by Don Ho
parent 4642be5492
commit 2794c927b3
4 changed files with 100 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
boostregex/AnsiDocumentIterator.h
View File

@ -1,13 +1,35 @@
#ifndef ANSIDOCUMENTITERATOR_H_12481491281240 // This file is part of Notepad++ project
// Copyright (C) 2021 Notepad++ authors.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// at your option any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
#ifndef ANSIDOCUMENTITERATOR_H_12481491281240
#define ANSIDOCUMENTITERATOR_H_12481491281240 #define ANSIDOCUMENTITERATOR_H_12481491281240
#include "Position.h" #include "Position.h"
namespace Scintilla { namespace Scintilla {
class AnsiDocumentIterator : public std::iterator<std::bidirectional_iterator_tag, char> class AnsiDocumentIterator
{ {
public: public:
using iterator_category = std::bidirectional_iterator_tag;
using value_type = char;
using difference_type = ptrdiff_t;
using pointer = char*;
using reference = char&;
AnsiDocumentIterator() {}; AnsiDocumentIterator() {};
AnsiDocumentIterator(Document* doc, Sci::Position pos, Sci::Position end) : AnsiDocumentIterator(Document* doc, Sci::Position pos, Sci::Position end) :

1
boostregex/BoostRegExSearch.cxx
View File

@ -10,7 +10,6 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <iterator>
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <string_view> #include <string_view>

18
boostregex/UTF8DocumentIterator.cxx
View File

@ -1,6 +1,20 @@
#include "UTF8DocumentIterator.h" // This file is part of Notepad++ project
// Copyright (C) 2021 Notepad++ authors.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// at your option any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "UTF8DocumentIterator.h"
#include <string_view> #include <string_view>
#include <stdexcept> #include <stdexcept>
@ -9,8 +23,6 @@
#include "Scintilla.h" #include "Scintilla.h"
#include "Platform.h" #include "Platform.h"
#include "CharacterCategory.h" #include "CharacterCategory.h"
#include "Position.h" #include "Position.h"
#include "SplitVector.h" #include "SplitVector.h"

101
boostregex/UTF8DocumentIterator.h
View File

@ -1,8 +1,23 @@
#ifndef UTF8DOCUMENTITERATOR_H_3452843291318441149 // This file is part of Notepad++ project
// Copyright (C) 2021 Notepad++ authors.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// at your option any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
#ifndef UTF8DOCUMENTITERATOR_H_3452843291318441149
#define UTF8DOCUMENTITERATOR_H_3452843291318441149 #define UTF8DOCUMENTITERATOR_H_3452843291318441149
#include <stdlib.h> #include <stdlib.h>
#include <iterator>
#include <vector> #include <vector>
#include <memory> #include <memory>
#include "Position.h" #include "Position.h"
@ -11,60 +26,66 @@ namespace Scintilla {
class Document; class Document;
class UTF8DocumentIterator : public std::iterator<std::bidirectional_iterator_tag, wchar_t> class UTF8DocumentIterator
{ {
public: public:
UTF8DocumentIterator() {}; using iterator_category = std::bidirectional_iterator_tag;
using value_type = wchar_t;
using difference_type = ptrdiff_t;
using pointer = wchar_t*;
using reference = wchar_t&;
UTF8DocumentIterator(Document* doc, Sci::Position pos, Sci::Position end); UTF8DocumentIterator() {};
UTF8DocumentIterator(const UTF8DocumentIterator& copy);
bool operator == (const UTF8DocumentIterator& other) const UTF8DocumentIterator(Document* doc, Sci::Position pos, Sci::Position end);
{ UTF8DocumentIterator(const UTF8DocumentIterator& copy);
return (ended() == other.ended()) && (m_doc == other.m_doc) && (m_pos == other.m_pos);
}
bool operator != (const UTF8DocumentIterator& other) const bool operator == (const UTF8DocumentIterator& other) const
{ {
return !(*this == other); return (ended() == other.ended()) && (m_doc == other.m_doc) && (m_pos == other.m_pos);
} }
wchar_t operator * () const bool operator != (const UTF8DocumentIterator& other) const
{ {
return m_character[m_characterIndex]; return !(*this == other);
} }
UTF8DocumentIterator& operator = (Sci::Position other) wchar_t operator * () const
{ {
m_pos = other; return m_character[m_characterIndex];
return *this; }
}
UTF8DocumentIterator& operator = (Sci::Position other)
{
m_pos = other;
return *this;
}
UTF8DocumentIterator& operator ++ (); UTF8DocumentIterator& operator ++ ();
UTF8DocumentIterator& operator -- (); UTF8DocumentIterator& operator -- ();
Sci::Position pos() const Sci::Position pos() const
{ {
return m_pos; return m_pos;
} }
private: private:
void readCharacter(); void readCharacter();
bool ended() const bool ended() const
{ {
return m_pos >= m_end; return m_pos >= m_end;
} }
Sci::Position m_pos = 0; Sci::Position m_pos = 0;
wchar_t m_character[2]; wchar_t m_character[2];
Sci::Position m_end = 0; Sci::Position m_end = 0;
int m_characterIndex = 0; int m_characterIndex = 0;
int m_utf8Length = 0; int m_utf8Length = 0;
int m_utf16Length = 0; int m_utf16Length = 0;
Document* m_doc = nullptr; Document* m_doc = nullptr;
static const unsigned char m_firstByteMask[]; static const unsigned char m_firstByteMask[];
}; };
} }