anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 22:17:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a cmake monolithic build error

Browse Source 
N_() is a preprocessor macro to mark translatable static strings. It is not a
good idea to also name a class member variable N_: It did only work in the
other build configurations because gettext.h was not included.
This commit is contained in:
Georg Baum 2015-11-16 21:39:03 +01:00
parent b835c454ec
commit 1900eb2834
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Compare.cpp
View File

@ -228,7 +228,7 @@ class Compare::Impl {
public: public:
/// ///
Impl(Compare const & compare) Impl(Compare const & compare)
: abort_(false), N_(0), M_(0), offset_reverse_diagonal_(0), : abort_(false), n_(0), m_(0), offset_reverse_diagonal_(0),
odd_offset_(0), compare_(compare), odd_offset_(0), compare_(compare),
old_buf_(0), new_buf_(0), dest_buf_(0), dest_pars_(0), old_buf_(0), new_buf_(0), dest_buf_(0), dest_pars_(0),
recursion_level_(0), nested_inset_level_(0), D_(0) recursion_level_(0), nested_inset_level_(0), D_(0)
@ -306,9 +306,9 @@ private:
void writeToDestBuffer(ParagraphList const & copy_pars) const; void writeToDestBuffer(ParagraphList const & copy_pars) const;
/// The length of the old chunk currently processed /// The length of the old chunk currently processed
int N_; int n_;
/// The length of the new chunk currently processed /// The length of the new chunk currently processed
int M_; int m_;
/// The offset diagonal of the reverse path of the /// The offset diagonal of the reverse path of the
/// currently processed chunk /// currently processed chunk
int offset_reverse_diagonal_; int offset_reverse_diagonal_;
@ -612,7 +612,7 @@ Compare::Impl::SnakeResult Compare::Impl::retrieveMiddleSnake(
if (os[k].empty() && os_r[kk].empty()) { if (os[k].empty() && os_r[kk].empty()) {
// No, there is no snake at all, in which case // No, there is no snake at all, in which case
// the length of the shortest edit script is M+N. // the length of the shortest edit script is M+N.
LATTEST(2 * D - odd_offset_ == M_ + N_); LATTEST(2 * D - odd_offset_ == m_ + n_);
return NoSnake; return NoSnake;
} }
@ -634,12 +634,12 @@ int Compare::Impl::findMiddleSnake(DocRangePair const & rp,
DocPair & middle_snake) DocPair & middle_snake)
{ {
// The lengths of the old and new chunks. // The lengths of the old and new chunks.
N_ = rp.o.length(); n_ = rp.o.length();
M_ = rp.n.length(); m_ = rp.n.length();
// Forward paths are centered around the 0-diagonal; reverse paths // Forward paths are centered around the 0-diagonal; reverse paths
// are centered around the diagonal N - M. (Delta in the article) // are centered around the diagonal N - M. (Delta in the article)
offset_reverse_diagonal_ = N_ - M_; offset_reverse_diagonal_ = n_ - m_;
// If the offset is odd, only check for overlap while extending forward // If the offset is odd, only check for overlap while extending forward
// paths, otherwise only check while extending reverse paths. // paths, otherwise only check while extending reverse paths.
@ -655,7 +655,7 @@ int Compare::Impl::findMiddleSnake(DocRangePair const & rp,
nrs.reset(DocIterator()); nrs.reset(DocIterator());
// In the formula below, the "+ 1" ensures we round like ceil() // In the formula below, the "+ 1" ensures we round like ceil()
int const D_max = (M_ + N_ + 1)/2; int const D_max = (m_ + n_ + 1)/2;
// D is the number of horizontal and vertical steps, i.e. // D is the number of horizontal and vertical steps, i.e.
// different characters in the old and new chunk. // different characters in the old and new chunk.
for (int D = 0; D <= D_max; ++D) { for (int D = 0; D <= D_max; ++D) {