Merged docs with upstream dev
authorDmitriy Morozov <dmitriy@mrzv.org>
Thu, 15 Jul 2010 10:20:06 -0700
branchdev
changeset 214 ee0dca73ea47
parent 213 3568e0bfe2cd (current diff)
parent 208 36ea2751f290 (diff)
child 222 fdfde7291a0f
child 223 3d54247cbccf
Merged docs with upstream
--- a/include/utilities/orderlist.h	Thu Jul 15 10:19:18 2010 -0700
+++ b/include/utilities/orderlist.h	Thu Jul 15 10:20:06 2010 -0700
@@ -93,7 +93,7 @@
 		/// @}
 
 	private:
-		static const float density_threshold = 1.2;
+		static const float density_threshold;
 };
 
 /// Basic comparison that LessThan and GreaterThan derive from
--- a/include/utilities/orderlist.hpp	Thu Jul 15 10:19:18 2010 -0700
+++ b/include/utilities/orderlist.hpp	Thu Jul 15 10:20:06 2010 -0700
@@ -4,6 +4,10 @@
 static rlog::RLogChannel* rlOrderList = 					DEF_CHANNEL("utilities/orderlist", rlog::Log_Debug);
 #endif // LOGGING
 
+// This cannot be in the header file to conform to the C++ standard
+template<class T>
+const float OrderList<T>::density_threshold = 1.2;
+
 template<class T>
 void 
 OrderList<T>::