Fix the build on OS X Mavericks

https://github.com/fish-shell/fish-shell/issues/968
This commit is contained in:
ridiculousfish 2013-08-21 14:41:12 -07:00
parent 7b6780f712
commit 7541fac245

10
io.h
View file

@ -2,12 +2,16 @@
#define FISH_IO_H #define FISH_IO_H
#include <vector> #include <vector>
#if __cplusplus > 199711L
// C++11 // Note that we have to include something to get any _LIBCPP_VERSION defined so we can detect libc++
// So it's key that vector go above. If we didn't need vector for other reasons, we might include ciso646, which does nothing
#if defined(_LIBCPP_VERSION) || __cplusplus > 199711L
// C++11 or libc++ (which is a C++11-only library, but the memory header works OK in C++03)
#include <memory> #include <memory>
using std::shared_ptr; using std::shared_ptr;
#else #else
// C++03 // C++03 or libstdc++
#include <tr1/memory> #include <tr1/memory>
using std::tr1::shared_ptr; using std::tr1::shared_ptr;
#endif #endif