From 21cfa5c6ccd001349e1593e7ee9ebfb54219a9d6 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 18 May 2011 15:10:43 +0200
Subject: [PATCH] cdbext: Fix msvc warnings
Change-Id: Ib1604c2e36d2a4dbfb7edccb5be0e4c401b026c5
Reviewed-by: Friedemann Kleint
---
src/libs/qtcreatorcdbext/symbolgroupvalue.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
index f1c87a94a6b..76a4977e47d 100644
--- a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
+++ b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
@@ -30,6 +30,9 @@
**
**************************************************************************/
+// std::copy is perfectly fine, don't let MSVC complain about it being deprecated
+#pragma warning (disable: 4996)
+
#include "symbolgroupvalue.h"
#include "symbolgroup.h"
#include "stringutils.h"
@@ -2312,6 +2315,7 @@ AssignmentStringData AssignmentStringData::decodeString(const char *begin, const
const unsigned char *source = reinterpret_cast<const unsigned char *>(begin);
unsigned short *target = reinterpret_cast<unsigned short *>(result.data);
std::copy(source, source + stringLength, target);
+
return result;
} // toUtf16
switch (valueEncoding) {
@@ -2457,7 +2461,7 @@ static inline int assignStdStringI(SymbolGroupNode *n, int type,
}
if (reserved < 0 || !size || !bx)
return 42;
- if (reserved <= data.stringLength)
+ if (reserved <= (int)data.stringLength)
return 1; // Insufficient memory.
// Copy data: 'Buf' array for small strings, else pointer 'Ptr'.
const int bufSize = type == KT_StdString ? 16 : 8; // see basic_string.
--
GitLab