Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes for compiling with a newer (system) jsoncpp #4429

Merged
merged 3 commits into from
Aug 10, 2016
Merged

Fixes for compiling with a newer (system) jsoncpp #4429

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
617e005
Move included json code to jsoncpp subdirectory
Rogier-5 Aug 10, 2016
3c919f6
Fix json includes
Rogier-5 Aug 10, 2016
4393bd8
Fix for jsoncpp deprecated function warning
Rogier-5 Aug 10, 2016
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
Prev Previous commit
Fix for jsoncpp deprecated function warning 
When compiling with a newer version of jsoncpp (and
ENABLE_SYSTEM_JSONCPP=true), jsoncpp emits a warning
about a deprecated function that minetest uses.
  • Loading branch information
@Rogier-5
Rogier-5 committed Aug 10, 2016
commit 4393bd81361a3c8b503c9ade02b09b9d6b1e6edd
5 changes: 5 additions & 0 deletions src/script/common/c_content.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,8 +1250,13 @@ static bool push_json_value_helper(lua_State *L, const Json::Value &value,
lua_newtable(L);
for (Json::Value::const_iterator it = value.begin();
it != value.end(); ++it) {
#ifndef JSONCPP_STRING
const char *str = it.memberName();
lua_pushstring(L, str ? str : "");
#else
std::string str = it.name();
lua_pushstring(L, str.c_str());
#endif
push_json_value_helper(L, *it, nullindex);
lua_rawset(L, -3);
}
Expand Down