mirror of
https://github.com/NGSolve/netgen.git
synced 2024-12-26 13:50:33 +05:00
Merge branch 'dont_include_zlib_h_everywhere' into 'master'
include gzsteram.h only where needed See merge request jschoeberl/netgen!440
This commit is contained in:
commit
93be5b1251
@ -4,6 +4,7 @@
|
|||||||
#include <core/python_ngcore.hpp>
|
#include <core/python_ngcore.hpp>
|
||||||
#include <csg.hpp>
|
#include <csg.hpp>
|
||||||
#include "../meshing/python_mesh.hpp"
|
#include "../meshing/python_mesh.hpp"
|
||||||
|
#include "../general/gzstream.h"
|
||||||
|
|
||||||
|
|
||||||
using namespace netgen;
|
using namespace netgen;
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
#include <mystdlib.h>
|
#include <mystdlib.h>
|
||||||
#include <myadt.hpp>
|
#include <myadt.hpp>
|
||||||
//#include "gzstream.h"
|
#include "gzstream.h"
|
||||||
//#include <iostream>
|
//#include <iostream>
|
||||||
//#include <string.h> // for memcpy
|
//#include <string.h> // for memcpy
|
||||||
|
|
||||||
|
@ -45,7 +45,6 @@ namespace netgen
|
|||||||
|
|
||||||
#include "mpi_interface.hpp"
|
#include "mpi_interface.hpp"
|
||||||
#include "netgenout.hpp"
|
#include "netgenout.hpp"
|
||||||
#include "gzstream.h"
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -8,6 +8,8 @@
|
|||||||
#include "../sockets/sockets.hpp"
|
#include "../sockets/sockets.hpp"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "../general/gzstream.h"
|
||||||
|
|
||||||
#include "nginterface.h"
|
#include "nginterface.h"
|
||||||
// #include "../visualization/soldata.hpp"
|
// #include "../visualization/soldata.hpp"
|
||||||
// #include <visual.hpp>
|
// #include <visual.hpp>
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
#include <meshing.hpp>
|
#include <meshing.hpp>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
|
#include "../general/gzstream.h"
|
||||||
|
|
||||||
namespace netgen
|
namespace netgen
|
||||||
{
|
{
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
#include <meshing.hpp>
|
#include <meshing.hpp>
|
||||||
|
|
||||||
#include "writeuser.hpp"
|
#include "writeuser.hpp"
|
||||||
|
#include "../general/gzstream.h"
|
||||||
|
|
||||||
|
|
||||||
namespace netgen
|
namespace netgen
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include "meshing.hpp"
|
#include "meshing.hpp"
|
||||||
|
#include "../general/gzstream.h"
|
||||||
|
|
||||||
#ifdef NG_PYTHON
|
#ifdef NG_PYTHON
|
||||||
// must be included to instantiate Archive::Shallow(NetgenGeometry&)
|
// must be included to instantiate Archive::Shallow(NetgenGeometry&)
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
// #include <geometry2d.hpp>
|
// #include <geometry2d.hpp>
|
||||||
#include <../interface/writeuser.hpp>
|
#include <../interface/writeuser.hpp>
|
||||||
#include <../include/nginterface.h>
|
#include <../include/nginterface.h>
|
||||||
|
#include <../general/gzstream.h>
|
||||||
|
|
||||||
|
|
||||||
class ClearSolutionClass
|
class ClearSolutionClass
|
||||||
|
@ -22,6 +22,8 @@ The interface between the GUI and the netgen library
|
|||||||
#include "../libsrc/sockets/socketmanager.hpp"
|
#include "../libsrc/sockets/socketmanager.hpp"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "../libsrc/general/gzstream.h"
|
||||||
|
|
||||||
|
|
||||||
// to be sure to include the 'right' togl-version
|
// to be sure to include the 'right' togl-version
|
||||||
#include "Togl2.1/togl.h"
|
#include "Togl2.1/togl.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user