Am Mittwoch, 5. Oktober 2016 um 00:28:00, schrieb Jean-Marc Lasgouttes <lasgout...@lyx.org> > The branch, betterspacing, has been updated. > > - Log -----------------------------------------------------------------
Under cmake, the compilation does not succeed. Binding lyx, I get errors because of multiple definitions. --- ../lib/libmathed.a(InsetMath.cpp.o): In function `std::_Rb_tree<lyx::MathMacro const*, std::pair<lyx::MathMacro const* const, lyx::Dimension>, std::_Select1st<std::pair<lyx::MathMacro const* const, lyx::Dimension> >, std::less<lyx::MathMacro const*>, std::allocator<std::pair<lyx::MathMacro const* const, lyx::Dimension> > >::key_comp() const': /usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:38: multiple definition of `lyx::MathAtomSpacing::MathAtomSpacing(lyx::MathAtomSpacing::Kind, lyx::MathClass)' ../lib/libmathed.a(MathRow.cpp.o):/usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:38: first defined here ../lib/libmathed.a(InsetMath.cpp.o): In function `std::_Rb_tree<lyx::MathMacro const*, std::pair<lyx::MathMacro const* const, lyx::Dimension>, std::_Select1st<std::pair<lyx::MathMacro const* const, lyx::Dimension> >, std::less<lyx::MathMacro const*>, std::allocator<std::pair<lyx::MathMacro const* const, lyx::Dimension> > >::key_comp() const': /usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:38: multiple definition of `lyx::MathAtomSpacing::MathAtomSpacing(lyx::MathAtomSpacing::Kind, lyx::MathClass)' ../lib/libmathed.a(MathRow.cpp.o):/usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:38: first defined here ../lib/libmathed.a(InsetMath.cpp.o): In function `void __gnu_cxx::new_allocator<lyx::MathAtomSpacing>::construct<lyx::MathAtomSpacing, lyx::MathAtomSpacing const&>(lyx::MathAtomSpacing*, lyx::MathAtomSpacing const&)': /usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:45: multiple definition of `lyx::MathRow::MathRow(lyx::MetricsInfo const&, lyx::MathData const*)' ../lib/libmathed.a(MathRow.cpp.o):/usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:45: first defined here ../lib/libmathed.a(InsetMath.cpp.o): In function `lyx::MathRow::after(int) const': /usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:98: multiple definition of `lyx::MathRow::after(int) const' ../lib/libmathed.a(MathRow.cpp.o):/usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:98: first defined here ../lib/libmathed.a(InsetMath.cpp.o): In function `lyx::MathRow::before(int) const': /usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:87: multiple definition of `lyx::MathRow::before(int) const' ../lib/libmathed.a(MathRow.cpp.o):/usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:87: first defined here ../lib/libmathed.a(InsetMath.cpp.o): In function `void __gnu_cxx::new_allocator<lyx::MathAtomSpacing>::construct<lyx::MathAtomSpacing, lyx::MathAtomSpacing const&>(lyx::MathAtomSpacing*, lyx::MathAtomSpacing const&)': /usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:45: multiple definition of `lyx::MathRow::MathRow(lyx::MetricsInfo const&, lyx::MathData const*)' ../lib/libmathed.a(MathRow.cpp.o):/usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:45: first defined here ../lib/libmathed.a(InsetMath.cpp.o): In function `lyx::MathRow::metrics(lyx::MetricsInfo&, lyx::Dimension&) const': /usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:109: multiple definition of `lyx::MathRow::metrics(lyx::MetricsInfo&, lyx::Dimension&) const' ../lib/libmathed.a(MathRow.cpp.o):/usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:109: first defined here ../lib/libmathed.a(InsetMath.cpp.o): In function `lyx::MathRow::draw(lyx::PainterInfo&, int, int) const': /usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:174: multiple definition of `lyx::MathRow::draw(lyx::PainterInfo&, int, int) const' ../lib/libmathed.a(MathRow.cpp.o):/usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:174: first defined here ../lib/libmathed.a(InsetMath.cpp.o): In function `lyx::MathRow::kerning(lyx::BufferView const*) const': /usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:233: multiple definition of `lyx::MathRow::kerning(lyx::BufferView const*) const' ../lib/libmathed.a(MathRow.cpp.o):/usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:233: first defined here ../lib/libmathed.a(InsetMath.cpp.o): In function `lyx::operator<<(std::ostream&, lyx::MathAtomSpacing const&)': /usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:239: multiple definition of `lyx::operator<<(std::ostream&, lyx::MathAtomSpacing const&)' ../lib/libmathed.a(MathRow.cpp.o):/usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:239: first defined here ../lib/libmathed.a(InsetMath.cpp.o): In function `lyx::operator<<(std::ostream&, lyx::MathRow const&)': /usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:270: multiple definition of `lyx::operator<<(std::ostream&, lyx::MathRow const&)' ../lib/libmathed.a(MathRow.cpp.o):/usr2/src/lyx/lyx-features/src/mathed/MathRow.cpp:270: first defined here collect2: error: ld returned 1 exit status --- Note that I did not compile previous versions, so this commit is probably not responsible. Kornel
signature.asc
Description: This is a digitally signed message part.