Unverified Commit 7b7d10bf authored by Mccaskey, Alex's avatar Mccaskey, Alex Committed by GitHub
Browse files

Merge pull request #490 from tnguyen-ornl/tnguyen/add-header-include-gcc-11

Added some missing headers for GCC 11 compatibility
parents cf31eeeb 9fbb9607
Pipeline #170826 passed with stage
in 12 minutes and 54 seconds
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "xacc.hpp" #include "xacc.hpp"
#include "xacc_service.hpp" #include "xacc_service.hpp"
#include <cassert> #include <cassert>
#include <optional>
using namespace xacc; using namespace xacc;
namespace { namespace {
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <stdexcept> #include <stdexcept>
#include <regex> #include <regex>
#include <optional>
namespace xacc { namespace xacc {
namespace ibm_pulse { namespace ibm_pulse {
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <stdexcept> #include <stdexcept>
#include <regex> #include <regex>
#include <unordered_map> #include <unordered_map>
#include <optional>
#ifndef NLOHMANN_OPT_HELPER #ifndef NLOHMANN_OPT_HELPER
#define NLOHMANN_OPT_HELPER #define NLOHMANN_OPT_HELPER
namespace nlohmann { namespace nlohmann {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "xacc_service.hpp" #include "xacc_service.hpp"
#include <bitset> #include <bitset>
#include <optional>
#include "QObjGenerator.hpp" #include "QObjGenerator.hpp"
#include "py-aer/aer_python_adapter.hpp" #include "py-aer/aer_python_adapter.hpp"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "GateMergeOptimizer.hpp" #include "GateMergeOptimizer.hpp"
#include "GateFusion.hpp" #include "GateFusion.hpp"
#include "xacc_service.hpp" #include "xacc_service.hpp"
#include <optional>
namespace { namespace {
bool compareMatIgnoreGlobalPhase(const Eigen::Matrix4cd& in_a, const Eigen::Matrix4cd& in_b) bool compareMatIgnoreGlobalPhase(const Eigen::Matrix4cd& in_a, const Eigen::Matrix4cd& in_b)
{ {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "xacc_plugin.hpp" #include "xacc_plugin.hpp"
#include "IRUtils.hpp" #include "IRUtils.hpp"
#include <cassert> #include <cassert>
#include <optional>
namespace { namespace {
inline bool isMeasureGate(const xacc::InstPtr &in_instr) { inline bool isMeasureGate(const xacc::InstPtr &in_instr) {
return (in_instr->name() == "Measure"); return (in_instr->name() == "Measure");
......
Subproject commit 4b9b4c57c969b07eeabe92eef4f25b355e8083ce Subproject commit 3dfb92faa2bd8e281d2ca85acccdf7eb93b9a442
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "Cloneable.hpp" #include "Cloneable.hpp"
#include "InstructionVisitor.hpp" #include "InstructionVisitor.hpp"
#include "heterogeneous.hpp" #include "heterogeneous.hpp"
#include <limits>
namespace xacc { namespace xacc {
using InstructionParameter = Variant<int, double, std::string>; using InstructionParameter = Variant<int, double, std::string>;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment