xiaokang opened a new pull request, #15223: URL: https://github.com/apache/doris/pull/15223
# Proposed changes fix conflit name BOOL in odbc sqltypes.h and simdjson element.h. Change BOOL to BOOLEAN in simdjson. - thirdparty/installed/include/sqltypes.h > #define BOOL int - thirdparty/src/simdjson-1.0.2/include/simdjson/dom/element.h > enum class element_type { > ARRAY = '[', ///< dom::array > OBJECT = '{', ///< dom::object > INT64 = 'l', ///< int64_t > UINT64 = 'u', ///< uint64_t: any integer that fits in uint64_t but *not* int64_t > DOUBLE = 'd', ///< double: Any number with a "." or "e" that fits in double. > STRING = '"', ///< std::string_view > BOO = 't', ///< bool > NULL_VALUE = 'n' ///< null > }; > ## Problem summary Describe your changes. ## Checklist(Required) 1. Does it affect the original behavior: - [ ] Yes - [ ] No - [ ] I don't know 2. Has unit tests been added: - [ ] Yes - [ ] No - [ ] No Need 3. Has document been added or modified: - [ ] Yes - [ ] No - [ ] No Need 4. Does it need to update dependencies: - [ ] Yes - [ ] No 5. Are there any changes that cannot be rolled back: - [ ] Yes (If Yes, please explain WHY) - [ ] No ## Further comments If this is a relatively large or complex change, kick off the discussion at [d...@doris.apache.org](mailto:d...@doris.apache.org) by explaining why you chose the solution you did and what alternatives you considered, etc... -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org