Updated breakpad to chrome_53/b7efb2d318fafa435bd79131386ce604eb74f905

Removed unused hash-related include
Fixed some compile errors for clang

Author: sbx320

Server/core/CServerImpl.cpp

@@ -852,7 +852,7 @@ void CServerImpl::HandleInput ( void )
             WCHAR wUNICODE[2] = { iStdIn, 0 };
             Printf ( "%s", UTF16ToMbUTF8(wUNICODE).c_str() );
 #else
-            wchar_t wUNICODE[2] = { iStdIn, 0 };
+            wchar_t wUNICODE[2] = { (wchar_t)iStdIn, 0 };
             if ( !g_bSilent && !g_bNoCurses )
                 wprintw ( m_wndInput, "%s", UTF16ToMbUTF8(wUNICODE).c_str() );
 #endif

Server/mods/deathmatch/logic/lua/CLuaCFunctions.cpp

@@ -78,7 +78,7 @@ void CLuaCFunctions::RemoveFunction ( const SString& strName )
 CLuaCFunction* CLuaCFunctions::GetFunction ( lua_CFunction f )
 {
     // Quick cull of unknown pointer range
-    if ( f < ms_pFunctionPtrLow || f > ms_pFunctionPtrHigh )
+    if ( reinterpret_cast<void*>(f) < ms_pFunctionPtrLow || reinterpret_cast<void*>(f) > ms_pFunctionPtrHigh )
         return NULL;
 
     CFastHashMap < lua_CFunction, CLuaCFunction* >::iterator it;
@@ -108,7 +108,7 @@ CLuaCFunction* CLuaCFunctions::GetFunction ( const char* szName )
 bool CLuaCFunctions::IsNotFunction ( lua_CFunction f )
 {
     // Return true if unknown pointer range
-    return ( f < ms_pFunctionPtrLow || f > ms_pFunctionPtrHigh );
+    return ( reinterpret_cast<void*>(f) < ms_pFunctionPtrLow || reinterpret_cast<void*>(f) > ms_pFunctionPtrHigh );
 }
 
 

Server/sdk/MTAPlatform.h

@@ -83,13 +83,6 @@ extern "C" bool g_bNoTopBar;
     #include <sys/time.h>
     #include <sys/times.h>
 
-    // Non-standard hash include
-    #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))
-        #include <hash_fun.h>
-    #else
-        #include <ext/hash_fun.h>
-    #endif
-
     #define MAX_PATH 255
 
     #ifndef stricmp
@@ -109,17 +102,7 @@ extern "C" bool g_bNoTopBar;
     // Itoa replacement function
     char* itoa ( int value, char* result, int base );
 
-    // Hash function
-    namespace __gnu_cxx
-    {
-        template<> struct hash < std::string >
-        {
-            size_t operator()( const std::string& str ) const
-            {
-                return hash< const char* >()( str.c_str() );
-            }   
-        };
-    }
+    
 #endif
 
 // This function should be used instead of mkdir to preserve multiplatform

Shared/sdk/SharedUtil.HashMap.h

@@ -111,5 +111,5 @@ namespace std
         }
     };
 }
-
+
 #endif  // WITH_ALLOC_TRACKING

vendor/google-breakpad/.gitignore

@@ -31,6 +31,7 @@
 
 # Ignore common compiled artifacts.
 *~
+*.dwo
 *.o
 lib*.a
 /breakpad.pc
@@ -45,13 +46,14 @@ lib*.a
 /src/tools/linux/md2core/minidump-2-core
 /src/tools/linux/symupload/minidump_upload
 /src/tools/linux/symupload/sym_upload
+/src/tools/mac/dump_syms/dump_syms
 
 # Ignore autotools generated artifacts.
 .deps
 .dirstamp
 autom4te.cache/
 /config.cache
-#config.h
+config.h
 /config.log
 /config.status
 /Makefile
@@ -65,12 +67,17 @@ stamp-h1
 *.vcproj
 *.vcxproj
 
+# Ignore GYP generated Makefiles
+src/Makefile
+*.Makefile
+*.target.mk
+
 # Ignore compiled Python files.
 *.pyc
 
 # Ignore directories gclient syncs.
 src/testing
-#src/third_party/glog
+src/third_party/glog
 src/third_party/lss
 src/third_party/protobuf
 src/tools/gyp

vendor/google-breakpad/.travis.yml

@@ -0,0 +1,26 @@
+# Travis build integration.
+# https://docs.travis-ci.com/
+language: cpp
+# TODO: add a clang build as well.
+compiler:
+ - gcc
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - gcc-4.8
+      - g++-4.8
+# Travis sets CC/CXX to the system toolchain based on the `compiler`
+# selection. If clang is added, this should move to be set inside the
+# matrix.
+env:
+  - USE_CC=gcc-4.8 USE_CXX=g++-4.8
+before_install: ./scripts/travis-checkout.sh
+script: ./scripts/travis-build.sh
+# TODO: add mac support
+os:
+  - linux
+notifications:
+  email:
+    - google-breakpad-dev@googlegroups.com

vendor/google-breakpad/DEPS

@@ -35,22 +35,31 @@
 deps = {
   # Logging code.
   "src/src/third_party/glog":
-    "http://google-glog.googlecode.com/svn/trunk@97",
+    "https://github.com/google/glog.git" +
+      "@v0.3.4",
 
   # Testing libraries and utilities.
-  "src/src/testing": "http://googlemock.googlecode.com/svn/trunk@408",
-  "src/src/testing/gtest": "http://googletest.googlecode.com/svn/trunk@615",
+  "src/src/testing":
+    "https://github.com/google/googlemock.git" +
+      "@release-1.7.0",
+  "src/src/testing/gtest":
+    "https://github.com/google/googletest.git" +
+      "@release-1.7.0",
 
   # Protobuf.
   "src/src/third_party/protobuf/protobuf":
-    "http://protobuf.googlecode.com/svn/trunk@407",
+    "https://github.com/google/protobuf.git" +
+      "@cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac",
 
   # GYP project generator.
-  "src/src/tools/gyp": "http://gyp.googlecode.com/svn/trunk@1886",
+  "src/src/tools/gyp":
+    "https://chromium.googlesource.com/external/gyp/" +
+      "@e8ab0833a42691cd2184bd4c45d779e43821d3e0",
 
   # Linux syscall support.
   "src/src/third_party/lss":
-    "http://linux-syscall-support.googlecode.com/svn/trunk/lss@24",
+    "https://chromium.googlesource.com/linux-syscall-support/" +
+      "@9292030109847793f7a6689adac1ddafb412fe14"
 }
 
 hooks = [