External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pulled 'null' renaming fix

Browse Source
This commit is contained in:
Jesse Beder 2012-11-08 18:39:06 -06:00
commit 5721ac6194
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/yaml-cpp/emitter.h
View File

@ -62,7 +62,7 @@ namespace YAML
Emitter& Write(const _Anchor& anchor); Emitter& Write(const _Anchor& anchor);
Emitter& Write(const _Tag& tag); Emitter& Write(const _Tag& tag);
Emitter& Write(const _Comment& comment); Emitter& Write(const _Comment& comment);
Emitter& Write(const _Null& null); Emitter& Write(const _Null& n);
Emitter& Write(const Binary& binary); Emitter& Write(const Binary& binary);
template <typename T> template <typename T>

2
include/yaml-cpp/exceptions.h
View File

@ -189,7 +189,7 @@ namespace YAML
class EmitterException: public Exception { class EmitterException: public Exception {
public: public:
EmitterException(const std::string& msg_) EmitterException(const std::string& msg_)
: Exception(Mark::null(), msg_) {} : Exception(Mark::null_mark(), msg_) {}
}; };
class BadFile: public Exception { class BadFile: public Exception {

2
include/yaml-cpp/mark.h
View File

@ -13,7 +13,7 @@ namespace YAML
struct YAML_CPP_API Mark { struct YAML_CPP_API Mark {
Mark(): pos(0), line(0), column(0) {} Mark(): pos(0), line(0), column(0) {}
static const Mark null() { return Mark(-1, -1, -1); } static const Mark null_mark() { return Mark(-1, -1, -1); }
int pos; int pos;
int line, column; int line, column;

2
src/scanner.cpp
View File

@ -383,7 +383,7 @@ namespace YAML
// . Does not parse any more tokens. // . Does not parse any more tokens.
void Scanner::ThrowParserException(const std::string& msg) const void Scanner::ThrowParserException(const std::string& msg) const
{ {
Mark mark = Mark::null(); Mark mark = Mark::null_mark();
if(!m_tokens.empty()) { if(!m_tokens.empty()) {
const Token& token = m_tokens.front(); const Token& token = m_tokens.front();
mark = token.mark; mark = token.mark;