Ensure __STDC_LIMIT_MACROS is defined before the CGAL headers are included
Additional resolution of bug-report http://www.openfoam.org/mantisbt/view.php?id=1474
This commit is contained in:
@ -2,7 +2,7 @@
|
|||||||
========= |
|
========= |
|
||||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||||
\\ / O peration |
|
\\ / O peration |
|
||||||
\\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation |
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
@ -41,8 +41,9 @@ SourceFiles
|
|||||||
#ifndef conformalVoronoiMesh_H
|
#ifndef conformalVoronoiMesh_H
|
||||||
#define conformalVoronoiMesh_H
|
#define conformalVoronoiMesh_H
|
||||||
|
|
||||||
#include "CGALTriangulation3Ddefs.H"
|
// Include uint.H before CGAL headers to define __STDC_LIMIT_MACROS
|
||||||
#include "uint.H"
|
#include "uint.H"
|
||||||
|
#include "CGALTriangulation3Ddefs.H"
|
||||||
#include "searchableSurfaces.H"
|
#include "searchableSurfaces.H"
|
||||||
#include "conformationSurfaces.H"
|
#include "conformationSurfaces.H"
|
||||||
#include "cellShapeControl.H"
|
#include "cellShapeControl.H"
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
========= |
|
========= |
|
||||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||||
\\ / O peration |
|
\\ / O peration |
|
||||||
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation |
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
@ -39,6 +39,8 @@ SourceFiles
|
|||||||
#ifndef featurePointConformer_H
|
#ifndef featurePointConformer_H
|
||||||
#define featurePointConformer_H
|
#define featurePointConformer_H
|
||||||
|
|
||||||
|
// Include uint.H before CGAL headers to define __STDC_LIMIT_MACROS
|
||||||
|
#include "uint.H"
|
||||||
#include "CGALTriangulation3Ddefs.H"
|
#include "CGALTriangulation3Ddefs.H"
|
||||||
#include "vector.H"
|
#include "vector.H"
|
||||||
#include "DynamicList.H"
|
#include "DynamicList.H"
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
========= |
|
========= |
|
||||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||||
\\ / O peration |
|
\\ / O peration |
|
||||||
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
|
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
|
||||||
\\/ M anipulation |
|
\\/ M anipulation |
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
License
|
License
|
||||||
@ -117,8 +117,9 @@ SourceFiles
|
|||||||
#define CGAL_INEXACT
|
#define CGAL_INEXACT
|
||||||
#define CGAL_HIERARCHY
|
#define CGAL_HIERARCHY
|
||||||
|
|
||||||
|
// Include uint.H before CGAL headers to define __STDC_LIMIT_MACROS
|
||||||
|
#include "uint.H"
|
||||||
#include "CGALTriangulation2Ddefs.H"
|
#include "CGALTriangulation2Ddefs.H"
|
||||||
|
|
||||||
#include "Time.H"
|
#include "Time.H"
|
||||||
#include "point2DFieldFwd.H"
|
#include "point2DFieldFwd.H"
|
||||||
#include "dictionary.H"
|
#include "dictionary.H"
|
||||||
|
|||||||
Reference in New Issue
Block a user