summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/CMakeLists.txt1
-rw-r--r--src/common/common.h6
-rw-r--r--src/common/console_listener.cpp6
-rw-r--r--src/common/file_search.cpp4
-rw-r--r--src/common/file_util.cpp7
-rw-r--r--src/common/fixed_size_queue.h70
-rw-r--r--src/common/log_manager.cpp1
-rw-r--r--src/common/math_util.cpp3
-rw-r--r--src/common/mem_arena.cpp4
-rw-r--r--src/common/memory_util.cpp3
-rw-r--r--src/common/string_util.cpp15
-rw-r--r--src/common/thread.cpp1
-rw-r--r--src/common/utf8.cpp4
13 files changed, 11 insertions, 114 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/console_listener.cpp b/src/common/console_listener.cpp
index 96970ab17..40122224c 100644
--- a/src/common/console_listener.cpp
+++ b/src/common/console_listener.cpp
@@ -3,14 +3,10 @@
// Refer to the license.txt file included.
#include <algorithm>
-#include <cmath>
-#include <cstdio>
-#include <string>
+
#ifdef _WIN32
#include <windows.h>
#include <array>
-#else
-#include <cstdarg>
#endif
#include "common/common.h"
diff --git a/src/common/file_search.cpp b/src/common/file_search.cpp
index a80a98820..63580f688 100644
--- a/src/common/file_search.cpp
+++ b/src/common/file_search.cpp
@@ -4,15 +4,13 @@
#include "common/common.h"
-#include "common/common_paths.h"
+
#ifndef _WIN32
-#include <sys/types.h>
#include <dirent.h>
#else
#include <windows.h>
#endif
-#include <string>
#include <algorithm>
#include "common/file_search.h"
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 2fdc7ec01..970041007 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -4,9 +4,7 @@
#include "common/common.h"
-#include "common/common_paths.h"
#include "common/file_util.h"
-#include "common/string_util.h"
#ifdef _WIN32
#include <windows.h>
@@ -16,10 +14,7 @@
#include <io.h>
#include <direct.h> // getcwd
#else
-#include <cerrno>
-#include <cstdlib>
#include <sys/param.h>
-#include <sys/types.h>
#include <dirent.h>
#endif
@@ -32,8 +27,6 @@
#include <algorithm>
#include <sys/stat.h>
-#include "common/string_util.h"
-
#ifndef S_ISDIR
#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR)
#endif
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/log_manager.cpp b/src/common/log_manager.cpp
index 9fd019fb3..43346f279 100644
--- a/src/common/log_manager.cpp
+++ b/src/common/log_manager.cpp
@@ -8,7 +8,6 @@
#include "common/console_listener.h"
#include "common/timer.h"
#include "common/thread.h"
-#include "common/file_util.h"
void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line,
const char* function, const char* fmt, ...)
diff --git a/src/common/math_util.cpp b/src/common/math_util.cpp
index 82eceab00..ab0e6b75c 100644
--- a/src/common/math_util.cpp
+++ b/src/common/math_util.cpp
@@ -6,8 +6,7 @@
#include "common/common.h"
#include "common/math_util.h"
-#include <cmath>
-#include <numeric>
+#include <numeric> // Necessary on OS X, but not Linux
namespace MathUtil
{
diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp
index d4dd933bf..40d9c03a2 100644
--- a/src/common/mem_arena.cpp
+++ b/src/common/mem_arena.cpp
@@ -22,11 +22,7 @@
#include "common/string_util.h"
#ifndef _WIN32
-#include <sys/stat.h>
#include <fcntl.h>
-#include <unistd.h>
-#include <cerrno>
-#include <cstring>
#ifdef ANDROID
#include <sys/ioctl.h>
#include <linux/ashmem.h>
diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp
index 1496002e9..bab7d9f7a 100644
--- a/src/common/memory_util.cpp
+++ b/src/common/memory_util.cpp
@@ -10,9 +10,6 @@
#ifdef _WIN32
#include <windows.h>
#include <psapi.h>
-#else
-#include <cerrno>
-#include <cstdio>
#endif
#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT)
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index bd4c33391..9199e30bc 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -3,17 +3,13 @@
// Refer to the license.txt file included.
#include <algorithm>
-#include <cstdlib>
-#include <cstdio>
#include "common/common.h"
-#include "common/common_paths.h"
#include "common/string_util.h"
#ifdef _WIN32
#include <Windows.h>
#else
- #include <cerrno>
#include <iconv.h>
#endif
@@ -281,12 +277,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;
}
diff --git a/src/common/thread.cpp b/src/common/thread.cpp
index 830795182..60d8ed075 100644
--- a/src/common/thread.cpp
+++ b/src/common/thread.cpp
@@ -3,7 +3,6 @@
// Refer to the license.txt file included.
#include "common/thread.h"
-#include "common/common.h"
#ifdef __APPLE__
#include <mach/mach.h>
diff --git a/src/common/utf8.cpp b/src/common/utf8.cpp
index c83824d35..be4ebc855 100644
--- a/src/common/utf8.cpp
+++ b/src/common/utf8.cpp
@@ -19,12 +19,8 @@
#endif
#include <cstdlib>
-#include <cstdio>
#include <cstring>
-#include <cstdarg>
-
#include <algorithm>
-#include <string>
#include "common/common_types.h"
#include "common/utf8.h"