mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-11 04:17:15 +02:00
conflict merge fix
This commit is contained in:
@ -12,7 +12,7 @@ import subprocess
|
||||
from parse import remove_comments
|
||||
|
||||
allow_bitwise_op = ["M3_GainCaps"]
|
||||
allow_bitwise_op = ["EthernetInterface"]
|
||||
allow_bitwise_op = ["ethernetInterface"]
|
||||
|
||||
op_key = {"operator|": "__or__",
|
||||
"operator&" : "__and__"}
|
||||
@ -23,7 +23,7 @@ def single_line_enum(line):
|
||||
|
||||
def extract_enums(lines):
|
||||
|
||||
# deal with enum class EthernetInterface : int32_t
|
||||
# deal with enum class ethernetInterface : int32_t
|
||||
# and normal enum burstMode {
|
||||
|
||||
line_iter = iter(lines)
|
||||
@ -90,7 +90,7 @@ def generate_enum_string(enums):
|
||||
|
||||
#Here add the operators
|
||||
for op in operators:
|
||||
data.append(f"\n\t.def(\"{op_key[op]}\", py::overload_cast< const slsDetectorDefs::EthernetInterface&, const slsDetectorDefs::EthernetInterface&>(&{op}))")
|
||||
data.append(f"\n\t.def(\"{op_key[op]}\", py::overload_cast< const slsDetectorDefs::ethernetInterface&, const slsDetectorDefs::ethernetInterface&>(&{op}))")
|
||||
|
||||
|
||||
data.append(';\n\n')
|
||||
|
Reference in New Issue
Block a user