peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 20:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed signed/unsigned mismatch with the new precision code

Browse Source
This commit is contained in:
Jesse Beder
2012-01-11 16:50:06 -06:00
parent 0e61ddb6d9
commit 7ace0e93d2
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/yaml-cpp/emittermanip.h
View File

@@ -143,15 +143,15 @@ namespace YAML
int doublePrecision; int doublePrecision;
}; };
inline _Precision FloatPrecision(unsigned n) { inline _Precision FloatPrecision(int n) {
return _Precision(n, -1); return _Precision(n, -1);
} }
inline _Precision DoublePrecision(unsigned n) { inline _Precision DoublePrecision(int n) {
return _Precision(-1, n); return _Precision(-1, n);
} }
inline _Precision Precision(unsigned n) { inline _Precision Precision(int n) {
return _Precision(n, n); return _Precision(n, n);
} }
} }

8
src/emitterstate.cpp
View File

@@ -265,17 +265,17 @@ namespace YAML
} }
} }
bool EmitterState::SetFloatPrecision(unsigned value, FMT_SCOPE scope) bool EmitterState::SetFloatPrecision(int value, FMT_SCOPE scope)
{ {
if(value > std::numeric_limits<float>::digits10) if(value < 0 || value > std::numeric_limits<float>::digits10)
return false; return false;
_Set(m_floatPrecision, value, scope); _Set(m_floatPrecision, value, scope);
return true; return true;
} }
bool EmitterState::SetDoublePrecision(unsigned value, FMT_SCOPE scope) bool EmitterState::SetDoublePrecision(int value, FMT_SCOPE scope)
{ {
if(value > std::numeric_limits<double>::digits10) if(value < 0 || value > std::numeric_limits<double>::digits10)
return false; return false;
_Set(m_doublePrecision, value, scope); _Set(m_doublePrecision, value, scope);
return true; return true;

8
src/emitterstate.h
View File

@@ -146,9 +146,9 @@ namespace YAML
bool SetMapKeyFormat(EMITTER_MANIP value, FMT_SCOPE scope); bool SetMapKeyFormat(EMITTER_MANIP value, FMT_SCOPE scope);
EMITTER_MANIP GetMapKeyFormat() const { return m_mapKeyFmt.get(); } EMITTER_MANIP GetMapKeyFormat() const { return m_mapKeyFmt.get(); }
bool SetFloatPrecision(unsigned value, FMT_SCOPE scope); bool SetFloatPrecision(int value, FMT_SCOPE scope);
unsigned GetFloatPrecision() const { return m_floatPrecision.get(); } unsigned GetFloatPrecision() const { return m_floatPrecision.get(); }
bool SetDoublePrecision(unsigned value, FMT_SCOPE scope); bool SetDoublePrecision(int value, FMT_SCOPE scope);
unsigned GetDoublePrecision() const { return m_doublePrecision.get(); } unsigned GetDoublePrecision() const { return m_doublePrecision.get(); }
private: private:
@@ -174,8 +174,8 @@ namespace YAML
Setting<EMITTER_MANIP> m_seqFmt; Setting<EMITTER_MANIP> m_seqFmt;
Setting<EMITTER_MANIP> m_mapFmt; Setting<EMITTER_MANIP> m_mapFmt;
Setting<EMITTER_MANIP> m_mapKeyFmt; Setting<EMITTER_MANIP> m_mapKeyFmt;
Setting<unsigned> m_floatPrecision; Setting<int> m_floatPrecision;
Setting<unsigned> m_doublePrecision; Setting<int> m_doublePrecision;
SettingChanges m_modifiedSettings; SettingChanges m_modifiedSettings;
SettingChanges m_globalModifiedSettings; SettingChanges m_globalModifiedSettings;