diff options
author | 2015-10-20 21:34:36 +0200 | |
---|---|---|
committer | 2015-10-20 21:34:36 +0200 | |
commit | a7b8acbe3eebcf17367baa642375cfa47ae4ea85 (patch) | |
tree | 854b859d6176802c0278f4b00de3f7c774e02dda /3rdparty/bx/tests/vector_complex.cpp | |
parent | 4610935e796661874bb4ee7ec6536d9423aeb7be (diff) | |
parent | 74aae76c4e3e257f99d139c4febb5d86d1419e50 (diff) |
Merge pull request #6 from mamedev/master
Sync to base master
Diffstat (limited to '3rdparty/bx/tests/vector_complex.cpp')
-rw-r--r-- | 3rdparty/bx/tests/vector_complex.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/3rdparty/bx/tests/vector_complex.cpp b/3rdparty/bx/tests/vector_complex.cpp index 97716fbc070..8deaa3fd3ff 100644 --- a/3rdparty/bx/tests/vector_complex.cpp +++ b/3rdparty/bx/tests/vector_complex.cpp @@ -1,5 +1,5 @@ /*- - * Copyright 2012 Matthew Endsley + * Copyright 2012-1015 Matthew Endsley * All rights reserved * * Redistribution and use in source and binary forms, with or without @@ -35,9 +35,9 @@ struct complex { complex() {data = 0;} - complex(const char* s) { data = _strdup(s); } + complex(const char* s) { data = strdup(s); } ~complex() { free(data); } - complex(const complex& other) { data = 0; if (other.data) data = _strdup(other.data); } + complex(const complex& other) { data = 0; if (other.data) data = strdup(other.data); } complex& operator=(const complex& other) { complex(other).swap(*this); return *this; } void swap(complex& other) { std::swap(data, other.data); } |