[LyX/master] Merge files Text{,2,3}.cpp
Jean-Marc Lasgouttes
lasgouttes at lyx.org
Thu May 4 13:59:44 UTC 2023
commit 43b24085fb90873f3a7803a6684d359454a4f3cd
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date: Thu May 4 15:21:02 2023 +0200
Merge files Text{,2,3}.cpp
This is done at the end of the release cycle to avoid backporting issues.
The goal is to simplify development, since it was difficult to guess
in which file a given method could be found.
There is some effect on compilation time, but it is not too bad:
* before merge
lapinot: time make Text.o Text3.o Text2.o
CXX Text.o
CXX Text3.o
CXX Text2.o
real 0m32,504s
user 0m31,027s
sys 0m1,446s
lapinot: rm Text*.o
lapinot: time make -j8 Text.o Text3.o Text2.o
CXX Text.o
CXX Text3.o
CXX Text2.o
real 0m21,282s
user 0m32,661s
sys 0m1,424s
* after merge
lapinot: time make Text.o
CXX Text.o
real 0m26,731s
user 0m25,706s
sys 0m1,020s
src/Makefile.am | 2 -
src/Text.cpp | 4794 ++++++++++++++++++++++++++++++++++++++++++++-
src/Text2.cpp | 1013 ----------
src/Text3.cpp | 3866 ------------------------------------
src/insets/InsetFloat.cpp | 2 +-
5 files changed, 4785 insertions(+), 4892 deletions(-)
More information about the lyx-cvs
mailing list