Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _internal/Source/JSONMemory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
public:
LIBJSON_OBJECT(mempool_callback_setter)
inline mempool_callback_setter(void) json_nothrow {
` LIBJSON_CTOR;
LIBJSON_CTOR;
mempool_callbacks::set(std::malloc, std::realloc, std::free);
}
private:
Expand Down Expand Up @@ -111,7 +111,7 @@ void * JSONMemory::json_realloc(void * ptr, size_t siz) json_nothrow {
}

#ifdef JSON_MEMORY_POOL
//it is okay to pass null to these callbacks, no make sure they function exists
//it is okay to pass null to these callbacks, so make sure the function exists
static void * malloc_proxy(size_t siz) json_nothrow {
if (json_malloc_t callback = JSONSingleton<json_malloc_t>::get()){
return callback(siz);
Expand Down
2 changes: 1 addition & 1 deletion _internal/Source/JSONNode_Mutex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void * JSONNode::getThisLock(JSONNode * pthis) json_nothrow {
if (pthis -> internal -> mylock != 0){
return pthis -> internal -> mylock;
}
JSON_ASSERT(global_mutex != 0, JSON_TEXT("No global_mutex")); //this is safe, because it's just goingi to return 0 anyway
JSON_ASSERT(global_mutex != 0, JSON_TEXT("No global_mutex")); //this is safe, because it's just going to return 0 anyway
return global_mutex;
}

Expand Down