oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity
5732 commits 5 branches 133 tags 218 MiB
Commit graph

6 commits

Author SHA1 Message Date
Matthew Chen
e77c3e6717 Retain changes from session database branch. 2018-01-10 12:18:23 -05:00
Michael Kirk
08c324f948 Fix compiler warnings around ambiguous macro redefinition. 
LMK if there's a better way to do this, which doesn't involve requiring
modules.

// FREEBIE
 2017-12-04 12:50:28 -05:00
Michael Kirk
336d59a6ce restore chrono timestamp 
make SSK compatible with c++ by using non-modular imports, which
requires disambiguating our ddLog variable.

// FREEBIE
 2017-11-30 09:38:39 -08:00
Michael Kirk
c5b0f7cd01 framework compatible CocoaLumberjack import 
With previous import style, the `LOG_ASYNC_ENABLED, LOG_LEVEL_DEF`
macros were not being defined.

@import style module includes are handled differently in ObjC++, causing
problems with out millisecondTimeStamp implementation. Rather than
address that problem head on, I simple reimplemented our millisecond
timestamp method in objective-c, removing our single ObjC++ file.

// FREEBIE
 2017-11-29 13:58:27 -08:00
Matthew Chen
a6bfc0a60e Fix build warnings from XCode 9. 2017-11-09 02:52:44 -05:00
Michael Kirk
ccb4a88742 Import SSK (and history) into Signal-iOS 
git remote add ssk ../SignalServiceKit
git remote update
git merge -s ours --allow-unrelated-histories --no-commit ssk/master
git read-tree --prefix=SignalServiceKit -u ssk/master
git commit
 2017-07-21 13:55:01 -04:00