From 9ea05223d10a5140fce54029862941709618fd89 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Sat, 8 Aug 2015 07:23:42 -0400
Subject: [PATCH] ceph-dencoder: clean up macro name

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/test/encoding/ceph_dencoder.cc | 8 ++++----
 src/test/encoding/types.h          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/encoding/ceph_dencoder.cc b/src/test/encoding/ceph_dencoder.cc
index 0156f9c3856..776e6007e02 100644
--- a/src/test/encoding/ceph_dencoder.cc
+++ b/src/test/encoding/ceph_dencoder.cc
@@ -25,7 +25,7 @@
 #include "include/assert.h"
 
 #define TYPE(t)
-#define TYPEWITHSTRAYDATA(t)
+#define TYPE_STRAYDATA(t)
 #define TYPE_NONDETERMINISTIC(t)
 #define TYPE_FEATUREFUL(t)
 #define TYPE_FEATUREFUL_STRAYDATA(t)
@@ -34,7 +34,7 @@
 #define MESSAGE(t)
 #include "types.h"
 #undef TYPE
-#undef TYPEWITHSTRAYDATA
+#undef TYPE_STRAYDATA
 #undef TYPE_NONDETERMINISTIC
 #undef TYPE_FEATUREFUL
 #undef TYPE_FEATUREFUL_STRAYDATA
@@ -274,7 +274,7 @@ int main(int argc, const char **argv)
 #define T_STR(x) #x
 #define T_STRINGIFY(x) T_STR(x)
 #define TYPE(t) dencoders[T_STRINGIFY(t)] = new DencoderImplNoFeature<t>(false, false);
-#define TYPEWITHSTRAYDATA(t) dencoders[T_STRINGIFY(t)] = new DencoderImplNoFeature<t>(true, false);
+#define TYPE_STRAYDATA(t) dencoders[T_STRINGIFY(t)] = new DencoderImplNoFeature<t>(true, false);
 #define TYPE_NONDETERMINISTIC(t) dencoders[T_STRINGIFY(t)] = new DencoderImplNoFeature<t>(false, true);
 #define TYPE_FEATUREFUL(t) dencoders[T_STRINGIFY(t)] = new DencoderImplFeatureful<t>(false, false);
 #define TYPE_FEATUREFUL_STRAYDATA(t) dencoders[T_STRINGIFY(t)] = new DencoderImplFeatureful<t>(true, false);
@@ -283,7 +283,7 @@ int main(int argc, const char **argv)
 #define MESSAGE(t) dencoders[T_STRINGIFY(t)] = new MessageDencoderImpl<t>;
 #include "types.h"
 #undef TYPE
-#undef TYPEWITHSTRAYDATA
+#undef TYPE_STRAYDATA
 #undef TYPE_NONDETERMINISTIC
 #undef TYPE_FEATUREFUL
 #undef TYPE_FEATUREFUL_STRAYDATA
diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index 7838ca6b079..e2f180d050b 100644
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -185,7 +185,7 @@ TYPE_NOCOPY(Capability)
 TYPE(InoTable)
 
 #include "mds/SnapServer.h"
-TYPEWITHSTRAYDATA(SnapServer)
+TYPE_STRAYDATA(SnapServer)
 
 #include "mds/events/ECommitted.h"
 TYPE(ECommitted)