comparison src/share/vm/services/diagnosticArgument.cpp @ 11198:1e6d5dec4a4e

Merge.
author Christian Humer <christian.humer@gmail.com>
date Mon, 05 Aug 2013 13:20:06 +0200
parents ef57c43512d6
children 1b03bed31241
comparison
equal deleted inserted replaced
11197:3479ab380552 11198:1e6d5dec4a4e
245 fatal("Default string must be parsable"); 245 fatal("Default string must be parsable");
246 } 246 }
247 } else { 247 } else {
248 _value._time = 0; 248 _value._time = 0;
249 _value._nanotime = 0; 249 _value._nanotime = 0;
250 strcmp(_value._unit, "ns"); 250 strcpy(_value._unit, "ns");
251 } 251 }
252 } 252 }
253 253
254 template <> void DCmdArgument<NanoTimeArgument>::destroy_value() { } 254 template <> void DCmdArgument<NanoTimeArgument>::destroy_value() { }
255 255