Skip to content

fixed compile error for #1045 - #1134

Merged
nlohmann merged 2 commits into
nlohmann:developfrom
Daniel599:feature/items_iterator
Jun 28, 2018
Merged

fixed compile error for #1045#1134
nlohmann merged 2 commits into
nlohmann:developfrom
Daniel599:feature/items_iterator

Conversation

@Daniel599

@Daniel599 Daniel599 commented Jun 16, 2018 •
edited
Loading

Copy link
Copy Markdown
Contributor

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

@Daniel599

Daniel599 commented Jun 16, 2018 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

@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

nlohmann commented Jun 16, 2018

Copy link
Copy Markdown
Owner

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

@Daniel599

Daniel599 commented Jun 25, 2018

Copy link
Copy Markdown
Contributor Author

@nlohmann any update?

@nlohmann

nlohmann commented Jun 25, 2018

Copy link
Copy Markdown
Owner

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

@nlohmann

nlohmann commented Jun 26, 2018

Copy link
Copy Markdown
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

Daniel599 commented Jun 27, 2018

Copy link
Copy Markdown
Contributor Author

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

nlohmann
nlohmann reviewed Jun 28, 2018
View reviewed changes
Comment thread single_include/nlohmann/json.hpp
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?

@nlohmann nlohmann Jun 28, 2018

Copy link
Copy Markdown
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.

nlohmann
nlohmann reviewed Jun 28, 2018
View reviewed changes
Comment thread include/nlohmann/detail/conversions/to_json.hpp
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?

@nlohmann nlohmann Jun 28, 2018

Copy link
Copy Markdown
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.

nlohmann
nlohmann approved these changes Jun 28, 2018
View reviewed changes

@nlohmann nlohmann left a comment

Copy link
Copy Markdown
Owner

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
🔨 cleanup after #1134
39dd775
@nlohmann

nlohmann commented Jun 28, 2018

Copy link
Copy Markdown
Owner

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

@nlohmann nlohmann mentioned this pull request Jun 28, 2018
Closed
@Daniel599

Daniel599 commented Jun 28, 2018

Copy link
Copy Markdown
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

mnzn2530 commented Jul 16, 2020

Copy link
Copy Markdown

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

nlohmann commented Jul 16, 2020

Copy link
Copy Markdown
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

Reviewers

@nlohmann nlohmann nlohmann approved these changes

Assignees

@nlohmann nlohmann

Labels

kind: enhancement/improvement

Projects

None yet

Milestone

Release 3.2.0

Development

Successfully merging this pull request may close these issues.

5 participants

@Daniel599 @nlohmann @mnzn2530 @gregmarr @theodelrieu