Ticket #12743: 0002-MailProtocol.cpp-fix-gcc6-build.patch

File 0002-MailProtocol.cpp-fix-gcc6-build.patch, 1.9 KB (added by mt, 8 years ago)

  • src/kits/mail/MailProtocol.cpp 

    From 42526db3e770a83dcafa609cdcd3748e24773cc3 Mon Sep 17 00:00:00 2001
From: Murai Takashi <tmurai01@gmail.com>
Date: Mon, 2 May 2016 19:41:25 +0900
Subject: [PATCH 2/4] MailProtocol.cpp: fix gcc6 build

---
 src/kits/mail/MailProtocol.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/kits/mail/MailProtocol.cpp b/src/kits/mail/MailProtocol.cpp
index c4291b0..2433441 100644
    a b  
    1010#include <fs_attr.h>
    1111
    1212#include <Alert.h>
     13#include <Autolock.h>
    1314#include <Directory.h>
    14 #include <FindDirectory.h>
    1515#include <E-mail.h>
    16 #include <Locker.h>
     16#include <FindDirectory.h>
    1717#include <Node.h>
    1818#include <NodeInfo.h>
    1919#include <NodeMonitor.h>
    … … BMailProtocol::MailNotifier() const  
    8888bool
    8989BMailProtocol::AddFilter(BMailFilter* filter)
    9090{
    91     BLocker locker(this);
     91    BAutolock locker(const_cast< BMailProtocol * >(this));
    9292    return fFilterList.AddItem(filter);
    9393}
    9494
    … … BMailProtocol::AddFilter(BMailFilter* filter)  
    9696int32
    9797BMailProtocol::CountFilter() const
    9898{
    99     BLocker locker(this);
     99    BAutolock locker(const_cast< BMailProtocol * >(this));
    100100    return fFilterList.CountItems();
    101101}
    102102
    … … BMailProtocol::CountFilter() const  
    104104BMailFilter*
    105105BMailProtocol::FilterAt(int32 index) const
    106106{
    107     BLocker locker(this);
     107    BAutolock locker(const_cast< BMailProtocol * >(this));
    108108    return fFilterList.ItemAt(index);
    109109}
    110110
    … … BMailProtocol::FilterAt(int32 index) const  
    112112BMailFilter*
    113113BMailProtocol::RemoveFilter(int32 index)
    114114{
    115     BLocker locker(this);
     115    BAutolock locker(const_cast< BMailProtocol * >(this));
    116116    return fFilterList.RemoveItemAt(index);
    117117}
    118118
    … … BMailProtocol::RemoveFilter(int32 index)  
    120120bool
    121121BMailProtocol::RemoveFilter(BMailFilter* filter)
    122122{
    123     BLocker locker(this);
     123    BAutolock locker(const_cast< BMailProtocol * >(this));
    124124    return fFilterList.RemoveItem(filter);
    125125}
    126126