[LyX/master] Rename MathStream to MathMLStream.

Pavel Sanda sanda at lyx.org
Sun Jan 3 17:16:48 UTC 2021


On Sat, Jan 02, 2021 at 07:52:27PM +0100, Thibaut Cuvelier wrote:
> commit ecafea8227d0c51f36dbf8ff45e9c3ebc15e19cf
> Author: Thibaut Cuvelier <tcuvelier at lyx.org>
> Date:   Sat Dec 26 20:02:46 2020 +0100
> 
>     Rename MathStream to MathMLStream.

This is what I see in older Qt/gcc:

  CXX      lyxfind.o
lyxfind.cpp: In member function 'lyx::{anonymous}::MatchResult lyx::{anonymous}::MatchStringAdv::findAux(const lyx::DocIterator&, int, bool) const':
lyxfind.cpp:3226:31: error: no match for 'operator-' (operand types are 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}' and 'const __gnu_cxx::__norma
l_iterator<const char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >')
   mres.match2end = str.size() - m[0].second;
                               ^
lyxfind.cpp:3226:31: note: candidates are:
In file included from /usr/include/qt4/QtCore/qsharedpointer.h:50:0,
                 from /usr/include/qt4/QtCore/qdatetime.h:47,
                 from /usr/include/qt4/QtCore/QDate:1,
                 from /usr/include/qt4/QtCore/qlibraryinfo.h:46,
                 from /usr/include/qt4/QtCore/QtCore:59,
                 from lyxfind.cpp:56:
/usr/include/qt4/QtCore/qsharedpointer_impl.h:740:63: note: template<class T, class X> typename QSharedPointer<T>::difference_type operator-(const QSharedPointer<X>&, const QSharedPointer<T>&)
 Q_INLINE_TEMPLATE typename QSharedPointer<T>::difference_type operator-(const QSharedPointer<T> &ptr1, const QSharedPointer<X> &ptr2)
                                                               ^
/usr/include/qt4/QtCore/qsharedpointer_impl.h:740:63: note:   template argument deduction/substitution failed:
lyxfind.cpp:3226:38: note:   mismatched types 'const QSharedPointer<X>' and 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}'
   mres.match2end = str.size() - m[0].second;
                                      ^
In file included from /usr/include/qt4/QtCore/qsharedpointer.h:50:0,
                 from /usr/include/qt4/QtCore/qdatetime.h:47,
                 from /usr/include/qt4/QtCore/QDate:1,
                 from /usr/include/qt4/QtCore/qlibraryinfo.h:46,
                 from /usr/include/qt4/QtCore/QtCore:59,
                 from lyxfind.cpp:56:  
/usr/include/qt4/QtCore/qsharedpointer_impl.h:745:63: note: template<class T, class X> typename QSharedPointer<T>::difference_type operator-(const QSharedPointer<X>&, X*)
 Q_INLINE_TEMPLATE typename QSharedPointer<T>::difference_type operator-(const QSharedPointer<T> &ptr1, X *ptr2)
                                                               ^
/usr/include/qt4/QtCore/qsharedpointer_impl.h:745:63: note:   template argument deduction/substitution failed:
lyxfind.cpp:3226:38: note:   mismatched types 'const QSharedPointer<X>' and 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}'
   mres.match2end = str.size() - m[0].second;
                                      ^
In file included from /usr/include/qt4/QtCore/qsharedpointer.h:50:0,
                 from /usr/include/qt4/QtCore/qdatetime.h:47,
                 from /usr/include/qt4/QtCore/QDate:1,
                 from /usr/include/qt4/QtCore/qlibraryinfo.h:46,
                 from /usr/include/qt4/QtCore/QtCore:59,
                 from lyxfind.cpp:56:  
/usr/include/qt4/QtCore/qsharedpointer_impl.h:750:63: note: template<class T, class X> typename QSharedPointer<T>::difference_type operator-(T*, const QSharedPointer<T>&)
 Q_INLINE_TEMPLATE typename QSharedPointer<X>::difference_type operator-(T *ptr1, const QSharedPointer<X> &ptr2)
                                                               ^
/usr/include/qt4/QtCore/qsharedpointer_impl.h:750:63: note:   template argument deduction/substitution failed:
lyxfind.cpp:3226:38: note:   mismatched types 'T*' and 'long unsigned int'
   mres.match2end = str.size() - m[0].second;
                                      ^
In file included from /usr/include/qt4/QtCore/qline.h:45:0,
                 from /usr/include/qt4/QtCore/QtCore:98,
                 from lyxfind.cpp:56:  
/usr/include/qt4/QtCore/qpoint.h:170:21: note: const QPoint operator-(const QPoint&, const QPoint&)
 inline const QPoint operator-(const QPoint &p1, const QPoint &p2)
                     ^                 
/usr/include/qt4/QtCore/qpoint.h:170:21: note:   no known conversion for argument 1 from 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}' to 'const QPoint&'                                 
/usr/include/qt4/QtCore/qpoint.h:191:21: note: const QPoint operator-(const QPoint&)
 inline const QPoint operator-(const QPoint &p)
                     ^                 
/usr/include/qt4/QtCore/qpoint.h:191:21: note:   candidate expects 1 argument, 2 provided
/usr/include/qt4/QtCore/qpoint.h:344:22: note: const QPointF operator-(const QPointF&, const QPointF&)
 inline const QPointF operator-(const QPointF &p1, const QPointF &p2)
                      ^                
/usr/include/qt4/QtCore/qpoint.h:344:22: note:   no known conversion for argument 1 from 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}' to 'const QPointF&'                                
/usr/include/qt4/QtCore/qpoint.h:359:22: note: const QPointF operator-(const QPointF&)
 inline const QPointF operator-(const QPointF &p)
/usr/include/qt4/QtCore/qpoint.h:359:22: note:   candidate expects 1 argument, 2 provided
In file included from /usr/include/qt4/QtCore/qrect.h:45:0,
                 from /usr/include/qt4/QtCore/QtCore:107,
                 from lyxfind.cpp:56:  
/usr/include/qt4/QtCore/qsize.h:165:20: note: const QSize operator-(const QSize&, const QSize&)
 inline const QSize operator-(const QSize &s1, const QSize &s2)
                    ^                  
/usr/include/qt4/QtCore/qsize.h:165:20: note:   no known conversion for argument 1 from 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}' to 'const QSize&'                                   
/usr/include/qt4/QtCore/qsize.h:323:21: note: const QSizeF operator-(const QSizeF&, const QSizeF&)
 inline const QSizeF operator-(const QSizeF &s1, const QSizeF &s2)
                     ^                 
/usr/include/qt4/QtCore/qsize.h:323:21: note:   no known conversion for argument 1 from 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}' to 'const QSizeF&'                                  
In file included from /usr/include/c++/4.9/deque:64:0,
                 from /usr/include/c++/4.9/stack:60,
                 from /usr/include/c++/4.9/regex:48,
                 from lyxfind.cpp:53:  
/usr/include/c++/4.9/bits/stl_deque.h:347:5: note: template<class _Tp, class _RefL, class _PtrL, class _RefR, class _PtrR> typename std::_Deque_iterator<_Tp, _Ref, _Ptr>::difference_type std::operator-(const std::_Deque_iterator<_Tp, _Ref, _Ptr>&, const std::_Deque_iterator<_Tp, _RefR, _PtrR>&)
     operator-(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
     ^                                 
/usr/include/c++/4.9/bits/stl_deque.h:347:5: note:   template argument deduction/substitution failed:
lyxfind.cpp:3226:38: note:   mismatched types 'const std::_Deque_iterator<_Tp, _Ref, _Ptr>' and 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}'
   mres.match2end = str.size() - m[0].second;
                                      ^
In file included from /usr/include/c++/4.9/deque:64:0,
                 from /usr/include/c++/4.9/stack:60,
                 from /usr/include/c++/4.9/regex:48,
                 from lyxfind.cpp:53:  
/usr/include/c++/4.9/bits/stl_deque.h:335:5: note: template<class _Tp, class _Ref, class _Ptr> typename std::_Deque_iterator<_Tp, _Ref, _Ptr>::difference_type std::operator-(const std::_Deque_iterator<_Tp, _Ref, _Ptr>&, const std::_Deque_iterator<_Tp, _Ref, _Ptr>&)
     operator-(const _Deque_iterator<_Tp, _Ref, _Ptr>& __x,
     ^                                 
/usr/include/c++/4.9/bits/stl_deque.h:335:5: note:   template argument deduction/substitution failed:
lyxfind.cpp:3226:38: note:   mismatched types 'const std::_Deque_iterator<_Tp, _Ref, _Ptr>' and 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}'
   mres.match2end = str.size() - m[0].second;
                                      ^
In file included from /usr/include/c++/4.9/vector:65:0,
                 from Buffer.h:25,     
                 from lyxfind.cpp:20:  
/usr/include/c++/4.9/bits/stl_bvector.h:208:3: note: std::ptrdiff_t std::operator-(const std::_Bit_iterator_base&, const std::_Bit_iterator_base&)
   operator-(const _Bit_iterator_base& __x, const _Bit_iterator_base& __y)
   ^                                   
/usr/include/c++/4.9/bits/stl_bvector.h:208:3: note:   no known conversion for argument 1 from 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}' to 'const std::_Bit_iterator_base&'          
In file included from /usr/include/c++/4.9/bits/stl_algobase.h:67:0,
                 from /usr/include/c++/4.9/bits/char_traits.h:39,
                 from /usr/include/c++/4.9/string:40,
                 from support/docstring.h:18,
                 from lyxfind.h:22,    
                 from lyxfind.cpp:18:  
/usr/include/c++/4.9/bits/stl_iterator.h:1128:5: note: template<class _Iterator> decltype ((__x.base() - __y.base())) std::operator-(const std::move_iterator<_Iterator>&, const std::move_iterator<_Iterator>&)
     operator-(const move_iterator<_Iterator>& __x,
     ^                                 
/usr/include/c++/4.9/bits/stl_iterator.h:1128:5: note:   template argument deduction/substitution failed:
lyxfind.cpp:3226:38: note:   mismatched types 'const std::move_iterator<_Iterator>' and 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}'
   mres.match2end = str.size() - m[0].second;
                                      ^
In file included from /usr/include/c++/4.9/bits/stl_algobase.h:67:0,
                 from /usr/include/c++/4.9/bits/char_traits.h:39,
                 from /usr/include/c++/4.9/string:40,
                 from support/docstring.h:18,
                 from lyxfind.h:22,
                 from lyxfind.cpp:18:  
/usr/include/c++/4.9/bits/stl_iterator.h:1121:5: note: template<class _IteratorL, class _IteratorR> decltype ((__x.base() - __y.base())) std::operator-(const std::move_iterator<_Iterator>&, const std::move_iterator<_IteratorR>&)                    
     operator-(const move_iterator<_IteratorL>& __x,
     ^                                 
/usr/include/c++/4.9/bits/stl_iterator.h:1121:5: note:   template argument deduction/substitution failed:
lyxfind.cpp:3226:38: note:   mismatched types 'const std::move_iterator<_Iterator>' and 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}'
   mres.match2end = str.size() - m[0].second;
                                      ^
In file included from /usr/include/c++/4.9/bits/stl_algobase.h:67:0,
                 from /usr/include/c++/4.9/bits/char_traits.h:39,
                 from /usr/include/c++/4.9/string:40,
                 from support/docstring.h:18,
                 from lyxfind.h:22,    
                 from lyxfind.cpp:18:  
/usr/include/c++/4.9/bits/stl_iterator.h:380:5: note: template<class _IteratorL, class _IteratorR> decltype ((__y.base() - __x.base())) std::operator-(const std::reverse_iterator<_Iterator>&, const std::reverse_iterator<_IteratorR>&)               
     operator-(const reverse_iterator<_IteratorL>& __x,
     ^                                 
/usr/include/c++/4.9/bits/stl_iterator.h:380:5: note:   template argument deduction/substitution failed:
lyxfind.cpp:3226:38: note:   mismatched types 'const std::reverse_iterator<_Iterator>' and 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}'
   mres.match2end = str.size() - m[0].second;
                                      ^
In file included from /usr/include/c++/4.9/bits/stl_algobase.h:67:0,
                 from /usr/include/c++/4.9/bits/char_traits.h:39,
                 from /usr/include/c++/4.9/string:40,
                 from support/docstring.h:18,
                 from lyxfind.h:22,    
                 from lyxfind.cpp:18:  
/usr/include/c++/4.9/bits/stl_iterator.h:328:5: note: template<class _Iterator> typename std::reverse_iterator<_Iterator>::difference_type std::operator-(const std::reverse_iterator<_Iterator>&, const std::reverse_iterator<_Iterator>&)             
     operator-(const reverse_iterator<_Iterator>& __x,
     ^                                 
/usr/include/c++/4.9/bits/stl_iterator.h:328:5: note:   template argument deduction/substitution failed:
lyxfind.cpp:3226:38: note:   mismatched types 'const std::reverse_iterator<_Iterator>' and 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}'
   mres.match2end = str.size() - m[0].second;
                                      ^
In file included from /usr/include/c++/4.9/bits/stl_algobase.h:67:0,
                 from /usr/include/c++/4.9/bits/char_traits.h:39,
                 from /usr/include/c++/4.9/string:40,
                 from support/docstring.h:18,
                 from lyxfind.h:22,    
                 from lyxfind.cpp:18:  
/usr/include/c++/4.9/bits/stl_iterator.h:911:5: note: template<class _Iterator, class _Container> typename __gnu_cxx::__normal_iterator<_Iterator, _Container>::difference_type __gnu_cxx::operator-(const __gnu_cxx::__normal_iterator<_Iterator, _Container>&, const __gnu_cxx::__normal_iterator<_Iterator, _Container>&)
     operator-(const __normal_iterator<_Iterator, _Container>& __lhs,
     ^                                 
/usr/include/c++/4.9/bits/stl_iterator.h:911:5: note:   template argument deduction/substitution failed:
lyxfind.cpp:3226:38: note:   mismatched types 'const __gnu_cxx::__normal_iterator<_Iterator, _Container>' and 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}'                               
   mres.match2end = str.size() - m[0].second;
                                      ^
In file included from /usr/include/c++/4.9/bits/stl_algobase.h:67:0,
                 from /usr/include/c++/4.9/bits/char_traits.h:39,
                 from /usr/include/c++/4.9/string:40,
                 from support/docstring.h:18,
                 from lyxfind.h:22,    
                 from lyxfind.cpp:18:  
/usr/include/c++/4.9/bits/stl_iterator.h:899:5: note: template<class _IteratorL, class _IteratorR, class _Container> decltype ((__lhs.base() - __rhs.base())) __gnu_cxx::operator-(const __gnu_cxx::__normal_iterator<_IteratorL, _Container>&, const __gnu_cxx::__normal_iterator<_IteratorR, _Container>&)
     operator-(const __normal_iterator<_IteratorL, _Container>& __lhs,
/usr/include/c++/4.9/bits/stl_iterator.h:911:5: note:   template argument deduction/substitution failed:
lyxfind.cpp:3226:38: note:   mismatched types 'const __gnu_cxx::__normal_iterator<_Iterator, _Container>' and 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}'                               
   mres.match2end = str.size() - m[0].second;
                                      ^
In file included from /usr/include/c++/4.9/bits/stl_algobase.h:67:0,
                 from /usr/include/c++/4.9/bits/char_traits.h:39,
                 from /usr/include/c++/4.9/string:40,
                 from support/docstring.h:18,
                 from lyxfind.h:22,    
                 from lyxfind.cpp:18:  
/usr/include/c++/4.9/bits/stl_iterator.h:899:5: note: template<class _IteratorL, class _IteratorR, class _Container> decltype ((__lhs.base() - __rhs.base())) __gnu_cxx::operator-(const __gnu_cxx::__normal_iterator<_IteratorL, _Container>&, const __gnu_cxx::__normal_iterator<_IteratorR, _Container>&)
     operator-(const __normal_iterator<_IteratorL, _Container>& __lhs,
     ^                                 
/usr/include/c++/4.9/bits/stl_iterator.h:899:5: note:   template argument deduction/substitution failed:
lyxfind.cpp:3226:38: note:   mismatched types 'const __gnu_cxx::__normal_iterator<_IteratorL, _Container>' and 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type {aka long unsigned int}'                              
   mres.match2end = str.size() - m[0].second;
                                      ^
lyxfind.cpp:3227:12: error: cannot convert 'const __gnu_cxx::__normal_iterator<const char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >' to 'int' in assignment
   mres.pos = m[2].first;              
            ^                   

Pavel


More information about the lyx-devel mailing list