]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw: remove potentially conficting definition of dout_subsys 53462/head
authorJ. Eric Ivancich <ivancich@redhat.com>
Fri, 13 May 2022 23:03:25 +0000 (19:03 -0400)
committerKonstantin Shalygin <k0ste@k0ste.ru>
Thu, 14 Sep 2023 13:43:37 +0000 (20:43 +0700)
commit64994de0abdbf02c89dfca395a08de02ca0cac5a
tree71c56e059c0be209eacaba142af89024c0a816ce
parent2d2566b937b517fbd225e0f5d2e33ed3b7ab7b1d
rgw: remove potentially conficting definition of dout_subsys

dout_subsys should strictly be defined in .cc files. There was a
definition of dout_subsys in rgw_log.h, which is included in a variety
of .cc files due to transitive includes. When a subsystem wants a
conflicting definition, a compiler warning is then generated due to
the redefinition of dout_subsys.

The definition is removed from rgw_log.h and follow-on fixes are made.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 8efea3e894e7db82a6f65cd997bb832e1e91a54a)
src/rgw/rgw_log.cc
src/rgw/rgw_log.h
src/rgw/rgw_s3select.cc