Fix gcc4.4 warnings.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31485 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 3f35b90ee5b372f8afb31bd7f4b356e05329518b..46b3e079b451d3fba7010efde633d895f593119d 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1865,8 +1865,9 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                        break;
                }
                // put cursor in front of inset.
-               if (!setCursorFromInset(inset))
+               if (!setCursorFromInset(inset)) {
                        LASSERT(false, break);
+               }
                // useful if we are called from a dialog.
                cur.beginUndoGroup();
                cur.recordUndo();

diff --git a/src/support/lstrings.cpp b/src/support/lstrings.cpp
index 178e571a64b678cd0e85f3f24d83f9b5d02a66ef..402b2c31190781e1ff746b16c7c8faef0441002d 100644 (file)
--- a/src/support/lstrings.cpp
+++ b/src/support/lstrings.cpp
@@ -958,8 +958,8 @@ vector<docstring> wrapToVec(docstring const & str, int ind,
        vector<docstring> retval;
        while (s.size() > width) {
                // find the last space within the first 'width' chars
-               int i = s.find_last_of(' ', width - 1);
-               if (i == docstring::npos || i <= ind) {
+               size_t i = s.find_last_of(' ', width - 1);
+               if (i == docstring::npos || i <= size_t(ind)) {
                        // no space found
                        s = s.substr(0, width - 3) + "...";
                        break;