From e1cab763441f4dff1ca9b4da1dc459a49ee01bc8 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 20 May 2012 21:11:10 +0200 Subject: [PATCH] Fix ICC warnings about commas at the end of enums They're non-standard. Remove them. Change-Id: I58dc093c2459747ce0183685d325522fb51e86ab Reviewed-by: Kai Koehne --- src/libs/cplusplus/pp-engine.cpp | 2 +- src/shared/symbianutils/virtualserialdevice.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 693bcd54936..79a69eea577 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -77,7 +77,7 @@ namespace { enum { eagerExpansion = 1, MAX_TOKEN_EXPANSION_COUNT = 5000, - MAX_TOKEN_BUFFER_DEPTH = 16000, // for when macros are using some kind of right-folding, this is the list of "delayed" buffers waiting to be expanded after the current one. + MAX_TOKEN_BUFFER_DEPTH = 16000 // for when macros are using some kind of right-folding, this is the list of "delayed" buffers waiting to be expanded after the current one. }; } diff --git a/src/shared/symbianutils/virtualserialdevice.h b/src/shared/symbianutils/virtualserialdevice.h index 3cbe9156b2e..ac70d08b3ea 100644 --- a/src/shared/symbianutils/virtualserialdevice.h +++ b/src/shared/symbianutils/virtualserialdevice.h @@ -97,7 +97,7 @@ private: enum FlushPendingOption { NothingSpecial = 0, StopAfterWritingOneBuffer = 1, - EmitBytesWrittenAsync = 2, // Needed so we don't emit bytesWritten signal directly from writeBytes + EmitBytesWrittenAsync = 2 // Needed so we don't emit bytesWritten signal directly from writeBytes }; Q_DECLARE_FLAGS(FlushPendingOptions, FlushPendingOption) bool tryFlushPendingBuffers(QMutexLocker& locker, FlushPendingOptions flags = NothingSpecial);