takino
/
termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

get rid of clamp macro to make gcc happy

This commit is contained in:
Daniel Micay 2012-10-10 23:42:03 -04:00
parent 3d92b8b61e
commit 9cd8d5122a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -10,7 +10,7 @@ CXXFLAGS := -std=c++11 -O3 \
-Wshadow \ -Wshadow \
-Wformat=2 \ -Wformat=2 \
-Wmissing-declarations \ -Wmissing-declarations \
-Wstrict-overflow=4 \ -Wstrict-overflow=5 \
-Wcast-align \ -Wcast-align \
-Wcast-qual \ -Wcast-qual \
-Wconversion \ -Wconversion \

5
termite.cc
View File

@ -13,6 +13,7 @@
#include <vte/vteaccess.h> #include <vte/vteaccess.h>
#include "url_regex.hh" #include "url_regex.hh"
#include "util/clamp.hh"
#include "util/memory.hh" #include "util/memory.hh"
using namespace std::placeholders; using namespace std::placeholders;
@ -292,8 +293,8 @@ static void move(VteTerminal *vte, select_info *select, long col, long row) {
vte_terminal_get_cursor_position(vte, &cursor_col, &cursor_row); vte_terminal_get_cursor_position(vte, &cursor_col, &cursor_row);
vte_terminal_set_cursor_position(vte, vte_terminal_set_cursor_position(vte,
CLAMP(cursor_col + col, 0, end_col), clamp(cursor_col + col, 0l, end_col),
CLAMP(cursor_row + row, first_row(vte), last_row(vte))); clamp(cursor_row + row, first_row(vte), last_row(vte)));
update_scroll(vte); update_scroll(vte);
update_selection(vte, select); update_selection(vte, select);

2
util

@ -1 +1 @@
Subproject commit 4d9248982472c774ea539c4180a0f89103ebaec3 Subproject commit f028ce5881f49f5435f4376dbb9ee840d18aef06