From 0c7282530386ca5dce283521a7b17fea95c43db2 Mon Sep 17 00:00:00 2001
From: Jesse Beder <jbeder+github@gmail.com>
Date: Thu, 8 Nov 2012 18:38:20 -0600
Subject: [PATCH] Renamed all variables named 'null' (for real now, and only
 that)

---
 include/yaml-cpp/emitter.h    | 2 +-
 include/yaml-cpp/exceptions.h | 2 +-
 include/yaml-cpp/mark.h       | 2 +-
 src/scanner.cpp               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/yaml-cpp/emitter.h b/include/yaml-cpp/emitter.h
index 4230e7d..927fe6c 100644
--- a/include/yaml-cpp/emitter.h
+++ b/include/yaml-cpp/emitter.h
@@ -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>
diff --git a/include/yaml-cpp/exceptions.h b/include/yaml-cpp/exceptions.h
index 00848f4..2c6b7b1 100644
--- a/include/yaml-cpp/exceptions.h
+++ b/include/yaml-cpp/exceptions.h
@@ -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_) {}
 	};
 }
 
diff --git a/include/yaml-cpp/mark.h b/include/yaml-cpp/mark.h
index 7c80fbc..e07b317 100644
--- a/include/yaml-cpp/mark.h
+++ b/include/yaml-cpp/mark.h
@@ -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;
diff --git a/src/scanner.cpp b/src/scanner.cpp
index 767637e..66cce0a 100644
--- a/src/scanner.cpp
+++ b/src/scanner.cpp
@@ -383,7 +383,7 @@ namespace YAML
 	// . Does not parse any more tokens.
 	void Scanner::ThrowParserException(const std::string& msg) const
 	{
-		Mark mark = Mark::null();
+		Mark mark = Mark::null_mark();
 		if(!m_tokens.empty()) {
 			const Token& token = m_tokens.front();
 			mark = token.mark;