• R/O
  • SSH
  • HTTPS

iutest: コミット


コミットメタ情報

リビジョン123 (tree)
日時2012-10-09 21:53:59
作者srz_zumix

ログメッセージ

マージ

変更サマリ

差分

--- branches/v1.1.1/include/iutest_ver.hpp (revision 122)
+++ branches/v1.1.1/include/iutest_ver.hpp (revision 123)
@@ -22,11 +22,11 @@
2222
2323 //======================================================================
2424 // define
25-#define IUTEST_VER 0x01010100u //!< iutest version 1.1.1.0
25+#define IUTEST_VER 0x01010101u //!< iutest version 1.1.1.1
2626 #define IUTEST_MAJORVER 0x01u //!< Major Version
2727 #define IUTEST_MINORVER 0x01u //!< Minor Version
2828 #define IUTEST_BUILD 0x01u //!< Build
29-#define IUTEST_REVISION 0x00u //!< Revision
29+#define IUTEST_REVISION 0x01u //!< Revision
3030
3131 /**
3232 * @mainpage
@@ -92,7 +92,7 @@
9292 * @page CHANGELOG 変更履歴
9393 * @par Changes
9494 <ul>
95- <li>v1.1.1.0
95+ <li>v1.1.1.1
9696 <ul>
9797 <li>Windows Mobile でのビルドエラー修正</li>
9898 <li>IUTEST_HAS_STRINGSTREAM=0 のときのビルドエラー修正</li>
--- branches/v1.1.1/include/internal/iutest_filepath.hpp (revision 122)
+++ branches/v1.1.1/include/internal/iutest_filepath.hpp (revision 123)
@@ -194,10 +194,10 @@
194194 */
195195 bool CreateFolder(void) const
196196 {
197-#ifdef IUTEST_OS_WINDOWS_MOBILE
198-#elif IUTEST_OS_WINDOWS_MINGW
197+#if defined(IUTEST_OS_WINDOWS_MOBILE)
198+#elif defined(IUTEST_OS_WINDOWS_MINGW)
199199 if( mkdir(c_str()) == 0 ) return true;
200-#elif IUTEST_OS_WINDOWS
200+#elif defined(IUTEST_OS_WINDOWS)
201201 if( _mkdir(c_str()) == 0 ) return true;
202202 #else
203203 if( mkdir(c_str(), 0777) == 0 ) return true;
@@ -338,7 +338,7 @@
338338 */
339339 static char GetPathSeparator(void)
340340 {
341-#if IUTEST_OS_WINDOWS
341+#ifdef IUTEST_OS_WINDOWS
342342 return '\\';
343343 #else
344344 return '/';
@@ -376,7 +376,7 @@
376376 private:
377377 static bool IsPathSeparator(char c)
378378 {
379-#if IUTEST_OS_WINDOWS
379+#ifdef IUTEST_OS_WINDOWS
380380 if( c == '\\' ) return true;
381381 #endif
382382 return c == '/';
--- branches/v1.1.1/include/internal/iutest_genparams.hpp (revision 122)
+++ branches/v1.1.1/include/internal/iutest_genparams.hpp (revision 123)
@@ -2880,7 +2880,7 @@
28802880
28812881 ::std::vector<ParamType> params;
28822882
2883- for( ParamIndexesList::const_iterator it=list.begin(), end=list.end(); it != end; ++it )
2883+ for( typename ParamIndexesList::const_iterator it=list.begin(), end=list.end(); it != end; ++it )
28842884 {
28852885 const _MyParamIndexes& indexes = *it;
28862886 params.push_back( ParamType(
@@ -2932,7 +2932,7 @@
29322932
29332933 ::std::vector<ParamType> params;
29342934
2935- for( ParamIndexesList::const_iterator it=list.begin(), end=list.end(); it != end; ++it )
2935+ for( typename ParamIndexesList::const_iterator it=list.begin(), end=list.end(); it != end; ++it )
29362936 {
29372937 const _MyParamIndexes& indexes = *it;
29382938 params.push_back( ParamType(
@@ -2989,7 +2989,7 @@
29892989
29902990 ::std::vector<ParamType> params;
29912991
2992- for( ParamIndexesList::const_iterator it=list.begin(), end=list.end(); it != end; ++it )
2992+ for( typename ParamIndexesList::const_iterator it=list.begin(), end=list.end(); it != end; ++it )
29932993 {
29942994 const _MyParamIndexes& indexes = *it;
29952995 params.push_back( ParamType(
@@ -3052,7 +3052,7 @@
30523052
30533053 ::std::vector<ParamType> params;
30543054
3055- for( ParamIndexesList::const_iterator it=list.begin(), end=list.end(); it != end; ++it )
3055+ for( typename ParamIndexesList::const_iterator it=list.begin(), end=list.end(); it != end; ++it )
30563056 {
30573057 const _MyParamIndexes& indexes = *it;
30583058 params.push_back( ParamType(
@@ -3120,7 +3120,7 @@
31203120
31213121 ::std::vector<ParamType> params;
31223122
3123- for( ParamIndexesList::const_iterator it=list.begin(), end=list.end(); it != end; ++it )
3123+ for( typename ParamIndexesList::const_iterator it=list.begin(), end=list.end(); it != end; ++it )
31243124 {
31253125 const _MyParamIndexes& indexes = *it;
31263126 params.push_back( ParamType(
@@ -3193,7 +3193,7 @@
31933193
31943194 ::std::vector<ParamType> params;
31953195
3196- for( ParamIndexesList::const_iterator it=list.begin(), end=list.end(); it != end; ++it )
3196+ for( typename ParamIndexesList::const_iterator it=list.begin(), end=list.end(); it != end; ++it )
31973197 {
31983198 const _MyParamIndexes& indexes = *it;
31993199 params.push_back( ParamType(
@@ -3271,7 +3271,7 @@
32713271
32723272 ::std::vector<ParamType> params;
32733273
3274- for( ParamIndexesList::const_iterator it=list.begin(), end=list.end(); it != end; ++it )
3274+ for( typename ParamIndexesList::const_iterator it=list.begin(), end=list.end(); it != end; ++it )
32753275 {
32763276 const _MyParamIndexes& indexes = *it;
32773277 params.push_back( ParamType(
--- branches/v1.1.1/projects/make/Makefile (revision 122)
+++ branches/v1.1.1/projects/make/Makefile (revision 123)
@@ -20,7 +20,7 @@
2020 CXXFLAGS += -g -Wall -Wextra -Wundef
2121 #CXXFLAGS += -DSHOW_FAILURE
2222
23-ifeq ($(CXX),clang++)
23+ifeq ($(findstring clang, $(CXX)),clang)
2424
2525 #
2626 # clang version
@@ -28,6 +28,7 @@
2828 #
2929
3030 #CXXFLAGS += -std=c++0x
31+#CXXFLAGS += -std=c++11
3132
3233 else
3334
旧リポジトリブラウザで表示