From 3a8453b3703cb891498fd3fa7e95e2f28b15804b Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Sun, 18 May 2008 19:13:18 +0000 Subject: [PATCH] =?UTF-8?q?A=20few=20minor=20changes=20to=20help=20build?= =?UTF-8?q?=20on=20Linux=20Still=20get=20"PolyVox/include/Volume.inl:128:?= =?UTF-8?q?=20error:=20=E2=80=98mVolume=E2=80=99=20was=20not=20declared=20?= =?UTF-8?q?in=20this=20scope"=20though?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/Block.inl | 1 + include/Utility.h | 2 +- include/VolumeIterator.inl | 2 +- source/IndexedSurfacePatch.cpp | 12 ++++++------ 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/Block.inl b/include/Block.inl index ccb5400c..d113b1a0 100644 --- a/include/Block.inl +++ b/include/Block.inl @@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #pragma region Headers #include #include //For memcpy +#include //for std::invalid_argument #pragma endregion namespace PolyVox diff --git a/include/Utility.h b/include/Utility.h index 41f26ed6..741f09aa 100644 --- a/include/Utility.h +++ b/include/Utility.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifndef __PolyVox_Utility_H__ #define __PolyVox_Utility_H__ -#include "Typedef.h" +#include "TypeDef.h" #include "boost/cstdint.hpp" diff --git a/include/VolumeIterator.inl b/include/VolumeIterator.inl index 45994265..f8809d1d 100644 --- a/include/VolumeIterator.inl +++ b/include/VolumeIterator.inl @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ #pragma endregion -#include "block.h" +#include "Block.h" #include "Volume.h" using namespace boost; diff --git a/source/IndexedSurfacePatch.cpp b/source/IndexedSurfacePatch.cpp index 03d40e19..c1848ad3 100644 --- a/source/IndexedSurfacePatch.cpp +++ b/source/IndexedSurfacePatch.cpp @@ -130,11 +130,11 @@ namespace PolyVox assert(pos.z() <= POLYVOX_REGION_SIDE_LENGTH); float xIntPart; - float xFracPart = modf(pos.x(), &xIntPart); + float xFracPart = std::modf(pos.x(), &xIntPart); float yIntPart; - float yFracPart = modf(pos.y(), &yIntPart); + float yFracPart = std::modf(pos.y(), &yIntPart); float zIntPart; - float zFracPart = modf(pos.z(), &zIntPart); + float zFracPart = std::modf(pos.z(), &zIntPart); //Of all the fractional parts, two should be zero and one should have a value. if(xFracPart > 0.000001f) @@ -164,11 +164,11 @@ namespace PolyVox assert(newIndex < 10000); float xIntPart; - float xFracPart = modf(pos.x(), &xIntPart); + float xFracPart = std::modf(pos.x(), &xIntPart); float yIntPart; - float yFracPart = modf(pos.y(), &yIntPart); + float yFracPart = std::modf(pos.y(), &yIntPart); float zIntPart; - float zFracPart = modf(pos.z(), &zIntPart); + float zFracPart = std::modf(pos.z(), &zIntPart); //Of all the fractional parts, two should be zero and one should have a value. if(xFracPart > 0.000001f)