Fix for the BG/Q Clang compilers. Also, PGI's handling of Rapidjson (#157)

* Fix for the BG/Q Clang compilers

* Fix for PGI

Author: DavidPoliakoff

src/caliper/cali.cpp

@@ -649,6 +649,39 @@ struct _cali_configset_t {
     std::map<std::string, std::string> cfgset;
 };
 
+
+/**
+ *
+ * When the BG/Q machines die at LLNL, we can delete these.
+ * They exist because BG/Q had Clang compilers that *mostly*
+ * supported C++11, except for features like std::vector<T>::emplace.
+ */
+
+template<typename Container, typename = void>
+struct emplace_helper{
+    template<typename Emplaced>
+    static void emplace(Container& emplace_into, Emplaced object){
+        emplace_into.insert(object);
+    }
+};
+
+template<typename Container>
+struct emplace_helper<
+   Container,
+   typename std::enable_if<
+       std::is_same<
+           decltype(std::declval<Container>().emplace(std::make_pair("",""))),
+           decltype(std::declval<Container>().emplace(std::make_pair("","")))
+       >::value
+       , void
+   >::type 
+> {
+    template<typename Emplaced>
+    static void emplace(Container& emplace_into, Emplaced&& object){
+        emplace_into.emplace(object);
+    }
+};
+
 cali_configset_t
 cali_create_configset(const char* keyvallist[][2])
 {
@@ -657,9 +690,10 @@ cali_create_configset(const char* keyvallist[][2])
     if (!keyvallist)
         return cfg;
 
-    for ( ; (*keyvallist)[0] && (*keyvallist)[1]; ++keyvallist)
-        cfg->cfgset.emplace( std::make_pair(std::string((*keyvallist)[0]),
+    for ( ; (*keyvallist)[0] && (*keyvallist)[1]; ++keyvallist){
+        emplace_helper<decltype(cfg->cfgset)>::emplace( cfg->cfgset, std::make_pair(std::string((*keyvallist)[0]),
                                             std::string((*keyvallist)[1])) );
+    }
 
     return cfg;
 }

src/services/spot/Spot.cpp

@@ -36,6 +36,7 @@
 
 #include "caliper/CaliperService.h"
 
+#include "caliper/caliper-config.h"
 #include "caliper/Caliper.h"
 #include "caliper/SnapshotRecord.h"
 
@@ -49,12 +50,17 @@
 #include "caliper/common/OutputStream.h"
 #include "caliper/common/RuntimeConfig.h"
 #include "caliper/common/util/split.hpp"
-
+#ifdef CALIPER_REDUCED_CONSTEXPR_USAGE
+#define OLD_GNUC __GNUC__
+#undef __GNUC__
+#endif
 #include "rapidjson/rapidjson.h"
 #include "rapidjson/document.h"
 #include "rapidjson/ostreamwrapper.h"
 #include "rapidjson/writer.h"
-
+#ifdef CALIPER_REDUCED_CONSTEXPR_USAGE
+#define __GNUC_ OLD_GNUC
+#endif
 #include <iostream>
 #include <sstream>
 #include <iterator>