mirror of
https://github.com/NGSolve/netgen.git
synced 2025-05-25 03:30:49 +05:00
small fixes to build with VS 2022
This commit is contained in:
parent
31d55962cf
commit
0df91284bf
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,3 +9,4 @@ __pycache__
|
||||
*.zip
|
||||
.cache
|
||||
*.patch
|
||||
.vscode/
|
@ -25,12 +25,12 @@ option( USE_GEOM2D "build 2d geometry kernels" ON)
|
||||
option( USE_JPEG "enable snapshots using library libjpeg" OFF )
|
||||
option( USE_MPEG "enable video recording with FFmpeg, uses libavcodec" OFF )
|
||||
option( USE_CGNS "enable CGNS file read/write support" OFF )
|
||||
option( USE_NUMA "compile with NUMA-aware code")
|
||||
option( INTEL_MIC "cross compile for intel xeon phi")
|
||||
option( USE_NUMA "compile with NUMA-aware code" OFF)
|
||||
option( INTEL_MIC "cross compile for intel xeon phi" OFF)
|
||||
option( INSTALL_PROFILES "install environment variable settings to /etc/profile.d" OFF )
|
||||
option( USE_CCACHE "use ccache")
|
||||
option( USE_CCACHE "use ccache" OFF)
|
||||
option( USE_INTERNAL_TCL "Compile tcl files into the code and don't install them" ON)
|
||||
option( ENABLE_UNIT_TESTS "Enable Catch unit tests")
|
||||
option( ENABLE_UNIT_TESTS "Enable Catch unit tests" OFF)
|
||||
option( ENABLE_CPP_CORE_GUIDELINES_CHECK "Enable cpp core guideline checks on ngcore" OFF)
|
||||
option( DEBUG_LOG "Enable more debug output (may increase computation time) - only works with USE_SPDLOG=ON" OFF)
|
||||
option( CHECK_RANGE "Check array range access, automatically enabled if built in debug mode" OFF)
|
||||
|
@ -226,7 +226,7 @@ private:
|
||||
|
||||
bool operator[] (IndexType i) const { return Test(i); }
|
||||
T_Range<IndexType> Range() const { return { IndexBASE<IndexType>(), IndexBASE<IndexType>()+Size() }; }
|
||||
NGCORE_API TBitArray & Or (const TBitArray & ba2)
|
||||
inline TBitArray & Or (const TBitArray & ba2)
|
||||
{
|
||||
BitArray::Or(ba2);
|
||||
return *this;
|
||||
|
@ -52,8 +52,8 @@ namespace ngcore
|
||||
*/
|
||||
std::string CleanupDemangledName( std::string s )
|
||||
{
|
||||
for(const auto & [r, sub] : demangle_regexes)
|
||||
s = std::regex_replace (s,r,sub);
|
||||
// for(const auto & [r, sub] : demangle_regexes)
|
||||
// s = std::regex_replace (s,r,sub);
|
||||
#ifdef EMSCRIPTEN
|
||||
// for some reason regex_replace is not working at all
|
||||
std::string temp = s;
|
||||
|
@ -17,7 +17,6 @@
|
||||
#include <stlgeom.hpp>
|
||||
#include <geometry2d.hpp>
|
||||
#include <meshing.hpp>
|
||||
#include <../visualization/soldata.hpp>
|
||||
|
||||
#ifdef OCCGEOMETRY
|
||||
#include <occgeom.hpp>
|
||||
@ -31,9 +30,7 @@ namespace netgen {
|
||||
shared_ptr<Mesh> & mesh,
|
||||
MeshingParameters & mp);
|
||||
|
||||
extern void Optimize2d (Mesh & mesh,
|
||||
MeshingParameters & mp);
|
||||
|
||||
extern void Optimize2d(Mesh & mesh, MeshingParameters & mp, int faceindex=0);
|
||||
// Global meshing parameters !!
|
||||
//MeshingParameters mparam;
|
||||
}
|
||||
@ -615,8 +612,7 @@ namespace nglib
|
||||
}
|
||||
|
||||
|
||||
DLL_HEADER Ng_Result Ng_OptimizeMesh_2D (Ng_Mesh *mesh,
|
||||
Ng_Meshing_Parameters * mp)
|
||||
DLL_HEADER Ng_Result Ng_OptimizeMesh_2D (Ng_Mesh *mesh, Ng_Meshing_Parameters * mp)
|
||||
{
|
||||
Mesh * m = (Mesh*)mesh;
|
||||
|
||||
|
@ -25,7 +25,7 @@ namespace netgen {
|
||||
extern void MeshFromSpline2D (SplineGeometry2d & geometry,
|
||||
shared_ptr<Mesh> & mesh,
|
||||
MeshingParameters & mp);
|
||||
extern void Optimize2d(Mesh & mesh, MeshingParameters & mp);
|
||||
extern void Optimize2d(Mesh & mesh, MeshingParameters & mp, int faceindex=0);
|
||||
extern MeshingParameters mparam;
|
||||
DLL_HEADER extern STLParameters stlparam;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user