Commit d4efb0b2 authored by Nghia Truong's avatar Nghia Truong
Browse files

BUG: Fix g++-5 compiling errors

parent 80cba6da
This diff is collapsed.
......@@ -31,8 +31,8 @@ using namespace imstk;
#define SPHERE_RADIUS Real(1)
#define SPHERE_CENTER Vec3r(0, 0, 0)
#define PARTICLE_RADIUS Real(0.05)
#define ITERATIONS 100
#define STEP Real(1.02)
#define ITERATIONS 5
#define STEP Real(1.1)
///
/// \brief Advance particle positions
......
......@@ -114,13 +114,13 @@ public:
/// \brief Get data in cell
/// \param A position in space
///
CellData& getCellData(const Vec3r& ppos) { return m_CellData[getCellFlatIndexFromCoordinate<unsigned int>(ppos)]; }
CellData& getCellData(const Vec3r& ppos) { return m_CellData[getCellFlatIndexFromCoordinate < unsigned int > (ppos)]; }
///
/// \brief Get data in cell
/// \param A position in space
///
const CellData& getCellData(const Vec3r& ppos) const { return m_CellData[getCellFlatIndexFromCoordinate<unsigned int>(ppos)]; }
const CellData& getCellData(const Vec3r& ppos) const { return m_CellData[getCellFlatIndexFromCoordinate < unsigned int > (ppos)]; }
///
/// \brief Get data in cell
......@@ -187,7 +187,7 @@ private:
Real m_CellSize {1.0};
Real m_InvCellSize {1.0};
std::array<unsigned int, 3> m_Resolution { 0u, 0u, 0u };
std::array<unsigned int, 3> m_Resolution {{ 0u, 0u, 0u }};
unsigned int m_NTotalCells { 1u };
std::vector<CellData> m_CellData;
......
......@@ -21,6 +21,7 @@
#pragma once
#include <memory>
#include "imstkMath.h"
namespace imstk
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment