This repository has been archived by the owner on Mar 26, 2020. It is now read-only.
Separate flags to enum_flags.djinni
#346
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
added 2 commits
January 3, 2018 17:51
Separate `flags` to `enum_flags.djinni`, to exclude it from `common.djinni`, so that it wouldn’t be picked up by Python in `python` branch. Otherwise it causes failure in `python` branch since flags feature is not implemented.
|
This PR addresses #334 |
artwyman
approved these changes
Jan 4, 2018
mariannegru
added a commit
to mariannegru/djinni
that referenced
this pull request
Jan 19, 2018
* upstream/master: (54 commits) Upgrade example build (dropbox#339) Separate `flags` to `enum_flags.djinni` (dropbox#346) Add a script to build static fat binary lib. (dropbox#341) Upgrade the example to Gradle 4.2 and Android plugin 2.3.3 (dropbox#329) Android parcelable support (dropbox#308) Add assembly to produce standalone jar. (dropbox#324) New "flags" archetype for enums oriented towards bitwise flags (dropbox#323) Add Xianwen to contacts Fix CFStringEncoding/NSStringEncoding confusion Added missing std:: in platform_threads_impl (dropbox#321) Avoid unused variable warning when compiling djinni_support.cpp (dropbox#319) [Android] Fix Djinni initialization crash in multi shared library case (dropbox#310) Fix rsync commands to not update timestamps on unchanged contents Swap the README.md change for a CONTRIBUTORS file for attribution. Renaming "temp" to "proxy_handle" to make more readable. Adding comment to warn of the potential segfault in gcc. Making three changes to fix compilation in our environment. Make Swift code more idiomatic move CMakeLists.txt file to root directory and rename target name to djinni_support_lib revert unintended generator change ... # Conflicts: # example/generated-src/objc/TXSTextboxListener+Private.mm # example/objc/TextSort.xcodeproj/project.pbxproj # example/objc/TextSort.xcodeproj/xcshareddata/xcschemes/TextSort.xcscheme # src/source/ObjcppGenerator.scala # src/source/parser.scala # test-suite/djinni/common.djinni # test-suite/generated-src/inFileList.txt # test-suite/generated-src/objc/DBClientInterface+Private.mm # test-suite/generated-src/objc/DBEnumUsageInterface+Private.mm # test-suite/generated-src/objc/DBExternInterface2+Private.mm # test-suite/generated-src/objc/DBFirstListener+Private.mm # test-suite/generated-src/objc/DBObjcOnlyListener+Private.mm # test-suite/generated-src/objc/DBSecondListener+Private.mm # test-suite/generated-src/objc/DBUserToken+Private.mm # test-suite/generated-src/objc/DBUsesSingleLanguageListeners+Private.mm # test-suite/generated-src/outFileList.txt # test-suite/handwritten-src/java/com/dropbox/djinni/test/AllTests.java # test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
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.
Separate
flagstoenum_flags.djinni, to exclude it fromcommon.djinni, so that it wouldn’t be picked up by Python inpythonbranch.Otherwise it causes failure in
pythonbranch since flags feature isnot implemented for Python.