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

farmhash cleanup #2473

Merged
merged 1 commit into from
Jan 24, 2020
Merged

farmhash cleanup #2473

merged 1 commit into from
Jan 24, 2020

Conversation

lgritz
Copy link
Collaborator

@lgritz lgritz commented Jan 23, 2020

  • Remove the majority of farmhash.cpp that is about the self-test.

  • Make sure absolutely everything is within the OIIO namespace.

@lgritz
farmhash cleanup
912c61f 
* Remove the majority of farmhash.cpp that is about the self-test.

* Make sure absolutely everything is within the OIIO namespace.
@lgritz
Copy link
Collaborator Author

lgritz commented Jan 23, 2020

Closes #2472

@lgritz
Copy link
Collaborator Author

lgritz commented Jan 23, 2020

Before:

$ nm dist/macosx/lib/libOpenImageIO.dylib  | grep farm
000000000059db30 T __ZN10farmhashcc14Fingerprint128EPKcm
000000000059d050 T __ZN10farmhashcc14Hash32WithSeedEPKcmj
000000000059d400 T __ZN10farmhashcc19CityHash128WithSeedEPKcmNSt3__14pairIyyEE
000000000059cb70 T __ZN10farmhashcc6Hash32EPKcm
000000000059ba90 T __ZN10farmhashmk14Hash32WithSeedEPKcmj
000000000059b5f0 T __ZN10farmhashmk6Hash32EPKcm
000000000059a5c0 T __ZN10farmhashna14Hash64WithSeedEPKcmy
000000000059a620 T __ZN10farmhashna15Hash64WithSeedsEPKcmyy
000000000059a080 T __ZN10farmhashna6Hash64EPKcm
000000000059b560 T __ZN10farmhashnt14Hash32WithSeedEPKcmj
000000000059b530 T __ZN10farmhashnt6Hash32EPKcm
000000000059c7e0 T __ZN10farmhashsa14Hash32WithSeedEPKcmj
000000000059bec0 T __ZN10farmhashsa6Hash32EPKcm
000000000059be80 T __ZN10farmhashsu14Hash32WithSeedEPKcmj
000000000059be40 T __ZN10farmhashsu6Hash32EPKcm
000000000059b480 T __ZN10farmhashte14Hash64WithSeedEPKcmy
000000000059b510 T __ZN10farmhashte15Hash64WithSeedsEPKcmyy
000000000059aee0 T __ZN10farmhashte6Hash64EPKcm
000000000059af10 t __ZN10farmhashteL10Hash64LongEPKcmyy
000000000059a9a0 T __ZN10farmhashuo14Hash64WithSeedEPKcmy
000000000059a670 T __ZN10farmhashuo15Hash64WithSeedsEPKcmyy
000000000059aa10 T __ZN10farmhashuo6Hash64EPKcm
000000000059ae70 T __ZN10farmhashxo14Hash64WithSeedEPKcmy
000000000059ae60 T __ZN10farmhashxo15Hash64WithSeedsEPKcmyy
000000000059aa30 T __ZN10farmhashxo6Hash64EPKcm
000000000059ddb0 T __ZN18OpenImageIO_v2_2_08farmhash13Fingerprint32EPKcm
000000000059ddc0 T __ZN18OpenImageIO_v2_2_08farmhash13Fingerprint64EPKcm
000000000059ddd0 T __ZN18OpenImageIO_v2_2_08farmhash14Fingerprint128EPKcm
000000000059dbb0 T __ZN18OpenImageIO_v2_2_08farmhash14Hash32WithSeedEPKcmj
000000000059dca0 T __ZN18OpenImageIO_v2_2_08farmhash14Hash64WithSeedEPKcmy
000000000059dda0 T __ZN18OpenImageIO_v2_2_08farmhash15Hash128WithSeedEPKcmNSt3__14pairIyyEE
000000000059dd00 T __ZN18OpenImageIO_v2_2_08farmhash15Hash64WithSeedsEPKcmyy
000000000059dc70 T __ZN18OpenImageIO_v2_2_08farmhash4HashEPKcm
000000000059db80 T __ZN18OpenImageIO_v2_2_08farmhash6Hash32EPKcm
000000000059dc40 T __ZN18OpenImageIO_v2_2_08farmhash6Hash64EPKcm
000000000059dd50 T __ZN18OpenImageIO_v2_2_08farmhash7Hash128EPKcm

After:

$ nm dist/macosx/lib/libOpenImageIO.dylib  | grep farm
000000000059db30 T __ZN18OpenImageIO_v2_2_010farmhashcc14Fingerprint128EPKcm
000000000059d050 T __ZN18OpenImageIO_v2_2_010farmhashcc14Hash32WithSeedEPKcmj
000000000059d400 T __ZN18OpenImageIO_v2_2_010farmhashcc19CityHash128WithSeedEPKcmNSt3__14pairIyyEE
000000000059cb70 T __ZN18OpenImageIO_v2_2_010farmhashcc6Hash32EPKcm
000000000059ba90 T __ZN18OpenImageIO_v2_2_010farmhashmk14Hash32WithSeedEPKcmj
000000000059b5f0 T __ZN18OpenImageIO_v2_2_010farmhashmk6Hash32EPKcm
000000000059a5c0 T __ZN18OpenImageIO_v2_2_010farmhashna14Hash64WithSeedEPKcmy
000000000059a620 T __ZN18OpenImageIO_v2_2_010farmhashna15Hash64WithSeedsEPKcmyy
000000000059a080 T __ZN18OpenImageIO_v2_2_010farmhashna6Hash64EPKcm
000000000059b560 T __ZN18OpenImageIO_v2_2_010farmhashnt14Hash32WithSeedEPKcmj
000000000059b530 T __ZN18OpenImageIO_v2_2_010farmhashnt6Hash32EPKcm
000000000059c7e0 T __ZN18OpenImageIO_v2_2_010farmhashsa14Hash32WithSeedEPKcmj
000000000059bec0 T __ZN18OpenImageIO_v2_2_010farmhashsa6Hash32EPKcm
000000000059be80 T __ZN18OpenImageIO_v2_2_010farmhashsu14Hash32WithSeedEPKcmj
000000000059be40 T __ZN18OpenImageIO_v2_2_010farmhashsu6Hash32EPKcm
000000000059b480 T __ZN18OpenImageIO_v2_2_010farmhashte14Hash64WithSeedEPKcmy
000000000059b510 T __ZN18OpenImageIO_v2_2_010farmhashte15Hash64WithSeedsEPKcmyy
000000000059aee0 T __ZN18OpenImageIO_v2_2_010farmhashte6Hash64EPKcm
000000000059af10 t __ZN18OpenImageIO_v2_2_010farmhashteL10Hash64LongEPKcmyy
000000000059a9a0 T __ZN18OpenImageIO_v2_2_010farmhashuo14Hash64WithSeedEPKcmy
000000000059a670 T __ZN18OpenImageIO_v2_2_010farmhashuo15Hash64WithSeedsEPKcmyy
000000000059aa10 T __ZN18OpenImageIO_v2_2_010farmhashuo6Hash64EPKcm
000000000059ae70 T __ZN18OpenImageIO_v2_2_010farmhashxo14Hash64WithSeedEPKcmy
000000000059ae60 T __ZN18OpenImageIO_v2_2_010farmhashxo15Hash64WithSeedsEPKcmyy
000000000059aa30 T __ZN18OpenImageIO_v2_2_010farmhashxo6Hash64EPKcm
000000000059ddb0 T __ZN18OpenImageIO_v2_2_08farmhash13Fingerprint32EPKcm
000000000059ddc0 T __ZN18OpenImageIO_v2_2_08farmhash13Fingerprint64EPKcm
000000000059ddd0 T __ZN18OpenImageIO_v2_2_08farmhash14Fingerprint128EPKcm
000000000059dbb0 T __ZN18OpenImageIO_v2_2_08farmhash14Hash32WithSeedEPKcmj
000000000059dca0 T __ZN18OpenImageIO_v2_2_08farmhash14Hash64WithSeedEPKcmy
000000000059dda0 T __ZN18OpenImageIO_v2_2_08farmhash15Hash128WithSeedEPKcmNSt3__14pairIyyEE
000000000059dd00 T __ZN18OpenImageIO_v2_2_08farmhash15Hash64WithSeedsEPKcmyy
000000000059dc70 T __ZN18OpenImageIO_v2_2_08farmhash4HashEPKcm
000000000059db80 T __ZN18OpenImageIO_v2_2_08farmhash6Hash32EPKcm
000000000059dc40 T __ZN18OpenImageIO_v2_2_08farmhash6Hash64EPKcm
000000000059dd50 T __ZN18OpenImageIO_v2_2_08farmhash7Hash128EPKcm

Definitely all inside the OIIO namespace now.

@lgritz lgritz merged commit e081016 into AcademySoftwareFoundation:master Jan 24, 2020
@lgritz lgritz mentioned this pull request Jan 24, 2020
Closed
@lgritz lgritz deleted the lg-farmhash branch January 24, 2020 06:40
lgritz added a commit to lgritz/OpenImageIO that referenced this pull request Jan 24, 2020
@lgritz
farmhash cleanup (AcademySoftwareFoundation#2473)
4487c05 
* Remove the majority of farmhash.cpp that is about the self-test.

* Make sure absolutely everything is within the OIIO namespace.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@lgritz