update r779

srz-zumix · Jan 19, 2015 · ffaeb16 · ffaeb16
1 parent 60948a0
commit ffaeb16
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/doc/Doxyfile b/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = iutest
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.11.0.4
+PROJECT_NUMBER         = 1.11.0.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/include/impl/iutest_debug.ipp b/include/impl/iutest_debug.ipp
@@ -6,7 +6,7 @@
  *
  * @author		t.shirayanagi
  * @par			copyright
- * Copyright (C) 2013-2014, Takazumi Shirayanagi\n
+ * Copyright (C) 2013-2015, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -21,7 +21,7 @@
 
 #if defined(_MSC_VER) && _MSC_VER >= 1310
 #  if !defined(IUTEST_OS_WINDOWS_MOBILE) && !defined(IUTEST_OS_WINDOWS_PHONE) && !defined(IUTEST_OS_WINDOWS_RT)
-#    if defined(_MSC_FULL_VER) && (_MSC_FULL_VER <= 190022310)
+#    if defined(_MSC_FULL_VER) && (_MSC_FULL_VER <= 190022512)
 IUTEST_PRAGMA_MSC_WARN_PUSH()
 IUTEST_PRAGMA_MSC_WARN_DISABLE(4091)
 #      include <DbgHelp.h>

diff --git a/include/internal/iutest_filepath.hpp b/include/internal/iutest_filepath.hpp
@@ -6,7 +6,7 @@
  *
  * @author		t.shirayanagi
  * @par			copyright
- * Copyright (C) 2012-2014, Takazumi Shirayanagi\n
+ * Copyright (C) 2012-2015, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -19,7 +19,6 @@
 
 //======================================================================
 // include
-#include "iutest_string.hpp"
 #include "iutest_port.hpp"
 
 #if IUTEST_HAS_FILE_STAT

diff --git a/include/internal/iutest_stdlib.hpp b/include/internal/iutest_stdlib.hpp
@@ -374,6 +374,10 @@ using tuples::get;
 #  define IUTEST_HAS_HDR_SYSTIME		1
 #endif
 
+// socklen_t
+#if defined(IUTEST_OS_WINDOWS_WINE)
+#  define __socklen_t_defined
+#endif
 
 namespace iutest {
 namespace detail

diff --git a/include/iutest_ver.hpp b/include/iutest_ver.hpp
@@ -17,11 +17,11 @@
 
 //======================================================================
 // define
-#define IUTEST_VER			0x01110004u //!< iutest version 1.11.0.4
+#define IUTEST_VER			0x01110005u //!< iutest version 1.11.0.5
 #define IUTEST_MAJORVER		0x01u		//!< Major Version
 #define IUTEST_MINORVER		0x11u		//!< Minor Version
 #define IUTEST_BUILD		0x00u		//!< Build
-#define IUTEST_REVISION		0x04u		//!< Revision
+#define IUTEST_REVISION		0x05u		//!< Revision
 
 /**
  * @mainpage