Skip to content

Commit

Permalink
Merge pull request kstenerud#409 from nickh-apadmi/abseil-compat
Browse files Browse the repository at this point in the history 
Firebase and abseil compatibility
  • Loading branch information
@kstenerud
kstenerud authored May 25, 2021
2 parents bba17ee + 38883c6 commit 03e55ba
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 30 deletions.
12 changes: 6 additions & 6 deletions Mac/KSCrash-Mac.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
CB25A60B1DF23F0C00EC2B02 /* KSCPU_Apple.h in Headers */ = {isa = PBXBuildFile; fileRef = CB25A6091DF23F0C00EC2B02 /* KSCPU_Apple.h */; };
CB26860F1C694E4400EE4EB3 /* None.h in Headers */ = {isa = PBXBuildFile; fileRef = CB2685F81C694E4400EE4EB3 /* None.h */; settings = {ATTRIBUTES = (Private, ); }; };
CB2686101C694E4400EE4EB3 /* None.h in Headers */ = {isa = PBXBuildFile; fileRef = CB2685F81C694E4400EE4EB3 /* None.h */; settings = {ATTRIBUTES = (Private, ); }; };
CB2686111C694E4400EE4EB3 /* Optional.h in Headers */ = {isa = PBXBuildFile; fileRef = CB2685F91C694E4400EE4EB3 /* Optional.h */; settings = {ATTRIBUTES = (Private, ); }; };
CB2686121C694E4400EE4EB3 /* Optional.h in Headers */ = {isa = PBXBuildFile; fileRef = CB2685F91C694E4400EE4EB3 /* Optional.h */; settings = {ATTRIBUTES = (Private, ); }; };
CB2686111C694E4400EE4EB3 /* KSOptional.h in Headers */ = {isa = PBXBuildFile; fileRef = CB2685F91C694E4400EE4EB3 /* KSOptional.h */; settings = {ATTRIBUTES = (Private, ); }; };
CB2686121C694E4400EE4EB3 /* KSOptional.h in Headers */ = {isa = PBXBuildFile; fileRef = CB2685F91C694E4400EE4EB3 /* KSOptional.h */; settings = {ATTRIBUTES = (Private, ); }; };
CB2686131C694E4400EE4EB3 /* StringRef.h in Headers */ = {isa = PBXBuildFile; fileRef = CB2685FA1C694E4400EE4EB3 /* StringRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
CB2686141C694E4400EE4EB3 /* StringRef.h in Headers */ = {isa = PBXBuildFile; fileRef = CB2685FA1C694E4400EE4EB3 /* StringRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
CB2686151C694E4400EE4EB3 /* llvm-config.h in Headers */ = {isa = PBXBuildFile; fileRef = CB2685FC1C694E4400EE4EB3 /* llvm-config.h */; settings = {ATTRIBUTES = (Private, ); }; };
Expand Down Expand Up @@ -493,7 +493,7 @@
CB25A5F81DF23B5D00EC2B02 /* KSDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KSDebug.h; path = ../../Source/KSCrash/Recording/Tools/KSDebug.h; sourceTree = "<group>"; };
CB25A6091DF23F0C00EC2B02 /* KSCPU_Apple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KSCPU_Apple.h; path = ../../Source/KSCrash/Recording/Tools/KSCPU_Apple.h; sourceTree = "<group>"; };
CB2685F81C694E4400EE4EB3 /* None.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = None.h; sourceTree = "<group>"; };
CB2685F91C694E4400EE4EB3 /* Optional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Optional.h; sourceTree = "<group>"; };
CB2685F91C694E4400EE4EB3 /* KSOptional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSOptional.h; sourceTree = "<group>"; };
CB2685FA1C694E4400EE4EB3 /* StringRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringRef.h; sourceTree = "<group>"; };
CB2685FC1C694E4400EE4EB3 /* llvm-config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "llvm-config.h"; sourceTree = "<group>"; };
CB2685FD1C694E4400EE4EB3 /* LICENSE.TXT */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.TXT; sourceTree = "<group>"; };
Expand Down Expand Up @@ -761,7 +761,7 @@
isa = PBXGroup;
children = (
CB2685F81C694E4400EE4EB3 /* None.h */,
CB2685F91C694E4400EE4EB3 /* Optional.h */,
CB2685F91C694E4400EE4EB3 /* KSOptional.h */,
CB2685FA1C694E4400EE4EB3 /* StringRef.h */,
);
path = ADT;
Expand Down Expand Up @@ -1258,7 +1258,7 @@
CB6240B117EBCA74006471F1 /* KSCrashMonitor_AppState.h in Headers */,
830AB8702361D28900CB4BF8 /* KSgetsect.h in Headers */,
CBBD3AAF1CAD98A300DBB897 /* KSCrashInstallationConsole.h in Headers */,
CB2686121C694E4400EE4EB3 /* Optional.h in Headers */,
CB2686121C694E4400EE4EB3 /* KSOptional.h in Headers */,
CBA1A5331DD24FB5007B1CE7 /* KSDemangle_Swift.h in Headers */,
CB6240AD17EBCA74006471F1 /* KSCrashReport.h in Headers */,
CB62410017EBCA74006471F1 /* KSCrashDoctor.h in Headers */,
Expand Down Expand Up @@ -1398,7 +1398,7 @@
CB26861C1C694E4400EE4EB3 /* Compiler.h in Headers */,
CB8E56EB17EB9B89000C56D3 /* KSCString.h in Headers */,
CB8E569817EB9B43000C56D3 /* KSString.h in Headers */,
CB2686111C694E4400EE4EB3 /* Optional.h in Headers */,
CB2686111C694E4400EE4EB3 /* KSOptional.h in Headers */,
CB8E562E17EB9AFD000C56D3 /* KSCrashC.h in Headers */,
CB2686301C694E4400EE4EB3 /* SwiftStrings.h in Headers */,
9729E5CA2633934F00AE3237 /* Config.h in Headers */,
Expand Down
0 Source/KSCrash/llvm/ADT/Optional.h → Source/KSCrash/llvm/ADT/KSOptional.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion Source/KSCrash/swift/Basic/OldDemangler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "ManglingUtils.h"
#include "SwiftStrings.h"
#include "Punycode.h"
#include "Optional.h"
#include "KSOptional.h"
#include <functional>
#include <vector>
#include <cstdio>
Expand Down
2 changes: 1 addition & 1 deletion Source/KSCrash/swift/Basic/STLExtras.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define SWIFT_BASIC_INTERLEAVE_H

#include "LLVM.h"
#include "Optional.h"
#include "KSOptional.h"
//#include "llvm/ADT/STLExtras.h"
#include "Casting.h"
#include <algorithm>
Expand Down
16 changes: 8 additions & 8 deletions TVOS/KSCrash-TVOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
CBEE5CE81CB86989005EAF61 /* KSCrashInstallationVictory.h in Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C3E1CB86989005EAF61 /* KSCrashInstallationVictory.h */; settings = {ATTRIBUTES = (Public, ); }; };
CBEE5CE91CB86989005EAF61 /* KSCrashInstallationVictory.m in Sources */ = {isa = PBXBuildFile; fileRef = CBEE5C3F1CB86989005EAF61 /* KSCrashInstallationVictory.m */; };
CBEE5CEA1CB86989005EAF61 /* None.h in Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C421CB86989005EAF61 /* None.h */; settings = {ATTRIBUTES = (Private, ); }; };
CBEE5CEB1CB86989005EAF61 /* Optional.h in Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C431CB86989005EAF61 /* Optional.h */; settings = {ATTRIBUTES = (Private, ); }; };
CBEE5CEB1CB86989005EAF61 /* KSOptional.h in Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C431CB86989005EAF61 /* KSOptional.h */; settings = {ATTRIBUTES = (Private, ); }; };
CBEE5CEC1CB86989005EAF61 /* StringRef.h in Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C441CB86989005EAF61 /* StringRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
CBEE5CED1CB86989005EAF61 /* llvm-config.h in Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C461CB86989005EAF61 /* llvm-config.h */; settings = {ATTRIBUTES = (Private, ); }; };
CBEE5CEE1CB86989005EAF61 /* LICENSE.TXT in Resources */ = {isa = PBXBuildFile; fileRef = CBEE5C471CB86989005EAF61 /* LICENSE.TXT */; };
Expand Down Expand Up @@ -266,7 +266,7 @@
F05D77122101F9B600968B97 /* KSCrashMonitorContext.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = CB5633D21DD53C0A0023CEB6 /* KSCrashMonitorContext.h */; };
F05D77142101F9B600968B97 /* KSCrashMonitorType.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C601CB86989005EAF61 /* KSCrashMonitorType.h */; };
F05D77152101FAA000968B97 /* None.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C421CB86989005EAF61 /* None.h */; };
F05D77162101FAA000968B97 /* Optional.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C431CB86989005EAF61 /* Optional.h */; };
F05D77162101FAA000968B97 /* KSOptional.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C431CB86989005EAF61 /* KSOptional.h */; };
F05D77172101FAA000968B97 /* StringRef.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C441CB86989005EAF61 /* StringRef.h */; };
F05D77182101FAA000968B97 /* llvm-config.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C461CB86989005EAF61 /* llvm-config.h */; };
F05D77192101FAA000968B97 /* AlignOf.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C491CB86989005EAF61 /* AlignOf.h */; };
Expand Down Expand Up @@ -461,7 +461,7 @@
F05D784B210204CA00968B97 /* KSCrashMonitor_Zombie.h in Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C991CB86989005EAF61 /* KSCrashMonitor_Zombie.h */; settings = {ATTRIBUTES = (Private, ); }; };
F05D784D210204CA00968B97 /* KSCrashMonitor.h in Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C671CB86989005EAF61 /* KSCrashMonitor.h */; settings = {ATTRIBUTES = (Private, ); }; };
F05D784F210204CA00968B97 /* None.h in Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C421CB86989005EAF61 /* None.h */; settings = {ATTRIBUTES = (Private, ); }; };
F05D7850210204CA00968B97 /* Optional.h in Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C431CB86989005EAF61 /* Optional.h */; settings = {ATTRIBUTES = (Private, ); }; };
F05D7850210204CA00968B97 /* KSOptional.h in Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C431CB86989005EAF61 /* KSOptional.h */; settings = {ATTRIBUTES = (Private, ); }; };
F05D7851210204CA00968B97 /* StringRef.h in Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C441CB86989005EAF61 /* StringRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
F05D7852210204CA00968B97 /* llvm-config.h in Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C461CB86989005EAF61 /* llvm-config.h */; settings = {ATTRIBUTES = (Private, ); }; };
F05D7854210204CA00968B97 /* AlignOf.h in Headers */ = {isa = PBXBuildFile; fileRef = CBEE5C491CB86989005EAF61 /* AlignOf.h */; settings = {ATTRIBUTES = (Private, ); }; };
Expand Down Expand Up @@ -594,7 +594,7 @@
F05D77232101FAB700968B97 /* KSCrashReportFilterSets.h in Copy Headers */,
F05D77242101FAB700968B97 /* KSCrashReportFilterStringify.h in Copy Headers */,
F05D77152101FAA000968B97 /* None.h in Copy Headers */,
F05D77162101FAA000968B97 /* Optional.h in Copy Headers */,
F05D77162101FAA000968B97 /* KSOptional.h in Copy Headers */,
F05D77172101FAA000968B97 /* StringRef.h in Copy Headers */,
F05D77182101FAA000968B97 /* llvm-config.h in Copy Headers */,
F05D77192101FAA000968B97 /* AlignOf.h in Copy Headers */,
Expand Down Expand Up @@ -745,7 +745,7 @@
CBEE5C3E1CB86989005EAF61 /* KSCrashInstallationVictory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSCrashInstallationVictory.h; sourceTree = "<group>"; };
CBEE5C3F1CB86989005EAF61 /* KSCrashInstallationVictory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSCrashInstallationVictory.m; sourceTree = "<group>"; };
CBEE5C421CB86989005EAF61 /* None.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = None.h; sourceTree = "<group>"; };
CBEE5C431CB86989005EAF61 /* Optional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Optional.h; sourceTree = "<group>"; };
CBEE5C431CB86989005EAF61 /* KSOptional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSOptional.h; sourceTree = "<group>"; };
CBEE5C441CB86989005EAF61 /* StringRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringRef.h; sourceTree = "<group>"; };
CBEE5C461CB86989005EAF61 /* llvm-config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "llvm-config.h"; sourceTree = "<group>"; };
CBEE5C471CB86989005EAF61 /* LICENSE.TXT */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE.TXT; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1013,7 +1013,7 @@
isa = PBXGroup;
children = (
CBEE5C421CB86989005EAF61 /* None.h */,
CBEE5C431CB86989005EAF61 /* Optional.h */,
CBEE5C431CB86989005EAF61 /* KSOptional.h */,
CBEE5C441CB86989005EAF61 /* StringRef.h */,
);
path = ADT;
Expand Down Expand Up @@ -1364,7 +1364,7 @@
CBEE5D581CB86989005EAF61 /* KSVarArgs.h in Headers */,
CBEE5CED1CB86989005EAF61 /* llvm-config.h in Headers */,
CB9821D11DFB42DA00164220 /* KSMach.h in Headers */,
CBEE5CEB1CB86989005EAF61 /* Optional.h in Headers */,
CBEE5CEB1CB86989005EAF61 /* KSOptional.h in Headers */,
CBEE5D391CB86989005EAF61 /* KSString.h in Headers */,
CB25A5E81DF2370300EC2B02 /* KSThread.h in Headers */,
CBEE5D4C1CB86989005EAF61 /* KSCrashReportFilterBasic.h in Headers */,
Expand Down Expand Up @@ -1497,7 +1497,7 @@
F05D782F210204CA00968B97 /* KSCrashDoctor.h in Headers */,
F05D7851210204CA00968B97 /* StringRef.h in Headers */,
F05D784F210204CA00968B97 /* None.h in Headers */,
F05D7850210204CA00968B97 /* Optional.h in Headers */,
F05D7850210204CA00968B97 /* KSOptional.h in Headers */,
F05D7881210204CA00968B97 /* KSObjC.h in Headers */,
F05D7878210204CA00968B97 /* KSJSONCodec.h in Headers */,
F05D784D210204CA00968B97 /* KSCrashMonitor.h in Headers */,
Expand Down
8 changes: 4 additions & 4 deletions WatchOS/KSCrash.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
CB736FD41D9B6F0E00E3230F /* NSError+SimpleConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = CB736FA71D9B6F0E00E3230F /* NSError+SimpleConstructor.h */; settings = {ATTRIBUTES = (Private, ); }; };
CB736FD51D9B6F0E00E3230F /* NSError+SimpleConstructor.m in Sources */ = {isa = PBXBuildFile; fileRef = CB736FA81D9B6F0E00E3230F /* NSError+SimpleConstructor.m */; };
CB736FE21D9B6F4D00E3230F /* None.h in Headers */ = {isa = PBXBuildFile; fileRef = CB736FDF1D9B6F4D00E3230F /* None.h */; settings = {ATTRIBUTES = (Private, ); }; };
CB736FE31D9B6F4D00E3230F /* Optional.h in Headers */ = {isa = PBXBuildFile; fileRef = CB736FE01D9B6F4D00E3230F /* Optional.h */; settings = {ATTRIBUTES = (Private, ); }; };
CB736FE31D9B6F4D00E3230F /* KSOptional.h in Headers */ = {isa = PBXBuildFile; fileRef = CB736FE01D9B6F4D00E3230F /* KSOptional.h */; settings = {ATTRIBUTES = (Private, ); }; };
CB736FE41D9B6F4D00E3230F /* StringRef.h in Headers */ = {isa = PBXBuildFile; fileRef = CB736FE11D9B6F4D00E3230F /* StringRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
CB736FE61D9B6F5500E3230F /* llvm-config.h in Headers */ = {isa = PBXBuildFile; fileRef = CB736FE51D9B6F5500E3230F /* llvm-config.h */; settings = {ATTRIBUTES = (Private, ); }; };
CB736FEB1D9B6F5D00E3230F /* AlignOf.h in Headers */ = {isa = PBXBuildFile; fileRef = CB736FE71D9B6F5D00E3230F /* AlignOf.h */; settings = {ATTRIBUTES = (Private, ); }; };
Expand Down Expand Up @@ -318,7 +318,7 @@
CB736FA71D9B6F0E00E3230F /* NSError+SimpleConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSError+SimpleConstructor.h"; path = "../../Source/KSCrash/Recording/Tools/NSError+SimpleConstructor.h"; sourceTree = "<group>"; };
CB736FA81D9B6F0E00E3230F /* NSError+SimpleConstructor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSError+SimpleConstructor.m"; path = "../../Source/KSCrash/Recording/Tools/NSError+SimpleConstructor.m"; sourceTree = "<group>"; };
CB736FDF1D9B6F4D00E3230F /* None.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = None.h; path = ../../Source/KSCrash/llvm/ADT/None.h; sourceTree = "<group>"; };
CB736FE01D9B6F4D00E3230F /* Optional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Optional.h; path = ../../Source/KSCrash/llvm/ADT/Optional.h; sourceTree = "<group>"; };
CB736FE01D9B6F4D00E3230F /* KSOptional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KSOptional.h; path = ../../Source/KSCrash/llvm/ADT/KSOptional.h; sourceTree = "<group>"; };
CB736FE11D9B6F4D00E3230F /* StringRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringRef.h; path = ../../Source/KSCrash/llvm/ADT/StringRef.h; sourceTree = "<group>"; };
CB736FE51D9B6F5500E3230F /* llvm-config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "llvm-config.h"; path = "../../Source/KSCrash/llvm/Config/llvm-config.h"; sourceTree = "<group>"; };
CB736FE71D9B6F5D00E3230F /* AlignOf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AlignOf.h; path = ../../Source/KSCrash/llvm/Support/AlignOf.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -612,7 +612,7 @@
isa = PBXGroup;
children = (
CB736FDF1D9B6F4D00E3230F /* None.h */,
CB736FE01D9B6F4D00E3230F /* Optional.h */,
CB736FE01D9B6F4D00E3230F /* KSOptional.h */,
CB736FE11D9B6F4D00E3230F /* StringRef.h */,
);
name = ADT;
Expand Down Expand Up @@ -868,7 +868,7 @@
CB7370241D9B6FA800E3230F /* KSCrashReportFilterStringify.h in Headers */,
63289D571DED6ABF0089E031 /* KSCrashReportFixer.h in Headers */,
CB73707C1D9BB77500E3230F /* KSReachabilityKSCrash.h in Headers */,
CB736FE31D9B6F4D00E3230F /* Optional.h in Headers */,
CB736FE31D9B6F4D00E3230F /* KSOptional.h in Headers */,
CB25A60F1DF23F2A00EC2B02 /* KSCPU_Apple.h in Headers */,
CB736FE41D9B6F4D00E3230F /* StringRef.h in Headers */,
CB7370221D9B6FA800E3230F /* KSCrashReportFilterSets.h in Headers */,
Expand Down
Loading

0 comments on commit 03e55ba

Please sign in to comment.