Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

PacketLib
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a7cfcad8

Commit a7cfcad8 authored Mar 4, 2014 by Andrea Bulgarelli

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/optimize'

Conflicts:
	include/SourceDataField.h
	src/ByteStream.cpp
	src/InputPacketStream.cpp
	src/Packet.cpp

parents 71838da3 6d741615

No related branches found

No related tags found

No related merge requests found

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

include/InputPacketStream.h 2 additions, 1 deletion

include/InputPacketStream.h
include/Packet.h 3 additions, 0 deletions

include/Packet.h
include/SourceDataField.h 1 addition, 1 deletion

include/SourceDataField.h
src/ByteStream.cpp 16 additions, 30 deletions

src/ByteStream.cpp
src/File.cpp 7 additions, 40 deletions

src/File.cpp
src/InputPacketStream.cpp 15 additions, 6 deletions

src/InputPacketStream.cpp
src/Packet.cpp 10 additions, 5 deletions

src/Packet.cpp
src/PartOfPacket.cpp 2 additions, 2 deletions

src/PartOfPacket.cpp
src/SDFBlockFixed.cpp 2 additions, 2 deletions

src/SDFBlockFixed.cpp
src/SDFBlockVariable.cpp 2 additions, 2 deletions

src/SDFBlockVariable.cpp

with 60 additions and 89 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment