Skip to content

Commit 9376afb

Browse files
committed
rm CPPTL
1 parent 5986568 commit 9376afb

File tree

1 file changed

+0
-31
lines changed

1 file changed

+0
-31
lines changed

include/json/thing.h

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,7 @@ class JSON_API Thing {
125125
};
126126

127127
public:
128-
#ifndef JSON_USE_CPPTL_SMALLMAP
129128
typedef std::map<CZString, Thing> ObjectThings;
130-
#else
131-
typedef CppTL::SmallMap<CZString, Thing> ObjectThings;
132-
#endif // ifndef JSON_USE_CPPTL_SMALLMAP
133129
#endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
134130

135131
public:
@@ -175,9 +171,6 @@ Json::Thing obj_value(Json::objectThing); // {}
175171
*/
176172
Thing(const StaticString& value);
177173
Thing(const std::string& value); ///< Copy data() til size(). Embedded zeroes too.
178-
#ifdef JSON_USE_CPPTL
179-
Thing(const CppTL::ConstString& value);
180-
#endif
181174
Thing(bool value);
182175
/// Deep copy.
183176
Thing(const Thing& other);
@@ -213,9 +206,6 @@ Json::Thing obj_value(Json::objectThing); // {}
213206
*/
214207
bool getString(
215208
char const** begin, char const** end) const;
216-
#ifdef JSON_USE_CPPTL
217-
CppTL::ConstString asConstString() const;
218-
#endif
219209
Int asInt() const;
220210
UInt asUInt() const;
221211
#if defined(JSON_HAS_INT64)
@@ -329,13 +319,6 @@ Json::Thing obj_value(Json::objectThing); // {}
329319
* \endcode
330320
*/
331321
Thing& operator[](const StaticString& key);
332-
#ifdef JSON_USE_CPPTL
333-
/// Access an object value by name, create a null member if it does not exist.
334-
Thing& operator[](const CppTL::ConstString& key);
335-
/// Access an object value by name, returns null if there is no member with
336-
/// that name.
337-
const Thing& operator[](const CppTL::ConstString& key) const;
338-
#endif
339322
/// Return the member named key if it exist, defaultThing otherwise.
340323
/// \note deep copy
341324
Thing get(const char* key, const Thing& defaultThing) const;
@@ -347,11 +330,6 @@ Json::Thing obj_value(Json::objectThing); // {}
347330
/// \note deep copy
348331
/// \param key may contain embedded nulls.
349332
Thing get(const std::string& key, const Thing& defaultThing) const;
350-
#ifdef JSON_USE_CPPTL
351-
/// Return the member named key if it exist, defaultThing otherwise.
352-
/// \note deep copy
353-
Thing get(const CppTL::ConstString& key, const Thing& defaultThing) const;
354-
#endif
355333
/// Most general and efficient version of isMember()const, get()const,
356334
/// and operator[]const
357335
/// \note As stated elsewhere, behavior is undefined if (end-begin) >= 2^30
@@ -400,10 +378,6 @@ Json::Thing obj_value(Json::objectThing); // {}
400378
bool isMember(const std::string& key) const;
401379
/// Same as isMember(std::string const& key)const
402380
bool isMember(const char* begin, const char* end) const;
403-
#ifdef JSON_USE_CPPTL
404-
/// Return true if the object has a member named key.
405-
bool isMember(const CppTL::ConstString& key) const;
406-
#endif
407381

408382
/// \brief Return a list of the member names.
409383
///
@@ -412,11 +386,6 @@ Json::Thing obj_value(Json::objectThing); // {}
412386
/// \post if type() was nullThing, it remains nullThing
413387
Members getMemberNames() const;
414388

415-
//# ifdef JSON_USE_CPPTL
416-
// EnumMemberNames enumMemberNames() const;
417-
// EnumThings enumThings() const;
418-
//# endif
419-
420389
/// \deprecated Always pass len.
421390
JSONCPP_DEPRECATED("Use setComment(std::string const&) instead.")
422391
void setComment(const char* comment, CommentPlacement placement);

0 commit comments

Comments
 (0)