Skip to content

Commit 6d135cb

Browse files
cdunn2001cdunn2001
committed
Added prop svn:eol-style native. Stripped carriage-returns on unix. Hopefully, this will work for Windows too now.
1 parent b2f7204 commit 6d135cb

7 files changed

Lines changed: 1445 additions & 1445 deletions

File tree

‎include/json/autolink.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
#ifndef JSON_AUTOLINK_H_INCLUDED
2-
# define JSON_AUTOLINK_H_INCLUDED
3-
4-
# include "config.h"
5-
6-
# ifdef JSON_IN_CPPTL
7-
# include <cpptl/cpptl_autolink.h>
8-
# endif
9-
10-
# if !defined(JSON_NO_AUTOLINK) && !defined(JSON_DLL_BUILD) && !defined(JSON_IN_CPPTL)
11-
# define CPPTL_AUTOLINK_NAME "json"
12-
# undef CPPTL_AUTOLINK_DLL
13-
# ifdef JSON_DLL
14-
# define CPPTL_AUTOLINK_DLL
15-
# endif
16-
# include "autolink.h"
17-
# endif
18-
19-
#endif // JSON_AUTOLINK_H_INCLUDED
1+
#ifndef JSON_AUTOLINK_H_INCLUDED
2+
# define JSON_AUTOLINK_H_INCLUDED
3+
4+
# include "config.h"
5+
6+
# ifdef JSON_IN_CPPTL
7+
# include <cpptl/cpptl_autolink.h>
8+
# endif
9+
10+
# if !defined(JSON_NO_AUTOLINK) && !defined(JSON_DLL_BUILD) && !defined(JSON_IN_CPPTL)
11+
# define CPPTL_AUTOLINK_NAME "json"
12+
# undef CPPTL_AUTOLINK_DLL
13+
# ifdef JSON_DLL
14+
# define CPPTL_AUTOLINK_DLL
15+
# endif
16+
# include "autolink.h"
17+
# endif
18+
19+
#endif // JSON_AUTOLINK_H_INCLUDED

‎include/json/config.h‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
#ifndef JSON_CONFIG_H_INCLUDED
2-
# define JSON_CONFIG_H_INCLUDED
3-
4-
/// If defined, indicates that json library is embedded in CppTL library.
5-
//# define JSON_IN_CPPTL 1
6-
7-
/// If defined, indicates that json may leverage CppTL library
8-
//# define JSON_USE_CPPTL 1
9-
/// If defined, indicates that cpptl vector based map should be used instead of std::map
10-
/// as Value container.
11-
//# define JSON_USE_CPPTL_SMALLMAP 1
12-
/// If defined, indicates that Json specific container should be used
13-
/// (hash table & simple deque container with customizable allocator).
14-
/// THIS FEATURE IS STILL EXPERIMENTAL!
15-
//# define JSON_VALUE_USE_INTERNAL_MAP 1
16-
/// Force usage of standard new/malloc based allocator instead of memory pool based allocator.
17-
/// The memory pools allocator used optimization (initializing Value and ValueInternalLink
18-
/// as if it was a POD) that may cause some validation tool to report errors.
19-
/// Only has effects if JSON_VALUE_USE_INTERNAL_MAP is defined.
20-
//# define JSON_USE_SIMPLE_INTERNAL_ALLOCATOR 1
21-
22-
23-
# ifdef JSON_IN_CPPTL
24-
# include <cpptl/config.h>
25-
# ifndef JSON_USE_CPPTL
26-
# define JSON_USE_CPPTL 1
27-
# endif
28-
# endif
29-
30-
# ifdef JSON_IN_CPPTL
31-
# define JSON_API CPPTL_API
32-
# elif defined(JSON_DLL_BUILD)
33-
# define JSON_API __declspec(dllexport)
34-
# elif defined(JSON_DLL)
35-
# define JSON_API __declspec(dllimport)
36-
# else
37-
# define JSON_API
38-
# endif
39-
40-
#endif // JSON_CONFIG_H_INCLUDED
1+
#ifndef JSON_CONFIG_H_INCLUDED
2+
# define JSON_CONFIG_H_INCLUDED
3+
4+
/// If defined, indicates that json library is embedded in CppTL library.
5+
//# define JSON_IN_CPPTL 1
6+
7+
/// If defined, indicates that json may leverage CppTL library
8+
//# define JSON_USE_CPPTL 1
9+
/// If defined, indicates that cpptl vector based map should be used instead of std::map
10+
/// as Value container.
11+
//# define JSON_USE_CPPTL_SMALLMAP 1
12+
/// If defined, indicates that Json specific container should be used
13+
/// (hash table & simple deque container with customizable allocator).
14+
/// THIS FEATURE IS STILL EXPERIMENTAL!
15+
//# define JSON_VALUE_USE_INTERNAL_MAP 1
16+
/// Force usage of standard new/malloc based allocator instead of memory pool based allocator.
17+
/// The memory pools allocator used optimization (initializing Value and ValueInternalLink
18+
/// as if it was a POD) that may cause some validation tool to report errors.
19+
/// Only has effects if JSON_VALUE_USE_INTERNAL_MAP is defined.
20+
//# define JSON_USE_SIMPLE_INTERNAL_ALLOCATOR 1
21+
22+
23+
# ifdef JSON_IN_CPPTL
24+
# include <cpptl/config.h>
25+
# ifndef JSON_USE_CPPTL
26+
# define JSON_USE_CPPTL 1
27+
# endif
28+
# endif
29+
30+
# ifdef JSON_IN_CPPTL
31+
# define JSON_API CPPTL_API
32+
# elif defined(JSON_DLL_BUILD)
33+
# define JSON_API __declspec(dllexport)
34+
# elif defined(JSON_DLL)
35+
# define JSON_API __declspec(dllimport)
36+
# else
37+
# define JSON_API
38+
# endif
39+
40+
#endif // JSON_CONFIG_H_INCLUDED

‎include/json/forwards.h‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
#ifndef JSON_FORWARDS_H_INCLUDED
2-
# define JSON_FORWARDS_H_INCLUDED
3-
4-
# include "config.h"
5-
6-
namespace Json {
7-
8-
class FastWriter;
9-
class Reader;
10-
class StyledWriter;
11-
12-
// value.h
13-
class StaticString;
14-
class Path;
15-
class PathArgument;
16-
class Value;
17-
class ValueIteratorBase;
18-
class ValueIterator;
19-
class ValueConstIterator;
20-
#ifdef JSON_VALUE_USE_INTERNAL_MAP
21-
class ValueAllocator;
22-
class ValueMapAllocator;
23-
class ValueInternalLink;
24-
class ValueInternalArray;
25-
class ValueInternalMap;
26-
#endif // #ifdef JSON_VALUE_USE_INTERNAL_MAP
27-
28-
} // namespace Json
29-
30-
31-
#endif // JSON_FORWARDS_H_INCLUDED
1+
#ifndef JSON_FORWARDS_H_INCLUDED
2+
# define JSON_FORWARDS_H_INCLUDED
3+
4+
# include "config.h"
5+
6+
namespace Json {
7+
8+
class FastWriter;
9+
class Reader;
10+
class StyledWriter;
11+
12+
// value.h
13+
class StaticString;
14+
class Path;
15+
class PathArgument;
16+
class Value;
17+
class ValueIteratorBase;
18+
class ValueIterator;
19+
class ValueConstIterator;
20+
#ifdef JSON_VALUE_USE_INTERNAL_MAP
21+
class ValueAllocator;
22+
class ValueMapAllocator;
23+
class ValueInternalLink;
24+
class ValueInternalArray;
25+
class ValueInternalMap;
26+
#endif // #ifdef JSON_VALUE_USE_INTERNAL_MAP
27+
28+
} // namespace Json
29+
30+
31+
#endif // JSON_FORWARDS_H_INCLUDED

‎include/json/json.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#ifndef JSON_JSON_H_INCLUDED
2-
# define JSON_JSON_H_INCLUDED
3-
4-
# include "autolink.h"
5-
# include "value.h"
6-
# include "reader.h"
7-
# include "writer.h"
8-
9-
#endif // JSON_JSON_H_INCLUDED
1+
#ifndef JSON_JSON_H_INCLUDED
2+
# define JSON_JSON_H_INCLUDED
3+
4+
# include "autolink.h"
5+
# include "value.h"
6+
# include "reader.h"
7+
# include "writer.h"
8+
9+
#endif // JSON_JSON_H_INCLUDED

0 commit comments

Comments
 (0)