remove patch, add patch

old one included in 2.5.0 add new string patch
conda-forge · Oct 3, 2019 · 1c57555 · 1c57555
1 parent 5782d16
commit 1c57555
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 62 deletions.
diff --git a/recipe/0001-pyd-path-msvc.patch b/recipe/0001-pyd-path-msvc.patch
diff --git a/recipe/0001-string-compare.patch b/recipe/0001-string-compare.patch
@@ -0,0 +1,14 @@
+diff --git a/source/adios2/toolkit/query/JsonWorker.cpp b/source/adios2/toolkit/query/JsonWorker.cpp
+index 6af48587..d2657382 100644
+--- a/source/adios2/toolkit/query/JsonWorker.cpp
++++ b/source/adios2/toolkit/query/JsonWorker.cpp
+@@ -124,7 +124,7 @@ void JsonWorker::ParseJson()
+     }
+
+     auto ioO = jsonObj.find("io");
+-    auto ioName = (*ioO)["name"];
++    std::string const ioName = (*ioO)["name"];
+     if (m_SourceReader->m_IO.m_Name.compare(ioName) != 0)
+         throw std::ios_base::failure("invalid query io. Expecting io name = " +
+                                      m_SourceReader->m_IO.m_Name);
+
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -19,8 +19,8 @@ source:
   url: https://github.com/ornladios/ADIOS2/archive/v{{ version }}.tar.gz
   sha256: {{ sha256 }}
   patches:
-    # FIXME: https://github.com/ornladios/ADIOS2/pull/1593
-    - 0001-pyd-path-msvc.patch
+    # FIXME: https://github.com/ornladios/ADIOS2/pull/...
+    - 0001-string-compare.patch
 
 build:
   number: {{ build }}