andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update endif/else behavior for unreachable code error on Windows.

Browse Source 
Summary:
Per #3367
Closes https://github.com/facebook/rocksdb/pull/3389

Differential Revision: D6766126

Pulled By: gfosco

fbshipit-source-id: e441a15e8aec6747c613d68f4f0621b605eb48a0
This commit is contained in:
Fosco Marotto 2018-01-31 12:04:52 -08:00 committed by Facebook Github Bot
parent 5400800a56
commit 6efa8e270c
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
util/compression.h
View File

@ -57,8 +57,9 @@ inline bool Snappy_Supported() {
inline bool Zlib_Supported() { inline bool Zlib_Supported() {
#ifdef ZLIB #ifdef ZLIB
return true; return true;
#endif #else
return false; return false;
#endif
} }
inline bool BZip2_Supported() { inline bool BZip2_Supported() {
@ -283,8 +284,9 @@ inline bool Zlib_Compress(const CompressionOptions& opts,
deflateEnd(&_stream); deflateEnd(&_stream);
return compressed; return compressed;
#endif #else
return false; return false;
#endif
} }
// compress_format_version == 1 -- decompressed size is not included in the // compress_format_version == 1 -- decompressed size is not included in the
@ -382,9 +384,9 @@ inline char* Zlib_Uncompress(const char* input_data, size_t input_length,
*decompress_size = static_cast<int>(output_len - _stream.avail_out); *decompress_size = static_cast<int>(output_len - _stream.avail_out);
inflateEnd(&_stream); inflateEnd(&_stream);
return output; return output;
#endif #else
return nullptr; return nullptr;
#endif
} }
// compress_format_version == 1 -- decompressed size is not included in the // compress_format_version == 1 -- decompressed size is not included in the
@ -441,8 +443,9 @@ inline bool BZip2_Compress(const CompressionOptions& opts,
BZ2_bzCompressEnd(&_stream); BZ2_bzCompressEnd(&_stream);
return compressed; return compressed;
#endif #else
return false; return false;
#endif
} }
// compress_format_version == 1 -- decompressed size is not included in the // compress_format_version == 1 -- decompressed size is not included in the
@ -520,8 +523,9 @@ inline char* BZip2_Uncompress(const char* input_data, size_t input_length,
*decompress_size = static_cast<int>(output_len - _stream.avail_out); *decompress_size = static_cast<int>(output_len - _stream.avail_out);
BZ2_bzDecompressEnd(&_stream); BZ2_bzDecompressEnd(&_stream);
return output; return output;
#endif #else
return nullptr; return nullptr;
#endif
} }
// compress_format_version == 1 -- decompressed size is included in the // compress_format_version == 1 -- decompressed size is included in the
@ -583,8 +587,9 @@ inline bool LZ4_Compress(const CompressionOptions& opts,
} }
output->resize(static_cast<size_t>(output_header_len + outlen)); output->resize(static_cast<size_t>(output_header_len + outlen));
return true; return true;
#endif // LZ4 #else // LZ4
return false; return false;
#endif
} }
// compress_format_version == 1 -- decompressed size is included in the // compress_format_version == 1 -- decompressed size is included in the
@ -639,8 +644,9 @@ inline char* LZ4_Uncompress(const char* input_data, size_t input_length,
} }
assert(*decompress_size == static_cast<int>(output_len)); assert(*decompress_size == static_cast<int>(output_len));
return output; return output;
#endif // LZ4 #else // LZ4
return nullptr; return nullptr;
#endif
} }
// compress_format_version == 1 -- decompressed size is included in the // compress_format_version == 1 -- decompressed size is included in the
@ -711,8 +717,9 @@ inline bool LZ4HC_Compress(const CompressionOptions& opts,
} }
output->resize(static_cast<size_t>(output_header_len + outlen)); output->resize(static_cast<size_t>(output_header_len + outlen));
return true; return true;
#endif // LZ4 #else // LZ4
return false; return false;
#endif
} }
inline bool XPRESS_Compress(const char* input, size_t length, std::string* output) { inline bool XPRESS_Compress(const char* input, size_t length, std::string* output) {
@ -765,8 +772,9 @@ inline bool ZSTD_Compress(const CompressionOptions& opts, const char* input,
} }
output->resize(output_header_len + outlen); output->resize(output_header_len + outlen);
return true; return true;
#endif #else // ZSTD
return false; return false;
#endif
} }
// @param compression_dict Data for presetting the compression library's // @param compression_dict Data for presetting the compression library's
@ -796,8 +804,9 @@ inline char* ZSTD_Uncompress(const char* input_data, size_t input_length,
assert(actual_output_length == output_len); assert(actual_output_length == output_len);
*decompress_size = static_cast<int>(actual_output_length); *decompress_size = static_cast<int>(actual_output_length);
return output; return output;
#endif #else // ZSTD
return nullptr; return nullptr;
#endif
} }
inline std::string ZSTD_TrainDictionary(const std::string& samples, inline std::string ZSTD_TrainDictionary(const std::string& samples,