Merge pull request #118 from TimoFischer/develop

Develop
bgrimstad · Feb 23, 2019 · da6ac4f · da6ac4f
2 parents 82fcd1b + 8b27508
commit da6ac4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/include/json_parser.h b/include/json_parser.h
@@ -10,7 +10,7 @@
 #ifndef SPLINTER_JSON_PARSER_H
 #define SPLINTER_JSON_PARSER_H
 
-#include "json.h"
+#include <string>
 
 namespace SPLINTER
 {

diff --git a/src/json_parser.cpp b/src/json_parser.cpp
@@ -8,6 +8,7 @@
 */
 
 #include "json_parser.h"
+#include "json.h"
 #include "bspline.h"
 #include "data_table.h"
 #include "utilities.h"