mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 23:17:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix the build with GCC 4.7

Browse source 
Disable bitfields completely in SyncFileItem with that compiler.
This commit is contained in:
Jocelyn Turcotte 2015-03-12 12:56:43 +01:00
parent 1dd3488973
commit 0f84510e6f
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/libsync/syncfileitem.h
View file

@ -21,6 +21,13 @@
#include <csync.h> #include <csync.h>
#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG) && (__GNUC__ * 100 + __GNUC_MINOR__ < 408)
// openSuse 12.3 didn't like enum bitfields.
#define BITFIELD(size)
#else
#define BITFIELD(size) :size
#endif
namespace OCC { namespace OCC {
class SyncFileItem { class SyncFileItem {
@ -114,19 +121,19 @@ public:
// Variables usefull for everybody // Variables usefull for everybody
QString _file; QString _file;
QString _renameTarget; QString _renameTarget;
Type _type:3; Type _type BITFIELD(3);
Direction _direction:2; Direction _direction BITFIELD(2);
bool _isDirectory:1; bool _isDirectory BITFIELD(1);
/// Whether there's an entry in the blacklist table. /// Whether there's an entry in the blacklist table.
/// Note: that entry may have retries left, so this can be true /// Note: that entry may have retries left, so this can be true
/// without the status being FileIgnored. /// without the status being FileIgnored.
bool _hasBlacklistEntry:1; bool _hasBlacklistEntry BITFIELD(1);
// Variables usefull to report to the user // Variables usefull to report to the user
Status _status:4; Status _status BITFIELD(4);
bool _isRestoration:1; // The original operation was forbidden, and this is a restoration bool _isRestoration BITFIELD(1); // The original operation was forbidden, and this is a restoration
bool _should_update_etag:1; bool _should_update_etag BITFIELD(1);
quint16 _httpErrorCode; quint16 _httpErrorCode;
QString _errorString; // Contains a string only in case of error QString _errorString; // Contains a string only in case of error
QByteArray _responseTimeStamp; QByteArray _responseTimeStamp;
@ -155,8 +162,8 @@ public:
time_t _other_modtime; time_t _other_modtime;
QByteArray _other_etag; QByteArray _other_etag;
QByteArray _other_fileId; QByteArray _other_fileId;
enum csync_instructions_e _instruction:16; enum csync_instructions_e _instruction BITFIELD(16);
enum csync_instructions_e _other_instruction:16; enum csync_instructions_e _other_instruction BITFIELD(16);
} log; } log;
}; };