\fixme isn't accepted outside a function definition:

[synfig.git] / ETL / trunk / ETL / _misc.h

diff --git a/ETL/trunk/ETL/_misc.h b/ETL/trunk/ETL/_misc.h
index 2090583..30277e3 100644 (file)
--- a/ETL/trunk/ETL/_misc.h
+++ b/ETL/trunk/ETL/_misc.h
@@ -42,28 +42,28 @@ binary_find(I begin, I end, const T& value)
 {
 #if 1
        I iter(begin+(end-begin)/2);
-       
+
        while(end-begin>1 && !(*iter==value))
        {
                ((*iter<value)?begin:end) = iter;
-               
+
                iter = begin+(end-begin)/2;
        }
        return iter;
 #else
        size_t len_(end-begin);
        size_t half_(len_/2);
-       
+
        I iter(begin);
        iter+=half_;
-       
+
        while(len_>1 && !(*iter==value))
        {
                ((*iter<value)?begin:end) = iter;
-               
+
                len_=half_;
                half_/=2;
-               
+
                iter=begin;
                iter+=half_;
        }
@@ -71,17 +71,19 @@ binary_find(I begin, I end, const T& value)
 #endif
 }
 
-/*!    \fixme Isn't there some x86 FPU instruction for quickly
-**     converting a float to a rounded integer? It's worth
-**     looking into at some point... */
-inline int round_to_int(const float x) { return static_cast<int>(x+0.5f); }
+inline int round_to_int(const float x) {
+       /*!     \fixme Isn't there some x86 FPU instruction for quickly
+       **      converting a float to a rounded integer? It's worth
+       **      looking into at some point... */
+       return static_cast<int>(x+0.5f);
+}
 inline int round_to_int(const double x) { return static_cast<int>(x+0.5); }
 
 inline int ceil_to_int(const float x) { return static_cast<int>(ceil(x)); }
 inline int ceil_to_int(const double x) { return static_cast<int>(ceil(x)); }
 
-inline int floor_to_int(const float x) { return static_cast<int>(floor(x)); }
-inline int floor_to_int(const double x) { return static_cast<int>(floor(x)); }
+inline int floor_to_int(const float x) { return static_cast<int>(x); }
+inline int floor_to_int(const double x) { return static_cast<int>(x); }
 
 _ETL_END_NAMESPACE