scnc
/
qiskit-aer
mirror of https://github.com/Qiskit/qiskit-aer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

For https://github.com/Qiskit/qiskit-aer/issues/1905 and https://gith… (#1907) 

* For https://github.com/Qiskit/qiskit-aer/issues/1905 and https://github.com/Qiskit/qiskit-aer/issues/1906

* formatting

* Hopefully clang likes it now

* Now with clang run on it, hopefully it's fine.

* Removed prelude section in release note

* Removed prelude section in release notes
This commit is contained in:
Adrian Roman 2023-09-04 05:20:30 +03:00 committed by GitHub
parent f9a6691269
commit 1819ffdb0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/conan.cmake
View File

@ -55,6 +55,8 @@ function(_get_msvc_ide_version result)
set(${result} 15 PARENT_SCOPE) set(${result} 15 PARENT_SCOPE)
elseif(NOT MSVC_VERSION VERSION_LESS 1920 AND MSVC_VERSION VERSION_LESS 1930) elseif(NOT MSVC_VERSION VERSION_LESS 1920 AND MSVC_VERSION VERSION_LESS 1930)
set(${result} 16 PARENT_SCOPE) set(${result} 16 PARENT_SCOPE)
elseif(NOT MSVC_VERSION VERSION_LESS 1930 AND MSVC_VERSION VERSION_LESS 1940)
set(${result} 17 PARENT_SCOPE)
else() else()
message(FATAL_ERROR "Conan: Unknown MSVC compiler version [${MSVC_VERSION}]") message(FATAL_ERROR "Conan: Unknown MSVC compiler version [${MSVC_VERSION}]")
endif() endif()

11
releasenotes/notes/latest-vc++-compilation-fixes-555601315e7e821b.yaml Normal file
View File

@ -0,0 +1,11 @@
---
fixes:
- |
Adresses two opened issues, one about replacing a char* parameter to a
const char*, another one for adding support for the latest vc++ in
conan.cmake
Changes:
Passing const char* to a char* parameter in CacheBlocking::insert_sim_op call: #1905
https://github.com/Qiskit/qiskit-aer/issues/1905
Add support for the latest VC++ in conan.cmake #1906:
https://github.com/Qiskit/qiskit-aer/issues/1906

7
src/transpile/cacheblocking.hpp
View File

@ -98,8 +98,9 @@ protected:
void insert_swap(std::vector<Operations::Op> &ops, uint_t bit0, uint_t bit1, void insert_swap(std::vector<Operations::Op> &ops, uint_t bit0, uint_t bit1,
bool chunk) const; bool chunk) const;
void insert_sim_op(std::vector<Operations::Op> &ops, char *name, void insert_sim_op(std::vector<Operations::Op> &ops, const char *name,
const reg_t &qubits) const; const reg_t &qubits) const;
void insert_pauli(std::vector<Operations::Op> &ops, reg_t &qubits, void insert_pauli(std::vector<Operations::Op> &ops, reg_t &qubits,
std::string &pauli) const; std::string &pauli) const;
@ -192,8 +193,8 @@ void CacheBlocking::insert_swap(std::vector<Operations::Op> &ops, uint_t bit0,
ops.push_back(sgate); ops.push_back(sgate);
} }
void CacheBlocking::insert_sim_op(std::vector<Operations::Op> &ops, char *name, void CacheBlocking::insert_sim_op(std::vector<Operations::Op> &ops,
const reg_t &qubits) const { const char *name, const reg_t &qubits) const {
Operations::Op op; Operations::Op op;
op.type = Operations::OpType::sim_op; op.type = Operations::OpType::sim_op;
op.name = name; op.name = name;