diff options
author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 1997-08-19 22:37:19 +0000 |
---|---|---|
committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 1997-08-19 22:37:19 +0000 |
commit | 39c8ac16092a748daf89f32ca2fb98f07ca5c004 (patch) | |
tree | c8c543d8e3d26335e4c36b96311e6dad36aef6fc /gcc/cp/cvt.c | |
parent | ff741e9063a991791f896e8093579cce230fc3d3 (diff) | |
download | gcc-39c8ac16092a748daf89f32ca2fb98f07ca5c004.tar.gz |
merge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@14852 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/cvt.c')
-rw-r--r-- | gcc/cp/cvt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 8dbbf4ad9e5..20e86e0096f 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -26,6 +26,7 @@ Boston, MA 02111-1307, USA. */ but what kind of conversions it does will depend on the language. */ #include "config.h" +#include <stdio.h> #include "tree.h" #include "flags.h" #include "cp-tree.h" @@ -1100,7 +1101,10 @@ ocp_convert (type, expr, convtype, flags) if ((flags & LOOKUP_ONLYCONVERTING) && ! (IS_AGGR_TYPE (dtype) && DERIVED_FROM_P (type, dtype))) - ctor = build_user_type_conversion (type, ctor, flags); + { + ctor = build_user_type_conversion (type, ctor, flags); + flags |= LOOKUP_NO_CONVERSION; + } if (ctor) ctor = build_method_call (NULL_TREE, ctor_identifier, build_tree_list (NULL_TREE, ctor), |