From d29b783b68cb7808366dfd3dd84647e7d2319d1d Mon Sep 17 00:00:00 2001 From: bolero-MURAKAMI Date: Thu, 29 Jan 2015 00:55:00 +0900 Subject: [PATCH] fix workaround bug --- sprout/workaround/std/cstddef.hpp | 2 +- tools/files/filegraph.cpp | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/sprout/workaround/std/cstddef.hpp b/sprout/workaround/std/cstddef.hpp index 37fbbcfa..6ee12619 100644 --- a/sprout/workaround/std/cstddef.hpp +++ b/sprout/workaround/std/cstddef.hpp @@ -12,7 +12,7 @@ #include #if defined(__clang__) && defined(__GLIBCXX__) -# if SPROUT_CLANG_EARLIER(3, 4, 2) && (__GLIBCXX__ >= 20150422) +# if SPROUT_CLANG_EARLIER(3, 4, 2) && (__GLIBCXX__ >= 20140422) # include # # if defined(__STDDEF_H) diff --git a/tools/files/filegraph.cpp b/tools/files/filegraph.cpp index 2468d980..b284a085 100644 --- a/tools/files/filegraph.cpp +++ b/tools/files/filegraph.cpp @@ -241,6 +241,7 @@ void collect_sysinclude_paths(OutputIterator result, std::string const& command int main(int argc, const char* argv[]) { std::string src; + std::string command; std::string text; if (argc >= 2) { @@ -253,6 +254,9 @@ int main(int argc, const char* argv[]) { std::istreambuf_iterator() ); } + if (argc >= 3) { + command = argv[2]; + } try { // プリプロセッサを用意 @@ -272,9 +276,19 @@ int main(int argc, const char* argv[]) { ) ); // インクルードパスの設定 + if (!command.empty()) { + std::cout + << "collect command :\n" + << command << "\n" + ; + } { std::vector list; - ::collect_sysinclude_paths(std::back_inserter(list)); + if (command.empty()) { + ::collect_sysinclude_paths(std::back_inserter(list)); + } else { + ::collect_sysinclude_paths(std::back_inserter(list), command); + } std::cout << "sysinclude paths :\n" ;