valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Merge branch 'svn/trunk' r4333

Browse source 
Conflict resolutions required some algorithm adjustments.
This commit is contained in:
Patryk Obara 2020-02-25 10:07:58 +01:00
commit 5e41eaf150
6 changed files with 108 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/setup.h
View file

@ -89,7 +89,7 @@ public:
Value& operator= (char const * const in) { return copy(Value(in));}
Value& operator= (Value const& in) { return copy(Value(in));}
bool operator== (Value const & other);
bool operator== (Value const & other) const;
operator bool () const;
operator Hex () const;
operator int () const;
@ -144,7 +144,7 @@ protected:
}
Value value;
std::vector<Value> suggested_values;
typedef std::vector<Value>::iterator iter;
typedef std::vector<Value>::const_iterator const_iter;
Value default_value;
const Changeable::Value change;
};