epics/normativeTypes
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge branch 'master' into release/5.0

Browse Source
This commit is contained in:
Dave Hickin
2015-09-05 07:38:15 +01:00
parent 392cc7426d 2bc01a482e
commit f9d27b2d74
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nt/nttable.h
View File

@@ -53,7 +53,7 @@ namespace detail {
* @param elementType column type, a scalar array.
* @return this instance of <b>NTTableBuilder</b>.
*/
shared_pointer addColumn(std::string const & name, epics::pvData::ScalarType elememtType);
shared_pointer addColumn(std::string const & name, epics::pvData::ScalarType elementType);
/**
* Add descriptor field to the NTTable.

8
src/nt/nturi.h
View File

@@ -74,14 +74,6 @@ namespace detail {
*/
shared_pointer addQueryInt(std::string const & name);
/**
* Add a column of given <b>Scalar</b> type.
* @param name name of the column.
* @param elementType column type, a scalar array.
* @return this instance of <b>NTURIBuilder</b>.
*/
//shared_pointer addColumn(std::string const & name, epics::pvData::ScalarType elememtType);
/**
* Create a <b>Structure</b> that represents NTURI.
* This resets this instance state and allows new instance to be created.