diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc
index 1f542d2..4b7fb7b 100755
--- a/compiler/cpp/src/generate/t_cpp_generator.cc
+++ b/compiler/cpp/src/generate/t_cpp_generator.cc
@@ -1526,6 +1526,14 @@
       indent() << "swap(a.__isset, b.__isset);" << endl;
   }
 
+  // handle empty structs
+  if (fields.size() == 0) {
+    out <<
+      indent() << "(void) a;" << endl;
+    out <<
+      indent() << "(void) b;" << endl;
+  }
+
   scope_down(out);
   out << endl;
 }