Merge "Suppress null-dereference warning temporarily" (ae461e07) · Commits · e / os / android_frameworks_av

media/codec2/core/include/C2Param.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -988,7 +988,10 @@ struct C2FieldDescriptor {
		/** specialization for easy enums */
		template<typename E>
		inline static NamedValuesType namedValuesFor(const C2EasyEnum<E> &) {
		#pragma GCC diagnostic push
		#pragma GCC diagnostic ignored "-Wnull-dereference"
		return namedValuesFor((E)nullptr);
		#pragma GCC diagnostic pop
		}

		private:
		@@ -1104,7 +1107,10 @@ struct C2FieldDescriptor::_NamedValuesGetter<B, false> {
		template<typename B>
		struct C2FieldDescriptor::_NamedValuesGetter<B, true> {
		inline static C2FieldDescriptor::NamedValuesType getNamedValues() {
		#pragma GCC diagnostic push
		#pragma GCC diagnostic ignored "-Wnull-dereference"
		return C2FieldDescriptor::namedValuesFor((B)nullptr);
		#pragma GCC diagnostic pop
		}
		};