From 68124f49e54c07de7f8ab21d9378d6ef19dd6ee8 Mon Sep 17 00:00:00 2001 From: Garett Bass Date: Tue, 12 Feb 2013 22:43:45 -0800 Subject: [PATCH 1/3] Fix for MSVC warning MSVC warning C4244: conversion from 'uint32_t' to 'uint16_t', possible loss of data. NOTE: this could also be fixed by appending & 0xFFFF after the function call. --- include/bx/uint32_t.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/bx/uint32_t.h b/include/bx/uint32_t.h index 179ba4e..2bcab80 100644 --- a/include/bx/uint32_t.h +++ b/include/bx/uint32_t.h @@ -474,9 +474,9 @@ namespace bx const uint32_t f_h_e_biased_flag = uint32_li(0x0000008f); const uint32_t f_s = uint32_and(ftou.ui, f_s_mask); const uint32_t f_e = uint32_and(ftou.ui, f_e_mask); - const uint16_t h_s = uint32_srl(f_s, f_h_s_pos_offset); + const uint16_t h_s = (uint16_t)uint32_srl(f_s, f_h_s_pos_offset); const uint32_t f_m = uint32_and(ftou.ui, f_m_mask); - const uint16_t f_e_amount = uint32_srl(f_e, f_e_pos); + const uint16_t f_e_amount = (uint16_t)uint32_srl(f_e, f_e_pos); const uint32_t f_e_half_bias = uint32_sub(f_e_amount, f_h_bias_offset); const uint32_t f_snan = uint32_and(ftou.ui, f_snan_mask); const uint32_t f_m_round_mask = uint32_and(f_m, f_m_round_bit); From 6b099ca5bc657fa2f5f9fc0a3495a0bb729cff34 Mon Sep 17 00:00:00 2001 From: Garett Bass Date: Tue, 12 Feb 2013 22:50:00 -0800 Subject: [PATCH 2/3] Fix for MSVC warning MSVC warning C4512: 'bx::RingBufferControl' : assignment operator could not be generated MSVC warning C4512: 'bx::SpScRingBufferControl' : assignment operator could not be generated --- include/bx/ringbuffer.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/bx/ringbuffer.h b/include/bx/ringbuffer.h index 844dff9..535db32 100644 --- a/include/bx/ringbuffer.h +++ b/include/bx/ringbuffer.h @@ -82,6 +82,10 @@ namespace bx uint32_t m_current; uint32_t m_write; uint32_t m_read; + + private: + RingBufferControl(const RingBufferControl&); + void operator=(const RingBufferControl&); }; class SpScRingBufferControl @@ -158,6 +162,10 @@ namespace bx uint32_t m_current; uint32_t m_write; uint32_t m_read; + + private: + SpScRingBufferControl(const SpScRingBufferControl&); + void operator=(const SpScRingBufferControl&); }; template From 97a411578fb987d9fc030f03611d9f6d6d499518 Mon Sep 17 00:00:00 2001 From: Garett Bass Date: Tue, 12 Feb 2013 22:51:20 -0800 Subject: [PATCH 3/3] Fix for MSVC warning MSVC warning C4100: '_size' : unreferenced formal parameter MSVC warning C4100: '_data' : unreferenced formal parameter --- include/bx/readerwriter.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/bx/readerwriter.h b/include/bx/readerwriter.h index 6489185..a0aafd6 100644 --- a/include/bx/readerwriter.h +++ b/include/bx/readerwriter.h @@ -136,7 +136,7 @@ namespace bx { } - virtual void* more(uint32_t _size = 0) BX_OVERRIDE + virtual void* more(uint32_t /*_size*/ = 0) BX_OVERRIDE { return m_data; } @@ -202,7 +202,7 @@ namespace bx return m_pos; } - virtual int32_t write(const void* _data, int32_t _size) BX_OVERRIDE + virtual int32_t write(const void* /*_data*/, int32_t _size) BX_OVERRIDE { int32_t morecore = int32_t(m_pos - m_top) + _size;