AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed warnings.

Browse Source
This commit is contained in:
David Williams 2015-03-05 00:04:22 +01:00
parent 61bffc9783
commit 89550fcd44
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/PolyVox/Impl/Timer.h
View File

@ -52,13 +52,13 @@ namespace PolyVox
return elapsed_seconds.count(); return elapsed_seconds.count();
} }
uint32_t elapsedTimeInMilliSeconds(void) float elapsedTimeInMilliSeconds(void)
{ {
std::chrono::duration<float, std::milli> elapsed_milliseconds = clock::now() - m_start; std::chrono::duration<float, std::milli> elapsed_milliseconds = clock::now() - m_start;
return elapsed_milliseconds.count(); return elapsed_milliseconds.count();
} }
uint32_t elapsedTimeInMicroSeconds(void) float elapsedTimeInMicroSeconds(void)
{ {
std::chrono::duration<float, std::micro> elapsed_microseconds = clock::now() - m_start; std::chrono::duration<float, std::micro> elapsed_microseconds = clock::now() - m_start;
return elapsed_microseconds.count(); return elapsed_microseconds.count();

2
include/PolyVox/PagedVolume.h
View File

@ -187,7 +187,7 @@ namespace PolyVox
#if defined(_MSC_VER) #if defined(_MSC_VER)
class Sampler : public BaseVolume<VoxelType>::Sampler< PagedVolume<VoxelType> > //This line works on VS2010 class Sampler : public BaseVolume<VoxelType>::Sampler< PagedVolume<VoxelType> > //This line works on VS2010
#else #else
class Sampler : public BaseVolume<VoxelType>::template Sampler< PagedVolume<VoxelType> > //This line works on GCC class Sampler : public BaseVolume<VoxelType>::template Sampler< PagedVolume<VoxelType> > //This line works on GCC
#endif #endif
{ {
public: public:

4
include/PolyVox/PagedVolume.inl
View File

@ -80,9 +80,9 @@ namespace PolyVox
m_uChunkCountLimit = (std::max)(m_uChunkCountLimit, uMinPracticalNoOfChunks); m_uChunkCountLimit = (std::max)(m_uChunkCountLimit, uMinPracticalNoOfChunks);
m_uChunkCountLimit = (std::min)(m_uChunkCountLimit, uMaxPracticalNoOfChunks); m_uChunkCountLimit = (std::min)(m_uChunkCountLimit, uMaxPracticalNoOfChunks);
uint32_t uChunkSizeInBytes = PagedVolume<VoxelType>::Chunk::calculateSizeInBytes(m_uChunkSideLength);
POLYVOX_LOG_DEBUG("Memory usage limit for volume initially set to " << (m_uChunkCountLimit * uChunkSizeInBytes) / (1024 * 1024) POLYVOX_LOG_DEBUG("Memory usage limit for volume initially set to " << (m_uChunkCountLimit * uChunkSizeInBytes) / (1024 * 1024)
<< "Mb (" << m_uChunkCountLimit << " chunks of " << uChunkSizeInBytes / 1024 << "Kb each)."); << "Mb (" << m_uChunkCountLimit << " chunks of " << PagedVolume<VoxelType>::Chunk::calculateSizeInBytes(m_uChunkSideLength) / 1024 << "Kb each).");
initialise(); initialise();
} }