From 5560c7b2d9e376995a88cba30706a319f40438c4 Mon Sep 17 00:00:00 2001
From: Yann Dirson <ydirson@altern.org>
Date: Sun, 20 Apr 2008 21:52:42 +0200
Subject: [PATCH] Fix use of singleton pattern.

---
 src/random.cpp | 9 ++-------
 src/random.h   | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/random.cpp b/src/random.cpp
index 02df1c1..35d6468 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -10,8 +10,6 @@
 
 #include "random.h"
 
-Random* Random::m_instance = 0;
-
 Random::Random() { }
 
 Random::IntegerGenerator Random::rand(int min, int max) {
@@ -28,9 +26,6 @@ Random::RealGenerator Random::rand(double min, double max) {
 }
 
 Random& Random::instance() {
-  if (!m_instance) {
-    m_instance = new Random;
-  }
-  return *m_instance;
+  static Random instance;
+  return instance;
 }
-
diff --git a/src/random.h b/src/random.h
index a3e68a4..774b836 100644
--- a/src/random.h
+++ b/src/random.h
@@ -27,7 +27,6 @@ private:
   RandomGenerator m_generator;
   
   Random(); // singleton
-  static Random* m_instance;
 public:
   IntegerGenerator rand(int min, int max);
   RealGenerator rand(float min, float max);
-- 
2.11.4.GIT