aboutsummaryrefslogtreecommitdiff
path: root/odb/processor.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-05-06 17:17:30 -0700
committerBoris Kolpackov <boris@codesynthesis.com>2014-05-06 17:17:30 -0700
commit4f54aea0a7a1735502c845524ae5d650eb630181 (patch)
tree96f1f7e62fd0159142ab097881593508234499f4 /odb/processor.cxx
parent4617f8f3b0c07a40d46bb04ab4b66e8446a8250b (diff)
GCC 4.9.0 runtime compatibility fixes
Whoever figures out why the old version no longer works in 4.9.0 gets a cookie.
Diffstat (limited to 'odb/processor.cxx')
-rw-r--r--odb/processor.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/odb/processor.cxx b/odb/processor.cxx
index 6a9c2a3..a08d986 100644
--- a/odb/processor.cxx
+++ b/odb/processor.cxx
@@ -180,7 +180,7 @@ namespace
// Accessor is a function with no arguments (other than 'this').
//
- if (FUNCTION_FIRST_USER_PARM (f) != NULL_TREE)
+ if (FUNCTION_FIRST_USER_PARMTYPE (f) != void_list_node)
return found_none;
// Note that to get the return type we have to use
@@ -235,7 +235,7 @@ namespace
member_access& ma,
bool strict)
{
- tree a (FUNCTION_FIRST_USER_PARM (f));
+ tree a (FUNCTION_FIRST_USER_PARMTYPE (f));
// For a modifier, it can either be a function that returns a non-
// const reference (or non-const pointer, in case the member is an
@@ -246,7 +246,7 @@ namespace
semantics::type& t (utype (m));
semantics::array* ar (dynamic_cast<semantics::array*> (&t));
- if (a == NULL_TREE)
+ if (a == void_list_node)
{
// Note that to get the return type we have to use
// TREE_TYPE(TREE_TYPE()) and not DECL_RESULT, as
@@ -285,7 +285,7 @@ namespace
// Otherwise look for a by value modifier, which is a function
// with a single argument.
//
- else if (DECL_CHAIN (a) == NULL_TREE)
+ else if (DECL_CHAIN (a) == void_list_node)
{
// In the lax mode any function with a single argument works
// for us. And we don't care what it returns.
@@ -296,7 +296,7 @@ namespace
// member. This is exactly the same logic as in accessor
// with regards to arrays, references, etc.
//
- tree at (TREE_TYPE (a));
+ tree at (TREE_VALUE (a));
gcc_tree_code_type tc (TREE_CODE (at));
if (ar != 0 && tc != POINTER_TYPE)