Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-18 13:03:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from gtbass/master

Browse Source 
Fixes for MSVC warnings
This commit is contained in:
Branimir Karadžić
2013-02-12 23:23:45 -08:00
parent 78506ac4cc 97a411578f
commit 5740340bd3
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/bx/readerwriter.h
View File

@@ -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;

8
include/bx/ringbuffer.h
View File

@@ -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 <typename Control>

4
include/bx/uint32_t.h
View File

@@ -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);