Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fix for r74457.

Browse Source 
Remove stray #endif from incorrectly merged changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2013-07-09 16:12:05 +00:00
parent bc9dcd9fd4
commit d459632844
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/defs.h
View File

@@ -359,7 +359,6 @@ typedef short int WXTYPE;
#ifndef HAVE_TR1_TYPE_TRAITS #ifndef HAVE_TR1_TYPE_TRAITS
#if defined(__has_include) && __has_include(<tr1/type_traits>) #if defined(__has_include) && __has_include(<tr1/type_traits>)
#define HAVE_TR1_TYPE_TRAITS #define HAVE_TR1_TYPE_TRAITS
#endif
#elif defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729) #elif defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729)
#define HAVE_TR1_TYPE_TRAITS #define HAVE_TR1_TYPE_TRAITS
#endif #endif