3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-23 02:35:57 +01:00
Code Issues Releases Wiki Activity

Merge pull request #383 from laudrup/silence-msvc2017-warnings

Browse Source 
Fix compiler warnings from MSVC 2017
This commit is contained in:
Matias Fontanini
2020-02-01 10:59:38 -08:00
committed by GitHub
parent 28663b0e93 9e61286a59
commit a87c4a64f5
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/tins/icmpv6.h
View File

@@ -173,7 +173,7 @@ public:
addr_list_type(const addresses_type& addresses = addresses_type()) addr_list_type(const addresses_type& addresses = addresses_type())
: addresses(addresses) { : addresses(addresses) {
std::fill(reserved, reserved + sizeof(reserved), 0); std::fill(reserved, reserved + sizeof(reserved), static_cast<uint8_t>(0));
} }
static addr_list_type from_option(const option& opt); static addr_list_type from_option(const option& opt);
@@ -199,7 +199,7 @@ public:
naack_type(uint8_t code = 0, uint8_t status = 0) naack_type(uint8_t code = 0, uint8_t status = 0)
: code(code), status(status) { : code(code), status(status) {
std::fill(reserved, reserved + 4, 0); std::fill(reserved, reserved + 4, static_cast<uint8_t>(0));
} }
static naack_type from_option(const option& opt); static naack_type from_option(const option& opt);
@@ -323,7 +323,7 @@ public:
* The key_hash member will be 0-initialized. * The key_hash member will be 0-initialized.
*/ */
rsa_sign_type() { rsa_sign_type() {
std::fill(key_hash, key_hash + sizeof(key_hash), 0); std::fill(key_hash, key_hash + sizeof(key_hash), static_cast<uint8_t>(0));
} }
static rsa_sign_type from_option(const option& opt); static rsa_sign_type from_option(const option& opt);
@@ -489,7 +489,7 @@ public:
timestamp_type(uint64_t timestamp = 0) timestamp_type(uint64_t timestamp = 0)
: timestamp(timestamp) { : timestamp(timestamp) {
std::fill(reserved, reserved + sizeof(reserved), 0); std::fill(reserved, reserved + sizeof(reserved), static_cast<uint8_t>(0));
} }
static timestamp_type from_option(const option& opt); static timestamp_type from_option(const option& opt);

4
include/tins/ip.h
View File

@@ -174,9 +174,9 @@ public:
option_identifier(OptionNumber number, OptionClass op_class, option_identifier(OptionNumber number, OptionClass op_class,
small_uint<1> copied) small_uint<1> copied)
#if TINS_IS_LITTLE_ENDIAN #if TINS_IS_LITTLE_ENDIAN
: number(number), op_class(op_class), copied(copied) {} : number(static_cast<uint8_t>(number)), op_class(static_cast<uint8_t>(op_class)), copied(copied) {}
#else #else
: copied(copied), op_class(op_class), number(number) {} : copied(copied), op_class(static_cast<uint8_t>(op_class)), number(static_cast<uint8_t>(number)) {}
#endif #endif
/** /**

4
include/tins/llc.h
View File

@@ -236,7 +236,7 @@ public:
* \return The LLC frame format. * \return The LLC frame format.
*/ */
uint8_t type() { uint8_t type() {
return type_; return static_cast<uint8_t>(type_);
} }
/** /**
@@ -245,7 +245,7 @@ public:
* \return The sender send sequence number if format is INFORMATION else 0. * \return The sender send sequence number if format is INFORMATION else 0.
*/ */
uint8_t send_seq_number() { uint8_t send_seq_number() {
return (type() == INFORMATION) ? (control_field.info.send_seq_num) : 0; return static_cast<uint8_t>((type() == INFORMATION) ? (control_field.info.send_seq_num) : 0);
} }
/** /**