commit 75bab51a8aea749cc7fd53baa5523841e839fceb
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Tue Jan 28 12:08:35 2014 +0100
Fix a couple of compilation warnings
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index d824da0..664e1b9 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -274,9 +274,9 @@ bool Lexer::Pimpl::setFile(FileName const & filename)
// Skip byte order mark.
if (is.peek() == 0xef) {
- int c = is.get();
+ is.get();
if (is.peek() == 0xbb) {
- c = is.get();
+ is.get();
LASSERT(is.get() == 0xbf, /**/);
} else
is.unget();
diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 862d010..f4c2427 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -559,27 +559,6 @@ string apply_escapes(string s, Escapes const & escape_map)
return s;
}
-/** Return the position of the closing brace matching the open one at s[pos],
- ** or s.size() if not found.
- **/
-static size_t find_matching_brace(string const & s, size_t pos)
-{
- LASSERT(s[pos] == '{', /* */);
- int open_braces = 1;
- for (++pos; pos < s.size(); ++pos) {
- if (s[pos] == '\\')
- ++pos;
- else if (s[pos] == '{')
- ++open_braces;
- else if (s[pos] == '}') {
- --open_braces;
- if (open_braces == 0)
- return pos;
- }
- }
- return s.size();
-}
-
/// Within \regexp{} apply get_lyx_unescapes() only (i.e., preserve regexp
semantics of the string),
/// while outside apply get_lyx_unescapes()+get_regexp_escapes().
/// If match_latex is true, then apply regexp_latex_escapes() to \regexp{}
contents as well.
diff --git a/status.20x b/status.20x
index 3ee0c0c..3eae2e2 100644
--- a/status.20x
+++ b/status.20x
@@ -81,3 +81,4 @@ What's new
- improve detection of Qt via pkg-config, especially on Mac OS.
+- fix a couple of compilation warnings.
