This repository has been archived by the owner on Jun 23, 2022. It is now read-only.
modify s2 library dependence #129
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
acelyc111
commented
Jul 12, 2018
acelyc111
commented
- modify s2 library dependence from personal github site to google official .zip package
shengofsun
reviewed
Jul 12, 2018
thirdparty/download-thirdparty.sh
Outdated
| "s2geometry" | ||
| ret_code=$? | ||
| if [ $ret_code -eq 2 ]; then | ||
| exit -1 |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
thirdparty/download-thirdparty.sh
Outdated
| if [ $? != 0 ]; then | ||
| echo "ERROR: download s2geometry wrong" | ||
| echo "ERROR: patch fix_s2_for_pegasus.patch for s2geometry failed" | ||
| exit -1 |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
neverchanje
reviewed
Jul 12, 2018
| @@ -42,6 +42,7 @@ | |||
| // The following code is internal implementation detail. See the comment at the | |||
| // top of this file for the API documentation. | |||
|
|
|||
| namespace dsn { | |||
There was a problem hiding this comment.
这里加个注释
// to prevent symbol conflict from third-parties (google/s2 eg.) that also uses abseil.
neverchanje
reviewed
Jul 12, 2018
| @@ -46,6 +46,7 @@ | |||
|
|
|||
| #include <dsn/utility/absl/base/internal/invoke.h> | |||
|
|
|||
| namespace dsn { | |||
There was a problem hiding this comment.
同上
// to prevent symbol conflict from third-parties (google/s2 eg.) that also uses abseil.
This comment has been minimized.
This comment has been minimized.
neverchanje
reviewed
Jul 13, 2018
| @@ -200,5 +202,6 @@ auto apply(Functor &&functor, Tuple &&t) -> decltype(utility_internal::apply_hel | |||
| std::tuple_size<typename std::remove_reference<Tuple>::type>::value>{}); | |||
| } | |||
| } // namespace absl | |||
| } // namespace dsn | |||
|
|
|||
| #endif // ABSL_UTILITY_UTILITY_H_ | |||
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
shengofsun
approved these changes
Jul 13, 2018
neverchanje
approved these changes
Jul 13, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.