Fix compilation issues for PGI compiler (#81)

* Avoid shadowing issues with class "value" (PGI compiler only) * Add workaround for PGI compiler
skystrife · Aug 21, 2018 · fb39c14 · fb39c14
1 parent b0f1b58
commit fb39c14
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/include/cpptoml.h b/include/cpptoml.h
@@ -1962,7 +1962,12 @@ class parser
 
             if (curr_table->contains(part))
             {
+#if !defined(__PGI)
                 auto b = curr_table->get(part);
+#else
+                // Workaround for PGI compiler
+                std::shared_ptr<base> b = curr_table->get(part);
+#endif
                 if (b->is_table())
                     curr_table = static_cast<table*>(b.get());
                 else if (b->is_table_array())
@@ -2044,7 +2049,12 @@ class parser
 
             if (curr_table->contains(part))
             {
+#if !defined(__PGI)
                 auto b = curr_table->get(part);
+#else
+                // Workaround for PGI compiler
+                std::shared_ptr<base> b = curr_table->get(part);
+#endif
 
                 // if this is the end of the table array name, add an
                 // element to the table array that we just looked up,
@@ -3030,9 +3040,9 @@ class parser
         auto arr = make_array();
         while (it != end && *it != ']')
         {
-            auto value = parse_value(it, end);
-            if (auto v = value->as<Value>())
-                arr->get().push_back(value);
+            auto val = parse_value(it, end);
+            if (auto v = val->as<Value>())
+                arr->get().push_back(val);
             else
                 throw_parse_exception("Arrays must be homogeneous");
             skip_whitespace_and_comments(it, end);