Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

c++: fixes for old compilers

Browse Source 
On the CI with GCC 6:

    examples/c++/calc++/parser.cc:845:5: error: 'ptrdiff_t' was not declared in this scope
         ptrdiff_t yycount = 0;
         ^~~~~~~~~
    examples/c++/calc++/parser.cc:845:5: note: suggested alternatives:
    /usr/include/x86_64-linux-gnu/c++/6/bits/c++config.h:202:28: note:   'std::ptrdiff_t'
       typedef __PTRDIFF_TYPE__ ptrdiff_t;
                                ^~~~~~~~~

* data/skeletons/lalr1.cc: Qualify ptrdiff_t and size_t with std::.
This commit is contained in:
Akim Demaille
2019-10-02 22:04:59 +02:00
parent d96fff6115
commit 5df33278b4
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
data/skeletons/stack.hh
View File

@@ -49,7 +49,7 @@ m4_define([b4_stack_define],
return seq_[size () - 1 - i];
}
T&
operator[] (ptrdiff_t i)
operator[] (std::ptrdiff_t i)
{
return operator[] (size_type (i));
}
@@ -68,7 +68,7 @@ m4_define([b4_stack_define],
return seq_[size () - 1 - i];
}
const T&
operator[] (ptrdiff_t i) const
operator[] (std::ptrdiff_t i) const
{
return operator[] (size_type (i));
}
@@ -90,7 +90,7 @@ m4_define([b4_stack_define],
/// Pop elements from the stack.
void
pop (ptrdiff_t n = 1) YY_NOEXCEPT
pop (std::ptrdiff_t n = 1) YY_NOEXCEPT
{
for (; 0 < n; --n)
seq_.pop_back ();
@@ -109,10 +109,10 @@ m4_define([b4_stack_define],
{
return seq_.size ();
}
ptrdiff_t
std::ptrdiff_t
ssize () const YY_NOEXCEPT
{
return (ptrdiff_t) size ();
return (std::ptrdiff_t) size ();
}
/// Iterator on top of the stack (going downwards).
@@ -133,20 +133,20 @@ m4_define([b4_stack_define],
class slice
{
public:
slice (const stack& stack, ptrdiff_t range)
slice (const stack& stack, std::ptrdiff_t range)
: stack_ (stack)
, range_ (range)
{}
const T&
operator[] (ptrdiff_t i) const
operator[] (std::ptrdiff_t i) const
{
return stack_[range_ - i];
}
private:
const stack& stack_;
ptrdiff_t range_;
std::ptrdiff_t range_;
};
private: