Fixed some gcc 4 warnings.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32394 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -510,8 +510,8 @@ BasicTerminalBuffer::Find(const char* _pattern, const TermPos& start,
|
||||
// check word match
|
||||
if (matchWord) {
|
||||
TermPos tempPos(matchStart);
|
||||
if (_PreviousChar(tempPos, c) && !c.IsSpace()
|
||||
|| _NextChar(tempPos = matchEnd, c) && !c.IsSpace()) {
|
||||
if ((_PreviousChar(tempPos, c) && !c.IsSpace())
|
||||
|| (_NextChar(tempPos = matchEnd, c) && !c.IsSpace())) {
|
||||
//debug_printf(" but no word match!\n");
|
||||
continue;
|
||||
}
|
||||
@@ -1079,8 +1079,8 @@ BasicTerminalBuffer::_ResizeRewrap(int32 width, int32 height,
|
||||
if (fCursor.y + historySize == sourceIndex
|
||||
&& fCursor.x >= sourceX
|
||||
&& (fCursor.x < sourceX + toCopy
|
||||
|| destLeft >= sourceLeft
|
||||
&& sourceX + sourceLeft <= fCursor.x)) {
|
||||
|| (destLeft >= sourceLeft
|
||||
&& sourceX + sourceLeft <= fCursor.x))) {
|
||||
cursor.x = destLine->length + fCursor.x - sourceX;
|
||||
cursor.y = destTotalLines;
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ public:
|
||||
|
||||
inline bool operator<=(const TermPos& other) const
|
||||
{
|
||||
return y < other.y || y == other.y && x <= other.x;
|
||||
return y < other.y || (y == other.y && x <= other.x);
|
||||
}
|
||||
|
||||
inline bool operator>=(const TermPos& other) const
|
||||
|
||||
@@ -1341,7 +1341,7 @@ void
|
||||
TermView::MessageReceived(BMessage *msg)
|
||||
{
|
||||
entry_ref ref;
|
||||
char *ctrl_l = "\x0c";
|
||||
const char *ctrl_l = "\x0c";
|
||||
|
||||
// first check for any dropped message
|
||||
if (msg->WasDropped()) {
|
||||
|
||||
Reference in New Issue
Block a user