Merge pull request #4378 from roystgnr/fix_no_exceptions_again

Fix `--disable-exceptions` builds

Author: jwpeterson

include/base/libmesh_exceptions.h

@@ -219,7 +219,7 @@ class TerminationException
 
 #else
 
-#define LIBMESH_THROW(e) do { libMesh::err << e.what(); libmesh_abort(); } while (0)
+#define LIBMESH_THROW(e) do { libMesh::err << e.what(); libMesh::libmesh_abort(); } while (0)
 #define libmesh_rethrow
 #define libmesh_try
 #define libmesh_catch(e) if (0)

src/base/libmesh.C

@@ -160,7 +160,9 @@ MPI_Comm           GLOBAL_COMM_WORLD = MPI_COMM_NULL;
 int                GLOBAL_COMM_WORLD = 0;
 #endif
 
+#ifdef LIBMESH_ENABLE_EXCEPTIONS
 std::terminate_handler LibMeshInit::_old_terminate_handler;
+#endif
 
 OStreamProxy out(std::cout);
 OStreamProxy err(std::cerr);