summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bx/tests/vector_nodefault.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-10-20 21:34:36 +0200
committer ImJezze <jezze@gmx.net>2015-10-20 21:34:36 +0200
commita7b8acbe3eebcf17367baa642375cfa47ae4ea85 (patch)
tree854b859d6176802c0278f4b00de3f7c774e02dda /3rdparty/bx/tests/vector_nodefault.cpp
parent4610935e796661874bb4ee7ec6536d9423aeb7be (diff)
parent74aae76c4e3e257f99d139c4febb5d86d1419e50 (diff)
Merge pull request #6 from mamedev/master
Sync to base master
Diffstat (limited to '3rdparty/bx/tests/vector_nodefault.cpp')
-rw-r--r--3rdparty/bx/tests/vector_nodefault.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/3rdparty/bx/tests/vector_nodefault.cpp b/3rdparty/bx/tests/vector_nodefault.cpp
index 319fd5546fb..4a8bc8cf1dd 100644
--- a/3rdparty/bx/tests/vector_nodefault.cpp
+++ b/3rdparty/bx/tests/vector_nodefault.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
@@ -33,14 +33,10 @@
#include <string.h>
#include <stdlib.h>
-#if !BX_COMPILER_MSVC
-# define _strdup strdup
-#endif // !BX_COMPILER_MSVC
-
struct nodefault {
- nodefault(const char* s) { data = _strdup(s); }
+ nodefault(const char* s) { data = strdup(s); }
~nodefault() { free(data); }
- nodefault(const nodefault& other) { data = 0; if (other.data) data = _strdup(other.data); }
+ nodefault(const nodefault& other) { data = 0; if (other.data) data = strdup(other.data); }
nodefault& operator=(const nodefault& other) { nodefault(other).swap(*this); return *this; }
void swap(nodefault& other) { std::swap(data, other.data); }