Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

backport: backport from iresearch upstream: address some MSVC warnings

This commit is contained in:
Vasiliy 2018-04-10 15:38:39 +03:00
parent 2554f109e3
commit 4e49b1afad
4 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
3rdParty/iresearch/core/formats/formats_burst_trie.cpp vendored
View File

@ -35,8 +35,6 @@
#include "utils/timer_utils.hpp" #include "utils/timer_utils.hpp"
#include "utils/fst.hpp" #include "utils/fst.hpp"
#include "utils/fst_utils.hpp"
#include "utils/fst_decl.hpp"
#include "utils/bit_utils.hpp" #include "utils/bit_utils.hpp"
#include "utils/bitset.hpp" #include "utils/bitset.hpp"
#include "utils/attributes.hpp" #include "utils/attributes.hpp"
@ -45,25 +43,6 @@
#include "utils/fst_matcher.hpp" #include "utils/fst_matcher.hpp"
#if defined(_MSC_VER) #if defined(_MSC_VER)
// NOOP
#elif defined (__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
#if (__GNUC__ >= 6)
#pragma GCC diagnostic ignored "-Wmisleading-indentation"
#endif
#endif
#include <fst/equivalent.h>
#if defined(_MSC_VER)
// NOOP
#elif defined (__GNUC__)
#pragma GCC diagnostic pop
#endif
#if defined(_MSC_VER)
#pragma warning(disable : 4267) // conversion from 'size_t' to 'uint32_t', possible loss of data
#pragma warning(disable : 4291) #pragma warning(disable : 4291)
#elif defined (__GNUC__) #elif defined (__GNUC__)
// NOOP // NOOP
@ -72,7 +51,6 @@
#include <fst/matcher.h> #include <fst/matcher.h>
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(default: 4267)
#pragma warning(default: 4291) #pragma warning(default: 4291)
#elif defined (__GNUC__) #elif defined (__GNUC__)
// NOOP // NOOP

6
3rdParty/iresearch/core/store/store_utils.cpp vendored
View File

@ -275,7 +275,7 @@ uint32_t write_block(
uint32_t write_block( uint32_t write_block(
data_output& out, data_output& out,
const uint64_t* RESTRICT decoded, const uint64_t* RESTRICT decoded,
uint32_t size, uint64_t size,
uint64_t* RESTRICT encoded) { uint64_t* RESTRICT encoded) {
assert(size); assert(size);
assert(encoded); assert(encoded);
@ -453,3 +453,7 @@ size_t bytes_input::read_bytes(byte_type* b, size_t size) {
} }
NS_END NS_END
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------

2
3rdParty/iresearch/core/store/store_utils.hpp vendored
View File

@ -616,7 +616,7 @@ IRESEARCH_API uint32_t write_block(
IRESEARCH_API uint32_t write_block( IRESEARCH_API uint32_t write_block(
data_output& out, data_output& out,
const uint64_t* RESTRICT decoded, const uint64_t* RESTRICT decoded,
uint32_t size, uint64_t size, // same type as 'decoded'/'encoded'
uint64_t* RESTRICT encoded uint64_t* RESTRICT encoded
); );

11
3rdParty/iresearch/core/utils/fst_string_weight.h vendored
View File

@ -24,13 +24,22 @@
#ifndef IRESEARCH_FST_STRING_WEIGHT_H #ifndef IRESEARCH_FST_STRING_WEIGHT_H
#define IRESEARCH_FST_STRING_WEIGHT_H #define IRESEARCH_FST_STRING_WEIGHT_H
#if defined(_MSC_VER)
#pragma warning(disable : 4267) // conversion from 'size_t' to 'uint32_t', possible loss of data
#endif
#include <fst/string-weight.h>
#if defined(_MSC_VER)
#pragma warning(default: 4267)
#endif
#include "shared.hpp" #include "shared.hpp"
#include "utils/string.hpp" #include "utils/string.hpp"
#include "utils/std.hpp" #include "utils/std.hpp"
#include "utils/bytes_utils.hpp" #include "utils/bytes_utils.hpp"
#include <string> #include <string>
#include <fst/string-weight.h>
NS_BEGIN(fst) NS_BEGIN(fst)