Commit 01480434 authored by Thery Sylvain's avatar Thery Sylvain Committed by Sylvain Thery
Browse files

back to mac osX

parent 236ada28
......@@ -41,6 +41,8 @@
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_ALGO_API
#endif
namespace CGoGN
......
......@@ -38,6 +38,8 @@
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_ALGO_API
#endif
namespace CGoGN
......
......@@ -39,6 +39,8 @@
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_ALGO_API
#endif
namespace CGoGN
......
......@@ -35,6 +35,8 @@
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_ALGO_API
#endif
......
......@@ -50,6 +50,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } }
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_ALGO_API
#endif
namespace CGoGN
......
......@@ -47,6 +47,8 @@
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_ALGO_API
#endif
namespace CGoGN
......
......@@ -38,6 +38,8 @@
#else
#define CGoGN_CONTAINER_API __declspec(dllimport)
#endif
#else
#define CGoGN_CONTAINER_API
#endif
namespace CGoGN
......@@ -1050,4 +1052,4 @@ public:
// CGoGN_XX_API void dumpByLines() const;
//
//
//};
\ No newline at end of file
//};
......@@ -94,7 +94,7 @@ typename VEC::DATA_TYPE angle(const VEC& a, const VEC& b)
template <typename VEC3>
typename VEC3::DATA_TYPE triangleArea(const VEC3& p1, const VEC3& p2, const VEC3& p3)
{
return VEC3::DATA_TYPE(0.5 * ((p2 - p1) ^ (p3 - p1)).norm());
return typename VEC3::DATA_TYPE (0.5 * ((p2 - p1) ^ (p3 - p1)).norm());
}
// normal of the plane spanned by 3 points in 3D
......
......@@ -273,7 +273,7 @@ inline Vector<DIM, T> Vector<DIM, T>::operator/(T2 a) const
Vector<DIM, T> res ;
T aa = T(a);
for (unsigned int i = 0; i < DIM; ++i)
res[i] = m_data[i] / T(a) ;
res[i] = m_data[i] / aa ;
return res ;
}
......
......@@ -31,4 +31,6 @@
#define CGoGN_TOPO_API __declspec(dllimport)
#endif
#endif
#endif
\ No newline at end of file
#else
#define CGoGN_TOPO_API
#endif
......@@ -23,6 +23,8 @@
*******************************************************************************/
#include "Utils/threadbarrier.h"
#include "Algo/Topo/embedding.h"
#include <vector>
......@@ -196,7 +198,6 @@ inline T& AttributeHandler<T, ORB, MAP>::operator[](Cell<ORB> c)
if (a == EMBNULL)
a = Algo::Topo::setOrbitEmbeddingOnNewCell(*m_map, c) ;
return m_attrib->operator[](a) ;
}
......
......@@ -22,6 +22,7 @@
* *
*******************************************************************************/
#include "Topology/generic/traversor/traversorFactory.h"
namespace CGoGN
{
......
......@@ -25,6 +25,12 @@
#ifndef __TRAVERSORFACTORY_H__
#define __TRAVERSORFACTORY_H__
#include "Topology/generic/traversor/traversor1Virt.h"
#include "Topology/generic/traversor/traversor2Virt.h"
#include "Topology/generic/traversor/traversor3Virt.h"
#include "Topology/generic/traversor/traversorCellVirt.h"
#include "Topology/generic/traversor/traversorDoO.h"
namespace CGoGN
{
......
......@@ -22,12 +22,6 @@
* *
*******************************************************************************/
#include "Topology/generic/traversor/traversor1Virt.h"
#include "Topology/generic/traversor/traversor2Virt.h"
#include "Topology/generic/traversor/traversor3Virt.h"
#include "Topology/generic/traversor/traversorCellVirt.h"
#include "Topology/generic/traversor/traversorDoO.h"
namespace CGoGN
{
......
......@@ -857,7 +857,7 @@ bool GMap3<MAP_IMPL>::isBoundaryAdjacentVolume(Dart d) const
for(unsigned int i = 0; i < visitedFaces.size(); ++i)
{
if (isBoundaryMarked<3>(beta3(visitedFaces[i])))
if (this->isBoundaryMarked<3>(beta3(visitedFaces[i])))
return true ;
Dart e = visitedFaces[i] ;
......
......@@ -46,6 +46,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } }
#else
#define CGoGN_UTILS_API __declspec(dllimport)
#endif
#else
#define CGoGN_UTILS_API
#endif
namespace CGoGN
......
......@@ -46,6 +46,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } }
#else
#define CGoGN_UTILS_API __declspec(dllimport)
#endif
#else
#define CGoGN_UTILS_API
#endif
namespace CGoGN
......
......@@ -47,6 +47,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } }
#define CGoGN_UTILS_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_UTILS_API
#endif
namespace CGoGN
......
......@@ -39,6 +39,8 @@
#else
#define CGoGN_UTILS_API __declspec(dllimport)
#endif
#else
#define CGoGN_UTILS_API
#endif
namespace CGoGN
......
......@@ -43,6 +43,8 @@
#else
#define CGoGN_UTILS_API __declspec(dllimport)
#endif
#else
#define CGoGN_UTILS_API
#endif
namespace CGoGN
......
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