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.

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

Added support for 64-bit integers in sf::Packet #710

Merged
merged 1 commit into from Oct 6, 2014

Conversation

Projects
None yet
7 participants
@LaurentGomila
Member

LaurentGomila commented Oct 2, 2014

Implements #208.

@TankOs

This comment has been minimized.

Show comment
Hide comment
@TankOs

TankOs Oct 3, 2014

Member

👍 Good review

Member

TankOs commented Oct 3, 2014

👍 Good review

@binary1248

This comment has been minimized.

Show comment
Hide comment
@binary1248

binary1248 Oct 3, 2014

Member

Passes this test as well. 😁

Feel free to add that to the unit tests if you want.

Member

binary1248 commented Oct 3, 2014

Passes this test as well. 😁

Feel free to add that to the unit tests if you want.

@eXpl0it3r

This comment has been minimized.

Show comment
Hide comment
@eXpl0it3r

eXpl0it3r Oct 5, 2014

Member

@binary1248's test seems to run fine here, though I've no idea what it does. 😄

You know the drill. This PR has been added to my merge list and will be merged very soon, unless anyone raises any concerns.

Edit: Well it needs a rebase, \n line endings FTW!

Member

eXpl0it3r commented Oct 5, 2014

@binary1248's test seems to run fine here, though I've no idea what it does. 😄

You know the drill. This PR has been added to my merge list and will be merged very soon, unless anyone raises any concerns.

Edit: Well it needs a rebase, \n line endings FTW!

@LaurentGomila

This comment has been minimized.

Show comment
Hide comment
@LaurentGomila

LaurentGomila Oct 6, 2014

Member

Well it needs a rebase, \n line endings FTW!

Can someone else do this? I'm not 100% sure to do the right thing 😁

Member

LaurentGomila commented Oct 6, 2014

Well it needs a rebase, \n line endings FTW!

Can someone else do this? I'm not 100% sure to do the right thing 😁

@MarioLiebisch

This comment has been minimized.

Show comment
Hide comment
@MarioLiebisch

MarioLiebisch Oct 6, 2014

Member

It's as easy as runnning git rebase master when in your branch.

Member

MarioLiebisch commented Oct 6, 2014

It's as easy as runnning git rebase master when in your branch.

@eXpl0it3r

This comment has been minimized.

Show comment
Hide comment
@eXpl0it3r

eXpl0it3r Oct 6, 2014

Member

And then you'll have to resolve all the conflicts... Which I think was Laurent's concerns, especially with the newline changes.

Member

eXpl0it3r commented Oct 6, 2014

And then you'll have to resolve all the conflicts... Which I think was Laurent's concerns, especially with the newline changes.

@MarioLiebisch

This comment has been minimized.

Show comment
Hide comment
@MarioLiebisch

MarioLiebisch Oct 6, 2014

Member

Seems like it worked, minus the "missing" newline at the end. :)

Line endings shouldn't be any concern now with the .gitattributes file explicitly naming a convention.

Member

MarioLiebisch commented Oct 6, 2014

Seems like it worked, minus the "missing" newline at the end. :)

Line endings shouldn't be any concern now with the .gitattributes file explicitly naming a convention.

@eXpl0it3r

This comment has been minimized.

Show comment
Hide comment
@eXpl0it3r

eXpl0it3r Oct 6, 2014

Member

I've rebased it. The .gitattributes branch hasn't been merged yet. 😉

Member

eXpl0it3r commented Oct 6, 2014

I've rebased it. The .gitattributes branch hasn't been merged yet. 😉

@MarioLiebisch

This comment has been minimized.

Show comment
Hide comment
@MarioLiebisch

MarioLiebisch Oct 6, 2014

Member

Uh okay. :P

Member

MarioLiebisch commented Oct 6, 2014

Uh okay. :P

@eXpl0it3r

This comment has been minimized.

Show comment
Hide comment
@eXpl0it3r

eXpl0it3r Oct 6, 2014

Member

Line endings are now fixed as well. Stupid GitHub doesn't show them as additional line... 😑

Member

eXpl0it3r commented Oct 6, 2014

Line endings are now fixed as well. Stupid GitHub doesn't show them as additional line... 😑

@eXpl0it3r eXpl0it3r merged commit f99035b into master Oct 6, 2014

@eXpl0it3r eXpl0it3r deleted the feature/packet_int64 branch Oct 6, 2014

@TankOs

This comment has been minimized.

Show comment
Hide comment
@TankOs

TankOs Oct 7, 2014

Member

Hint: Do the line conversions before you rebase/merge, so that the merge will be much easier, if not automatic.

Member

TankOs commented Oct 7, 2014

Hint: Do the line conversions before you rebase/merge, so that the merge will be much easier, if not automatic.

@mantognini

This comment has been minimized.

Show comment
Hide comment
@mantognini

mantognini Oct 7, 2014

Member

@TankOs D'you have a script to convert line endings by any chance? I'm facing the same issue. :-)

Member

mantognini commented Oct 7, 2014

@TankOs D'you have a script to convert line endings by any chance? I'm facing the same issue. :-)

@Bromeon

This comment has been minimized.

Show comment
Hide comment
@Bromeon

Bromeon Oct 7, 2014

Member

See here (depending on your system, you might also install it with a package manager). Maybe Tank has a script that also deals with colons and other formatting.

Member

Bromeon commented Oct 7, 2014

See here (depending on your system, you might also install it with a package manager). Maybe Tank has a script that also deals with colons and other formatting.

@mantognini

This comment has been minimized.

Show comment
Hide comment
@mantognini

mantognini Oct 7, 2014

Member

cool, thanks!

Member

mantognini commented Oct 7, 2014

cool, thanks!

@TankOs

This comment has been minimized.

Show comment
Hide comment
@TankOs

TankOs Oct 9, 2014

Member

This is what I used for the conversion: https://gist.github.com/TankOs/a95fe1cb1ab9ebe36a03

It requires zsh, though.

Member

TankOs commented Oct 9, 2014

This is what I used for the conversion: https://gist.github.com/TankOs/a95fe1cb1ab9ebe36a03

It requires zsh, though.

@mantognini

This comment has been minimized.

Show comment
Hide comment
@mantognini

mantognini Oct 9, 2014

Member

Nice, thank you :-)

Member

mantognini commented Oct 9, 2014

Nice, thank you :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment