Revision: 77312
http://sourceforge.net/p/brlcad/code/77312
Author: starseeker
Date: 2020-10-01 21:08:02 +0000 (Thu, 01 Oct 2020)
Log Message:
-----------
Don't need Hash.h anymore
Modified Paths:
--------------
brlcad/trunk/doc/legal/embedded/SPSR.txt
brlcad/trunk/src/libbg/CMakeLists.txt
brlcad/trunk/src/libbg/spsr/Geometry.h
brlcad/trunk/src/libbg/spsr/MultiGridOctreeData.h
Removed Paths:
-------------
brlcad/trunk/src/libbg/spsr/Hash.h
Modified: brlcad/trunk/doc/legal/embedded/SPSR.txt
===================================================================
--- brlcad/trunk/doc/legal/embedded/SPSR.txt 2020-10-01 20:42:02 UTC (rev
77311)
+++ brlcad/trunk/doc/legal/embedded/SPSR.txt 2020-10-01 21:08:02 UTC (rev
77312)
@@ -98,7 +98,6 @@
file:/src/libbg/spsr/Geometry.cpp
file:/src/libbg/spsr/Geometry.h
file:/src/libbg/spsr/Geometry.inl
-file:/src/libbg/spsr/Hash.h
file:/src/libbg/spsr/MAT.h
file:/src/libbg/spsr/MAT.inl
file:/src/libbg/spsr/MarchingCubes.cpp
Modified: brlcad/trunk/src/libbg/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbg/CMakeLists.txt 2020-10-01 20:42:02 UTC (rev
77311)
+++ brlcad/trunk/src/libbg/CMakeLists.txt 2020-10-01 21:08:02 UTC (rev
77312)
@@ -23,7 +23,6 @@
spsr/Geometry.cpp
spsr/Geometry.h
spsr/Geometry.inl
- spsr/Hash.h
spsr/MarchingCubes.cpp
spsr/MarchingCubes.h
spsr/MAT.h
Modified: brlcad/trunk/src/libbg/spsr/Geometry.h
===================================================================
--- brlcad/trunk/src/libbg/spsr/Geometry.h 2020-10-01 20:42:02 UTC (rev
77311)
+++ brlcad/trunk/src/libbg/spsr/Geometry.h 2020-10-01 21:08:02 UTC (rev
77312)
@@ -32,7 +32,9 @@
#include <math.h>
#include <vector>
#include <cstdlib>
-#include "Hash.h"
+#include <unordered_map>
+#define hash_map unordered_map
+using std::unordered_map;
template<class Real>
Real Random(void);
Deleted: brlcad/trunk/src/libbg/spsr/Hash.h
===================================================================
--- brlcad/trunk/src/libbg/spsr/Hash.h 2020-10-01 20:42:02 UTC (rev 77311)
+++ brlcad/trunk/src/libbg/spsr/Hash.h 2020-10-01 21:08:02 UTC (rev 77312)
@@ -1,7 +0,0 @@
-#ifndef HASH_INCLUDED
-#define HASH_INCLUDED
-#include <unordered_map>
-#define hash_map unordered_map
-using std::unordered_map;
-#endif // HASH_INCLUDED
-
Modified: brlcad/trunk/src/libbg/spsr/MultiGridOctreeData.h
===================================================================
--- brlcad/trunk/src/libbg/spsr/MultiGridOctreeData.h 2020-10-01 20:42:02 UTC
(rev 77311)
+++ brlcad/trunk/src/libbg/spsr/MultiGridOctreeData.h 2020-10-01 21:08:02 UTC
(rev 77312)
@@ -29,6 +29,10 @@
#ifndef MULTI_GRID_OCTREE_DATA_INCLUDED
#define MULTI_GRID_OCTREE_DATA_INCLUDED
+#include <unordered_map>
+#define hash_map unordered_map
+using std::unordered_map;
+
#define NEW_CODE 1
//#define MAX_MEMORY_GB 15
@@ -76,7 +80,6 @@
#pragma message( "[WARNING] Not zeroing out normal component on boundary" )
#endif // !FORCE_NEUMANN_FIELD
-#include "Hash.h"
#include "BSplineData.h"
#include "PointStream.h"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
