cpp_symbol_exprt now returns symbol_exprt

Daniel Kroening · Daniel Kroening · commit 6d23ffc2bc18 · 2018-11-06T10:28:10.000Z
diff --git a/src/cpp/cpp_util.cpp b/src/cpp/cpp_util.cpp
@@ -11,12 +11,12 @@
 #include <util/std_expr.h>
 #include <util/symbol.h>
 
-exprt cpp_symbol_expr(const symbolt &symbol)
+symbol_exprt cpp_symbol_expr(const symbolt &symbol)
 {
   symbol_exprt tmp(symbol.name, symbol.type);
 
   if(symbol.is_lvalue)
     tmp.set(ID_C_lvalue, true);
 
-  return std::move(tmp);
+  return tmp;
 }
diff --git a/src/cpp/cpp_util.h b/src/cpp/cpp_util.h
@@ -13,7 +13,7 @@
 #include <util/expr.h>
 #include <util/symbol.h>
 
-exprt cpp_symbol_expr(const symbolt &symbol);
+symbol_exprt cpp_symbol_expr(const symbolt &symbol);
 
 inline void already_typechecked(irept &irep)
 {

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,12 @@`
`11`	`11`	`#include <util/std_expr.h>`
`12`	`12`	`#include <util/symbol.h>`
`13`	`13`
`14`		`-exprt cpp_symbol_expr(const symbolt &symbol)`
	`14`	`+symbol_exprt cpp_symbol_expr(const symbolt &symbol)`
`15`	`15`	`{`
`16`	`16`	`symbol_exprt tmp(symbol.name, symbol.type);`
`17`	`17`
`18`	`18`	`if(symbol.is_lvalue)`
`19`	`19`	`tmp.set(ID_C_lvalue, true);`
`20`	`20`
`21`		`- return std::move(tmp);`
	`21`	`+ return tmp;`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`#include <util/expr.h>`
`14`	`14`	`#include <util/symbol.h>`
`15`	`15`
`16`		`-exprt cpp_symbol_expr(const symbolt &symbol);`
	`16`	`+symbol_exprt cpp_symbol_expr(const symbolt &symbol);`
`17`	`17`
`18`	`18`	`inline void already_typechecked(irept &irep)`
`19`	`19`	`{`