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

Renamed all variables named 'null'

Browse Source
This commit is contained in:
Jesse Beder
2012-11-08 18:21:00 -06:00
parent 979a91692f
commit 06e09d1d64
5 changed files with 5 additions and 5 deletions
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 _Tag& tag);
Emitter& Write(const _Comment& comment);
Emitter& Write(const _Null& null);
Emitter& Write(const _Null& n);
Emitter& Write(const Binary& binary);
template <typename T>

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

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

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

@@ -13,7 +13,7 @@ namespace YAML
struct YAML_CPP_API Mark {
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 line, column;