diff options
| author | James Farrell <jamesfarrell@google.com> | 2023-01-19 20:23:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-01-19 20:23:29 +0000 |
| commit | 2222fa5818324771ceb99fd8802e54a50a2fb1a4 (patch) | |
| tree | 1ae91df59da342959b75efa0a6bfa467038a78de /SPIRV/doc.h | |
| parent | 3413ac75f77bea1fb8cc7f04fd83a62384e1d34e (diff) | |
| download | glslang-fc6e7e53d7a43970f18ee6cae6a7fc23bde4784a.tar.gz | |
Revert "Merge remote-tracking branch 'aosp/upstream-master' into..."ndk-r27-rc1ndk-r26dndk-r26cndk-r26bndk-r26-rc1ndk-r26-beta1ndk-r26ndk-r27-releasendk-r26-releasemaster-ndk
Revert submission 2388945-update-shaderc
Reason for revert: Breaks NDK build on darwin.
Reverted changes: /q/submissionid:2388945-update-shaderc
Change-Id: I7e65acd5f2a56fdd82f921a7cdce50e24c68e553
Diffstat (limited to 'SPIRV/doc.h')
| -rw-r--r-- | SPIRV/doc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SPIRV/doc.h b/SPIRV/doc.h index 7e155995..2a0b28c6 100644 --- a/SPIRV/doc.h +++ b/SPIRV/doc.h @@ -190,7 +190,7 @@ protected: // Parameterize an enumerant class EnumParameters { public: - EnumParameters() : desc(nullptr) { } + EnumParameters() : desc(0) { } const char* desc; }; @@ -198,7 +198,7 @@ public: class EnumDefinition : public EnumParameters { public: EnumDefinition() : - ceiling(0), bitmask(false), getName(nullptr), enumParams(nullptr), operandParams(nullptr) { } + ceiling(0), bitmask(false), getName(0), enumParams(0), operandParams(0) { } void set(int ceil, const char* (*name)(int), EnumParameters* ep, bool mask = false) { ceiling = ceil; |