ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-24 21:10:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into boundarylayer

Browse Source
This commit is contained in:
Christopher Lackner 2020-04-20 10:38:24 +02:00
commit 7fe4ca9c4f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/core/utils.hpp
View File

@ -23,6 +23,10 @@ namespace ngcore
NGCORE_API std::string Demangle(const char* typeinfo); NGCORE_API std::string Demangle(const char* typeinfo);
template<typename T>
std::string GetName(const T& obj)
{ return Demangle(typeid(obj).name()); }
#if defined(__GNUC__) #if defined(__GNUC__)
inline bool likely (bool x) { return bool(__builtin_expect(long(x), 1L)); } inline bool likely (bool x) { return bool(__builtin_expect(long(x), 1L)); }
inline bool unlikely (bool x) { return bool(__builtin_expect(long(x), 0L)); } inline bool unlikely (bool x) { return bool(__builtin_expect(long(x), 0L)); }

3
libsrc/occ/occpkg.cpp
View File

@ -519,7 +519,8 @@ namespace netgen
stringstream str; stringstream str;
occgeometry->GetTopologyTree (str); occgeometry->GetTopologyTree (str);
char* cstr = (char*)str.str().c_str(); auto txt = str.str();
char* cstr = (char*) txt.c_str();
(*testout) << cstr << endl; (*testout) << cstr << endl;