peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 12:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compiler error in iterator_base friend forward declaration in node on clang (and I hope MSVC), plus warnings on clang

Browse Source
This commit is contained in:
beder
2012-01-07 01:42:21 -06:00
parent 569a0461f2
commit c82122ba36
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/yaml-cpp/node/detail/impl.h
View File

@@ -23,7 +23,7 @@ namespace YAML
template<typename Key> template<typename Key>
struct get_idx<Key, typename boost::enable_if<boost::is_unsigned<Key> >::type> { struct get_idx<Key, typename boost::enable_if<boost::is_unsigned<Key> >::type> {
static node *get(const std::vector<node *>& sequence, const Key& key, shared_memory_holder pMemory) { static node *get(const std::vector<node *>& sequence, const Key& key, shared_memory_holder /* pMemory */) {
return key < sequence.size() ? sequence[key] : 0; return key < sequence.size() ? sequence[key] : 0;
} }

2
include/yaml-cpp/node/detail/iterator_fwd.h
View File

@@ -16,7 +16,7 @@ namespace YAML
class node; class node;
namespace detail { namespace detail {
class iterator_value; struct iterator_value;
template<typename V> class iterator_base; template<typename V> class iterator_base;
} }

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

@@ -21,7 +21,7 @@ namespace YAML
friend class NodeBuilder; friend class NodeBuilder;
friend class NodeEvents; friend class NodeEvents;
friend class detail::node_data; friend class detail::node_data;
template<typename, typename, typename> friend class detail::iterator_base; template<typename> friend class detail::iterator_base;
Node(); Node();
explicit Node(NodeType::value type); explicit Node(NodeType::value type);

8
src/node/nodebuilder.cpp
View File

@@ -31,7 +31,7 @@ namespace YAML
{ {
} }
void NodeBuilder::OnNull(const Mark& mark, anchor_t anchor) void NodeBuilder::OnNull(const Mark& /* mark */, anchor_t anchor)
{ {
detail::node& node = Push(anchor); detail::node& node = Push(anchor);
node.set_null(); node.set_null();
@@ -45,7 +45,7 @@ namespace YAML
Pop(); Pop();
} }
void NodeBuilder::OnScalar(const Mark& mark, const std::string& tag, anchor_t anchor, const std::string& value) void NodeBuilder::OnScalar(const Mark& /* mark */, const std::string& tag, anchor_t anchor, const std::string& value)
{ {
detail::node& node = Push(anchor); detail::node& node = Push(anchor);
node.set_scalar(value); node.set_scalar(value);
@@ -53,7 +53,7 @@ namespace YAML
Pop(); Pop();
} }
void NodeBuilder::OnSequenceStart(const Mark& mark, const std::string& tag, anchor_t anchor) void NodeBuilder::OnSequenceStart(const Mark& /* mark */, const std::string& tag, anchor_t anchor)
{ {
detail::node& node = Push(anchor); detail::node& node = Push(anchor);
node.set_tag(tag); node.set_tag(tag);
@@ -65,7 +65,7 @@ namespace YAML
Pop(); Pop();
} }
void NodeBuilder::OnMapStart(const Mark& mark, const std::string& tag, anchor_t anchor) void NodeBuilder::OnMapStart(const Mark& /* mark */, const std::string& tag, anchor_t anchor)
{ {
detail::node& node = Push(anchor); detail::node& node = Push(anchor);
node.set_type(NodeType::Map); node.set_type(NodeType::Map);