• R/O
  • SSH
  • HTTPS

iutest: Commit


Commit MetaInfo

Revision1333 (tree)
Time2018-08-16 09:55:41
Authorsrz_zumix

Log Message

Merge remote-tracking branch 'origin/develop'

git@00bbe038e0ca1dff5124d747d71b534aac832ef4
https://github.com/srz-zumix/iutest/commit/00bbe038e0ca1dff5124d747d71b534aac832ef4

Change Summary

Incremental Difference

--- trunk/.travis.yml (revision 1332)
+++ trunk/.travis.yml (revision 1333)
@@ -16,14 +16,14 @@
1616 packages: &apt-common-packages
1717 - clang-6.0
1818 - libc++-dev
19- - g++-7
20- - gcc-7
19+ - g++-8
20+ - gcc-8
2121 #- cppcheck
2222
2323 before_install:
2424 - python .ci/travisci/travis_blocking_stdout.py
25- - apt-cache search clang
26- - apt-cache search gcc
25+ - apt-cache search clang || true
26+ - apt-cache search gcc || true
2727 - if [ "${CXX}" = 'g++' ] && [ "${HOST}" != 'WINE' ] && [ "${USE_COVERAGE}" != 'lcov' ]; then export USE_NEWEST_GCC=1; fi
2828
2929 install:
@@ -75,13 +75,13 @@
7575 # g++
7676 - |
7777 if [ "${USE_NEWEST_GCC}" = '1' ]; then
78- export CC=gcc-7
79- export CXX=g++-7
80- export CCOV=gcov-7
78+ export CC=gcc-8
79+ export CXX=g++-8
80+ export CCOV=gcov-8
8181 fi
8282 # clang
8383 - |
84- if [ "${CXX}" = 'clang++' ]; then
84+ if [ "${CXX}" = 'clang++' ] && [ "${TRAVIS_OS_NAME}" != 'osx' ; then
8585 export CXX=clang++-6.0;
8686 fi
8787 # mingw
@@ -206,8 +206,8 @@
206206 # Use Lib
207207 - compiler: gcc
208208 env: USE_LIB=1
209- - compiler: clang
210- env: USE_LIB=1
209+# - compiler: clang
210+# env: USE_LIB=1
211211 #- compiler: gcc
212212 # env: CPPCHECK=1
213213 - compiler: gcc
@@ -219,9 +219,11 @@
219219 name: "srz-zumix/iutest"
220220 description: "iutest c++ testing framework"
221221 notification_email: zumix.cpp@gmail.com
222- build_command_prepend: "cov-configure --comptype gcc --compiler gcc-7 --template && cd ./test"
222+ build_command_prepend: "cov-configure --comptype gcc --compiler gcc-8 --template && cd ./test"
223223 build_command: make coverity_scan STDFLAG=-std=c++1z
224224 branch_pattern: master
225+ - os: osx
226+ env: OSX=1 STDFLAG=-std=c++11
225227
226228 notifications:
227229 webhooks:
--- trunk/docs/wandbox.html (revision 1332)
+++ trunk/docs/wandbox.html (revision 1333)
@@ -41,7 +41,7 @@
4141 int main(int argc, char** argv)
4242 {
4343 int x = 0;
44- std::cout << "hoge" << std::endl;
44+ ::std::cout << "hoge" << ::std::endl;
4545
4646 IUTEST_INIT(&argc, argv);
4747 return IUTEST_RUN_ALL_TESTS();
--- trunk/tools/paiza.io/sample.cpp (revision 1332)
+++ trunk/tools/paiza.io/sample.cpp (revision 1333)
@@ -3,12 +3,12 @@
33
44 int main(int argc, char** argv)
55 {
6- int x = 0;
7- std::cout << "hoge" << std::endl;
8-
6+ int x = 0;
7+ ::std::cout << "hoge" << ::std::endl;
8+
99 // IUTEST_INIT(&argc, argv);
1010 // return IUTEST_RUN_ALL_TESTS();
11- return 0;
11+ return 0;
1212 }
1313
1414 //IUTEST(Foo, Bar)
--- trunk/tools/paiza.io/paizaio.py (revision 1332)
+++ trunk/tools/paiza.io/paizaio.py (revision 1333)
@@ -100,5 +100,5 @@
100100
101101 if __name__ == '__main__':
102102 paiza = PaizaIO()
103- paiza.code('#include <iostream>\nint main() { int x = 0; std::cout << "hoge" << std::endl; }')
103+ paiza.code('#include <iostream>\nint main() { int x = 0; ::std::cout << "hoge" << ::std::endl; }')
104104 print(paiza.run())
--- trunk/tools/wandbox/simple.cpp (revision 1332)
+++ trunk/tools/wandbox/simple.cpp (revision 1333)
@@ -3,6 +3,6 @@
33 int main(int argc, char** argv)
44 {
55 int x = 0;
6- std::cout << "hoge" << std::endl;
6+ ::std::cout << "hoge" << ::std::endl;
77 return 0;
88 }
--- trunk/tools/wandbox/Makefile (revision 1332)
+++ trunk/tools/wandbox/Makefile (revision 1333)
@@ -59,10 +59,10 @@
5959 python iuwandbox.py $< -c $(WANDBOX_COMPILER) --boost 1.60 -f"-DIUTEST_USE_MAIN" --encoding utf-8-sig $(EXPAND_INCLUDE) --verbose --dryrun
6060 python iuwandbox.py $< -c $(WANDBOX_COMPILER) --default --boost 1.60 -f"-DIUTEST_USE_MAIN" --encoding utf-8-sig $(EXPAND_INCLUDE) --verbose --dryrun
6161
62-test-all-compiler: ../../test/syntax_tests.cpp Makefile
62+test-all-compiler: ../../test/syntax_tests.cpp Makefile fused
6363 @for compiler in $(shell python iuwandbox.py --list-compiler); do \
6464 echo $${compiler}; \
65- python iuwandbox.py $< -c $${compiler} -f"-DIUTEST_USE_MAIN" -f"-Werror" --encoding utf-8-sig || exit 1; \
65+ python iuwandbox.py $< -c $${compiler} -f"-DIUTEST_USE_MAIN" -f"-Werror" --encoding utf-8-sig --verbose $(WANDBOX_ADD_OPTIONS) || exit 1; \
6666 done
6767
6868 list-compiler:
--- trunk/tools/wandbox/sample.cpp (revision 1332)
+++ trunk/tools/wandbox/sample.cpp (revision 1333)
@@ -8,7 +8,7 @@
88 int main(int argc, char** argv)
99 {
1010 int x = 0;
11- std::cout << "hoge" << std::endl;
11+ ::std::cout << "hoge" << ::std::endl;
1212
1313 IUTEST_INIT(&argc, argv);
1414 return IUTEST_RUN_ALL_TESTS();
--- trunk/tools/wandbox/iuwandbox.py (revision 1332)
+++ trunk/tools/wandbox/iuwandbox.py (revision 1333)
@@ -41,7 +41,7 @@
4141 '-v',
4242 '--version',
4343 action='version',
44- version=u'%(prog)s version 6.0'
44+ version=u'%(prog)s version 6.1'
4545 )
4646 parser.add_argument(
4747 '--list-compiler',
@@ -368,6 +368,10 @@
368368 tmp = list(filter(lambda s: s.find('c++') == -1, opt))
369369 tmp = list(filter(lambda s: s.find('gnu++') == -1, tmp))
370370 return tmp
371+ def find_cppname(opt):
372+ if any((x.startswith('c++') for x in opt)):
373+ return 'c++'
374+ return 'gnu++'
371375 opt = []
372376 if not options.no_default:
373377 opt = get_default_options(options.compiler)
@@ -389,10 +393,14 @@
389393 opt.append('cpp-verbose')
390394 # boost
391395 if workaround:
392- pass
396+ if options.compiler in ['clang-3.1']:
397+ cppname = find_cppname(opt)
398+ opt = filterout_cppver(opt)
399+ opt.append(cppname + '98')
393400 # if options.compiler in ['clang-3.4', 'clang-3.3']:
394401 # if not options.boost:
395402 # options.boost = 'nothing'
403+ pass
396404 if options.boost:
397405 if options.compiler not in options.boost:
398406 options.boost = options.boost + '-' + options.compiler
@@ -537,7 +545,8 @@
537545 def run_wandbox_cxx(code, includes, impliments, options):
538546 with Wandbox() as w:
539547 w.compiler(options.compiler)
540- w.options(','.join(create_option_list(options)))
548+ woptions = ','.join(create_option_list(options))
549+ w.options(woptions)
541550 if options.stdin:
542551 w.stdin(options.stdin)
543552 colist = create_compiler_raw_option_list(options)
@@ -549,9 +558,10 @@
549558 # colist.append('-DIUTEST_HAS_HDR_CXXABI=0')
550559 # if options.compiler in ['clang-3.3', 'clang-3.2', 'clang-3.1', 'clang-3.0']:
551560 # colist.append('-Qunused-arguments')
552- # if options.compiler in ['clang-3.4', 'clang-3.3']:
553- # colist.append('-fno-exceptions')
554- # colist.append('-fno-rtti')
561+ if 'boost-nothing' in woptions:
562+ if options.compiler in ['clang-3.4', 'clang-3.3']:
563+ colist.append('-fno-exceptions')
564+ colist.append('-fno-rtti')
555565 pass
556566 if colist:
557567 co = '\n'.join(colist)
--- trunk/tools/wandbox/wandbox.py (revision 1332)
+++ trunk/tools/wandbox/wandbox.py (revision 1333)
@@ -26,7 +26,8 @@
2626 return self
2727
2828 def __exit__(self, exc_type, exc_value, traceback):
29- return True
29+ self.reset()
30+ return False
3031
3132 @staticmethod
3233 def GetCompilerList():
@@ -151,5 +152,5 @@
151152 w.compiler('gcc-head')
152153 w.options('warning,gnu++1y')
153154 w.compiler_options('-Dx=hogefuga\n-O3')
154- w.code('#include <iostream>\nint main() { int x = 0; std::cout << "hoge" << std::endl; }')
155+ w.code('#include <iostream>\nint main() { int x = 0; ::std::cout << "hoge" << ::std::endl; }')
155156 print(w.run())
--- trunk/wercker.yml (revision 1332)
+++ trunk/wercker.yml (revision 1333)
@@ -95,6 +95,35 @@
9595 python ./iuwandbox.py ${IUWANDBOX_COMMANDLINE_OPTION} -c $compiler --std "gnu++${IUWANDBOX_CPPVER}" ${IUWANDBOX_ADD_OPTION} ${IUWANDBOX_STDC_ADD_OPTION};
9696 done
9797
98+wandbox-all-compiler:
99+ steps:
100+ - virtualenv:
101+ name: setup virtual environment
102+
103+ - pip-install:
104+ requirements_file: ""
105+ packages_list: "requests"
106+
107+ - script:
108+ name: make fused
109+ code: |
110+ make -C tools/fused
111+
112+ - script:
113+ name: setup
114+ code: |
115+ export PYTHONDONTWRITEBYTECODE=1
116+ export IUWANDBOX_COMMANDLINE_OPTION="../../test/syntax_tests.cpp -f"-DIUTEST_USE_MAIN=1" -f"-Werror" --encoding utf-8-sig --expand-include --verbose --check-config --retry-wait 180"
117+
118+ - script:
119+ name: all-compiler
120+ code: |
121+ cd tools/wandbox
122+ for compiler in $(shell python iuwandbox.py --list-compiler)
123+ do
124+ python ./iuwandbox.py ${IUWANDBOX_COMMANDLINE_OPTION} -c $compiler ${IUWANDBOX_ADD_OPTION} ${IUWANDBOX_STDC_ADD_OPTION};
125+ done
126+
98127 nothing:
99128 steps:
100129 - script:
--- trunk/samples/gmock/main.cpp (revision 1332)
+++ trunk/samples/gmock/main.cpp (revision 1333)
@@ -18,9 +18,9 @@
1818 int main(int argc, char* argv[])
1919 #endif
2020 {
21- ::testing::InitGoogleMock(&argc, argv);
22- IUTEST_INIT(&argc, argv);
23- return IUTEST_RUN_ALL_TESTS(); // run all
21+ ::testing::InitGoogleMock(&argc, argv);
22+ IUTEST_INIT(&argc, argv);
23+ return IUTEST_RUN_ALL_TESTS(); // run all
2424 }
2525
2626 /**
@@ -29,7 +29,7 @@
2929 class Foo
3030 {
3131 public:
32- virtual std::string name(void) = 0;
32+ virtual ::std::string name(void) = 0;
3333 };
3434
3535 /**
@@ -38,7 +38,7 @@
3838 class MockFoo : public Foo
3939 {
4040 public:
41- MOCK_METHOD0( name, std::string () );
41+ MOCK_METHOD0( name, ::std::string () );
4242 };
4343
4444 /**
@@ -46,27 +46,27 @@
4646 */
4747 class FooTest
4848 {
49- Foo* m_foo;
49+ Foo* m_foo;
5050 public:
51- FooTest(Foo* foo) : m_foo(foo) {}
51+ FooTest(Foo* foo) : m_foo(foo) {}
5252
53- std::string name(void) { return m_foo->name(); }
54- std::string repeat(int n)
55- {
56- std::string str;
57- for( int i=0; i < n; ++i ) str += name();
58- return str;
59- }
53+ ::std::string name(void) { return m_foo->name(); }
54+ ::std::string repeat(int n)
55+ {
56+ ::std::string str;
57+ for( int i=0; i < n; ++i ) str += name();
58+ return str;
59+ }
6060 };
6161
6262 TEST(FooTest, Name)
6363 {
64- // モック
65- MockFoo mock;
66- EXPECT_CALL(mock, name()).WillOnce( ::testing::Return("iutest") );
64+ // モック
65+ MockFoo mock;
66+ EXPECT_CALL(mock, name()).WillOnce( ::testing::Return("iutest") );
6767
68- FooTest test(&mock);
69- IUTEST_ASSERT_EQ( "iutest", test.name() );
68+ FooTest test(&mock);
69+ IUTEST_ASSERT_EQ( "iutest", test.name() );
7070 }
7171
7272 using testing::Pointwise;
@@ -79,7 +79,7 @@
7979 TEST(PointwiseTest, WorksForLhsNativeArray)
8080 {
8181 const int lhs[] = { 1, 2, 3 };
82- std::vector<int> rhs;
82+ ::std::vector<int> rhs;
8383 rhs.push_back(2);
8484 rhs.push_back(4);
8585 rhs.push_back(6);
--- trunk/samples/matcher.cpp (revision 1332)
+++ trunk/samples/matcher.cpp (revision 1333)
@@ -80,7 +80,7 @@
8080 IUTEST(Matcher, Member)
8181 {
8282 X x(0, 1);
83- std::map<int, X> m;
83+ ::std::map<int, X> m;
8484 for( int i=0; i < 10; ++i )
8585 {
8686 m.insert(::std::pair<int, X>(i, X(i, 100)));
--- trunk/samples/vcunittest/unittest.cpp (revision 1332)
+++ trunk/samples/vcunittest/unittest.cpp (revision 1333)
@@ -187,9 +187,9 @@
187187 IUTEST_INFORM_STRLNEQ(4, wcs);
188188
189189 {
190- std::string str1 = "tEst";
191- std::string str2 = "teSt";
192- std::string str3 = "hoSt";
190+ ::std::string str1 = "tEst";
191+ ::std::string str2 = "teSt";
192+ ::std::string str3 = "hoSt";
193193
194194 IUTEST_ASSERT_STRCASEEQ("TeSt", mbs);
195195 IUTEST_ASSERT_STRCASEEQ("TeSt", str1);
@@ -483,7 +483,7 @@
483483 throw 2;
484484 break;
485485 case 2:
486- throw std::bad_exception();
486+ throw ::std::bad_exception();
487487 break;
488488 default:
489489 break;
@@ -492,10 +492,10 @@
492492
493493 IUTEST(AssertionTest, Exception)
494494 {
495- //IUTEST_ASSERT_THROW(throw std::bad_exception(), std::bad_exception);
496- IUTEST_ASSERT_THROW(ExceptionFunction(2), std::bad_exception);
497- IUTEST_EXPECT_THROW(ExceptionFunction(2), std::bad_exception);
498- IUTEST_INFORM_THROW(ExceptionFunction(2), std::bad_exception);
495+ //IUTEST_ASSERT_THROW(throw ::std::bad_exception(), ::std::bad_exception);
496+ IUTEST_ASSERT_THROW(ExceptionFunction(2), ::std::bad_exception);
497+ IUTEST_EXPECT_THROW(ExceptionFunction(2), ::std::bad_exception);
498+ IUTEST_INFORM_THROW(ExceptionFunction(2), ::std::bad_exception);
499499 IUTEST_ASSERT_ANY_THROW(ExceptionFunction(1));
500500 IUTEST_EXPECT_ANY_THROW(ExceptionFunction(1));
501501 IUTEST_INFORM_ANY_THROW(ExceptionFunction(1));
@@ -507,16 +507,16 @@
507507 class exception_test
508508 {
509509 public:
510- exception_test(const std::vector<int>&)
510+ exception_test(const ::std::vector<int>&)
511511 {
512- IUTEST_SUPPRESS_UNREACHABLE_CODE_WARNING(throw std::exception());
512+ IUTEST_SUPPRESS_UNREACHABLE_CODE_WARNING(throw ::std::exception());
513513 }
514514 };
515515
516516 IUTEST(AssertionTest, Exception2)
517517 {
518- std::vector<int> a;
519- IUTEST_ASSERT_THROW(exception_test(a), std::exception);
518+ ::std::vector<int> a;
519+ IUTEST_ASSERT_THROW(exception_test(a), ::std::exception);
520520 }
521521
522522 #endif
--- trunk/test/exception_tests.cpp (revision 1332)
+++ trunk/test/exception_tests.cpp (revision 1333)
@@ -22,7 +22,7 @@
2222
2323 IUTEST(ExceptionTest, StdExceptionThrow)
2424 {
25- throw std::runtime_error("ExceptionTest");
25+ throw ::std::runtime_error("ExceptionTest");
2626 }
2727
2828 IUTEST(ExceptionTest, Throw)
--- trunk/test/printers_tests.cpp (revision 1332)
+++ trunk/test/printers_tests.cpp (revision 1333)
@@ -6,7 +6,7 @@
66 *
77 * @author t.shirayanagi
88 * @par copyright
9- * Copyright (C) 2012-2016, Takazumi Shirayanagi\n
9+ * Copyright (C) 2012-2018, Takazumi Shirayanagi\n
1010 * This software is released under the new BSD License,
1111 * see LICENSE
1212 */
@@ -19,6 +19,10 @@
1919 #include "iutest.hpp"
2020 #include "logger_tests.hpp"
2121
22+#if IUTEST_HAS_CXX_HDR_ARRAY
23+# include <array> // NOLINT
24+#endif
25+
2226 #if !defined(IUTEST_USE_GTEST)
2327 TestLogger printer_logger;
2428
@@ -357,6 +361,7 @@
357361 #if IUTEST_HAS_TUPLE
358362 IUTEST(PrintToTest, Tuple)
359363 {
364+ LogChecker ck("false, 100, 'a'");
360365 ::iutest::tuples::tuple<bool, int, char> t(false, 100, 'a');
361366
362367 IUTEST_SUCCEED() << ::iutest::PrintToString(t);
@@ -363,3 +368,12 @@
363368 }
364369 #endif
365370
371+#if IUTEST_HAS_CXX_HDR_ARRAY
372+IUTEST(PrintToTest, Array)
373+{
374+ LogChecker ck("3, 1, 4");
375+ ::std::array<int, 3> ar = { { 3, 1, 4 } };
376+ IUTEST_SUCCEED() << ::iutest::PrintToString(ar);
377+}
378+#endif
379+
--- trunk/include/gtest/iutest_assertion_only.hpp (revision 1332)
+++ trunk/include/gtest/iutest_assertion_only.hpp (revision 1333)
@@ -280,7 +280,7 @@
280280
281281 #if GTEST_MINORVER >= 0x07
282282 Message::Message() : ss_(new ::std::stringstream) {
283- *ss_ << ::std::setprecision(std::numeric_limits<double>::digits10 + 2);
283+ *ss_ << ::std::setprecision(::std::numeric_limits<double>::digits10 + 2);
284284 }
285285
286286 ::std::string Message::GetString() const {
--- trunk/include/iutest_config.hpp (revision 1332)
+++ trunk/include/iutest_config.hpp (revision 1333)
@@ -659,7 +659,7 @@
659659
660660 /**
661661 * @brief iutest で t1/tuple.h をインクルードするかどうか
662- * @details 1: std::tr1 名前空間にある tuple を使用します。
662+ * @details 1: ::std::tr1 名前空間にある tuple を使用します。
663663 * tuple.h はユーザーがインクルードします。
664664 * 0: 指定なし iutest が自動で判断します。
665665 */
@@ -674,7 +674,7 @@
674674 #define IUTEST_USE_EXTERNAL_STD_TUPLE 0
675675
676676 /**
677- * @brief std::is_member_function_pointer がコンパイルエラーになる場合に定義する
677+ * @brief ::std::is_member_function_pointer がコンパイルエラーになる場合に定義する
678678 */
679679 #define IUTEST_USE_OWN_IS_MEMBER_FUNCTION_POINTER 1
680680
--- trunk/include/iutest_assertion.hpp (revision 1332)
+++ trunk/include/iutest_assertion.hpp (revision 1333)
@@ -325,7 +325,7 @@
325325 void OnFixed(const Fixed& fixed)
326326 {
327327 // OnFixed で throw しないこと!テスト側の例外キャッチにかからなくなる
328- const std::string append_message = fixed.GetString();
328+ const ::std::string append_message = fixed.GetString();
329329 if( !append_message.empty() )
330330 {
331331 m_part_result.add_message(" " + append_message);
@@ -417,7 +417,7 @@
417417 * @brief Eq 系アサーション
418418 */
419419 inline AssertionResult EqFailure(const char* expected_expression, const char* actual_expression
420- , const std::string& expected, const std::string& actual, bool ignoring_case = false)
420+ , const ::std::string& expected, const ::std::string& actual, bool ignoring_case = false)
421421 {
422422 iu_global_format_stringstream strm;
423423 strm << "error: Value of " << actual_expression
--- trunk/include/iutest_param_tests.hpp (revision 1332)
+++ trunk/include/iutest_param_tests.hpp (revision 1333)
@@ -392,7 +392,7 @@
392392
393393 /**
394394 * @brief ユーザー定義ジェネレータ利用パラメータ
395- * @param generator = std::generate function
395+ * @param generator = ::std::generate function
396396 */
397397 template<typename StdGenerator>
398398 inline detail::iuValuesParamsGeneratorHolder<StdGenerator> IUTEST_ATTRIBUTE_UNUSED_ ValuesGen(size_t num, const StdGenerator& generator)
--- trunk/include/internal/iutest_compiler.hpp (revision 1332)
+++ trunk/include/internal/iutest_compiler.hpp (revision 1333)
@@ -100,8 +100,19 @@
100100 # include <android/api-level.h>
101101 #endif
102102
103+// c++2a
104+
103105 // c++17
106+#if !defined(IUTEST_HAS_CXX2A)
107+# if (defined(__cplusplus) && __cplusplus > 201703L)
108+# define IUTEST_HAS_CXX2A 1
109+# endif
110+#endif
104111
112+#if !defined(IUTEST_HAS_CXX2A)
113+# define IUTEST_HAS_CXX2A 0
114+#endif
115+
105116 //! is c++17 compiler
106117 #if !defined(IUTEST_HAS_CXX17)
107118 # if (defined(__cplusplus) && __cplusplus >= 201406L)
@@ -733,8 +744,10 @@
733744 #if !defined(IUTEST_CXX_NOTHROW)
734745 # if IUTEST_HAS_NOEXCEPT
735746 # define IUTEST_CXX_NOTHROW noexcept
747+# elif IUTEST_HAS_CXX2A
748+# define IUTEST_CXX_NOTHROW
736749 # else
737-# define IUTEST_CXX_NOTHROW throw()
750+# define IUTEST_CXX_NOTHROW throw() // C++20 で消える
738751 # endif
739752 #endif
740753
--- trunk/include/internal/iutest_random.hpp (revision 1332)
+++ trunk/include/internal/iutest_random.hpp (revision 1333)
@@ -209,9 +209,9 @@
209209 void shuffle(It first, It last)
210210 {
211211 #if IUTEST_HAS_CXX_HDR_RANDOM
212- std::shuffle(first, last, m_engine);
212+ ::std::shuffle(first, last, m_engine);
213213 #else
214- std::random_shuffle(first, last, *this);
214+ ::std::random_shuffle(first, last, *this);
215215 #endif
216216 }
217217 };
--- trunk/include/internal/iutest_exception.hpp (revision 1332)
+++ trunk/include/internal/iutest_exception.hpp (revision 1333)
@@ -20,7 +20,7 @@
2020
2121 #if IUTEST_HAS_EXCEPTIONS
2222 #include <exception>
23-//#include <stdexcept> // std::invalid_argment
23+//#include <stdexcept> // ::std::invalid_argment
2424
2525 namespace iutest {
2626 namespace detail
--- trunk/include/internal/iutest_genparams_from_file.hpp (revision 1332)
+++ trunk/include/internal/iutest_genparams_from_file.hpp (revision 1333)
@@ -100,7 +100,7 @@
100100 template<>inline bool iuCsvFileParamsGenerator<float>::ToParam(const ::std::string& data, float& param)
101101 {
102102 #if IUTEST_HAS_STD_STR_TO_VALUE
103- param = std::stof(data);
103+ param = ::std::stof(data);
104104 return true;
105105 #else
106106 ::std::istringstream strm(data);
--- trunk/include/internal/iutest_type_traits.hpp (revision 1332)
+++ trunk/include/internal/iutest_type_traits.hpp (revision 1333)
@@ -63,7 +63,7 @@
6363 namespace iutest_type_traits
6464 {
6565
66-typedef void void_t; // default template 引数用 (一部のコンパイラで = void だとエラーになるため)
66+typedef void type_defined_void; // default template 引数用 (一部のコンパイラで = void だとエラーになるため)
6767
6868 /**
6969 * @brief identity
@@ -108,7 +108,7 @@
108108
109109 #endif
110110
111-template<class COND, typename T = void_t>
111+template<class COND, typename T = type_defined_void>
112112 struct enable_if_t : public enable_if<COND::value, T> {};
113113
114114 /**
@@ -116,7 +116,7 @@
116116 */
117117 template<bool B, typename T>
118118 struct disable_if : public enable_if<!B, T> {};
119-template<class COND, typename T = void_t>
119+template<class COND, typename T = type_defined_void>
120120 struct disable_if_t : public disable_if<COND::value, T> {};
121121
122122 template<typename T>
--- trunk/include/internal/iutest_stdlib.hpp (revision 1332)
+++ trunk/include/internal/iutest_stdlib.hpp (revision 1333)
@@ -263,11 +263,11 @@
263263 # endif
264264 #endif
265265
266-//! has std::begin,std::end
266+//! has ::std::begin,::std::end
267267 #if !defined(IUTEST_HAS_STD_BEGIN_END)
268268 # define IUTEST_HAS_STD_BEGIN_END 0
269269 #endif
270-//! has std::declval
270+//! has ::std::declval
271271 #if !defined(IUTEST_HAS_STD_DECLVAL)
272272 # define IUTEST_HAS_STD_DECLVAL 0
273273 #endif
@@ -275,7 +275,7 @@
275275 #if !defined(IUTEST_USE_EXTERNAL_TR1_TUPLE)
276276 # define IUTEST_USE_EXTERNAL_TR1_TUPLE 0
277277 #endif
278-//! use external include std::tuple
278+//! use external include ::std::tuple
279279 #ifndef IUTEST_USE_EXTERNAL_STD_TUPLE
280280 # define IUTEST_USE_EXTERNAL_STD_TUPLE 0
281281 #endif
@@ -349,7 +349,7 @@
349349 //======================================================================
350350 // declare
351351
352-//! std::sto* が使用可能かどうか
352+//! ::std::sto* が使用可能かどうか
353353 #if !defined(IUTEST_HAS_STD_STR_TO_VALUE)
354354 # if IUTEST_HAS_CXX11
355355 # if defined(IUTEST_OS_WINDOWS_MINGW)
@@ -550,7 +550,7 @@
550550 # define __socklen_t_defined
551551 #endif
552552
553-//! std::stringstream が使用可能かどうか
553+//! ::std::stringstream が使用可能かどうか
554554 #if !defined(IUTEST_HAS_STRINGSTREAM)
555555 # if !defined(_STLP_NO_IOSTREAMS)
556556 # define IUTEST_HAS_STRINGSTREAM 1
@@ -563,7 +563,7 @@
563563
564564
565565 /**
566- * @brief std::strstream が使用可能かどうか
566+ * @brief ::std::strstream が使用可能かどうか
567567 * @note IUTEST_HAS_STRINGSTREAM が優先されます
568568 * @deprecated
569569 */
--- trunk/include/iutest_ver.hpp (revision 1332)
+++ trunk/include/iutest_ver.hpp (revision 1333)
@@ -17,11 +17,11 @@
1717
1818 //======================================================================
1919 // define
20-#define IUTEST_VER 0x01160500u //!< iutest version 1.16.5.0
20+#define IUTEST_VER 0x01160501u //!< iutest version 1.16.5.1
2121 #define IUTEST_MAJORVER 0x01u //!< Major Version
2222 #define IUTEST_MINORVER 0x16u //!< Minor Version
2323 #define IUTEST_MICROVER 0x05u //!< Micro Version
24-#define IUTEST_REVISION 0x00u //!< Revision
24+#define IUTEST_REVISION 0x01u //!< Revision
2525
2626 #define IUTEST_BUILD IUTEST_MICROVER //!< @deprecated
2727
@@ -122,6 +122,11 @@
122122 <ul>
123123 <li>v1.16.5.0
124124 <ul>
125+ <li></li>
126+ </ul>
127+ </li>
128+ <li>v1.16.5.0
129+ <ul>
125130 <li>IUTEST_*_NULL, IUTEST_*_NOTNULL を可変長引数対応</li>
126131 <li>IUTEST_*_HRESULT_SUCCEEDED, IUTEST_*_HRESULT_FAILED を可変長引数対応</li>
127132 <li>ad_hoc_testresult の取得関数名を ad_hoc_test_result に変更</li>
@@ -474,7 +479,7 @@
474479 <li>v0.36.2.1
475480 <ul>
476481 <li>型名表記をデマングルするように修正</li>
477- <li>Google Test を使用した場合でも std::string に対応した文字列比較アサーションを使えるように修正</li>
482+ <li>Google Test を使用した場合でも ::std::string に対応した文字列比較アサーションを使えるように修正</li>
478483 <li>Google Test を使用した時に wchar_t 版の STRCASENE が使えるように修正</li>
479484 <li>IUTEST_THROW_ON_ASSERT_FAILURE のデフォルト値を 0 に変更</li>
480485 <li>IUTEST_THROW_ON_ASSERT_FAILURE が有効なとき IUTEST_*_FATAL_FAILURE が正しく動作しない問題を修正</li>
@@ -515,7 +520,7 @@
515520 <ul>
516521 <li>IUTEST_STATIC_ASSERT 追加</li>
517522 <li>IUTEST_SCOPED_TRACE で gtest と同じ記法が使えるように修正</li>
518- <li>std::chrono::high_resolution_clock に対応</li>
523+ <li>::std::chrono::high_resolution_clock に対応</li>
519524 <li>iutest::PrintToString でストリーム出力できない型に対応(バイト配列を出力)</li>
520525 <li>テスト用乱数のシード取得を追加</li>
521526 <li>IUTEST_*_TRUE|FALSE で iutest::AssertionResult を受け取れるように修正</li>
@@ -631,7 +636,7 @@
631636 <ul>
632637 <li>イベントリスナーに RecordProperty 時のイベントを追加</li>
633638 <li>google mock 対応</li>
634- <li>IUTEST_*_STRCASE* に std::string をそのまま使えるように修正</li>
639+ <li>IUTEST_*_STRCASE* に ::std::string をそのまま使えるように修正</li>
635640 <li>rvalue reference 対応</li>
636641 </ul>
637642 </li>
Show on old repository browser