From 56677630199419c6ab9b21d68c76e4d3a67fd66f Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Thu, 11 Sep 2014 19:15:41 -0400 Subject: [PATCH] Revert "Branch fixes." This reverts commit ed081f045e486c90594068a0869de16952534960. --- core/metamod_oslink.cpp | 6 +----- support/buildbot/generate_headers.py | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/core/metamod_oslink.cpp b/core/metamod_oslink.cpp index 00cd6e6..2ec065d 100644 --- a/core/metamod_oslink.cpp +++ b/core/metamod_oslink.cpp @@ -94,11 +94,7 @@ bool GetFileOfAddress(void *pAddr, char *buffer, size_t maxlength) return true; } -#if defined __linux__ || defined __APPLE__ -extern "C" void __cxa_pure_virtual(void) -{ -} - +#if defined __GNUC__ && (__GNUC__ == 3 || __GNUC__ == 4) void * operator new(size_t size) { return malloc(size); } diff --git a/support/buildbot/generate_headers.py b/support/buildbot/generate_headers.py index 1e755af..0135d2c 100644 --- a/support/buildbot/generate_headers.py +++ b/support/buildbot/generate_headers.py @@ -50,7 +50,7 @@ def output_version_header(): count, shorthash, longhash = get_git_version() with open(os.path.join(SourceFolder, 'product.version')) as fp: - contents = fp.read().strip() + contents = fp.read() m = re.match('(\d+)\.(\d+)\.(\d+)-?(.*)', contents) if m == None: raise Exception('Could not detremine product version')