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

FIX: change initObjToJSON return type #3874

Merged
merged 1 commit into from
Jun 15, 2013
Merged

FIX: change initObjToJSON return type #3874

merged 1 commit into from
Jun 15, 2013

Conversation

cpcloud
Copy link
Member

@cpcloud cpcloud commented Jun 13, 2013

This is necessary because clang complains about the return type. There's a
call to the macro import_array() which injects a return statement into
wherever it's used.

closes #3872.

This is necessary because clang complains about the return type. There's a call
to the macro import_array() which injects a return statement into wherever it's
used.
@jreback
Copy link
Contributor

jreback commented Jun 13, 2013

also cc @Komnomnomnom

what do u think?

@Komnomnomnom
Copy link
Contributor

Sounds good to me, as a fix in ultrajson I think it should be pushed upstream to them as well though. Which I can do once I've merged in their recent changes, as I might have more stuff for them.

jreback added a commit that referenced this pull request Jun 15, 2013
FIX: change initObjToJSON return type
@jreback jreback merged commit aed9996 into pandas-dev:master Jun 15, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

build fails with clang, python3 and numpy 1.7.1 and higher
3 participants