Removed traces of boost/std::hash.
This commit is contained in:
parent
57350a55d6
commit
787b5c6928
@ -40,7 +40,6 @@ namespace PolyVox
|
|||||||
void execute();
|
void execute();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
//polyvox_function<bool(typename VolumeType::VoxelType voxel0, typename VolumeType::VoxelType voxel1, float& materialToUse)> m_funcIsQuadNeededCallback;
|
|
||||||
IsQuadNeeded m_funcIsQuadNeededCallback;
|
IsQuadNeeded m_funcIsQuadNeededCallback;
|
||||||
|
|
||||||
//The volume data and a sampler to access it.
|
//The volume data and a sampler to access it.
|
||||||
|
@ -69,9 +69,6 @@ freely, subject to the following restrictions:
|
|||||||
#include <boost/function.hpp>
|
#include <boost/function.hpp>
|
||||||
#define polyvox_function boost::function
|
#define polyvox_function boost::function
|
||||||
|
|
||||||
#include <boost/functional/hash.hpp>
|
|
||||||
#define polyvox_hash boost::hash
|
|
||||||
|
|
||||||
#include <boost/bind.hpp>
|
#include <boost/bind.hpp>
|
||||||
#define polyvox_bind boost::bind
|
#define polyvox_bind boost::bind
|
||||||
#define polyvox_placeholder_1 _1
|
#define polyvox_placeholder_1 _1
|
||||||
@ -100,7 +97,6 @@ freely, subject to the following restrictions:
|
|||||||
#define polyvox_bind std::bind
|
#define polyvox_bind std::bind
|
||||||
#define polyvox_placeholder_1 std::placeholders::_1
|
#define polyvox_placeholder_1 std::placeholders::_1
|
||||||
#define polyvox_placeholder_2 std::placeholders::_2
|
#define polyvox_placeholder_2 std::placeholders::_2
|
||||||
#define polyvox_hash std::hash
|
|
||||||
//#define static_assert static_assert //we can use this
|
//#define static_assert static_assert //we can use this
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user