Mercurial > projects > qtd

comparison qt/QGlobal.d @ 168:d66bbb9a5053

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ups
author eldar
date Sat, 20 Jun 2009 19:17:21 +0000
parents ae06da58ec25
children d3f4f14d43a5
comparison
equal deleted inserted replaced
167:ae06da58ec25 168:d66bbb9a5053
399 value2.data_ptr() = t; 399 value2.data_ptr() = t;
400 } 400 }
401 401
402 void qSwap(T)(ref T value1, ref T value2) 402 void qSwap(T)(ref T value1, ref T value2)
403 { 403 {
404 <<<<<<< .mine
405 const T.nativeId t = value1.nativeId;
406 value1.nativeId = value2.nativeId;
407 value2.nativeId = t;
408 =======
409 T t = value1; 404 T t = value1;
410 value1 = value2; 405 value1 = value2;
411 value2 = t; 406 value2 = t;
412 >>>>>>> .r170
413 } 407 }
414 408
415 /* 409 /*
416 QTypeInfo primitive specializations 410 QTypeInfo primitive specializations
417 TODO(katrina) Find out what we need to do here 411 TODO(katrina) Find out what we need to do here