From b5548159c0fdf5f0c79fac1f983d2a003dff0105 Mon Sep 17 00:00:00 2001 From: "SND\\kernelnet_cp" Date: Fri, 13 Sep 2013 14:08:37 +0000 Subject: [PATCH] [0.2.x] fixed : expr with cplusplus syntax git-svn-id: https://pykd.svn.codeplex.com/svn@85197 9b283d60-5439-405e-af05-b73fd8c4d996 --- pykd/python/pysupport.cpp | 4 ++-- pykd/python/pysupport.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pykd/python/pysupport.cpp b/pykd/python/pysupport.cpp index 0069d42..6f6d7b7 100644 --- a/pykd/python/pysupport.cpp +++ b/pykd/python/pysupport.cpp @@ -72,11 +72,11 @@ std::string printSystemVersion(SystemVersionPtr sysVer) /////////////////////////////////////////////////////////////////////////////// -std::string evaluate( const std::wstring &expression, bool cplusplus ) +python::object evaluate( const std::wstring &expression, bool cplusplus ) { BaseTypeVariant var = pykd::evaluate( expression, cplusplus ); - return boost::apply_visitor( pykd::VariantToStr(), var ); + return boost::apply_visitor( pykd::VariantToPyobj(), var ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/pykd/python/pysupport.h b/pykd/python/pysupport.h index 96aa834..c1dbe86 100644 --- a/pykd/python/pysupport.h +++ b/pykd/python/pysupport.h @@ -20,7 +20,7 @@ python::tuple moduleFindSymbolAndDisp( pykd::Module &module, ULONG64 offset ); std::string printSystemVersion(SystemVersionPtr sysVer); -std::string evaluate( const std::wstring &expression, bool cplusplus = false ); +python::object evaluate( const std::wstring &expression, bool cplusplus = false ); } } //pykd::support namespace end