]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crush: fix compilation guard around specialization for libfmt => 9 49768/head
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Tue, 17 Jan 2023 19:11:44 +0000 (19:11 +0000)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Thu, 19 Jan 2023 13:35:36 +0000 (13:35 +0000)
```
[ 77%] Building CXX object src/crimson/CMakeFiles/crimson-common.dir/__/crush/CrushLocation.cc.o
In file included from /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/18.0.0-1862-g7689999c/rpm/el8/BUILD/ceph-18.0.0-1862-g7689999c/src/common/ceph_context.h:47,
                 from /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/18.0.0-1862-g7689999c/rpm/el8/BUILD/ceph-18.0.0-1862-g7689999c/src/crush/CrushLocation.cc:11:
/home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/18.0.0-1862-g7689999c/rpm/el8/BUILD/ceph-18.0.0-1862-g7689999c/src/crush/CrushLocation.h:43:25: error: redefinition of ‘struct fmt::v9::formatter<crimson::crush::CrushLocation>’
   43 | template <> struct fmt::formatter<TOPNSPC::crush::CrushLocation> : fmt::ostream_formatter {};
```

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/crush/CrushLocation.h

index 2d2d4b52b9669b3f181dc015ca7dc7e02c4e7a9c..026ad107d833a913341e6a5131d485ec1212397c 100644 (file)
@@ -37,8 +37,9 @@ private:
 
 std::ostream& operator<<(std::ostream& os, const CrushLocation& loc);
 }
-#endif
 
 #if FMT_VERSION >= 90000
 template <> struct fmt::formatter<TOPNSPC::crush::CrushLocation> : fmt::ostream_formatter {};
 #endif
+
+#endif