ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-21 18:28:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx-test: fix warnings from MSVC 2013.

Browse Source
This commit is contained in:
Leonid Yuriev 2017-07-05 23:08:45 +03:00
parent a9faaaaf21
commit e3fcc4754e
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/base.h
View File

@ -20,6 +20,7 @@
#if defined(_WIN32) || defined(_WIN64) || defined(_WINDOWS) #if defined(_WIN32) || defined(_WIN64) || defined(_WINDOWS)
#ifdef _MSC_VER #ifdef _MSC_VER
#define _CRT_SECURE_NO_WARNINGS
#pragma warning(push, 1) #pragma warning(push, 1)
#pragma warning(disable : 4548) /* expression before comma has no effect; \ #pragma warning(disable : 4548) /* expression before comma has no effect; \
expected expression with side - effect */ expected expression with side - effect */
@ -91,4 +92,12 @@
#pragma warning(disable : 4201) /* nonstandard extension used : \ #pragma warning(disable : 4201) /* nonstandard extension used : \
nameless struct / union */ nameless struct / union */
#pragma warning(disable : 4127) /* conditional expression is constant */ #pragma warning(disable : 4127) /* conditional expression is constant */
#if _MSC_VER < 1900
#pragma warning(disable : 4510) /* default constructor could not be generated */
#pragma warning(disable : 4512) /* assignment operator could not be generated */
#pragma warning(disable : 4610) /* user-defined constructor required */
#define snprintf _snprintf
#pragma warning(disable : 4996) /* 'vsnprintf': This function or variable \
may be unsafe */
#endif #endif
#endif /* _MSC_VER */

2
test/keygen.h
View File

@ -71,7 +71,7 @@ namespace keygen {
typedef uint64_t serial_t; typedef uint64_t serial_t;
enum { enum : serial_t {
serial_minwith = 8, serial_minwith = 8,
serial_maxwith = sizeof(serial_t) * 8, serial_maxwith = sizeof(serial_t) * 8,
serial_allones = ~(serial_t)0 serial_allones = ~(serial_t)0

2
test/test.h
View File

@ -63,7 +63,7 @@ struct txn_deleter : public std::unary_function<void, MDBX_txn *> {
void operator()(MDBX_txn *txn) const { void operator()(MDBX_txn *txn) const {
int rc = mdbx_txn_abort(txn); int rc = mdbx_txn_abort(txn);
if (rc) if (rc)
log_trouble(__func__, "mdbx_txn_abort()", rc); log_trouble(mdbx_func_, "mdbx_txn_abort()", rc);
} }
}; };