From 356723f1216a3efce2af348d7b623429eb4f0d52 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 11 Oct 2016 19:00:49 +0200
Subject: [PATCH] revert some unneeded changes on netgen plugin

---
 src/3rdParty/salomesmesh/inc/NETGENPlugin_Mesher.hxx   | 10 ++++------
 .../src/NETGENPlugin/NETGENPlugin_Mesher.cpp           |  3 ---
 .../src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp        |  2 --
 .../src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp   |  1 +
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/3rdParty/salomesmesh/inc/NETGENPlugin_Mesher.hxx b/src/3rdParty/salomesmesh/inc/NETGENPlugin_Mesher.hxx
index fa5e801ce..7e5664f99 100644
--- a/src/3rdParty/salomesmesh/inc/NETGENPlugin_Mesher.hxx
+++ b/src/3rdParty/salomesmesh/inc/NETGENPlugin_Mesher.hxx
@@ -39,8 +39,6 @@
 namespace nglib {
 #include <nglib.h>
 }
-#include <meshing.hpp>
-#include <occgeom.hpp>
 
 #include <map>
 #include <vector>
@@ -56,10 +54,10 @@ class TopoDS_Shape;
 class NETGENPlugin_Hypothesis;
 class NETGENPlugin_SimpleHypothesis_2D;
 class NETGENPlugin_Internals;
-// namespace netgen {
-//   class OCCGeometry;
-//   class Mesh;
-// }
+namespace netgen {
+  class OCCGeometry;
+  class Mesh;
+}
 //=============================================================================
 /*!
  * \brief Struct storing nb of entities in netgen mesh
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
index 765a9bcb9..bbcec0017 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
@@ -2460,8 +2460,6 @@ bool NETGENPlugin_Mesher::Compute()
   // -------------------------
 #if NETGEN_VERSION < 6
   _ngMesh = NULL;
-// #else
-//   _ngMesh = std::make_shared<netgen::Mesh>();
 #endif
   NETGENPlugin_ngMeshInfo initState; // it remembers size of ng mesh equal to size of Smesh
 
@@ -2647,7 +2645,6 @@ bool NETGENPlugin_Mesher::Compute()
       err = ( err || !comment.empty() );
 
 #if NETGEN_VERSION > 5
-      // nglib::Ng_DeleteMesh((nglib::Ng_Mesh*)tmpNgMesh.get());
       tmpNgMesh.reset();
 #else
       nglib::Ng_DeleteMesh((nglib::Ng_Mesh*)tmpNgMesh);
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp
index f1a6693ea..6e52d3ecc 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp
@@ -46,8 +46,6 @@ namespace nglib {
 }
 #include <meshing.hpp>
 
-#include <iostream>
-
 using namespace std;
 
 //=============================================================================
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
index a2221af54..1edf3fd36 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
@@ -235,6 +235,7 @@ bool NETGENPlugin_NETGEN_2D_ONLY::Compute(SMESH_Mesh&         aMesh,
 {
   netgen::multithread.terminate = 0;
   //netgen::multithread.task = "Surface meshing";
+
   SMESHDS_Mesh* meshDS = aMesh.GetMeshDS();
   SMESH_MesherHelper helper(aMesh);
   helper.SetElementsOnShape( true );