Merge pull request #192

affde29 moved rapidjson to external folder, fixed CMake (Riccardo Spagni)
f1eaf88 Prints seed after wallet upgrade. Removed iostream include. (Oran Juice)
70971be Doxygen comments (Oran Juice)
031ca23 Rewrites to old wallet file correctly (Oran Juice)
1f833dc Doxygen comments in (Oran Juice)
0bd88ff Writes seed language while generating wallet. Wallet open fix. (Oran Juice)
09a659e Stores seed language in wallet file. added rapidjson. Yet to test backward compatibility (Oran Juice)

1 files changed, 43 insertions, 0 deletions

diff --git a/external/rapidjson/internal/strfunc.h b/external/rapidjson/internal/strfunc.h
new file mode 100644
index 000000000..80adcb6b7
--- /dev/null
+++ b/external/rapidjson/internal/strfunc.h
@@ -0,0 +1,43 @@
+// Copyright (C) 2011 Milo Yip

+//

+// Permission is hereby granted, free of charge, to any person obtaining a copy

+// of this software and associated documentation files (the "Software"), to deal

+// in the Software without restriction, including without limitation the rights

+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+// copies of the Software, and to permit persons to whom the Software is

+// furnished to do so, subject to the following conditions:

+//

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+// THE SOFTWARE.

+

+#ifndef RAPIDJSON_INTERNAL_STRFUNC_H_

+#define RAPIDJSON_INTERNAL_STRFUNC_H_

+

+namespace rapidjson {

+namespace internal {

+

+//! Custom strlen() which works on different character types.

+/*! \tparam Ch Character type (e.g. char, wchar_t, short)

+    \param s Null-terminated input string.

+    \return Number of characters in the string. 

+    \note This has the same semantics as strlen(), the return value is not number of Unicode codepoints.

+*/

+template <typename Ch>

+inline SizeType StrLen(const Ch* s) {

+    const Ch* p = s;

+    while (*p) ++p;

+    return SizeType(p - s);

+}

+

+} // namespace internal

+} // namespace rapidjson

+

+#endif // RAPIDJSON_INTERNAL_STRFUNC_H_