Ticket #12757: 0011-debugger-fix-gcc6-build.patch

File 0011-debugger-fix-gcc6-build.patch, 1.8 KB (added by mt, 8 years ago)

  • src/apps/debugger/debugger_interface/interfaces/LocalDebuggerInterface.cpp 

    From faaca7484613849e286e843f37840370ea798262 Mon Sep 17 00:00:00 2001
From: Murai Takashi <tmurai01@gmail.com>
Date: Thu, 5 May 2016 16:48:59 +0900
Subject: [PATCH 11/24] debugger: fix gcc6 build

* Reindent source code, to fix gcc6
  '-Werror=misleading-indentation' warnings.
---
 .../debugger/debugger_interface/interfaces/LocalDebuggerInterface.cpp | 4 ++--
 src/apps/debugger/user_interface/gui/util/SettingsMenu.cpp            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/apps/debugger/debugger_interface/interfaces/LocalDebuggerInterface.cpp b/src/apps/debugger/debugger_interface/interfaces/LocalDebuggerInterface.cpp
index 7fa0ea8..68ea324 100644
    a b LocalDebuggerInterface::GetNextDebugEvent(DebugEvent*& _event)  
    378378                if (message.origin.thread >= 0 && message.origin.nub_port >= 0)
    379379                    error = continue_thread(message.origin.nub_port,
    380380                        message.origin.thread);
    381                     if (error != B_OK)
    382                         return error;
     381                if (error != B_OK)
     382                    return error;
    383383                continue;
    384384            }
    385385

  • src/apps/debugger/user_interface/gui/util/SettingsMenu.cpp 

    diff --git a/src/apps/debugger/user_interface/gui/util/SettingsMenu.cpp b/src/apps/debugger/user_interface/gui/util/SettingsMenu.cpp
index 6165eef..70e33ab 100644
    a b public:  
    183183                optionItem->PrepareToShow(parentLooper, targetHandler,
    184184                    settings, dynamic_cast<OptionsSetting*>(GetSetting()));
    185185
    186                 optionItem->SetMarked(optionItem->Option() == selectedOption);
     186            optionItem->SetMarked(optionItem->Option() == selectedOption);
    187187        }
    188188    }
    189189