diff src/share/vm/classfile/systemDictionary.cpp @ 20771:9fa3bf3043a2

Merge
author asaha
date Wed, 26 Nov 2014 08:14:21 -0800
parents 02c7eebe5f52 82d3e7b5277a
children 7848fc12602b
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.cpp	Wed Nov 19 12:52:56 2014 -0800
+++ b/src/share/vm/classfile/systemDictionary.cpp	Wed Nov 26 08:14:21 2014 -0800
@@ -64,9 +64,8 @@
 #include "services/threadService.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ticks.hpp"
-
 #if INCLUDE_TRACE
- #include "trace/tracing.hpp"
+#include "trace/tracing.hpp"
 #endif
 
 Dictionary*            SystemDictionary::_dictionary          = NULL;
@@ -2665,7 +2664,7 @@
                                       class_loader->klass() : (Klass*)NULL);
     event.commit();
   }
-#endif /* INCLUDE_TRACE */
+#endif // INCLUDE_TRACE
 }
 
 #ifndef PRODUCT