TreePush with zero arguments was ambiguous. Resolved by making it cal…#1057
Closed
jawilkins wants to merge 6 commits intoocornut:masterfrom
Closed
TreePush with zero arguments was ambiguous. Resolved by making it cal…#1057jawilkins wants to merge 6 commits intoocornut:masterfrom
jawilkins wants to merge 6 commits intoocornut:masterfrom
Conversation
…l TreePush(const void*)
…uiTextFilter class
The EDG compiler used for syntax in MSVC is very picky about C++ prototypes matching their definitions EXACTLY. So, it puts green squiggles under prototypes when: * the type name is different, even if the underlying type is the same * the formal parameter name is different or missing These aren't technically errors, and Microsoft might not even want to be this strict, but the squiggles are annoying...
Owner
|
NB: I cannot merge full branch anymore as you pushed 3 unrelated commits to the same branch. It's a very common mistake when using git to not know that PR are associated to a branch. Will cherry-pick the single commit, no problem. |
…tCallbackData class
Contributor
Author
|
So that is what was going on. |
Contributor
Author
|
Even though it is unrelated to the original request, I think you could merge all of this after I fix the problems with 2fce77c, since they are just mismatches between typedefs and missing IMGUI_API tags. |
Owner
Contributor
Author
|
Thanks! Although you explained to me how pull requests work with branches,
I never went back and fixed it.
…On Sun, Nov 19, 2017 at 5:45 AM, omar ***@***.***> wrote:
Hello @jasonwilkins <https://github.com/jasonwilkins>, finally looked at
this, sorry for the late answer.
TreePush(): Merged 393f9f3
<393f9f3>
FindGlyph(): Merged f94f112
<f94f112>
For those commits:
c2e0881
<c2e0881>
2fce77c
<2fce77c>
cf0e992
<cf0e992>
An equivalent fix had already been applied to Master since you started
your branch.
Thanks for your help!
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#1057 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AD7eCTXT6u4DEVVDVhnGsrpL99MbpJlTks5s4BTogaJpZM4MWfDN>
.
|
ocornut
added
tree
Owner
|
Followed on this with 513c1ba |
ocornut
added a commit
that referenced
this pull request
Sep 10, 2024
Also #74, #96, #480, #501, #647, #654, #719, #843, #894, #1057, #1173, #1390, #1414, #1556, #1768, #2041, #2116, #2330, #2475, #2562, #2667, #2807, #2885, #3102, #3375, #3526, #3964, #4008, #4070, #4158, #4172, #4199, #4375, #4395, #4471, #4548, #4612, #4631, #4657, #4796, #5210, #5303, #5360, #5393, #5533, #5692, #5707, #5729, #5773, #5787, #5884, #6046, #6093, #6186, #6223, #6364, #6387, #6567, #6692, #6724, #6939, #6984, #7246, #7270, #7375, #7421, #7434, #7472, #7581, #7724, #7926, #7937 and probably more.. Tagging to increase visibility!
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
…l TreePush(const void*)