aboutsummaryrefslogtreecommitdiffhomepage
path: root/exec.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-02-07 17:06:45 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-02-07 17:36:54 -0800
commita0a43046b3b21853fdec115dd35f1def9c312670 (patch)
treedb3e668d3da07dbe1a146ff06edb789da42cab03 /exec.cpp
parente8af86017a4b072a9b03d914e34c24e387dac3f3 (diff)
Removed discriminated union from block_t type, allowing us to store wcstrings in it
Diffstat (limited to 'exec.cpp')
-rw-r--r--exec.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/exec.cpp b/exec.cpp
index 1361955d..adf019aa 100644
--- a/exec.cpp
+++ b/exec.cpp
@@ -1196,8 +1196,8 @@ void exec( parser_t &parser, job_t *j )
}
parser.push_block( shadows?FUNCTION_CALL:FUNCTION_CALL_NO_SHADOW );
- parser.current_block->param2.function_call_process = p;
- parser.current_block->param1.function_call_name = (wchar_t *)halloc_register( parser.current_block, wcsdup( p->argv0() ) );
+ parser.current_block->state2<process_t *>() = p;
+ parser.current_block->state1<wcstring>() = p->argv0();
/*