From 683c60f49042a274339461dce519f5268157098e Mon Sep 17 00:00:00 2001 From: Jesse Beder Date: Sat, 19 May 2012 01:19:03 -0500 Subject: [PATCH] Removed traces of old-api Node --- include/yaml-cpp/aliasmanager.h | 34 --------------------------------- include/yaml-cpp/binary.h | 4 ---- include/yaml-cpp/yaml.h | 4 ---- src/binary.cpp | 9 --------- src/null.cpp | 6 ------ src/parser.cpp | 1 - 6 files changed, 58 deletions(-) delete mode 100644 include/yaml-cpp/aliasmanager.h diff --git a/include/yaml-cpp/aliasmanager.h b/include/yaml-cpp/aliasmanager.h deleted file mode 100644 index e90c93d..0000000 --- a/include/yaml-cpp/aliasmanager.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef ALIASMANAGER_H_62B23520_7C8E_11DE_8A39_0800200C9A66 -#define ALIASMANAGER_H_62B23520_7C8E_11DE_8A39_0800200C9A66 - -#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4 -#pragma once -#endif - -#include "yaml-cpp/anchor.h" -#include - -namespace YAML -{ - class Node; - - class AliasManager - { - public: - AliasManager(); - - void RegisterReference(const Node& node); - anchor_t LookupAnchor(const Node& node) const; - - private: - anchor_t _CreateNewAnchor(); - - private: - typedef std::map AnchorByIdentity; - AnchorByIdentity m_anchorByIdentity; - - anchor_t m_curAnchor; - }; -} - -#endif // ALIASMANAGER_H_62B23520_7C8E_11DE_8A39_0800200C9A66 diff --git a/include/yaml-cpp/binary.h b/include/yaml-cpp/binary.h index 77c770a..edc0b2c 100644 --- a/include/yaml-cpp/binary.h +++ b/include/yaml-cpp/binary.h @@ -10,8 +10,6 @@ namespace YAML { - class Node; - std::string EncodeBase64(const unsigned char *data, std::size_t size); std::vector DecodeBase64(const std::string& input); @@ -59,8 +57,6 @@ namespace YAML const unsigned char *m_unownedData; std::size_t m_unownedSize; }; - - void operator >> (const Node& node, Binary& binary); } #endif // BASE64_H_62B23520_7C8E_11DE_8A39_0800200C9A66 diff --git a/include/yaml-cpp/yaml.h b/include/yaml-cpp/yaml.h index 9957fdf..0c219b3 100644 --- a/include/yaml-cpp/yaml.h +++ b/include/yaml-cpp/yaml.h @@ -10,8 +10,4 @@ #include "yaml-cpp/stlemitter.h" #include "yaml-cpp/exceptions.h" -#include "yaml-cpp/node.h" -#include "yaml-cpp/stlnode.h" -#include "yaml-cpp/iterator.h" - #endif // YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66 diff --git a/src/binary.cpp b/src/binary.cpp index 589eb08..62a6032 100644 --- a/src/binary.cpp +++ b/src/binary.cpp @@ -1,5 +1,4 @@ #include "yaml-cpp/binary.h" -#include "yaml-cpp/node.h" namespace YAML { @@ -91,12 +90,4 @@ namespace YAML ret.resize(out - &ret[0]); return ret; } - - void operator >> (const Node& node, Binary& binary) - { - std::string scalar; - node.GetScalar(scalar); - std::vector data = DecodeBase64(scalar); - binary.swap(data); - } } diff --git a/src/null.cpp b/src/null.cpp index 08fa9aa..37f3197 100644 --- a/src/null.cpp +++ b/src/null.cpp @@ -1,12 +1,6 @@ #include "yaml-cpp/null.h" -#include "yaml-cpp/node.h" namespace YAML { _Null Null; - - bool IsNull(const Node& node) - { - return node.Read(Null); - } } diff --git a/src/parser.cpp b/src/parser.cpp index d033f9a..7861ec1 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -1,7 +1,6 @@ #include "yaml-cpp/parser.h" #include "yaml-cpp/eventhandler.h" #include "yaml-cpp/exceptions.h" -#include "yaml-cpp/node.h" #include "directives.h" #include "scanner.h" #include "singledocparser.h"