mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-11-14 10:39:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix workaround bug

Browse source
This commit is contained in:
bolero-MURAKAMI 2015-01-29 00:55:00 +09:00
parent 4ecca97b78
commit d29b783b68
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sprout/workaround/std/cstddef.hpp
View file

@ -12,7 +12,7 @@
#include <sprout/detail/predef.hpp> #include <sprout/detail/predef.hpp>
#if defined(__clang__) && defined(__GLIBCXX__) #if defined(__clang__) && defined(__GLIBCXX__)
# if SPROUT_CLANG_EARLIER(3, 4, 2) && (__GLIBCXX__ >= 20150422) # if SPROUT_CLANG_EARLIER(3, 4, 2) && (__GLIBCXX__ >= 20140422)
# include <stddef.h> # include <stddef.h>
# #
# if defined(__STDDEF_H) # if defined(__STDDEF_H)

16
tools/files/filegraph.cpp
View file

@ -241,6 +241,7 @@ void collect_sysinclude_paths(OutputIterator result, std::string const& command
int main(int argc, const char* argv[]) { int main(int argc, const char* argv[]) {
std::string src; std::string src;
std::string command;
std::string text; std::string text;
if (argc >= 2) { if (argc >= 2) {
@ -253,6 +254,9 @@ int main(int argc, const char* argv[]) {
std::istreambuf_iterator<char>() std::istreambuf_iterator<char>()
); );
} }
if (argc >= 3) {
command = argv[2];
}
try { try {
// プリプロセッサを用意 // プリプロセッサを用意
@ -272,9 +276,19 @@ int main(int argc, const char* argv[]) {
) )
); );
// インクルードパスの設定 // インクルードパスの設定
if (!command.empty()) {
std::cout
<< "collect command :\n"
<< command << "\n"
;
}
{ {
std::vector<std::string> list; std::vector<std::string> 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 std::cout
<< "sysinclude paths :\n" << "sysinclude paths :\n"
; ;