Merge from core, and update several missing DLL exports. This does not resolve them all (in particular, node_data::equals seems to be still missing, even though it is inlined in a header, which seems strange).

This commit is contained in:
Jesse Beder
2014-03-24 00:31:43 -05:00
9 changed files with 38 additions and 23 deletions

View File

@@ -11,18 +11,20 @@
#include <string>
#include <vector>
#include "yaml-cpp/dll.h"
namespace YAML {
class Node;
Node Load(const std::string& input);
Node Load(const char* input);
Node Load(std::istream& input);
Node LoadFile(const std::string& filename);
YAML_CPP_API Node Load(const std::string& input);
YAML_CPP_API Node Load(const char* input);
YAML_CPP_API Node Load(std::istream& input);
YAML_CPP_API Node LoadFile(const std::string& filename);
std::vector<Node> LoadAll(const std::string& input);
std::vector<Node> LoadAll(const char* input);
std::vector<Node> LoadAll(std::istream& input);
std::vector<Node> LoadAllFromFile(const std::string& filename);
YAML_CPP_API std::vector<Node> LoadAll(const std::string& input);
YAML_CPP_API std::vector<Node> LoadAll(const char* input);
YAML_CPP_API std::vector<Node> LoadAll(std::istream& input);
YAML_CPP_API std::vector<Node> LoadAllFromFile(const std::string& filename);
}
#endif // VALUE_PARSE_H_62B23520_7C8E_11DE_8A39_0800200C9A66