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.

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

fixed compile error for #1045 #1134

Merged
merged 2 commits into from
Jun 28, 2018

Conversation

Daniel599
Copy link
Contributor

@Daniel599 Daniel599 commented Jun 16, 2018

#1045
Added to_json(BasicJsonType, iteration_proxy_internal) which was needed.
note: there are 2 TODOs to consider

@Daniel599
Copy link
Contributor Author

Daniel599 commented Jun 16, 2018

@nlohmann I don't understand why Codacy didn't work, I did retry but still no luck
maybe it's because I did the pull-request to feature/items_iterator instead of develop? should I create a new pull-request to develop?

@nlohmann
Copy link
Owner

Ignore Codacity for the moment. I am on holidays right now and shall have a look at this soon.

@Daniel599
Copy link
Contributor Author

@nlohmann any update?

@nlohmann
Copy link
Owner

Sorry for the delay. I’ll check tomorrow or Wednesday at latest.

@nlohmann
Copy link
Owner

Looks good, but could you make a PR for develop please?

@Daniel599 Daniel599 changed the base branch from feature/items_iterator to develop June 26, 2018 17:15
@Daniel599
Copy link
Contributor Author

I changed it to develop, or did you mean I should create a new one?

void to_json(BasicJsonType& j, T b) noexcept
{
typename BasicJsonType::object_t tmp_obj;
tmp_obj[b.key()] = b.value(); // TODO: maybe there is a better way?
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll have a look at this later.

void to_json(BasicJsonType& j, T b) noexcept
{
typename BasicJsonType::object_t tmp_obj;
tmp_obj[b.key()] = b.value(); // TODO: maybe there is a better way?
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll have a look at this later.

Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@nlohmann nlohmann merged commit 86a96b0 into nlohmann:develop Jun 28, 2018
@nlohmann nlohmann self-assigned this Jun 28, 2018
@nlohmann nlohmann added this to the Release 3.1.3 milestone Jun 28, 2018
nlohmann added a commit that referenced this pull request Jun 28, 2018
@nlohmann
Copy link
Owner

I solved the TODOs. Thanks so much for the PR!

@Daniel599
Copy link
Contributor Author

No problem 😁
Seems like my astyle run (ubuntu 16 on microsoft WSL) did some unwanted formatting, sorry about that.

@Daniel599 Daniel599 deleted the feature/items_iterator branch June 28, 2018 22:55
@mnzn2530
Copy link

i get compile error in vs2015 sp1:
illegal indirection
in single_include/nlohmann version, error message:

1>d:\xxxxxx\json.h(2599): error C2100: 非法的间接寻址 (编译源文件 D:\xxxx.cpp)
1> d:\xxxxxxx\json.h(3663): note: 参见对正在编译的类 模板 实例化“nlohmann::detail::static_constnlohmann::detail::from_json_fn”的引用 (编译源文件 D:\xxxxxx.cpp)

hope can fix this compile error.

@nlohmann
Copy link
Owner

@mnzn2530 Please create an issue for this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants