Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

C++ fixes #224

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

C++ fixes #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0248033
antlr3memory.hpp: fix for C++20 mode
avikivity May 12, 2020
a54d847
Remove const specifiers from CyclicDFA members
avikivity Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions runtime/Cpp/include/antlr3cyclicdfa.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,18 @@ class CyclicDFA : public ImplTraits::AllocPolicyType
/// Decision number that a particular static structure
/// represents.
///
const ANTLR_INT32 m_decisionNumber;
ANTLR_INT32 m_decisionNumber;

/// What this decision represents
///
const ANTLR_UCHAR* m_description;
const ANTLR_INT32* const m_eot;
const ANTLR_INT32* const m_eof;
const ANTLR_INT32* const m_min;
const ANTLR_INT32* const m_max;
const ANTLR_INT32* const m_accept;
const ANTLR_INT32* const m_special;
const ANTLR_INT32* const *const m_transition;
const ANTLR_INT32* m_eot;
const ANTLR_INT32* m_eof;
const ANTLR_INT32* m_min;
const ANTLR_INT32* m_max;
const ANTLR_INT32* m_accept;
const ANTLR_INT32* m_special;
const ANTLR_INT32* const * m_transition;

public:
CyclicDFA( ANTLR_INT32 decisionNumber
Expand Down
4 changes: 2 additions & 2 deletions runtime/Cpp/include/antlr3memory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ class DefaultAllocPolicy

template<class KeyType, class ValueType>
class UnOrderedMapType : public std::map< KeyType, ValueType, std::less<KeyType>,
AllocatorType<std::pair<KeyType, ValueType> > >
AllocatorType<std::pair<const KeyType, ValueType> > >
{
};

template<class KeyType, class ValueType>
class OrderedMapType : public std::map< KeyType, ValueType, std::less<KeyType>,
AllocatorType<std::pair<KeyType, ValueType> > >
AllocatorType<std::pair<const KeyType, ValueType> > >
{
};

Expand Down