diff src/share/vm/compiler/compileLog.hpp @ 14392:b5c8a61d7fa0

Merge
author kvn
date Fri, 21 Jun 2013 15:56:24 -0700
parents 813f26e34135
children de6a9e811145
line wrap: on
line diff
--- a/src/share/vm/compiler/compileLog.hpp	Thu Jun 20 16:30:44 2013 -0700
+++ b/src/share/vm/compiler/compileLog.hpp	Fri Jun 21 15:56:24 2013 -0700
@@ -57,7 +57,7 @@
   void va_tag(bool push, const char* format, va_list ap);
 
  public:
-  CompileLog(const char* file, FILE* fp, intx thread_id);
+  CompileLog(const char* file_name, FILE* fp, intx thread_id);
   ~CompileLog();
 
   intx          thread_id()                      { return _thread_id; }