fix some build error

[tortoisegit/TortoiseGitJp.git] / src / TortoiseMerge / BaseView.cpp

diff --git a/src/TortoiseMerge/BaseView.cpp b/src/TortoiseMerge/BaseView.cpp
index f351cd7..76fd3cd 100644 (file)
--- a/src/TortoiseMerge/BaseView.cpp
+++ b/src/TortoiseMerge/BaseView.cpp
@@ -1376,6 +1376,7 @@ bool CBaseView::DrawInlineDiff(CDC *pDC, const CRect &rc, int nLineIndex, const
 \r
        int lineoffset = 0;\r
        std::deque<int> removedPositions;\r
+#if 0\r
        while (diff)\r
        {\r
                apr_off_t len = diff->original_length;\r
@@ -1398,6 +1399,7 @@ bool CBaseView::DrawInlineDiff(CDC *pDC, const CRect &rc, int nLineIndex, const
        // Draw vertical bars at removed chunks' positions.\r
        for (std::deque<int>::iterator it = removedPositions.begin(); it != removedPositions.end(); ++it)\r
                pDC->FillSolidRect(*it, rc.top, 1, rc.Height(), m_InlineRemovedBk);\r
+#endif\r
        return true;\r
 }\r
 \r