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

More C++0x support stuff.

Browse Source
This commit is contained in:
David Williams 2009-03-30 21:15:37 +00:00
parent a703bf7a43
commit da6cc053fc
14 changed files with 23 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/CMakeLists.txt
View File

@ -26,7 +26,6 @@ SET(CORE_INC_FILES
include/PolyVoxCore/IndexedSurfacePatch.h
include/PolyVoxCore/MarchingCubesTables.h
include/PolyVoxCore/PolyVoxForwardDeclarations.h
include/PolyVoxCore/PolyVoxCStdInt.h
include/PolyVoxCore/Region.h
include/PolyVoxCore/SurfaceAdjusters.h
include/PolyVoxCore/SurfaceExtractors.h

2
library/include/PolyVoxCore/BlockData.h
View File

@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma region Headers
#include "PolyVoxForwardDeclarations.h"
#include "PolyVoxCStdInt.h"
#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
#pragma endregion
namespace PolyVox

2
library/include/PolyVoxCore/IndexedSurfacePatch.h
View File

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <vector>
#include "PolyVoxCStdInt.h"
#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
#include "Constants.h"
#include "PolyVoxForwardDeclarations.h"

38
library/include/PolyVoxCore/PolyVoxCStdInt.h
View File

@ -1,38 +0,0 @@
#pragma region License
/******************************************************************************
This file is part of the PolyVox library
Copyright (C) 2006 David Williams
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
******************************************************************************/
#pragma endregion
#ifndef __PolyVox_CStdInt_H__
#define __PolyVox_CStdInt_H__
//Adding things to the std namespace in not actually allowed, but Microsoft
//have still not added <cstdint> to thier standard library.
namespace PolyVox
{
typedef char int8;
typedef short int16;
typedef long int32;
typedef unsigned char uint8;
typedef unsigned short uint16;
typedef unsigned long uint32;
}
#endif

2
library/include/PolyVoxCore/PolyVoxForwardDeclarations.h
View File

@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define __PolyVox_ForwardDeclarations_H__
#include "Enums.h"
#include "PolyVoxCStdInt.h"
#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
namespace PolyVox
{

14
library/include/PolyVoxCore/PolyVoxImpl/CPlusPlusZeroXSupport.h
View File

@ -4,13 +4,27 @@
#ifdef C_PLUS_PLUS_ZERO_X_SUPPORTED
#include <shared_ptr> //Just a guess at what the standard name will be.
#include <weak_ptr> //These includes may need changing
#define POLYVOX_STD_NAMESPACE std
#define POLYVOX_SHARED_PTR std::shared_ptr
#define POLYVOX_WEAK_PTR std::weak_ptr
#else
#include "boost/shared_ptr.hpp"
#include "boost/weak_ptr.hpp"
#define POLYVOX_STD_NAMESPACE boost
#define POLYVOX_SHARED_PTR boost::shared_ptr
#define POLYVOX_WEAK_PTR boost::weak_ptr
#endif
namespace PolyVox
{
typedef char int8;
typedef short int16;
typedef long int32;
typedef unsigned char uint8;
typedef unsigned short uint16;
typedef unsigned long uint32;
}
#endif

2
library/include/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.h
View File

@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
#include "PolyVoxCore/TypeDef.h"
#include "PolyVoxCore/PolyVoxCStdInt.h"
#include "CPlusPlusZeroXSupport.h"
#pragma endregion
namespace PolyVox

2
library/include/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.h
View File

@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
#include "PolyVoxCore/TypeDef.h"
#include "PolyVoxCore/PolyVoxCStdInt.h"
#include "CPlusPlusZeroXSupport.h"
#pragma endregion
namespace PolyVox

2
library/include/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.h
View File

@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
#include "PolyVoxCore/TypeDef.h"
#include "PolyVoxCore/PolyVoxCStdInt.h"
#include "CPlusPlusZeroXSupport.h"
#pragma endregion
#include <vector>

2
library/include/PolyVoxCore/SurfaceAdjusters.h
View File

@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "PolyVoxForwardDeclarations.h"
#include "TypeDef.h"
#include "PolyVoxCStdInt.h"
#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
#pragma endregion
namespace PolyVox

2
library/include/PolyVoxCore/SurfaceExtractors.h
View File

@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "PolyVoxForwardDeclarations.h"
#include "TypeDef.h"
#include "PolyVoxCStdInt.h"
#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
#include <list>
#pragma endregion

2
library/include/PolyVoxCore/Volume.h
View File

@ -25,8 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma region Headers
#include "PolyVoxForwardDeclarations.h"
#include "PolyVoxCStdInt.h"
#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
#include <map>

2
library/include/PolyVoxCore/VolumeIterator.h
View File

@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma region Headers
#include "PolyVoxForwardDeclarations.h"
#include "PolyVoxCStdInt.h"
#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
#pragma endregion
namespace PolyVox

2
library/source/PolyVoxCore/GradientEstimators.cpp
View File

@ -2,8 +2,6 @@
#include "PolyVoxCore/IndexedSurfacePatch.h"
#include "PolyVoxCore/SurfaceVertex.h"
#include "PolyVoxCore/PolyVoxCStdInt.h"
using namespace std;
namespace PolyVox