From b07e69c37aa7cc1dd27aff9f3ba5cef703f2e357 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Tue, 2 Feb 2010 21:01:50 +0200 Subject: [PATCH] C++: Rename namespace json::_private to json::detail --- src/jansson-impl.hpp | 6 +++--- src/jansson.hpp | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/jansson-impl.hpp b/src/jansson-impl.hpp index de336dd..eb68fcd 100644 --- a/src/jansson-impl.hpp +++ b/src/jansson-impl.hpp @@ -8,7 +8,7 @@ #endif namespace json { - namespace _private { + namespace detail { // assignment operator template ValueBase<_Base>& ValueBase<_Base>::operator=(const Value& value) { @@ -325,7 +325,7 @@ namespace json { return json_object_get(_object, _key); } - } // namespace json::_private + } // namespace json::detail // construct Value::Value input Value::Value(const char* value) { @@ -378,7 +378,7 @@ namespace json { } // construct a new iterator for a given object - Iterator::Iterator(const _private::ValueBase<_private::PropertyProxy>& value) : + Iterator::Iterator(const detail::ValueBase& value) : _object(value.as_json()), _iter(0) { _iter = json_object_iter(_object.as_json()); } diff --git a/src/jansson.hpp b/src/jansson.hpp index 020a277..41afd67 100644 --- a/src/jansson.hpp +++ b/src/jansson.hpp @@ -20,7 +20,7 @@ namespace json { class Value; // implementation details; do not use directly - namespace _private { + namespace detail { class ElementProxy; class PropertyProxy; @@ -196,10 +196,10 @@ namespace json { const char* _key; }; - } // namespace json::_private + } // namespace json::detail // represents any JSON value - class Value : public _private::ValueBase<_private::Basic> { + class Value : public detail::ValueBase { public: // construct Value from input explicit inline Value(const char* value); @@ -215,19 +215,19 @@ namespace json { explicit inline Value(double value); // empty constructor - Value() : _private::ValueBase<_private::Basic>() {} + Value() : detail::ValueBase() {} // copy constructor for base - Value(const _private::Basic& value) : _private::ValueBase<_private::Basic>(value) {} + Value(const detail::Basic& value) : detail::ValueBase(value) {} // copy constructor for base - Value(const _private::ValueBase<_private::Basic>& value) : _private::ValueBase<_private::Basic>(value) {} + Value(const detail::ValueBase& value) : detail::ValueBase(value) {} // copy constructor - Value(const Value& value) : _private::ValueBase<_private::Basic>(value) {} + Value(const Value& value) : detail::ValueBase(value) {} // create reference to value - explicit Value(json_t* json) : _private::ValueBase<_private::Basic>(json) {} + explicit Value(json_t* json) : detail::ValueBase(json) {} }; // iterators over a JSON object @@ -237,7 +237,7 @@ namespace json { inline Iterator(const Value& value); // construct a new iterator for a given object - inline Iterator(const _private::ValueBase<_private::PropertyProxy>& value); + inline Iterator(const detail::ValueBase& value); // increment iterator inline void next(); -- 2.1.4