OSDN > Trouver un logiciel > Développement de logiciels > Frameworks > iutest > SCM > SVN > Commit

iutest

iutest: Commit

マージ

--- branches/v1.1.1/include/iutest_ver.hpp (revision 122)

+++ branches/v1.1.1/include/iutest_ver.hpp (revision 123)

		@@ -22,11 +22,11 @@
22	22
23	23	//======================================================================
24	24	// define
25		-#define IUTEST_VER 0x01010100u //!< iutest version 1.1.1.0
	25	+#define IUTEST_VER 0x01010101u //!< iutest version 1.1.1.1
26	26	#define IUTEST_MAJORVER 0x01u //!< Major Version
27	27	#define IUTEST_MINORVER 0x01u //!< Minor Version
28	28	#define IUTEST_BUILD 0x01u //!< Build
29		-#define IUTEST_REVISION 0x00u //!< Revision
	29	+#define IUTEST_REVISION 0x01u //!< Revision
30	30
31	31	/**
32	32	* @mainpage

		@@ -92,7 +92,7 @@
92	92	* @page CHANGELOG 変更履歴
93	93	* @par Changes
94	94	<ul>
95		- <li>v1.1.1.0
	95	+ <li>v1.1.1.1
96	96	<ul>
97	97	<li>Windows Mobile でのビルドエラー修正</li>
98	98	<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 @@
194	194	*/
195	195	bool CreateFolder(void) const
196	196	{
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)
199	199	if( mkdir(c_str()) == 0 ) return true;
200		-#elif IUTEST_OS_WINDOWS
	200	+#elif defined(IUTEST_OS_WINDOWS)
201	201	if( _mkdir(c_str()) == 0 ) return true;
202	202	#else
203	203	if( mkdir(c_str(), 0777) == 0 ) return true;

		@@ -338,7 +338,7 @@
338	338	*/
339	339	static char GetPathSeparator(void)
340	340	{
341		-#if IUTEST_OS_WINDOWS
	341	+#ifdef IUTEST_OS_WINDOWS
342	342	return '\\';
343	343	#else
344	344	return '/';

		@@ -376,7 +376,7 @@
376	376	private:
377	377	static bool IsPathSeparator(char c)
378	378	{
379		-#if IUTEST_OS_WINDOWS
	379	+#ifdef IUTEST_OS_WINDOWS
380	380	if( c == '\\' ) return true;
381	381	#endif
382	382	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 @@
2880	2880
2881	2881	::std::vector<ParamType> params;
2882	2882
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 )
2884	2884	{
2885	2885	const _MyParamIndexes& indexes = *it;
2886	2886	params.push_back( ParamType(

		@@ -2932,7 +2932,7 @@
2932	2932
2933	2933	::std::vector<ParamType> params;
2934	2934
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 )
2936	2936	{
2937	2937	const _MyParamIndexes& indexes = *it;
2938	2938	params.push_back( ParamType(

		@@ -2989,7 +2989,7 @@
2989	2989
2990	2990	::std::vector<ParamType> params;
2991	2991
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 )
2993	2993	{
2994	2994	const _MyParamIndexes& indexes = *it;
2995	2995	params.push_back( ParamType(

		@@ -3052,7 +3052,7 @@
3052	3052
3053	3053	::std::vector<ParamType> params;
3054	3054
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 )
3056	3056	{
3057	3057	const _MyParamIndexes& indexes = *it;
3058	3058	params.push_back( ParamType(

		@@ -3120,7 +3120,7 @@
3120	3120
3121	3121	::std::vector<ParamType> params;
3122	3122
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 )
3124	3124	{
3125	3125	const _MyParamIndexes& indexes = *it;
3126	3126	params.push_back( ParamType(

		@@ -3193,7 +3193,7 @@
3193	3193
3194	3194	::std::vector<ParamType> params;
3195	3195
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 )
3197	3197	{
3198	3198	const _MyParamIndexes& indexes = *it;
3199	3199	params.push_back( ParamType(

		@@ -3271,7 +3271,7 @@
3271	3271
3272	3272	::std::vector<ParamType> params;
3273	3273
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 )
3275	3275	{
3276	3276	const _MyParamIndexes& indexes = *it;
3277	3277	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 @@
20	20	CXXFLAGS += -g -Wall -Wextra -Wundef
21	21	#CXXFLAGS += -DSHOW_FAILURE
22	22
23		-ifeq ($(CXX),clang++)
	23	+ifeq ($(findstring clang, $(CXX)),clang)
24	24
25	25	#
26	26	# clang version