[haiku-commits] BRANCH midar-github.master - src/apps/terminal
- From: midar-github.master <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 18 Nov 2012 18:48:49 +0100 (CET)
added 1 changeset to branch 'refs/remotes/midar-github/master'
old head: 30243a53b8f3409c532eba0e34b60c5971246010
new head: ad3522e4bc41bab6f79f3d26187e4ee70a0ea249
overview: https://github.com/Midar/haiku/compare/30243a5...ad3522e
----------------------------------------------------------------------------
ad3522e: Make Terminal compile with Clang.
Does not work with -Werror yet, as there are still many warnings. The
idea is to first port all applications to Clang, then the kernel. If
that all works, I will work on getting it build with -Werror (meaning
eliminate all warnings).
[ Jonathan Schleifer <js@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Commit: ad3522e4bc41bab6f79f3d26187e4ee70a0ea249
Author: Jonathan Schleifer <js@xxxxxxxxxxx>
Date: Sun Nov 18 17:28:48 2012 UTC
----------------------------------------------------------------------------
2 files changed, 3 insertions(+), 2 deletions(-)
src/apps/terminal/BasicTerminalBuffer.cpp | 3 ++-
src/apps/terminal/Jamfile | 2 +-
----------------------------------------------------------------------------
diff --git a/src/apps/terminal/BasicTerminalBuffer.cpp
b/src/apps/terminal/BasicTerminalBuffer.cpp
index 5658216..76792b4 100644
--- a/src/apps/terminal/BasicTerminalBuffer.cpp
+++ b/src/apps/terminal/BasicTerminalBuffer.cpp
@@ -9,6 +9,7 @@
#include <stdlib.h>
#include <string.h>
+#include <vector>
#include <algorithm>
#include <String.h>
@@ -491,7 +492,7 @@ BasicTerminalBuffer::Find(const char* _pattern, const
TermPos& start,
int32 patternByteLen = strlen(_pattern);
// convert pattern to UTF8Char array
- UTF8Char pattern[patternByteLen];
+ std::vector<UTF8Char> pattern(patternByteLen);
int32 patternLen = 0;
while (*_pattern != '\0') {
int32 charLen = UTF8Char::ByteCount(*_pattern);
diff --git a/src/apps/terminal/Jamfile b/src/apps/terminal/Jamfile
index 8f68625..4ff322a 100644
--- a/src/apps/terminal/Jamfile
+++ b/src/apps/terminal/Jamfile
@@ -37,7 +37,7 @@ Application Terminal :
TitlePlaceholderMapper.cpp
VTKeyTbl.c
VTPrsTbl.c
- : be $(HAIKU_LOCALE_LIBS) tracker textencoding $(TARGET_LIBSUPC++)
+ : be $(HAIKU_LOCALE_LIBS) tracker textencoding $(TARGET_LIBSTDC++)
: Terminal.rdef
;
Other related posts:
