mirror of
https://github.com/Gnucash/gnucash.git
synced 2024-11-25 18:30:23 -06:00
Merge Gwynn Ciesla's "Allow building with GCC 14.1" into stable.
This commit is contained in:
commit
579da58a10
@ -510,7 +510,7 @@ if (WITH_PYTHON)
|
||||
|
||||
# Determine where to install the python libraries.
|
||||
execute_process(
|
||||
COMMAND ${Python3_EXECUTABLE} -c "from sysconfig import get_path; print(get_path('platlib', 'posix_user', {'userbase': '${CMAKE_INSTALL_PREFIX}'}))"
|
||||
COMMAND ${Python3_EXECUTABLE} -c "from sysconfig import get_path; print(get_path('platlib', 'posix_prefix', {'platbase': '${CMAKE_INSTALL_PREFIX}'}))"
|
||||
RESULT_VARIABLE PYTHON_SYSCONFIG_RESULT
|
||||
OUTPUT_VARIABLE PYTHON_SYSCONFIG_OUTPUT
|
||||
ERROR_VARIABLE PYTHON_SYSCONFIG_ERROR
|
||||
|
@ -396,13 +396,13 @@ template <typename ValueType>
|
||||
class GncOptionRangeValue : public OptionClassifier
|
||||
{
|
||||
public:
|
||||
GncOptionRangeValue<ValueType>(const char* section, const char* name,
|
||||
GncOptionRangeValue(const char* section, const char* name,
|
||||
const char* key, const char* doc_string,
|
||||
ValueType value, ValueType min,
|
||||
ValueType max, ValueType step) :
|
||||
GncOptionRangeValue<ValueType>{section, name, key, doc_string, value, min,
|
||||
max, step, GncOptionUIType::NUMBER_RANGE} {}
|
||||
GncOptionRangeValue<ValueType>(const char* section, const char* name,
|
||||
GncOptionRangeValue(const char* section, const char* name,
|
||||
const char* key, const char* doc_string,
|
||||
ValueType value, ValueType min,
|
||||
ValueType max, ValueType step, GncOptionUIType ui) :
|
||||
@ -412,8 +412,8 @@ public:
|
||||
m_min{min}, m_max{max}, m_step{step} {
|
||||
if constexpr(is_same_decayed_v<ValueType, int>)
|
||||
set_alternate(true);}
|
||||
GncOptionRangeValue<ValueType>(const GncOptionRangeValue<ValueType>&) = default;
|
||||
GncOptionRangeValue<ValueType>(GncOptionRangeValue<ValueType>&&) = default;
|
||||
GncOptionRangeValue(const GncOptionRangeValue<ValueType>&) = default;
|
||||
GncOptionRangeValue(GncOptionRangeValue<ValueType>&&) = default;
|
||||
GncOptionRangeValue<ValueType>& operator=(const GncOptionRangeValue<ValueType>&) = default;
|
||||
GncOptionRangeValue<ValueType>& operator=(GncOptionRangeValue<ValueType>&&) = default;
|
||||
ValueType get_value() const { return m_value; }
|
||||
|
Loading…
Reference in New Issue
Block a user