Am 07.01.2016 um 15:39 schrieb Stephan Witt <st.w...@gmx.net>: > ... > The next problem now is an error when compiling src/Compare.cpp: > > Stephan > > ======= > CompileC > /Users/stephan/git/lyx-build/cmake/2.2.0dev/src/LyX.build/Debug/LyX.build/Objects-normal/x86_64/Compare.o > src/Compare.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler > cd /Users/stephan/git/lyx > export LANG=en_US.US-ASCII > > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang > -x c++ -arch x86_64 -fmessage-length=0 -fdiagnostics-show-note-include-stack > -fmacro-backtrace-limit=0 -Wno-trigraphs -fpascal-strings -O0 > -Wno-missing-field-initializers -Wno-missing-prototypes -Wno-return-type > -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors > -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function > -Wno-unused-label -Wno-unused-parameter -Wno-unused-variable -Wunused-value > -Wno-empty-body -Wno-uninitialized -Wno-unknown-pragmas -Wno-shadow > -Wno-four-char-constants -Wno-conversion -Wno-constant-conversion > -Wno-int-conversion -Wno-bool-conversion -Wno-enum-conversion > -Wno-shorten-64-to-32 -Wno-newline-eof -Wno-c++11-extensions > -DCMAKE_INTDIR=\"Debug\" -DQT_CORE_LIB -DQT_GUI_LIB > -DBOOST_SIGNALS_NO_DEPRECATION_WARNING=1 -DQT_WIDGETS_LIB -DQT_CONCURRENT_LIB > -DQT_SVG_LIB -DQT_MACEXTRAS_LIB -isysroot > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk > -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof > -mmacosx-version-min=10.11 -g -Wno-sign-conversion > -I/Users/stephan/git/lyx-build/cmake/2.2.0dev/bin/Debug/include > -I/Users/stephan/git/lyx-build/cmake/2.2.0dev -I/Users/stephan/git/lyx/src > -I/Users/Shared/LyX/utilities/include -I/Users/stephan/git/lyx/3rdparty/boost > -I/Users/stephan/git/lyx-build/cmake/2.2.0dev/src -I/opt/local/include > -I/Users/Shared/LyX/qt-5.4.2-frameworks-cocoa-x86_64/lib/QtCore.framework/Headers > -I/Users/Shared/LyX/qt-5.4.2-frameworks-cocoa-x86_64/mkspecs/macx-clang > -I/Users/Shared/LyX/qt-5.4.2-frameworks-cocoa-x86_64/lib/QtGui.framework/Headers > > -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/OpenGL.framework/Headers > > -I/Users/Shared/LyX/qt-5.4.2-frameworks-cocoa-x86_64/lib/QtWidgets.framework/Headers > > -I/Users/Shared/LyX/qt-5.4.2-frameworks-cocoa-x86_64/lib/QtConcurrent.framework/Headers > > -I/Users/Shared/LyX/qt-5.4.2-frameworks-cocoa-x86_64/lib/QtSvg.framework/Headers > > -I/Users/Shared/LyX/qt-5.4.2-frameworks-cocoa-x86_64/lib/QtMacExtras.framework/Headers > > -I/Users/stephan/git/lyx-build/cmake/2.2.0dev/src/LyX.build/Debug/LyX.build/DerivedSources/x86_64 > > -I/Users/stephan/git/lyx-build/cmake/2.2.0dev/src/LyX.build/Debug/LyX.build/DerivedSources > -Wmost -Wno-four-char-constants -Wno-unknown-pragmas > -F/Users/stephan/git/lyx-build/cmake/2.2.0dev/bin/Debug > -F/Users/Shared/LyX/qt-5.4.2-frameworks-cocoa-x86_64/lib -Wall > -Wunused-parameter -fno-strict-aliasing -Wall -Wunused-parameter > -fno-strict-aliasing -D_DEBUG -fPIC -DBOOST_USER_CONFIG=<config.h> -MMD -MT > dependencies -MF > /Users/stephan/git/lyx-build/cmake/2.2.0dev/src/LyX.build/Debug/LyX.build/Objects-normal/x86_64/Compare.d > --serialize-diagnostics > /Users/stephan/git/lyx-build/cmake/2.2.0dev/src/LyX.build/Debug/LyX.build/Objects-normal/x86_64/Compare.dia > -c /Users/stephan/git/lyx/src/Compare.cpp -o > /Users/stephan/git/lyx-build/cmake/2.2.0dev/src/LyX.build/Debug/LyX.build/Objects-normal/x86_64/Compare.o > > /Users/stephan/git/lyx/src/Compare.cpp:425:25: error: call to 'next' is > ambiguous > ParagraphList tmp_pars(next(ps_.begin(), startpit), > ^~~~ > In file included from /Users/stephan/git/lyx/src/Compare.cpp:13: > In file included from /Users/stephan/git/lyx/src/Compare.h:15: > In file included from /Users/stephan/git/lyx/src/Buffer.h:16: > In file included from /Users/stephan/git/lyx/src/OutputParams.h:16: > In file included from /Users/stephan/git/lyx/src/support/shared_ptr.h:22: > In file included from > /Users/stephan/git/lyx/3rdparty/boost/boost/shared_ptr.hpp:17: > In file included from > /Users/stephan/git/lyx/3rdparty/boost/boost/smart_ptr/shared_ptr.hpp:23: > In file included from > /Users/stephan/git/lyx/3rdparty/boost/boost/config/no_tr1/memory.hpp:21: > In file included from > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/memory:604: > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/iterator:519:1: > note: candidate function [with _ForwardIter = > std::__1::__list_const_iterator<lyx::Paragraph, void *>] > next(_ForwardIter __x, > ^ > In file included from /Users/stephan/git/lyx/src/Compare.cpp:23: > /Users/stephan/git/lyx/src/support/lyxalgo.h:92:11: note: candidate function > [with It = std::__1::__list_const_iterator<lyx::Paragraph, void *>, Diff = > long] > inline It next(It i, Diff n = 1) > ^ > /Users/stephan/git/lyx/src/Compare.cpp:426:3: error: call to 'next' is > ambiguous > next(ps_.begin(), endpit + 1)); > ^~~~ > In file included from /Users/stephan/git/lyx/src/Compare.cpp:13: > In file included from /Users/stephan/git/lyx/src/Compare.h:15: > In file included from /Users/stephan/git/lyx/src/Buffer.h:16: > In file included from /Users/stephan/git/lyx/src/OutputParams.h:16: > In file included from /Users/stephan/git/lyx/src/support/shared_ptr.h:22: > In file included from > /Users/stephan/git/lyx/3rdparty/boost/boost/shared_ptr.hpp:17: > In file included from > /Users/stephan/git/lyx/3rdparty/boost/boost/smart_ptr/shared_ptr.hpp:23: > In file included from > /Users/stephan/git/lyx/3rdparty/boost/boost/config/no_tr1/memory.hpp:21: > In file included from > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/memory:604: > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/iterator:519:1: > note: candidate function [with _ForwardIter = > std::__1::__list_const_iterator<lyx::Paragraph, void *>] > next(_ForwardIter __x, > ^ > In file included from /Users/stephan/git/lyx/src/Compare.cpp:23: > /Users/stephan/git/lyx/src/support/lyxalgo.h:92:11: note: candidate function > [with It = std::__1::__list_const_iterator<lyx::Paragraph, void *>, Diff = > long] > inline It next(It i, Diff n = 1) > ^ > 2 errors generated. > =======
A possible solution I’ve attached as patch. Any better solution or ok to commit? Stephan
lyx-iter-next-prev.patch
Description: Binary data
