From 109459c8a51e33fe9bbb1d0ad0b7cf36f3e541fb Mon Sep 17 00:00:00 2001
From: Murai Takashi <tmurai01@gmail.com>
Date: Mon, 2 May 2016 19:41:25 +0900
Subject: [PATCH] MailProtocol.cpp: fix gcc6 build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérôme Duval <jerome.duval@gmail.com>
---
 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 c4291b093b..243344113f 100644
--- a/src/kits/mail/MailProtocol.cpp
+++ b/src/kits/mail/MailProtocol.cpp
@@ -10,10 +10,10 @@
 #include <fs_attr.h>
 
 #include <Alert.h>
+#include <Autolock.h>
 #include <Directory.h>
-#include <FindDirectory.h>
 #include <E-mail.h>
-#include <Locker.h>
+#include <FindDirectory.h>
 #include <Node.h>
 #include <NodeInfo.h>
 #include <NodeMonitor.h>
@@ -88,7 +88,7 @@ BMailProtocol::MailNotifier() const
 bool
 BMailProtocol::AddFilter(BMailFilter* filter)
 {
-	BLocker locker(this);
+	BAutolock locker(const_cast< BMailProtocol * >(this));
 	return fFilterList.AddItem(filter);
 }
 
@@ -96,7 +96,7 @@ BMailProtocol::AddFilter(BMailFilter* filter)
 int32
 BMailProtocol::CountFilter() const
 {
-	BLocker locker(this);
+	BAutolock locker(const_cast< BMailProtocol * >(this));
 	return fFilterList.CountItems();
 }
 
@@ -104,7 +104,7 @@ BMailProtocol::CountFilter() const
 BMailFilter*
 BMailProtocol::FilterAt(int32 index) const
 {
-	BLocker locker(this);
+	BAutolock locker(const_cast< BMailProtocol * >(this));
 	return fFilterList.ItemAt(index);
 }
 
@@ -112,7 +112,7 @@ BMailProtocol::FilterAt(int32 index) const
 BMailFilter*
 BMailProtocol::RemoveFilter(int32 index)
 {
-	BLocker locker(this);
+	BAutolock locker(const_cast< BMailProtocol * >(this));
 	return fFilterList.RemoveItemAt(index);
 }
 
@@ -120,7 +120,7 @@ BMailProtocol::RemoveFilter(int32 index)
 bool
 BMailProtocol::RemoveFilter(BMailFilter* filter)
 {
-	BLocker locker(this);
+	BAutolock locker(const_cast< BMailProtocol * >(this));
 	return fFilterList.RemoveItem(filter);
 }