From e9e82be79897dd3f193dd61da730391112ab6bcc Mon Sep 17 00:00:00 2001
From: Michael Kuron <mkuron@icp.uni-stuttgart.de>
Date: Tue, 30 Jan 2018 11:47:07 +0100
Subject: [PATCH] Reorder functions from previous commit
---
src/core/math/Random.h | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/core/math/Random.h b/src/core/math/Random.h
index dd4a4bff7..ec61aa51d 100644
--- a/src/core/math/Random.h
+++ b/src/core/math/Random.h
@@ -48,24 +48,6 @@ void seedRandomGenerator( const std::mt19937::result_type & seed ); // std::mt19
* \brief Returns a random integral number of type INT in the range [min,max] (max included!)
*/
//**********************************************************************************************************************
-template< typename INT >
-INT intRandom()
-{
- return intRandom( std::numeric_limits<INT>::min(), std::numeric_limits<INT>::max() );
-}
-
-template< typename INT >
-INT intRandom( const INT min )
-{
- return intRandom( min, std::numeric_limits<INT>::max(), internal::getGenerator() );
-}
-
-template< typename INT >
-INT intRandom( const INT min, const INT max )
-{
- return intRandom( min, max, internal::getGenerator() );
-}
-
template< typename INT >
INT intRandom( const INT min, const INT max, std::mt19937 & generator )
{
@@ -136,6 +118,25 @@ inline signed char intRandom<signed char>( const signed char min, const signed c
}
+template< typename INT >
+INT intRandom( const INT min )
+{
+ return intRandom( min, std::numeric_limits<INT>::max(), internal::getGenerator() );
+}
+
+template< typename INT >
+INT intRandom( const INT min, const INT max )
+{
+ return intRandom( min, max, internal::getGenerator() );
+}
+
+template< typename INT >
+INT intRandom()
+{
+ return intRandom( std::numeric_limits<INT>::min(), std::numeric_limits<INT>::max() );
+}
+
+
template< typename INT >
class IntRandom
--
GitLab