diff --git a/src/alias.h b/src/alias.h index ad80b79..dfe00dd 100644 --- a/src/alias.h +++ b/src/alias.h @@ -1,35 +1,35 @@ -#pragma once - -#include "content.h" - -namespace YAML -{ - class Alias : public Content - { - public: - Alias(Content *pNodeContent); - - virtual void Parse(Scanner* pScanner, const ParserState& state); - virtual void Write(std::ostream& out, int indent, bool startedLine, bool onlyOneCharOnLine); - - virtual bool GetBegin(std::vector ::const_iterator&) const; - virtual bool GetBegin(std::map ::const_iterator&) const; - virtual bool GetEnd(std::vector ::const_iterator&) const; - virtual bool GetEnd(std::map ::const_iterator&) const; - virtual Node* GetNode(unsigned) const; - virtual unsigned GetSize() const; - virtual bool IsScalar() const; - virtual bool IsMap() const; - virtual bool IsSequence() const; - +#pragma once + +#include "content.h" + +namespace YAML +{ + class Alias : public Content + { + public: + Alias(Content *pNodeContent); + + virtual void Parse(Scanner* pScanner, const ParserState& state); + virtual void Write(std::ostream& out, int indent, bool startedLine, bool onlyOneCharOnLine); + + virtual bool GetBegin(std::vector ::const_iterator&) const; + virtual bool GetBegin(std::map ::const_iterator&) const; + virtual bool GetEnd(std::vector ::const_iterator&) const; + virtual bool GetEnd(std::map ::const_iterator&) const; + virtual Node* GetNode(unsigned) const; + virtual unsigned GetSize() const; + virtual bool IsScalar() const; + virtual bool IsMap() const; + virtual bool IsSequence() const; + virtual bool GetScalar(std::string& s) const; - - virtual int Compare(Content *); - virtual int Compare(Scalar *); - virtual int Compare(Sequence *); - virtual int Compare(Map *); - - private: - Content* m_pRef; - }; -} + + virtual int Compare(Content *); + virtual int Compare(Scalar *); + virtual int Compare(Sequence *); + virtual int Compare(Map *); + + private: + Content* m_pRef; + }; +} diff --git a/src/stream.cpp b/src/stream.cpp index 97da1d4..4ca4f96 100644 --- a/src/stream.cpp +++ b/src/stream.cpp @@ -4,7 +4,7 @@ namespace YAML { - Stream::Stream(std::istream& input): buffer(0), pos(0), line(0), column(0), size(0) + Stream::Stream(std::istream& input): pos(0), line(0), column(0), size(0), buffer(0) { if(!input) return;