--- old/src/share/vm/gc_implementation/shared/gcHeapSummary.hpp	2014-03-13 13:50:28.898276103 +0100
+++ new/src/share/vm/gc_implementation/shared/gcHeapSummary.hpp	2014-03-13 13:50:28.798276098 +0100
@@ -154,7 +154,7 @@
     _class_space(class_space),
     _metaspace_chunk_free_list_summary(metaspace_chunk_free_list_summary),
     _class_chunk_free_list_summary(class_chunk_free_list_summary)
-  { }
+  {}
 
   size_t capacity_until_GC() const { return _capacity_until_GC; }
   const MetaspaceSizes& meta_space() const { return _meta_space; }
--- old/src/share/vm/gc_implementation/shared/gcTrace.hpp	2014-03-13 13:50:29.410276127 +0100
+++ new/src/share/vm/gc_implementation/shared/gcTrace.hpp	2014-03-13 13:50:29.314276122 +0100
@@ -42,8 +42,8 @@
 
 class EvacuationInfo;
 class GCHeapSummary;
-class MetaspaceSummary;
 class MetaspaceChunkFreeListSummary;
+class MetaspaceSummary;
 class PSHeapSummary;
 class ReferenceProcessorStats;
 class TimePartitions;
--- old/src/share/vm/gc_interface/collectedHeap.cpp	2014-03-13 13:50:29.926276151 +0100
+++ new/src/share/vm/gc_interface/collectedHeap.cpp	2014-03-13 13:50:29.830276146 +0100
@@ -98,9 +98,9 @@
       MetaspaceAux::reserved_bytes(Metaspace::ClassType));
 
   const MetaspaceChunkFreeListSummary& ms_chunk_free_list_summary =
-    MetaspaceAux::chunk_free_list_summary(Metaspace::ClassType);
-  const MetaspaceChunkFreeListSummary& class_chunk_free_list_summary =
     MetaspaceAux::chunk_free_list_summary(Metaspace::NonClassType);
+  const MetaspaceChunkFreeListSummary& class_chunk_free_list_summary =
+    MetaspaceAux::chunk_free_list_summary(Metaspace::ClassType);
 
   return MetaspaceSummary(MetaspaceGC::capacity_until_GC(), meta_space, data_space, class_space,
                           ms_chunk_free_list_summary, class_chunk_free_list_summary);
--- old/src/share/vm/memory/metaspace.cpp	2014-03-13 13:50:30.450276175 +0100
+++ new/src/share/vm/memory/metaspace.cpp	2014-03-13 13:50:30.346276170 +0100
@@ -185,13 +185,11 @@
   // Remove from a list by size.  Selects list based on size of chunk.
   Metachunk* free_chunks_get(size_t chunk_word_size);
 
-#define index_bounds_check(index)                                                       \
-  do {                                                                                  \
-    assert(index == SpecializedIndex ||                                                 \
-           index == SmallIndex ||                                                       \
-           index == MediumIndex ||                                                      \
-           index == HumongousIndex, err_msg("Bad index: %d", (int) index));             \
-  } while (0)
+#define index_bounds_check(index)                                         \
+  assert(index == SpecializedIndex ||                                     \
+         index == SmallIndex ||                                           \
+         index == MediumIndex ||                                          \
+         index == HumongousIndex, err_msg("Bad index: %d", (int) index))
 
   size_t num_free_chunks(ChunkIndex index) const {
     index_bounds_check(index);