[Scummvm-cvs-logs] SF.net SVN: scummvm:[46641] scummvm/trunk/common/algorithm.h

[lordhoto at users.sourceforge.net]

Revision: 46641
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46641&view=rev
Author:   lordhoto
Date:     2009-12-27 13:58:00 +0000 (Sun, 27 Dec 2009)

Log Message:
-----------
Some more code format fixes.

Modified Paths:
--------------
    scummvm/trunk/common/algorithm.h

Modified: scummvm/trunk/common/algorithm.h
===================================================================
--- scummvm/trunk/common/algorithm.h	2009-12-27 13:33:12 UTC (rev 46640)
+++ scummvm/trunk/common/algorithm.h	2009-12-27 13:58:00 UTC (rev 46641)
@@ -147,13 +147,13 @@
 }
 
 template<typename T>
-unsigned distance(T * first, T * last) {
+unsigned int distance(T *first, T *last) {
 	return last - first;
 }
 
 template<typename T>
-unsigned distance(T first, T last) {
-	unsigned n = 0;
+unsigned int distance(T first, T last) {
+	unsigned int n = 0;
 	while (first != last) {
 		++n;
 		++first;
@@ -162,13 +162,13 @@
 }
 
 template<typename T>
-T * _sort_choose_pivot(T * first, T * last) {
+T *sortChoosePivot(T *first, T *last) {
 	return first + distance(first, last) / 2;
 }
 
 template<typename T>
-T _sort_choose_pivot(T first, T last) {
-	unsigned n = distance(first, last);
+T sortChoosePivot(T first, T last) {
+	unsigned int n = distance(first, last);
 	n /= 2;
 	while (n--)
 		++first;
@@ -176,7 +176,7 @@
 }
 
 template<typename T, class StrictWeakOrdering>
-T _sort_partition(T first, T last, T pivot, StrictWeakOrdering &comp) {
+T sortPatition(T first, T last, T pivot, StrictWeakOrdering &comp) {
 	--last;
 	SWAP(*pivot, *last);
 
@@ -197,25 +197,22 @@
  * Simple sort function, modeled after std::sort.
  * It compares data with the given comparator object comp.
  */
-
 template<typename T, class StrictWeakOrdering>
 void sort(T first, T last, StrictWeakOrdering comp) {
 	if (first == last)
 		return;
 
-	T pivot = _sort_choose_pivot(first, last);
-	pivot = _sort_partition(first, last, pivot, comp);
+	T pivot = sortChoosePivot(first, last);
+	pivot = sortPatition(first, last, pivot, comp);
 	sort<T, StrictWeakOrdering>(first, pivot, comp);
 	sort<T, StrictWeakOrdering>(++pivot, last, comp);
 }
 
 /**
  * Simple sort function, modeled after std::sort.
- * Use it like this: sort(container.begin(), container.end()).
  */
-
 template<typename T>
-void sort(T * first, T * last) {
+void sort(T *first, T *last) {
 	sort(first, last, Common::Less<T>());
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.