[haiku-commits] haiku: hrev53467 - src/apps/terminal

  • From: waddlesplash <waddlesplash@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 7 Sep 2019 15:12:12 -0400 (EDT)

hrev53467 adds 1 changeset to branch 'master'
old head: 1625c5e549efea8e5d9aed90a4651e3f69ecd501
new head: 75d2b89f762cea1d8414e8a0c134c6b1aba73d46
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=75d2b89f762c+%5E1625c5e549ef

----------------------------------------------------------------------------

75d2b89f762c: Terminal: Fix GCC2 build.

                              [ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev53467
Commit:      75d2b89f762cea1d8414e8a0c134c6b1aba73d46
URL:         https://git.haiku-os.org/haiku/commit/?id=75d2b89f762c
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Sat Sep  7 19:11:46 2019 UTC

----------------------------------------------------------------------------

2 files changed, 2 insertions(+), 2 deletions(-)
src/apps/terminal/TermView.h         | 2 +-
src/apps/terminal/TermViewStates.cpp | 2 +-

----------------------------------------------------------------------------

diff --git a/src/apps/terminal/TermView.h b/src/apps/terminal/TermView.h
index 366f6913e5..f23241028d 100644
--- a/src/apps/terminal/TermView.h
+++ b/src/apps/terminal/TermView.h
@@ -345,7 +345,7 @@ private:
                        // keyboard
                        const key_map*          fKeymap;
                        const char*                     fKeymapChars;
-                       HashMap<HashKey32<int32>, const int(*)[128]>
+                       HashMap<HashKey32<int32>, const int32(*)[128]>
                                                                
fKeymapTableForModifiers;
                        bool                            fUseOptionAsMetaKey;
                        bool                            fInterpretMetaKey;
diff --git a/src/apps/terminal/TermViewStates.cpp 
b/src/apps/terminal/TermViewStates.cpp
index 706ca3f588..5aab892159 100644
--- a/src/apps/terminal/TermViewStates.cpp
+++ b/src/apps/terminal/TermViewStates.cpp
@@ -222,7 +222,7 @@ TermView::DefaultState::KeyDown(const char* bytes, int32 
numBytes)
                        bytes = (const char*)&rawChar;
                        numBytes = 1;
                } else {
-                       const int (*keymapTable)[128] =
+                       const int32 (*keymapTable)[128] =
                                fView->fKeymapTableForModifiers.Get(mod);
                        bytes = &fView->fKeymapChars[(*keymapTable)[key]];
                        numBytes = *(bytes++);


Other related posts:

  • » [haiku-commits] haiku: hrev53467 - src/apps/terminal - waddlesplash