diff options
Diffstat (limited to 'math/moab/files')
-rw-r--r-- | math/moab/files/patch-configure.ac | 12 | ||||
-rw-r--r-- | math/moab/files/patch-src_io_NCHelper.cpp | 11 | ||||
-rw-r--r-- | math/moab/files/patch-src_io_ReadABAQUS.cpp | 11 | ||||
-rw-r--r-- | math/moab/files/patch-src_io_WriteNCDF.cpp | 8 |
4 files changed, 4 insertions, 38 deletions
diff --git a/math/moab/files/patch-configure.ac b/math/moab/files/patch-configure.ac deleted file mode 100644 index 6d6a7718c8fe..000000000000 --- a/math/moab/files/patch-configure.ac +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.ac.orig 2018-11-05 00:30:52 UTC -+++ configure.ac -@@ -31,7 +31,8 @@ LIBS="$LIBS -lm" - - AC_PROG_LN_S - AC_PROG_MAKE_SET --AC_DISABLE_SHARED -+AC_ENABLE_SHARED -+AC_DISABLE_STATIC - AC_PROG_LIBTOOL - FATHOM_COMPILER_FLAGS - m4_ifdef([AM_SILENT_RULES],[ diff --git a/math/moab/files/patch-src_io_NCHelper.cpp b/math/moab/files/patch-src_io_NCHelper.cpp deleted file mode 100644 index 1a00dedf38c6..000000000000 --- a/math/moab/files/patch-src_io_NCHelper.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/io/NCHelper.cpp.orig 2018-11-05 01:48:41 UTC -+++ src/io/NCHelper.cpp -@@ -714,7 +714,7 @@ ErrorCode NCHelper::get_tag_to_set(ReadN - rval = mbImpl->tag_get_handle(tag_name.str().c_str(), 0, MB_TYPE_INTEGER, tagh, MB_TAG_CREAT | MB_TAG_SPARSE | MB_TAG_VARLEN); - break; - default: -- std::cerr << "Unrecognized data type for tag " << tag_name << std::endl; -+ std::cerr << "Unrecognized data type for tag " << tag_name.str() << std::endl; - rval = MB_FAILURE; - } - diff --git a/math/moab/files/patch-src_io_ReadABAQUS.cpp b/math/moab/files/patch-src_io_ReadABAQUS.cpp deleted file mode 100644 index 335fd11e5769..000000000000 --- a/math/moab/files/patch-src_io_ReadABAQUS.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/io/ReadABAQUS.cpp.orig 2018-11-04 23:41:08 UTC -+++ src/io/ReadABAQUS.cpp -@@ -105,7 +105,7 @@ void ReadABAQUS::reset() - ReadABAQUS::~ReadABAQUS() - { - mdbImpl->release_interface(readMeshIface); -- if (NULL != abFile) -+ if (abFile.is_open()) - abFile.close(); - } - diff --git a/math/moab/files/patch-src_io_WriteNCDF.cpp b/math/moab/files/patch-src_io_WriteNCDF.cpp index 36e804036893..8c91cad073bb 100644 --- a/math/moab/files/patch-src_io_WriteNCDF.cpp +++ b/math/moab/files/patch-src_io_WriteNCDF.cpp @@ -1,13 +1,13 @@ ---- src/io/WriteNCDF.cpp.orig 2018-11-05 01:47:40 UTC +--- src/io/WriteNCDF.cpp.orig 2018-11-23 06:26:09 UTC +++ src/io/WriteNCDF.cpp -@@ -154,8 +154,8 @@ void WriteNCDF::time_and_date(char* time +@@ -161,8 +161,8 @@ void WriteNCDF::time_and_date(char* time strftime(date_string, TIME_STR_LEN, "%m/%d/%Y", local_time); - // terminate with NULL character + // Terminate with NULL character - time_string[10] = (char)NULL; - date_string[10] = (char)NULL; + time_string[10] = (char)0; + date_string[10] = (char)0; } - ErrorCode WriteNCDF::write_file(const char *exodus_file_name, + ErrorCode WriteNCDF::write_file(const char *exodus_file_name, |