Permalink
Browse files

compile fixes: compile fixes for pathscale compiler

Signed-off-by: Tim Blechmann <tim@klingt.org>
  • Loading branch information...
1 parent 6daaba1 commit 96003d3190b0427a89432043abbaa9814f7a7151 @timblechmann timblechmann committed Dec 20, 2011
@@ -20,4 +20,4 @@ struct QcHelper
VariantList dummyVariantList() const { return VariantList(); }
};
-#endif
+#endif
@@ -149,4 +149,4 @@ class NumberBoxWidget : public QDoubleSpinBox
};
#endif
-#endif
+#endif
@@ -39,6 +39,14 @@
#define FLATTEN /*FLATTEN*/
#endif
+#ifdef __PATHCC__
+#undef HOT
+#undef FLATTEN
+
+#define HOT /*HOT*/
+#define FLATTEN /*FLATTEN*/
+#endif
+
#ifndef PURE
#define PURE /*PURE*/
@@ -60,4 +68,4 @@
#define COLD /*COLD*/
#endif
-#endif /* FUNCTION_ATTRIBUTES_H */
+#endif /* FUNCTION_ATTRIBUTES_H */
@@ -797,7 +797,7 @@ class pyr_pool_compile_allocator
return &x;
}
- pointer allocate(size_type n, const_pointer hint = 0)
+ pointer allocate(size_type n, const void* hint = 0)
{
return (pointer)pyr_pool_compile->Alloc(n*sizeof(T));
}
@@ -29,6 +29,7 @@
#include "PyrObjectProto.h"
#include "GC.h"
#include <new>
+#include <string>
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>

0 comments on commit 96003d3

Please sign in to comment.