Remove unused macros for thread-local storage
Mozc does not rely on thread-local storage (TLS) anymore. TLS support macros are actually dead code.
BUG=none
TEST=unittest
git-svn-id: https://mozc.googlecode.com/svn/trunk@391 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/base/thread.h b/src/base/thread.h
index 3df653c..a39170b 100644
--- a/src/base/thread.h
+++ b/src/base/thread.h
@@ -34,54 +34,6 @@
#include "base/port.h"
#include "base/scoped_ptr.h"
-// Definition of TLS (Thread Local Storage) keyword.
-#ifndef TLS_KEYWORD
-
-#if defined(OS_WIN) && defined(_MSC_VER)
-// Use VC's keyword on Windows.
-//
-// On Windows XP, thread local has a limitation. Since thread local
-// is now used inside converter and converter is a stand alone program,
-// it's not a issue at this moment.
-//
-// http://msdn.microsoft.com/en-us/library/9w1sdazb.aspx
-// Thread-local variables work for EXEs and DLLs that are statically
-// linked to the main executable (directly or via another DLL) -
-// i.e. the DLL has to load before the main executable code starts
-// running.
-#define TLS_KEYWORD __declspec(thread)
-#define HAVE_TLS 1
-#endif // OS_WIN && _MSC_VER
-
-// Andorid NDK and NaCl don't support TLS.
-#if defined(OS_LINUX) && !defined(OS_ANDROID) && \
- !defined(__native_client__) && (defined(__GNUC__) || defined(__clang__))
-// GCC and Clang support TLS.
-#define TLS_KEYWORD __thread
-#define HAVE_TLS 1
-#endif // OS_LINUX && !OS_ANDROID && (__GNUC__ || __clang__)
-
-
-#if defined(OS_MACOSX) && MOZC_GCC_VERSION_GE(4, 5)
-// GCC 4.5 and later can *emulate* TLS on Mac even though it is
-// expensive operation.
-#define TLS_KEYWORD __thread
-#define HAVE_TLS 1
-#endif // OS_MACOSX && GCC 4.5 and later
-
-#endif // !TLS_KEYWORD
-
-#ifndef TLS_KEYWORD
-// If TLS is not available, define TLS_KEYWORD as a dummy keyword.
-#define TLS_KEYWORD
-#endif // !TLS_KEYWORD
-
-// Hereafter, we can use TLS_KEYWORD like a keyword.
-#ifndef TLS_KEYWORD
-#error TLS_KEYWORD should be defined here.
-#endif // !TLS_KEYWORD
-
-
namespace mozc {
struct ThreadInternalState;
diff --git a/src/base/thread_test.cc b/src/base/thread_test.cc
index 31c91a7..5aa4c4f 100644
--- a/src/base/thread_test.cc
+++ b/src/base/thread_test.cc
@@ -119,49 +119,6 @@
}
namespace {
-TLS_KEYWORD int g_tls_value = 0;
-TLS_KEYWORD int g_tls_values[100] = { 0 };
-
-class TLSThread : public Thread {
- public:
- virtual void Run() {
- ++g_tls_value;
- ++g_tls_value;
- ++g_tls_value;
- for (int i = 0; i < 100; ++i) {
- g_tls_values[i] = i;
- }
- for (int i = 0; i < 100; ++i) {
- g_tls_values[i] += i;
- }
- int result = 0;
- for (int i = 0; i < 100; ++i) {
- result += g_tls_values[i];
- }
- EXPECT_EQ(3, g_tls_value);
- EXPECT_EQ(9900, result);
- }
-};
-}
-
-TEST(ThreadTest, TLSTest) {
-#ifdef HAVE_TLS
- vector<TLSThread *> threads;
- for (int i = 0; i < 10; ++i) {
- threads.push_back(new TLSThread);
- }
- for (int i = 0; i < 10; ++i) {
- threads[i]->Start();
- }
-
- for (int i = 0; i < 10; ++i) {
- threads[i]->Join();
- delete threads[i];
- }
-#endif
-}
-
-namespace {
class SampleDetachedThread : public DetachedThread {
public:
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 3bb5ab2..9ba8af0 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
MAJOR=2
MINOR=16
-BUILD=1931
+BUILD=1932
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.
