Experimental Physics and Industrial Control System
**************
Modified
**************
# source files
(5) base-3.14.9/src/iocsh/iocsh.cpp
Change the definition of varArgs[2] in function
iocshRegisterVariable because there is compiling error with
tornado 2.2.1.This solution is from TRIUMF.
Index: src/iocsh/iocsh.cpp
===================================================================
RCS file: /net/phoebus/epicsmgr/cvsroot/epics/base/src/iocsh/Attic/iocsh.cpp,v
retrieving revision 1.9.2.35
diff -u -b -r1.9.2.35 iocsh.cpp
--- src/iocsh/iocsh.cpp 12 Dec 2006 21:04:19 -0000 1.9.2.35
+++ src/iocsh/iocsh.cpp 12 Nov 2007 18:22:33 -0000
@@ -12,6 +12,15 @@
/* Heavily modified by Eric Norum Date: 03MAY2000 */
/* Adapted to C++ by Eric Norum Date: 18DEC2000 */
+/************************************************************************
+modification history
+----------------------
+Oct.16,2007,Gongfa Liu change the definition of varArgs[2] in function
+ iocshRegisterVariable because there is compiling
+ error with tornado 2.2.1.
+ This solution is from TRIUMF.
+************************************************************************/
+
#include <stddef.h>
#include <string.h>
#include <stdio.h>
@@ -149,7 +158,12 @@
int found;
static const iocshArg varArg0 = { "[variable",iocshArgString};
static const iocshArg varArg1 = { "[value]]",iocshArgString};
- static const iocshArg *varArgs[2] = {&varArg0, &varArg1};
+/* TRIUMF REPLACE THIS static const iocshArg *varArgs[2] = {&varArg0, &varArg1}; */
+ static const iocshArg *varArgs[2];
+ varArgs[0] = &varArg0;
+ varArgs[1] = &varArg1;
+
+ /*static const iocshArg *varArgs[2] = {&varArg0, &varArg1};*/
static const iocshFuncDef varFuncDef = {"var",2,varArgs};
iocshTableLock ();
- Replies:
- Re: Redundancy Patch: iocsh Andrew Johnson
- Navigate by Date:
- Prev:
Redundancy Patch: db Andrew Johnson
- Next:
Redundancy Patch: rsrv Andrew Johnson
- Index:
2002
2003
2004
2005
2006
<2007>
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
Re: Redundancy Patch: db Liu, Gongfa
- Next:
Re: Redundancy Patch: iocsh Andrew Johnson
- Index:
2002
2003
2004
2005
2006
<2007>
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024