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

Fix #10858 compiler warnings.

Browse Source
This commit is contained in:
Richard Heck 2017-12-15 23:41:32 -05:00
parent 1182e303b1
commit b954f478e3
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mathed/InsetMathHull.cpp
View File

@ -823,11 +823,9 @@ void InsetMathHull::preparePreview(DocIterator const & pos,
for (idx_type idx = 0; idx < nargs(); ++idx)
usedMacros(cell(idx), pos, macros, defs);
MacroNameSet::iterator it = defs.begin();
MacroNameSet::iterator end = defs.end();
docstring macro_preamble;
for (; it != end; ++it)
macro_preamble.append(*it);
for (auto const & defit : defs)
macro_preamble.append(defit);
// set the font series and size for this snippet
DocIterator dit = pos.getInnerText();
@ -1650,7 +1648,8 @@ void InsetMathHull::mutate(HullType newtype)
default:
// we passed the guard so we should not be here
LASSERT("Mutation not implemented, but should have been.", return);
LYXERR0("Mutation not implemented, but should have been.");
LASSERT(false, return);
break;
}// switch
}
@ -2084,11 +2083,10 @@ bool InsetMathHull::getStatus(Cursor & cur, FuncRequest const & cmd,
case LFUN_LABEL_COPY_AS_REFERENCE: {
bool enabled = false;
row_type row;
if (cmd.argument().empty() && &cur.inset() == this) {
// if there is no argument and we're inside math, we retrieve
// the row number from the cursor position.
row = (type_ == hullMultline) ? nrows() - 1 : cur.row();
row_type row = (type_ == hullMultline) ? nrows() - 1 : cur.row();
enabled = numberedType() && label_[row] && numbered(row);
} else {
// if there is an argument, find the corresponding label, else
@ -2319,8 +2317,8 @@ bool InsetMathHull::readQuiet(Lexer & lex)
int InsetMathHull::plaintext(odocstringstream & os,
OutputParams const & op, size_t max_length) const
{
// disables ASCII-art for export of equations. See #2275.
if (0 && display()) {
// Try enabling this now that there is a flag as requested at #2275.
if (buffer().isExporting() && display()) {
Dimension dim;
TextMetricsInfo mi;
metricsT(mi, dim);

2
src/support/gzstream.cpp
View File

@ -121,7 +121,7 @@ int gzstreambuf::overflow( int c) { // used for output buffer only
if ( ! ( mode & ios::out) || ! opened)
return EOF;
if (c != EOF) {
*pptr() = c;
*pptr() = (char) c;
pbump(1);
}
if ( flush_buffer() == EOF)