Skip to content

merge for continue edit #1

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.

Sign up for GitHub

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

Open
ETiV wants to merge 3 commits into
base: master
Choose a base branch
from
Open

merge for continue edit #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da9b712
Merge pull request #5 from ETiV/master
ETiV Aug 4, 2013
cb72195
fix 64位问题
GeforceLee Aug 7, 2013
93b1995
添加 rootMsg 支持
ETiV Aug 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions PomeloClient-WebSocket/FirstViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ - (void)viewDidLoad {
for (int i = 0; i< loop; i++) {
double val = ((double)arc4random() / ARC4RANDOM_MAX);
uint64_t number = (uint64_t)(val * limit);
NSMutableData* data = [PBCodec encodeUInt64:number];
uint64_t result = [PBCodec decodeUInt64:data];
NSMutableData* data = [PBCodec encodeUInt32:number];
uint64_t result = [PBCodec decodeUInt32:data];
NSLog(@"dat: %@ => src: %llu => dst: %llu", data, number, result);
assert(number == result);
}
Expand All @@ -70,8 +70,8 @@ - (void)viewDidLoad {
double val = ((double)arc4random() / ARC4RANDOM_MAX);

int64_t number = (int64_t)(val * limit) * flag;
NSMutableData* data = [PBCodec encodeSInt64:number];
int64_t result = [PBCodec decodeSInt64:data];
NSMutableData* data = [PBCodec encodeSInt32:number];
int64_t result = [PBCodec decodeSInt32:data];
NSLog(@"dat: %@ => src: %lld => dst: %lld", data, number, result);
assert(number == result);
}
Expand Down
50 changes: 25 additions & 25 deletions PomeloClientWS/Protobuf/PBCodec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
#define JSON_parse(string) [NSJSONSerialization JSONObjectWithData:([string dataUsingEncoding:NSUTF8StringEncoding]) options:NSJSONReadingAllowFragments|NSJSONReadingMutableContainers|NSJSONReadingMutableLeaves error:nil]

typedef enum {
PBT_Unknown = -1,
PBT_UInt32 = 0,
PBT_SInt32 = 0,
PBT_Int32 = 0,
PBT_Double = 1,
PBT_String = 2,
PBT_Message = 2,
PBT_Float = 5
PBT_Unknown = -1,
PBT_UInt32 = 0,
PBT_SInt32 = 0,
PBT_Int32 = 0,
PBT_Double = 1,
PBT_String = 2,
PBT_Message = 2,
PBT_Float = 5
} ProtoBufType;

//inline void translatePBTypeFromType(ProtoBufType type, NSMutableString *str) {
Expand Down Expand Up @@ -57,30 +57,30 @@ typedef enum {
/**
* unsigned long
*/
+ (NSMutableData *)encodeUInt32:(uint32_t)n;
+ (NSMutableData *)encodeUInt32:(uint64_t)n;

+ (uint32_t)decodeUInt32:(NSData *)data;
+ (uint64_t)decodeUInt32:(NSData *)data;

/**
* signed long
*/
+ (NSMutableData *)encodeSInt32:(int32_t)n;
+ (NSMutableData *)encodeSInt32:(int64_t)n;

+ (int32_t)decodeSInt32:(NSData *)data;
+ (int64_t)decodeSInt32:(NSData *)data;

/**
* unsigned long long
*/
+ (NSMutableData *)encodeUInt64:(uint64_t)n;

+ (uint64_t)decodeUInt64:(NSData *)data;

/**
* signed long long
*/
+ (NSMutableData *)encodeSInt64:(int64_t)n;

+ (int64_t)decodeSInt64:(NSData *)data;
///**
// * unsigned long long
// */
//+ (NSMutableData *)encodeUInt64:(uint64_t)n;
//
//+ (uint64_t)decodeUInt64:(NSData *)data;
//
///**
// * signed long long
// */
//+ (NSMutableData *)encodeSInt64:(int64_t)n;
//
//+ (int64_t)decodeSInt64:(NSData *)data;

/**
* float
Expand Down
Loading