townforge/property_tree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
170 Commits 1 Branch 0 Tags 1.1 MiB
cc
Commit Graph

170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Redl
315223b7ca Merge branch 'master' into develop 
This should resolve the broken merge that I added a year ago (bd1b83291),
which caused me no end of confusion and frustration.

Conflicts:
	include/boost/property_tree/detail/info_parser_read.hpp
 2015-01-20 17:59:48 +01:00
Berkus Decker
5c26e8d8b2 Add escaping tests. 2014-11-12 20:31:40 +02:00
Berkus Decker
72b124d07f Fix escape misbehavior on basic_string<char>. 
Signed entity used for byte comparison, which fails for signed char.
Due to this JSON serialization spits \uXXXX monstrosity instead of
proper UTF-8.
 2014-11-12 01:23:52 +02:00
CornedBee
24125b4e27 Merge pull request #6 from danieljames/metadata 
Create metadata file.
 2014-11-10 16:21:49 +01:00
CornedBee
6f11128ac1 Merge pull request #4 from MarcelRaad/patch-1 
Fix MSVC warning
 2014-11-10 16:20:03 +01:00
Daniel James
62ae09ca05 Add metadata file. 2014-08-18 15:09:24 +01:00
Marcel Raad
373ae555bb Fix MSVC warning 
warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
Fixed by explicitly comparing the return value of isspace to zero.
 2014-07-09 22:50:09 +02:00
CornedBee
615a3ee1f6 Merge pull request #2 from sanderbog/rebase_for_develop 
support for non-std::string keys
 2014-05-27 14:56:55 +02:00
Alexander Bogdashevsky
8af8b6bf3b support for non-std::string keys 2014-04-15 06:19:02 -04:00
Sebastian Redl
85f8d8866c Merge branch 'develop'. 
Merges fixes for bugs 7519, 7180, 6582.
 2014-02-24 13:51:50 +01:00
Sebastian Redl
4e7aa973f9 Escape newlines and tabs in content when writing XML. 
By having them escaped, we prevent their replacement with simple
whitespace when reparsing. Fixes bug 7519.
 2014-02-14 16:35:30 +01:00
Sebastian Redl
291055c65a Log more data in exact roundtrip tests. 
This ought to help me track down the test failure  on the msvc12 builder.
 2014-02-13 16:18:19 +01:00
Sebastian Redl
530e6fe5eb Fix JSON array compact printing. 
Fixes bug 7180.

As drive-by fixes, actually test the pretty printer and don't ever
start a new line after a property name.
 2014-02-11 16:54:07 +01:00
Sebastian Redl
5485b3130d Remove trailing spaces. 2014-02-11 15:41:26 +01:00
Sebastian Redl
da370882fb Fix an unused variable warning. Bug #6582 2014-02-10 17:25:35 +01:00
Sebastian Redl
e6958d6f4e Include recent bugfixes in release: #4391, #8879, #8776. 2014-02-10 15:51:49 +01:00
Sebastian Redl
fd24f85153 Fix copyrights, some spelling, sort the member reference defines, and use Quickbook code inclusion for the first example. 2014-01-09 17:37:20 +01:00
Sebastian Redl
24200749f7 Add a Jamfile to the examples so that they can be built easily. 2014-01-09 17:34:03 +01:00
Sebastian Redl
a46e57111b Write tabs as \t in JSON instead of a numeric escape. 2013-12-20 14:18:27 +01:00
Sebastian Redl
8f4f35e415 Bug 8879: Remove unused typedefs to silence a GCC warning. 2013-12-20 14:11:54 +01:00
Sebastian Redl
bd1b83291f Create first merge point for Git. 2013-12-20 14:07:26 +01:00
Sebastian Redl
23d8e7bbbe Delete files that shouldn't have been there. These are either SVN conversion zombies, or maybe I never merged this from devel. Either way they're gone now. 2013-12-20 13:52:24 +01:00
Sebastian Redl
2284b96fc2 Don't use an uninitialized variable if trying to read a numeric char from a property and the value is out of bounds for the target type. See bug 4391. This is the only place where the warning that some compilers give makes sense; if it still occurs after this change, it's just broken. 
[SVN r81507]
 2012-11-24 14:47:18 +00:00
Sebastian Redl
c3e643059e Merge r78550 to release. Fixes an outdated test to work again. Fixes bug #6785. Fixes bug #6808. 
[SVN r78679]
 2012-05-27 13:16:21 +00:00
Sebastian Redl
5dee8275ab Remove a stray semicolon. Fix a type conversion that has become invalid in C++11. Update the XML parser test to cope with the new detail/utf8_codecvt layout. See bugs 6808 and 6785 for the first two issues. 
[SVN r78550]
 2012-05-23 12:09:27 +00:00
Sebastian Redl
9b707a030d Merge [72000],[72001],[72003], [74691], [75587], [75589], [75590], and [75593] 
from trunk.
Fixes bug 4840.
Fixes bug 5259.
Fixes bug 5281, I think.
Fixes bug 5944.
Fixes bug 5757.
Fixes bug 5710.
Fixes bug 5307, I think.

[SVN r76447]
 2012-01-13 12:20:39 +00:00
Sebastian Redl
5e9261d726 Improve pair member bug workaround: should now hopefully work with Intel; also improve code clarity. See bug #5307. 
[SVN r75593]
 2011-11-21 13:11:18 +00:00
Sebastian Redl
0181c0f723 Suppress the MSVC insecure warning when compiling tests. Make argument-less sort() work. See bug #5710. 
[SVN r75590]
 2011-11-21 12:52:12 +00:00
Sebastian Redl
29270fd325 Make ptree_bad_data::data() and ptree_bad_path::path() const. See bug #5757. 
[SVN r75589]
 2011-11-21 12:11:06 +00:00
Sebastian Redl
e9e5ad25aa Give string_path an accessor for the separator. 
[SVN r75587]
 2011-11-21 10:56:45 +00:00
Sebastian Redl
37a7043ede Use boost::swap for swapping PTree's data member. Makes it possible to use types as data that don't provide a member swap(). See bug 5944. 
[SVN r74691]
 2011-10-04 11:11:51 +00:00
Sebastian Redl
2d0abadfc6 Try to work around MSVC name lookup bug. See bug 5281. 
[SVN r72003]
 2011-05-16 22:05:08 +00:00
Sebastian Redl
3dc573a245 Allow nuls in PTree XML. See bug 5259. 
[SVN r72001]
 2011-05-16 21:34:15 +00:00
Sebastian Redl
8a22543505 Make PTree XML writer escape attribute values. 
[SVN r72000]
 2011-05-16 20:58:01 +00:00
Sebastian Redl
56cfb6b2f9 Merge r70664-70666 to release. Improves INI parser and brings improvement to docs. Docs should now at least no longer contain completely incorrect examples. 
[SVN r71994]
 2011-05-16 18:50:06 +00:00
Sebastian Redl
afb7767602 Merge UTF-8 XML support improvements (r69622) to release. Fixes bug 5203. 
[SVN r71993]
 2011-05-16 18:39:10 +00:00
Sebastian Redl
b183df107e Merge r68990-68993, several fixes to PTree. Fixes bug 1678. Fixes bug 4387. Forgot to commit these together with the header part. 
[SVN r71992]
 2011-05-16 18:34:41 +00:00
Sebastian Redl
3e9c566a1b Merge r68990-68993, several fixes to PTree. Fixes bug 1678. Fixes bug 4387. 
[SVN r71991]
 2011-05-16 18:33:39 +00:00
Sebastian Redl
7c3d04561a Allow the use of # as a comment character in the PTree INI parser. 
[SVN r70666]
 2011-03-28 13:44:16 +00:00
Sebastian Redl
ef95113aba Somewhat improve PTree documentation. 
[SVN r70665]
 2011-03-28 13:33:21 +00:00
Sebastian Redl
794c1e1564 Slightly improve UTF-8 support in INFO parser. Don't crash on non-ASCII sequences. 
[SVN r70664]
 2011-03-28 13:32:19 +00:00
Sebastian Redl
6386e5fea2 Merge r68990 to release just before 2.46.1, because it's a critical and low-risk fix. Sorry about not waiting for permission, but I won't have access to this computer again until after the release. So if this merge is a problem, just revert it. 
[SVN r69684]
 2011-03-08 14:58:52 +00:00
Sebastian Redl
1c3804c01e Better support for UTF-8. See bug 5203. Thanks to Qiaozhiqiang for tracking down the actual problem. 
[SVN r69622]
 2011-03-07 09:45:58 +00:00
Sebastian Redl
0dd8746cba Erase assert() in favor of BOOST_ASSERT() in all PTree files, including RapidXML. See bug 4448. 
[SVN r68993]
 2011-02-18 16:39:55 +00:00
Sebastian Redl
4d3c2c6998 Allow top-level array in PTree JSON parser, as requested in bug 4387. 
[SVN r68992]
 2011-02-18 16:29:10 +00:00
Sebastian Redl
16a8d52cbc Apply patch from bug 1678 with slight modification: allow BOM in XML parsing for wide streams. Add test case. 
[SVN r68991]
 2011-02-18 16:16:25 +00:00
Sebastian Redl
78c9d85eb0 Fix a compile error in PTree JSON parser. 
[SVN r68990]
 2011-02-18 16:13:59 +00:00
Steven Watanabe
cdb2ffdc64 Revert [67111] (addition of boost/detail/iomanip.hpp) and all the commits that depend on it. ([68137], [68140], [68141], [68154], and [68165]). 
[SVN r68168]
 2011-01-15 08:11:51 +00:00
Bryce Adelstein-Lelbach
378c9dfca6 Replacing the use of <iomanip> with <boost/detail/iomanip.hpp> across Boost. 
On Linux, GNU's libstdc++, which is the default stdlib for icc and clang,
cannot parse the <iomanip> header in version 4.5+ (which thankfully neither
compiler advises the use of yet), as it's original C++98-friendly
implementation has been replaced with a gnu++0x implementation.
<boost/detail/iomanip.hpp> is a portable implementation of <iomanip>, providing
boost::detail::setfill, boost::detail::setbase, boost::detail::setw,
boost::detail::setprecision, boost::detail::setiosflags and
boost::detail::resetiosflags. 



[SVN r68140]
 2011-01-14 02:35:58 +00:00
Eric Niebler
1f205126f1 Merged revisions 66498 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r66498 | eric_niebler | 2010-11-11 15:28:11 -0500 (Thu, 11 Nov 2010) | 1 line
  
  add missing includes, fixes #4841
........


[SVN r66499]
 2010-11-11 20:34:42 +00:00