diff options
| author | Daniel Jasper <djasper@google.com> | 2016-12-20 10:05:04 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2016-12-20 10:05:04 +0000 |
| commit | 04092174f77a5cba9a2ff50d88002ffd82e478a5 (patch) | |
| tree | 26173d59f69e4e47b3b875abbcf6175c69b4ed83 /include | |
| parent | add07b73fd0f5cd4110bf6c944112df9350380d5 (diff) | |
Revert "[OpenCL] Enabling the usage of CLK_NULL_QUEUE as compare operand."
This reverts commit r290171. It triggers a bunch of warnings, because
the new enumerator isn't handled in all switches. We want a warning-free
build.
Replied on the commit with more details.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@290173 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/clang/AST/OperationKinds.def | 3 | ||||
| -rw-r--r-- | include/clang/Sema/Initialization.h | 5 | ||||
| -rw-r--r-- | include/clang/Sema/Overload.h | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/include/clang/AST/OperationKinds.def b/include/clang/AST/OperationKinds.def index 2d48a7df47..03a61e94e2 100644 --- a/include/clang/AST/OperationKinds.def +++ b/include/clang/AST/OperationKinds.def @@ -321,9 +321,6 @@ CAST_OPERATION(BuiltinFnToFnPtr) // Convert a zero value for OpenCL event_t initialization. CAST_OPERATION(ZeroToOCLEvent) -// Convert a zero value for OpenCL queue_t initialization. -CAST_OPERATION(ZeroToOCLQueue) - // Convert a pointer to a different address space. CAST_OPERATION(AddressSpaceConversion) diff --git a/include/clang/Sema/Initialization.h b/include/clang/Sema/Initialization.h index a7b8cce326..c2795fcaf3 100644 --- a/include/clang/Sema/Initialization.h +++ b/include/clang/Sema/Initialization.h @@ -751,8 +751,6 @@ public: SK_StdInitializerListConstructorCall, /// \brief Initialize an OpenCL sampler from an integer. SK_OCLSamplerInit, - /// \brief Initialize queue_t from 0. - SK_OCLZeroQueue, /// \brief Passing zero to a function where OpenCL event_t is expected. SK_OCLZeroEvent }; @@ -1150,9 +1148,6 @@ public: /// constant. void AddOCLZeroEventStep(QualType T); - /// \brief Add a step to initialize an OpenCL queue_t from 0. - void AddOCLZeroQueueStep(QualType T); - /// \brief Add steps to unwrap a initializer list for a reference around a /// single element and rewrap it at the end. void RewrapReferenceInitList(QualType T, InitListExpr *Syntactic); diff --git a/include/clang/Sema/Overload.h b/include/clang/Sema/Overload.h index 9771044a07..7c6699aca0 100644 --- a/include/clang/Sema/Overload.h +++ b/include/clang/Sema/Overload.h @@ -83,7 +83,6 @@ namespace clang { ICK_TransparentUnionConversion, ///< Transparent Union Conversions ICK_Writeback_Conversion, ///< Objective-C ARC writeback conversion ICK_Zero_Event_Conversion, ///< Zero constant to event (OpenCL1.2 6.12.10) - ICK_Zero_Queue_Conversion, ///< Zero constant to queue ICK_C_Only_Conversion, ///< Conversions allowed in C, but not C++ ICK_Incompatible_Pointer_Conversion, ///< C-only conversion between pointers /// with incompatible types |