4 files changed, 8 insertions, 80 deletions

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 868fda55e..3a82f5b80 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -38,7 +38,6 @@ set(HEADERS
             fifo_queue.h
             file_search.h
             file_util.h
-            fixed_size_queue.h
             hash.h
             linear_disk_cache.h
             log.h
diff --git a/src/common/common.h b/src/common/common.h
index cb69eabe4..9f3016d34 100644
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -20,11 +20,6 @@
 
 #define STACKALIGN
 
-#if __cplusplus >= 201103L || defined(_MSC_VER) || defined(__GXX_EXPERIMENTAL_CXX0X__)
-#define HAVE_CXX11_SYNTAX 1
-#endif
-
-#if HAVE_CXX11_SYNTAX
 // An inheritable class to disallow the copy constructor and operator= functions
 class NonCopyable
 {
@@ -36,7 +31,6 @@ private:
     NonCopyable(NonCopyable&);
     NonCopyable& operator=(NonCopyable& other);
 };
-#endif
 
 #include "common/log.h"
 #include "common/common_types.h"
diff --git a/src/common/fixed_size_queue.h b/src/common/fixed_size_queue.h
deleted file mode 100644
index 1e3a5dea6..000000000
--- a/src/common/fixed_size_queue.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
-// STL-look-a-like interface, but name is mixed case to distinguish it clearly from the
-// real STL classes.
-
-// Not fully featured, no safety checking yet. Add features as needed.
-
-// TODO: "inline" storage?
-
-template <class T, int N>
-class fixed_size_queue.h
-{
-    T *storage;
-    int head;
-    int tail;
-    int count;  // sacrifice 4 bytes for a simpler implementation. may optimize away in the future.
-
-    // Make copy constructor private for now.
-    fixed_size_queue.h(fixed_size_queue.h &other) {    }
-
-public:
-    fixed_size_queue.h()
-    {
-        storage = new T[N];
-        clear();
-    }
-
-    ~fixed_size_queue.h()
-    {
-        delete [] storage;
-    }
-
-    void clear() {
-        head = 0;
-        tail = 0;
-        count = 0;
-    }
-
-    void push(T t) {
-        storage[tail] = t;
-        tail++;
-        if (tail == N)
-            tail = 0;
-        count++;
-    }
-
-    void pop() {
-        head++;
-        if (head == N)
-            head = 0;
-        count--;
-    }
-
-    T pop_front() {
-        const T &temp = storage[head];
-        pop();
-        return temp;
-    }
-
-    T &front() { return storage[head]; }
-    const T &front() const { return storage[head]; }
-
-    size_t size() const {
-        return count;
-    }
-};
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index a3c7f479e..b0c65d47d 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -279,12 +279,17 @@ std::string TabsToSpaces(int tab_size, const std::string &in)
 
 std::string ReplaceAll(std::string result, const std::string& src, const std::string& dest)
 {
-    while(1)
+    size_t pos = 0;
+
+    if (src == dest)
+        return result;
+
+    while ((pos = result.find(src, pos)) != std::string::npos)
     {
-        size_t pos = result.find(src);
-        if (pos == std::string::npos) break;
         result.replace(pos, src.size(), dest);
+        pos += dest.length();
     }
+
     return result;
 }