nordugrid-arc.diff

diff --git a/src/hed/acc/JobDescriptionParser/ARCJSDLParser.cpp b/src/hed/acc/JobDescriptionParser/ARCJSDLParser.cpp
index eab7a58..78ace1a 100644
--- a/src/hed/acc/JobDescriptionParser/ARCJSDLParser.cpp
+++ b/src/hed/acc/JobDescriptionParser/ARCJSDLParser.cpp
@@ -225,7 +225,7 @@ namespace Arc {
     if (bool(xmlBenchmark["BenchmarkType"]) &&
         bool(xmlBenchmark["BenchmarkValue"]) &&
         stringto(xmlBenchmark["BenchmarkValue"], value))
-      benchmark = std::make_pair<std::string, int>((std::string)xmlBenchmark["BenchmarkType"], value);
+      benchmark = std::make_pair((std::string)xmlBenchmark["BenchmarkType"], value);
   }
 
   void ARCJSDLParser::outputBenchmark(const std::pair<std::string, double>& benchmark, XMLNode& arcJSDL) const {
diff --git a/src/hed/libs/common/UserConfig.cpp b/src/hed/libs/common/UserConfig.cpp
index 66af6cb..f53df8b 100644
--- a/src/hed/libs/common/UserConfig.cpp
+++ b/src/hed/libs/common/UserConfig.cpp
@@ -331,10 +331,10 @@ namespace Arc {
   bool UserConfig::Broker(const std::string& nameandarguments) {
     const std::size_t pos = nameandarguments.find(":");
     if (pos != std::string::npos) // Arguments given in 'nameandarguments'
-      broker = std::make_pair<std::string, std::string>(nameandarguments.substr(0, pos),
+      broker = std::make_pair(nameandarguments.substr(0, pos),
                                                         nameandarguments.substr(pos+1));
     else
-      broker = std::make_pair<std::string, std::string>(nameandarguments, "");
+      broker = std::make_pair(nameandarguments, "");
 
     return true;
   }
diff --git a/src/hed/libs/common/UserConfig.h b/src/hed/libs/common/UserConfig.h
index 5c01ba9..8b32fd1 100644
--- a/src/hed/libs/common/UserConfig.h
+++ b/src/hed/libs/common/UserConfig.h
@@ -601,7 +601,7 @@ namespace Arc {
      * @see Broker() const
      * @see DEFAULT_BROKER
      **/
-    bool Broker(const std::string& name, const std::string& argument) { broker = std::make_pair<std::string, std::string>(name, argument); return true;}
+    bool Broker(const std::string& name, const std::string& argument) { broker = std::make_pair(name, argument); return true;}
     /// Get the broker and corresponding arguments.
     /**
      * The returned pair contains the broker name as the first component