i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IMAP: fixed GCC4 build.

Browse Source
This commit is contained in:
Axel Dörfler
2015-01-08 15:36:47 +01:00
parent f873c092c7
commit 4fe2002b47
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/mail_daemon/inbound_protocols/imap/IMAPFolder.h
+7 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2013, Axel Dörfler, [email protected]. * Copyright 2012-2015, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef IMAP_FOLDER_H #ifndef IMAP_FOLDER_H
@@ -15,6 +15,7 @@
#include <String.h> #include <String.h>
class BFile;
class IMAPProtocol; class IMAPProtocol;
@@ -94,8 +95,13 @@ private:
size_t& length); size_t& length);
private: private:
#if __GNUC__ >= 4
typedef __gnu_cxx::hash_map<uint32, uint32> UIDToFlagsMap;
typedef __gnu_cxx::hash_map<uint32, entry_ref> UIDToRefMap;
#else
typedef std::hash_map<uint32, uint32> UIDToFlagsMap; typedef std::hash_map<uint32, uint32> UIDToFlagsMap;
typedef std::hash_map<uint32, entry_ref> UIDToRefMap; typedef std::hash_map<uint32, entry_ref> UIDToRefMap;
#endif
IMAPProtocol& fProtocol; IMAPProtocol& fProtocol;
const entry_ref fRef; const entry_ref fRef;
src/add-ons/mail_daemon/inbound_protocols/imap/IMAPMailbox.h
+5 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2013, Axel Dörfler, [email protected]. * Copyright 2013-2015, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef IMAP_MAILBOX_H #ifndef IMAP_MAILBOX_H
@@ -53,7 +53,11 @@ protected:
uint32 flags; uint32 flags;
uint32 size; uint32 size;
}; };
#if __GNUC__ >= 4
typedef __gnu_cxx::hash_map<uint32, MessageFlagsAndSize> MessageEntryMap;
#else
typedef std::hash_map<uint32, MessageFlagsAndSize> MessageEntryMap; typedef std::hash_map<uint32, MessageFlagsAndSize> MessageEntryMap;
#endif
IMAP::Protocol& fProtocol; IMAP::Protocol& fProtocol;
BString fMailboxName; BString fMailboxName;
src/add-ons/mail_daemon/inbound_protocols/imap/IMAPProtocol.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2013, Axel Dörfler, [email protected]. * Copyright 2013-2015, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
@@ -127,7 +127,7 @@ IMAPProtocol::MessageStored(IMAPFolder& folder, entry_ref& ref, BFile& stream,
uint32 fetchFlags, BMessage& attributes) uint32 fetchFlags, BMessage& attributes)
{ {
if ((fetchFlags & (IMAP::kFetchHeader | IMAP::kFetchBody)) if ((fetchFlags & (IMAP::kFetchHeader | IMAP::kFetchBody))
== IMAP::kFetchHeader | IMAP::kFetchBody) { == (IMAP::kFetchHeader | IMAP::kFetchBody)) {
ProcessMessageFetched(ref, stream, attributes); ProcessMessageFetched(ref, stream, attributes);
} else if ((fetchFlags & IMAP::kFetchHeader) != 0) { } else if ((fetchFlags & IMAP::kFetchHeader) != 0) {
ProcessHeaderFetched(ref, stream, attributes); ProcessHeaderFetched(ref, stream, attributes);