-
Notifications
You must be signed in to change notification settings - Fork 6.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[licensepp] Update to 2020-11-24 (#30663)
- Loading branch information
1 parent
b91728f
commit aebac86
Showing
6 changed files
with
37 additions
and
45 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
From b0e09221f5f782e6dc2dedf197eba8064095edcd Mon Sep 17 00:00:00 2001 | ||
From: Michael Migliore <[email protected]> | ||
Date: Thu, 6 Apr 2023 09:36:17 +0200 | ||
Subject: [PATCH] Fix compilation on macOS | ||
|
||
--- | ||
src/json-object.h | 6 ------ | ||
1 file changed, 6 deletions(-) | ||
|
||
diff --git a/src/json-object.h b/src/json-object.h | ||
index 712e9a0..9764514 100644 | ||
--- a/src/json-object.h | ||
+++ b/src/json-object.h | ||
@@ -80,12 +80,6 @@ class JsonObject | ||
return get<bool>(key, defaultValue); | ||
} | ||
|
||
- inline const char* getCString(const std::string& key, | ||
- const char* defaultValue = "") const | ||
- { | ||
- return getString(key, defaultValue).c_str(); | ||
- } | ||
- | ||
inline bool hasKey(const std::string& key) const | ||
{ | ||
return m_root.count(key) > 0; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters