hrev50281 adds 2 changesets to branch 'master'
old head: ab7c65d33d782ef90f0c5369122b6bdeb5c4e849
new head: 11ece1736cf18159e69906d9738db3ea46f8433f
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=11ece1736cf1+%5Eab7c65d33d78
----------------------------------------------------------------------------
109459c8a51e: MailProtocol.cpp: fix gcc6 build
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
[ Murai Takashi <tmurai01@xxxxxxxxx> ]
11ece1736cf1: build_cross_tools_gcc4: disable libatomic.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 8 insertions(+), 7 deletions(-)
build/scripts/build_cross_tools_gcc4 | 1 +
src/kits/mail/MailProtocol.cpp | 14 +++++++-------
############################################################################
Commit: 109459c8a51e33fe9bbb1d0ad0b7cf36f3e541fb
URL: http://cgit.haiku-os.org/haiku/commit/?id=109459c8a51e
Author: Murai Takashi <tmurai01@xxxxxxxxx>
Date: Mon May 2 10:41:25 2016 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Tue May 3 19:01:48 2016 UTC
MailProtocol.cpp: fix gcc6 build
Signed-off-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/kits/mail/MailProtocol.cpp b/src/kits/mail/MailProtocol.cpp
index c4291b0..2433441 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);
}
############################################################################
Revision: hrev50281
Commit: 11ece1736cf18159e69906d9738db3ea46f8433f
URL: http://cgit.haiku-os.org/haiku/commit/?id=11ece1736cf1
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Tue May 3 19:05:31 2016 UTC
build_cross_tools_gcc4: disable libatomic.
----------------------------------------------------------------------------
diff --git a/build/scripts/build_cross_tools_gcc4
b/build/scripts/build_cross_tools_gcc4
index a855f61..729540b 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -223,6 +223,7 @@ CFLAGS="$ccFlags" CXXFLAGS="$cxxFlags"
"$gccSourceDir/configure" \
--disable-nls --disable-shared --with-system-zlib \
--enable-languages=c,c++ --enable-lto --enable-frame-pointer \
--with-sysroot="$sysrootDir" --disable-threads --disable-tls \
+ --disable-libatomic \
$gccConfigureArgs \
|| exit 1
