Traits.h std::* declarations conflicts

[mcuelenaere]

Traits.h defines classes std::{pair,basic_string,vector,deque,list,set,map,shared_ptr}, however when compiling HHVM on OS X 10.9 (using clang and libc++) this results in conflicts à la:

In file included from hphp.y:11:
In file included from /Users/mcuelenaere/Projects/hhvm/hphp/compiler/parser/parser.h:23:
In file included from /Users/mcuelenaere/Projects/hhvm/hphp/runtime/base/exceptions.h:25:
In file included from /Users/mcuelenaere/Projects/hhvm/third-party/folly/folly/String.h:34:
In file included from /Users/mcuelenaere/Projects/hhvm/third-party/folly/folly/Conv.h:27:
/Users/mcuelenaere/Projects/hhvm/third-party/folly/folly/FBString.h:911:8: error: too few template arguments for class template 'basic_string'
  std::basic_string<Char> backend_;
       ^
/Users/mcuelenaere/Projects/hhvm/third-party/folly/folly/Traits.h:245:9: note: template is declared here
  class basic_string;
        ^
In file included from hphp.y:11:
In file included from /Users/mcuelenaere/Projects/hhvm/hphp/compiler/parser/parser.h:23:
In file included from /Users/mcuelenaere/Projects/hhvm/hphp/runtime/base/exceptions.h:25:
In file included from /Users/mcuelenaere/Projects/hhvm/third-party/folly/folly/String.h:34:
In file included from /Users/mcuelenaere/Projects/hhvm/third-party/folly/folly/Conv.h:30:
In file included from /Users/mcuelenaere/Projects/hhvm/third-party/folly/folly/Range.h:28:
/usr/local/include/glog/logging.h:1193:19: error: too few template arguments for class template 'vector'
             std::vector<std::string>* outvec);
                  ^
/Users/mcuelenaere/Projects/hhvm/third-party/folly/folly/Traits.h:251:9: note: template is declared here
  class vector;
        ^
In file included from hphp.y:11:
In file included from /Users/mcuelenaere/Projects/hhvm/hphp/compiler/parser/parser.h:23:
In file included from /Users/mcuelenaere/Projects/hhvm/hphp/runtime/base/exceptions.h:25:
In file included from /Users/mcuelenaere/Projects/hhvm/third-party/folly/folly/String.h:34:
In file included from /Users/mcuelenaere/Projects/hhvm/third-party/folly/folly/Conv.h:30:
In file included from /Users/mcuelenaere/Projects/hhvm/third-party/folly/folly/Range.h:28:
/usr/local/include/glog/logging.h:1433:33: error: too few template arguments for class template 'vector'
GOOGLE_GLOG_DLL_DECL const std::vector<std::string>& GetLoggingDirectories();
                                ^
/Users/mcuelenaere/Projects/hhvm/third-party/folly/folly/Traits.h:251:9: note: template is declared here
  class vector;
        ^

I hackfixed these with this diff:

iff --git a/folly/Traits.h b/folly/Traits.h
index 2b94df1..eaed2c3 100644
--- a/folly/Traits.h
+++ b/folly/Traits.h
@@ -235,6 +235,7 @@ template <class T> struct IsZeroInitializable
  * although that is not guaranteed by the standard.
  */

+#if 0
 FOLLY_NAMESPACE_STD_BEGIN

 template <class T, class U>
@@ -260,6 +261,16 @@ template <class T>
   class shared_ptr;

 FOLLY_NAMESPACE_STD_END
+#else
+#include <utility>
+#include <string>
+#include <vector>
+#include <deque>
+#include <list>
+#include <set>
+#include <map>
+#include <memory>
+#endif

 namespace boost {

however, I'm unsure if this is the right approach.

[mcuelenaere]

@denji thanks, I've opened #81

[ghost]

Thank you for reporting this issue and appreciate your patience. We've notified the core team for an update on this issue. We're looking for a response within the next 30 days or the issue may be closed.

[ghost]

Thank you for your patience. After 30 days with no updates from the core team, we're closing out the issue. If you're still experiencing the problem described, please reopen the issue - thanks!