Merge branch 'point-context' of https://github.com/PDAL/PDAL into poi…

…nt-context Conflicts: include/pdal/PointBuffer.hpp
PDAL · May 23, 2014 · bc65d90 · bc65d90
2 parents 378c3dc + fe855bb
commit bc65d90
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/include/pdal/IStream.hpp b/include/pdal/IStream.hpp
@@ -56,7 +56,7 @@ class IStream
 public:
     IStream(const std::string& filename)
         { m_stream = m_fstream = new std::ifstream(filename); }
-    IStream(std::istream *stream) : m_stream{stream}, m_fstream{NULL}
+    IStream(std::istream *stream) : m_stream(stream), m_fstream(NULL)
         {}
     ~IStream()
         { delete m_fstream; }

diff --git a/include/pdal/PointBuffer.hpp b/include/pdal/PointBuffer.hpp
@@ -49,6 +49,7 @@
 #include <pdal/Metadata.hpp>
 #include <pdal/third/nanoflann.hpp>
 
+#include <set>
 #include <vector>
 
 namespace pdal
@@ -483,8 +484,8 @@ class PDAL_DLL PointBuffer
         boost::uint32_t index) const;
 
 private:
-    template<typename IN, typename OUT>
-    void convertAndSet(pdal::Dimension const& dim, PointId idx, IN in);
+    template<typename T_IN, typename T_OUT>
+    void convertAndSet(pdal::Dimension const& dim, PointId idx, T_IN in);
 
     inline void setFieldInternal(Dimension const& dim, PointId pointIndex,
         void *value);

diff --git a/include/pdal/RawPtBuf.hpp b/include/pdal/RawPtBuf.hpp
@@ -46,8 +46,8 @@ namespace pdal
 class RawPtBuf
 {
 public:
-    RawPtBuf(SchemaPtr schema) : m_numPts{0}, m_allocPts{0},
-        m_schema{schema}
+    RawPtBuf(SchemaPtr schema) : m_numPts(0), m_allocPts(0),
+        m_schema(schema)
     {}
 
     PointId addPoint()