IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-25 18:30:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge Gwynn Ciesla's "Allow building with GCC 14.1" into stable.

Browse Source
This commit is contained in:
John Ralls 2024-05-09 17:28:35 -07:00
commit 579da58a10
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -510,7 +510,7 @@ if (WITH_PYTHON)
# Determine where to install the python libraries. # Determine where to install the python libraries.
execute_process( 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 RESULT_VARIABLE PYTHON_SYSCONFIG_RESULT
OUTPUT_VARIABLE PYTHON_SYSCONFIG_OUTPUT OUTPUT_VARIABLE PYTHON_SYSCONFIG_OUTPUT
ERROR_VARIABLE PYTHON_SYSCONFIG_ERROR ERROR_VARIABLE PYTHON_SYSCONFIG_ERROR

8
libgnucash/engine/gnc-option-impl.hpp
View File

@ -396,13 +396,13 @@ template <typename ValueType>
class GncOptionRangeValue : public OptionClassifier class GncOptionRangeValue : public OptionClassifier
{ {
public: public:
GncOptionRangeValue<ValueType>(const char* section, const char* name, GncOptionRangeValue(const char* section, const char* name,
const char* key, const char* doc_string, const char* key, const char* doc_string,
ValueType value, ValueType min, ValueType value, ValueType min,
ValueType max, ValueType step) : ValueType max, ValueType step) :
GncOptionRangeValue<ValueType>{section, name, key, doc_string, value, min, GncOptionRangeValue<ValueType>{section, name, key, doc_string, value, min,
max, step, GncOptionUIType::NUMBER_RANGE} {} 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, const char* key, const char* doc_string,
ValueType value, ValueType min, ValueType value, ValueType min,
ValueType max, ValueType step, GncOptionUIType ui) : ValueType max, ValueType step, GncOptionUIType ui) :
@ -412,8 +412,8 @@ public:
m_min{min}, m_max{max}, m_step{step} { m_min{min}, m_max{max}, m_step{step} {
if constexpr(is_same_decayed_v<ValueType, int>) if constexpr(is_same_decayed_v<ValueType, int>)
set_alternate(true);} set_alternate(true);}
GncOptionRangeValue<ValueType>(const GncOptionRangeValue<ValueType>&) = default; GncOptionRangeValue(const GncOptionRangeValue<ValueType>&) = default;
GncOptionRangeValue<ValueType>(GncOptionRangeValue<ValueType>&&) = default; GncOptionRangeValue(GncOptionRangeValue<ValueType>&&) = default;
GncOptionRangeValue<ValueType>& operator=(const GncOptionRangeValue<ValueType>&) = default; GncOptionRangeValue<ValueType>& operator=(const GncOptionRangeValue<ValueType>&) = default;
GncOptionRangeValue<ValueType>& operator=(GncOptionRangeValue<ValueType>&&) = default; GncOptionRangeValue<ValueType>& operator=(GncOptionRangeValue<ValueType>&&) = default;
ValueType get_value() const { return m_value; } ValueType get_value() const { return m_value; }