From 2ca673175a639f242dc992e49e07c55d8a459a59 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 7 Nov 2014 17:15:54 -0800
Subject: [PATCH] rename StdDev to StDev, patch its leak

---
 assignment-client/src/audio/AudioMixer.cpp     | 2 +-
 interface/src/Audio.cpp                        | 2 +-
 interface/src/Audio.h                          | 4 ++--
 libraries/audio/src/InboundAudioStream.h       | 2 +-
 libraries/shared/src/{StdDev.cpp => StDev.cpp} | 7 ++++---
 libraries/shared/src/{StdDev.h => StDev.h}     | 8 ++++----
 tests/jitter/src/main.cpp                      | 2 +-
 7 files changed, 14 insertions(+), 13 deletions(-)
 rename libraries/shared/src/{StdDev.cpp => StDev.cpp} (95%)
 rename libraries/shared/src/{StdDev.h => StDev.h} (87%)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 2c78257d2b..e00d8eb44d 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -48,7 +48,7 @@
 #include <OctreeConstants.h>
 #include <PacketHeaders.h>
 #include <SharedUtil.h>
-#include <StdDev.h>
+#include <StDev.h>
 #include <UUID.h>
 
 #include "AudioRingBuffer.h"
diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index 3039b7adfb..4a488bb296 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -35,7 +35,7 @@
 #include <NodeList.h>
 #include <PacketHeaders.h>
 #include <SharedUtil.h>
-#include <StdDev.h>
+#include <StDev.h>
 #include <UUID.h>
 #include <glm/glm.hpp>
 
diff --git a/interface/src/Audio.h b/interface/src/Audio.h
index bec2ce32a0..6de7cf8d91 100644
--- a/interface/src/Audio.h
+++ b/interface/src/Audio.h
@@ -40,12 +40,12 @@
 #include <QByteArray>
 
 #include <AbstractAudioInterface.h>
-#include <StdDev.h>
+#include <StDev.h>
 
 #include "MixedProcessedAudioStream.h"
 #include "AudioEffectOptions.h"
 #include <AudioRingBuffer.h>
-#include <StdDev.h>
+#include <StDev.h>
 
 extern "C" {
     #include <gverb.h>
diff --git a/libraries/audio/src/InboundAudioStream.h b/libraries/audio/src/InboundAudioStream.h
index a9ebc70072..4621de2899 100644
--- a/libraries/audio/src/InboundAudioStream.h
+++ b/libraries/audio/src/InboundAudioStream.h
@@ -18,7 +18,7 @@
 #include "SequenceNumberStats.h"
 #include "AudioStreamStats.h"
 #include "PacketHeaders.h"
-#include "StdDev.h"
+#include "StDev.h"
 #include "TimeWeightedAvg.h"
 
 // This adds some number of frames to the desired jitter buffer frames target we use when we're dropping frames.
diff --git a/libraries/shared/src/StdDev.cpp b/libraries/shared/src/StDev.cpp
similarity index 95%
rename from libraries/shared/src/StdDev.cpp
rename to libraries/shared/src/StDev.cpp
index 2069fbb8e4..1c38426176 100644
--- a/libraries/shared/src/StdDev.cpp
+++ b/libraries/shared/src/StDev.cpp
@@ -1,5 +1,5 @@
 //
-//  StdDev.cpp
+//  StDev.cpp
 //  libraries/shared/src
 //
 //  Created by Philip Rosedale on 3/12/13.
@@ -11,10 +11,11 @@
 
 #include <limits>   
 #include <cmath>
-#include "StdDev.h"
+#include <string>
+
+#include "StDev.h"
 
 StDev::StDev() :
-    _data(),
     _sampleCount(0)
 {
     reset();
diff --git a/libraries/shared/src/StdDev.h b/libraries/shared/src/StDev.h
similarity index 87%
rename from libraries/shared/src/StdDev.h
rename to libraries/shared/src/StDev.h
index b7ea363a7f..ab48aae6b5 100644
--- a/libraries/shared/src/StdDev.h
+++ b/libraries/shared/src/StDev.h
@@ -1,5 +1,5 @@
 //
-//  StdDev.h
+//  StDev.h
 //  libraries/shared/src
 //
 //  Created by Philip Rosedale on 3/12/13.
@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef hifi_StdDev_h
-#define hifi_StdDev_h
+#ifndef hifi_StDev_h
+#define hifi_StDev_h
 
 const int NUM_SAMPLES = 1000;
 
@@ -27,4 +27,4 @@ private:
     int _sampleCount;
 };
 
-#endif // hifi_StdDev_h
+#endif // hifi_StDev_h
diff --git a/tests/jitter/src/main.cpp b/tests/jitter/src/main.cpp
index 985ce99530..baaa2d08d6 100644
--- a/tests/jitter/src/main.cpp
+++ b/tests/jitter/src/main.cpp
@@ -20,7 +20,7 @@
 #include <SequenceNumberStats.h>
 #include <SharedUtil.h> // for usecTimestampNow
 #include <SimpleMovingAverage.h>
-#include <StdDev.h>
+#include <StDev.h>
 
 const quint64 MSEC_TO_USEC = 1000;
 const quint64 LARGE_STATS_TIME = 500; // we don't expect stats calculation to take more than this many usecs