Update SHRLIB_VERSION

update docs
NTTable::getColumnNames() wrong field
2019-03-20 13:57:00 -05:00 · 2019-03-12 19:45:30 -07:00 · 2019-03-12 17:42:36 -07:00 · 2018-12-17 16:05:45 -06:00 · 2018-12-17 16:04:09 -06:00 · 2018-11-26 11:52:01 -08:00
77 changed files with 3158 additions and 6339 deletions
--- a/.ci/travis-build.sh
+++ b/.ci/travis-build.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e -x
+
+make -j2 $EXTRA
+
+if [ "$TEST" != "NO" ]
+then
+  make -j2 tapfiles
+  make -j2 -s test-results
+fi
--- a/.ci/travis-prepare.sh
+++ b/.ci/travis-prepare.sh
@@ -0,0 +1,107 @@
+#!/bin/sh
+set -e -x
+
+CURDIR="$PWD"
+
+cat << EOF > $CURDIR/configure/RELEASE.local
+EPICS_BASE=$HOME/.source/epics-base
+EOF
+
+install -d "$HOME/.source"
+cd "$HOME/.source"
+
+add_gh_flat() {
+  MODULE=$1
+  REPOOWNER=$2
+  REPONAME=$3
+  BRANCH=$4
+  MODULE_UC=$(echo $MODULE | tr 'a-z' 'A-Z')
+  ( git clone --quiet --depth 5 --branch $BRANCH https://github.com/$REPOOWNER/$REPONAME.git $MODULE && \
+  cd $MODULE && git log -n1 )
+  cat < $CURDIR/configure/RELEASE.local > $MODULE/configure/RELEASE.local
+  cat << EOF >> $CURDIR/configure/RELEASE.local
+${MODULE_UC}=$HOME/.source/$MODULE
+EOF
+}
+
+# not recursive
+git clone --quiet --depth 5 --branch "$BRBASE" https://github.com/${REPOBASE:-epics-base}/epics-base.git epics-base
+(cd epics-base && git log -n1 )
+add_gh_flat pvData ${REPOPVD:-epics-base} pvDataCPP ${BRPVD:-master}
+
+if [ -e $CURDIR/configure/RELEASE.local ]
+then
+  cat $CURDIR/configure/RELEASE.local
+fi
+
+EPICS_HOST_ARCH=`sh epics-base/startup/EpicsHostArch`
+
+# requires wine and g++-mingw-w64-i686
+if [ "$WINE" = "32" ]
+then
+  echo "Cross mingw32"
+  sed -i -e '/CMPLR_PREFIX/d' epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
+  cat << EOF >> epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
+CMPLR_PREFIX=i686-w64-mingw32-
+EOF
+  cat << EOF >> epics-base/configure/CONFIG_SITE
+CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw
+EOF
+fi
+
+if [ "$STATIC" = "YES" ]
+then
+  echo "Build static libraries/executables"
+  cat << EOF >> epics-base/configure/CONFIG_SITE
+SHARED_LIBRARIES=NO
+STATIC_BUILD=YES
+EOF
+fi
+
+case "$CMPLR" in
+clang)
+  echo "Host compiler is clang"
+  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.$EPICS_HOST_ARCH
+GNU         = NO
+CMPLR_CLASS = clang
+CC          = clang
+CCC         = clang++
+EOF
+
+  # hack
+  sed -i -e 's/CMPLR_CLASS = gcc/CMPLR_CLASS = clang/' epics-base/configure/CONFIG.gnuCommon
+
+  clang --version
+  ;;
+*)
+  echo "Host compiler is default"
+  gcc --version
+  ;;
+esac
+
+cat <<EOF >> epics-base/configure/CONFIG_SITE
+USR_CPPFLAGS += $USR_CPPFLAGS
+USR_CFLAGS += $USR_CFLAGS
+USR_CXXFLAGS += $USR_CXXFLAGS
+EOF
+
+# set RTEMS to eg. "4.9" or "4.10"
+# requires qemu, bison, flex, texinfo, install-info
+if [ -n "$RTEMS" ]
+then
+  echo "Cross RTEMS${RTEMS} for pc386"
+  curl -L "https://github.com/mdavidsaver/rsb/releases/download/20171203-${RTEMS}/i386-rtems${RTEMS}-trusty-20171203-${RTEMS}.tar.bz2" \
+  | tar -C / -xmj
+
+  sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' epics-base/configure/os/CONFIG_SITE.Common.RTEMS
+  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.RTEMS
+RTEMS_VERSION=$RTEMS
+RTEMS_BASE=$HOME/.rtems
+EOF
+  cat << EOF >> epics-base/configure/CONFIG_SITE
+CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu
+EOF
+fi
+
+make -j2 -C epics-base $EXTRA
+make -j2 -C pvData $EXTRA
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,14 @@
-bin/
-include/
-lib/
-db/
-dbd/
-configure/*.local
-html/
-**/O.*
-**/**/O.*
+/cfg/
+/bin/
+/lib/
+/db/
+/dbd/
+/html/
+/include/
+/templates/
+/configure/*.local
+O.*/
+/QtC-*
+*.orig
+*.log
+.*.swp
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,31 @@
+sudo: false
+dist: trusty
+language: c++
+compiler:
+  - gcc
+addons:
+  apt:
+    packages:
+    - libreadline6-dev
+    - libncurses5-dev
+    - perl
+    - clang
+    - g++-mingw-w64-i686
+    - qemu-system-x86
+install:
+ - ./.ci/travis-prepare.sh
+script:
+ - ./.ci/travis-build.sh
+env:
+ - BRBASE=7.0
+ - BRBASE=7.0 CMPLR=clang
+ - BRBASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++98"
+ - BRBASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
+ - BRBASE=7.0 CMPLR=clang EXTRA="CMD_CXXFLAGS=-std=c++11"
+ - BRBASE=7.0 WINE=32 TEST=NO STATIC=YES
+ - BRBASE=7.0 WINE=32 TEST=NO STATIC=NO
+ - BRBASE=7.0 RTEMS=4.10 TEST=NO
+ - BRBASE=7.0 RTEMS=4.9 TEST=NO
+ - BRBASE=3.16
+ - BRBASE=3.15
+ - BRBASE=3.14
--- a/31
+++ b/31
@@ -1,31 +0,0 @@
-This software is in part copyrighted by the various organizations and
-individuals listed below. Permission to use it is set out in the file
-LICENSE that accompanies the software.
-
-In no event shall any copyright holder be liable to any party for
-direct, indirect, special, incidental, or consequential damages arising
-out of the use of this software, its documentation, or any derivatives
-thereof, even if they have been advised of the possibility of such
-damage.
-
-The copyright holders specifically disclaim any warranties, including,
-but not limited to, the implied warranties of merchantability, fitness
-for a particular purpose, and non-infringement. This software is
-provided on an "as is" basis, and the copyright holders have no
-obligation either collectively or individually to provide maintenance,
-support, updates, enhancements, or modifications.
-
-Copyright (c) 2006 - 2015 All rights reserved
-
-Martin R. Kraimer
-The University of Chicago, as Operator of Argonne National Laboratory.
-Deutsches Elektronen-Synchroton, Member of the Helmholtz Association,
-    (DESY), HAMBURG, GERMANY,
-BERLINER SPEICHERRING GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H.
-    (BESSY), BERLIN, GERMANY.
-COSYLAB (Control System Laboratory), Ljubljana, Slovenia.
-Brookhaven Science Associates, as Operator of Brookhaven
-    National Laboratory.
-Diamond Light Source Ltd., Didcot, United Kingdom.
-
-
--- a/109
+++ b/109
@@ -1,14 +1,16 @@
+Copyright and License Terms
+---------------------------

-Copyright (c) 2006-2015 Martin R. Kraimer
-Copyright (c) 2006 The University of Chicago, as Operator of Argonne
+Copyright (c) 2006-2016 Martin R. Kraimer
+Copyright (c) 2006-2016 UChicago Argonne LLC, as Operator of Argonne
     National Laboratory.
 Copyright (c) 2006 Deutsches Elektronen-Synchrotron,
     Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY.
-Copyright (c) 2007-2015 Control System Laboratory,
+Copyright (c) 2007-2016 Control System Laboratory,
    (COSYLAB) Ljubljana Slovenia
-Copyright (c) 2010-2015 Brookhaven Science Associates, as Operator of Brookhaven
-    National Laboratory
-Copyright (c) 2011-2015 Diamond Light Source Limited,
+Copyright (c) 2010-2016 Brookhaven Science Associates, as Operator
+    of Brookhaven National Laboratory
+Copyright (c) 2011-2016 Diamond Light Source Limited,
    (DLS) Didcot, United Kingdom

 Permission is hereby granted, free of charge, to any person
@@ -34,81 +36,30 @@ OTHER DEALINGS IN THE SOFTWARE.

 ________________________________________________________________________

-This software is in part copyrighted by the University of Chicago (UofC)
+Additional Disclaimers
+----------------------

-In no event shall UofC be liable to any party for direct, indirect,
-special, incidental, or consequential damages arising out of the use of
-this software, its documentation, or any derivatives thereof, even if
-UofC has been advised of the possibility of such damage.
+This software is copyright in part by these institutions:

-UofC specifically disclaims any warranties, including, but not limited
-to, the implied warranties of merchantability, fitness for a particular
-purpose, and non-infringement.  This software is provided on an "as is"
-basis, and UofC has no obligation to provide maintenance, support,
-updates, enhancements, or modifications.
+  * Brookhaven Science Associates, as Operator of Brookhaven
+    National Laboratory, New York, USA
+  * Control System Laboratory, Ljubljana, Slovenia
+  * Deutsches Elektronen-Synchroton, Member of the Helmholtz
+    Association, Hamburg, Germany
+  * Diamond Light Source Limited, Didcot, United Kingdom
+  * Helmholtz-Zentrum Berlin fuer Materialien und Energie m.b.H.,
+    Berlin, Germany.
+  * UChicage Argonne LLC, as Operator of Argonne National Laboratory,
+    Illinois, USA

-________________________________________________________________________
+In no event shall these institutions be liable to any party for direct,
+indirect, special, incidental, or consequential damages arising out of
+the use of this software, its documentation, or any derivatives thereof,
+even if advised of the possibility of such damage.

-This software is in part copyrighted by the BERLINER SPEICHERRING
-GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. (BESSY), BERLIN, GERMANY.
-
-In no event shall BESSY be liable to any party for direct, indirect,
-special, incidental, or consequential damages arising out of the use of
-this software, its documentation, or any derivatives thereof, even if
-BESSY has been advised of the possibility of such damage.
-
-BESSY specifically disclaims any warranties, including, but not limited
-to, the implied warranties of merchantability, fitness for a particular
-purpose, and non-infringement.  This software is provided on an "as is"
-basis, and BESSY has no obligation to provide maintenance, support,
-updates, enhancements, or modifications.
-
-________________________________________________________________________
-
-This software is in part copyrighted by the Deutsches Elektronen-Synchroton,
-    Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY.
-
-In no event shall DESY be liable to any party for direct, indirect,
-special, incidental, or consequential damages arising out of the use of
-this software, its documentation, or any derivatives thereof, even if
-DESY has been advised of the possibility of such damage.
-
-DESY specifically disclaims any warranties, including, but not limited
-to, the implied warranties of merchantability, fitness for a particular
-purpose, and non-infringement.  This software is provided on an "as is"
-basis, and DESY has no obligation to provide maintenance, support,
-updates, enhancements, or modifications.
-
-______________________________________________________________________
-
-This software is in part copyrighted by the Brookhaven
-    National Laboratory (BNL).
-
-In no event shall BNL be liable to any party for direct, indirect,
-special, incidental, or consequential damages arising out of the use of
-this software, its documentation, or any derivatives thereof, even if
-BNL has been advised of the possibility of such damage.
-
-BNL specifically disclaims any warranties, including, but not limited
-to, the implied warranties of merchantability, fitness for a particular
-purpose, and non-infringement.  This software is provided on an "as is"
-basis, and BNL has no obligation to provide maintenance, support,
-updates, enhancements, or modifications.
-
-________________________________________________________________________
-
-This software is in part copyrighted by Diamond Light Source Limited (DLS)
-
-In no event shall DLS be liable to any party for direct, indirect,
-special, incidental, or consequential damages arising out of the use of
-this software, its documentation, or any derivatives thereof, even if
-DLS has been advised of the possibility of such damage.
-
-DLS specifically disclaims any warranties, including, but not limited
-to, the implied warranties of merchantability, fitness for a particular
-purpose, and non-infringement.  This software is provided on an "as is"
-basis, and DLS has no obligation to provide maintenance, support,
-updates, enhancements, or modifications.
-
-________________________________________________________________________
+These institutions specifically disclaim any warranties, including, but
+not limited to, the implied warranties of merchantability, fitness for a
+particular purpose, and non-infringement. This software is provided on
+an "as is" basis, and these institutions have no obligation to provide
+maintenance, support, updates, enhancements, or modifications.

--- a/README.md
+++ b/README.md
@@ -1,78 +1,17 @@
-normativeTypesCPP
-=================
+# normativeTypesCPP

-normativeTypesCPP is a C++ module containing helper classes which implement
-and provide support for the EPICS V4 Normative Types.
+The EPICS **Normative Types** are a set of standard high-level data types, designed to aid interoperability between EPICS PVA applications.

-The latter are a set of standard high-level data types to aid interoperability
-of EPICS V4 applications and are specified in the
-[NormativeTypes Specification](http://epics-pvdata.sourceforge.net/alpha/normativeTypes/normativeTypes.html).
+This normativeTypesCPP module is a part of the EPICS software toolkit that provides C++ helper classes which implement the EPICS Normative Types.

+## Links

-Status
------
+- General information about EPICS can be found at the
+  [EPICS Controls website](https://epics-controls.org).
+- API documentation for this module can be found in its
+  documentation directory, in particular the file
+  normativeTypesCPP.html

-The current release (5.0) implements fully the
-[16 Mar 2015 version](http://epics-pvdata.sourceforge.net/alpha/normativeTypes/normativeTypes_20150316.html)
-of the Normative Types Specification.
-
-The module status is alpha and the API and behaviour may change in future
-versions.
-
-The previous release (4.0) supported only 6 types. 
-There is no documentation yet for the new types added in 5.0.
-
-
-Further Info
------------
-
-Consult the documents in the documentation directory, in particular
-
-* normativeTypesCPP.html
-* RELEASE_NOTES.md
-
-Also see the [EPICS Version 4 website](http://epics-pvdata.sourceforge.net)
-
-
-Prerequisites
-------------
-
-normativeTypesCPP requires recent versions of the following software:
-
-1. EPICS Base (v3.14.12.3 or later)
-2. EPICS4 pvCommonCPP (4.1.0 or later)
-2. pvDataCPP (5.0.0 or later)
-
-(pvCommonCPP may not be needed depending on host/compiler.)
-
-
-Building
--------
-
-Building uses the make utility and the EPICS base build system.
-
-The build system needs the location of the prerequisites, e.g. by placing the
-lines of the form
-
-    PVDATA = /home/install/epicsV4/pvDataCPP
-    PVCOMMON = /home/install/epicsV4/pvCommonCPP
-    EPICS_BASE = /home/install/epics/base
-
-pointing to the locations in a file called RELEASE.local
-in the configure directory or the parent directory of normativeTypesCPP.
-
-With this in place, to build type make
-
-    make
-
-To perform a clean build type
-
-    make clean uninstall
-
-To run the unit tests type
-
-    make runtests
-
-For more information on the EPICS build system consult the
-[Application Development guide](http://www.aps.anl.gov/epics/base/R3-14/12-docs/AppDevGuide.pdf).
+## Building

+This module is included as a submodule of a full EPICS 7 release and will be compiled during builds of that software.
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -29,9 +29,6 @@ USR_CPPFLAGS += --coverage
 USR_LDFLAGS += --coverage
 endif

-INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
-USR_INCLUDES += -I $(INSTALL_LOCATION)/include
-
 -include $(TOP)/../CONFIG_SITE.local
 -include $(TOP)/configure/CONFIG_SITE.local

--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -1,32 +1,40 @@
-#RELEASE Location of external products
+# RELEASE - Location of external support modules
 #
-# IF YOU MAKE ANY CHANGES to this file you MUST at least run
-# "gnumake" in this directory afterwards; you usually need
-# to run "gnumake rebuild" in the application's top level
-# directory each time this file is changed.
+# IF YOU CHANGE ANY PATHS in this file or make API changes to
+# any modules it refers to, you should do a "make rebuild" in
+# this application's top level directory.
 #
-# NOTE: The build does not check dependencies against files
-# that are outside this application, thus you should run
-# "gnumake distclean install" in the top directory each time
-# EPICS_BASE, SNCSEQ, or any other external module defined
-# in the RELEASE file is rebuilt.
+# The EPICS build process does not check dependencies against
+# any files from outside the application, so it is safest to
+# rebuild it completely if any modules it depends on change.
 #
-# Host/target specific settings can be specified in files named
+# Host- or target-specific settings can be given in files named
 #  RELEASE.$(EPICS_HOST_ARCH).Common
 #  RELEASE.Common.$(T_A)
 #  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+#
+# This file is parsed by both GNUmake and an EPICS Perl script,
+# so it may ONLY contain definititions of paths to other support
+# modules, variable definitions that are used in module paths,
+# and include statements that pull in other RELEASE files.
+# Variables may be used before their values have been set.
+# Build variables that are NOT used in paths should be set in
+# the CONFIG_SITE file.

-TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
+# Variables and paths to dependent modules:
+#MODULES = /path/to/modules
+#MYMODULE = $(MODULES)/my-module

-#If using the sequencer, point SNCSEQ at its top directory:
-#SNCSEQ=$(EPICS_BASE)/../modules/soft/seq
+# If building the EPICS modules individually, set these:
+#EPICS_PVDATA = $(MODULES)/pvData-7.0.0
+#EPICS_LIBCOM = $(MODULES)/libcom-3.17.0
+#EPICS_BASE = $(MODULES)/core-7.0.1

-# EPICS_BASE usually appears last so other apps can override stuff:
-#EPICS_BASE=/opt/epics/base
-
-#Capfast users may need the following definitions
-#CAPFAST_TEMPLATES=
-#SCH2EDIF_PATH=
+# Set RULES here if you want to use build rules from elsewhere:
+#RULES = $(MODULES)/build-rules

+# These allow developers to override the RELEASE variable settings
+# without having to modify the configure/RELEASE file itself.
 -include $(TOP)/../RELEASE.local
+-include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
 -include $(TOP)/configure/RELEASE.local
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -1,81 +0,0 @@
-<h1>Release 5.0</h1>
-
-<p>This release adds support through wrapper classes and builders for the
-remaining Normative Types:</p>
-
-<ul>
-<li>NTEnum</li>
-<li>NTMatrix</li>
-<li>NTURI</li>
-<li>NTAttribute</li>
-<li>NTContinuum</li>
-<li>NTHistogram</li>
-<li>NTAggregate</li>
-<li>NTUnion</li>
-<li>NTScalarMultiChannel</li>
-</ul>
-
-<p>Release 5.0 therefore implements fully the
-<a href="http://epics-pvdata.sourceforge.net/alpha/normativeTypes/normativeTypes_20150316.html">16 Mar 2015 version</a>
- of the normativeTypes specification.</p>
-
-<p>Each wrapper class has an extended API:</p>
-
-<ul>
-<li>is_a now has a convenience overload taking a PVStructure.</li>
-<li>isCompatible, reporting introspection type compatibility, now has an overload
-taking a Structure. The PVStructure version is retained as a convenience
-method and for backwards compatibility.</li>
-<li>An isValid function now reports validity of a compatible PVStructure's data
-with respect to the specification.</li>
-</ul>
-
-<p>Other changes are:</p>
-
-<ul>
-<li>Support for NTAttributes extended as required by NTNDArray
-(NTNDArrayAttributes).</li>
-<li>A new class for parsing NT IDs (NTID).</li>
-<li>Resolution of the confusion between column names and labels in NTTable and
-improved API. Function for adding columns is now addColumn rather than add.
-New getColumnNames function provided.</li>
-<li>isConnected is treated as an optional rather than a required field in
-NTMultiChannelArray. isConnected() and addIsConnected() functions added to
-wrapper and builder respectively.</li>
-<li>Unit tests for all new classes.</li>
-</ul>
-
-<h1>Release 4.0</h1>
-
-<p>This is the first release of normativeTypesCPP that is part of an official
-EPICS V4 release.
-It is a major rewrite of the previous versions of normativeTypesCPP.</p>
-
-<p>This release provides support through wrapper classes and builders for the
-following Normative Types:</p>
-
-<ul>
-<li>NTScalar</li>
-<li>NTScalarArray</li>
-<li>NTNameValue</li>
-<li>NTTable</li>
-<li>NTMultiChannel</li>
-<li>NTNDArray</li>
-</ul>
-
-<p>Each type has a wrapper class of the same name which has functions for checking 
-compatibility of existing PVStructures (isCompatible) and the reported types of 
-Structures (is_a), wraps existing PVStructures (wrap, wrapUnsafe) and provides
-a convenient interface to all required and optional fields.</p>
-
-<p>Each type has a builder which can create a Structure, a PVStructure or a
-wrapper around a new PVStructure. In each case optional or extra fields can be
-added and options such as choice of scalar type can be made.</p>
-
-<p>Additional features are:</p>
-
-<ul>
-<li>Utility classes NTField and NTPVField for standard structure fields and
-NTUtils for type IDs.</li>
-<li>Unit tests for the implemented classes.</li>
-</ul>
--- a/documentation/RELEASE_NOTES.md
+++ b/documentation/RELEASE_NOTES.md
@@ -1,5 +1,63 @@
-Release 5.0
-===========
+# normativeTypes Module
+
+This document summarizes the changes to the module between releases.
+
+## Release 5.2.2
+
+- Fix NTTable::getColumnNames().
+
+## Release 5.2.1 (EPICS 7.0.2, Dec 2018)
+
+* No functional changes.
+* Removal of declaration for unimplemented PVNTField::createAlarmLimit() and elimination of unused variables.
+
+
+## Release 5.2.0 (EPICS 7.0.1, Dec 2017)
+
+This release contains bug fixes and minor source updates needed to
+build against the latest version of pvData.
+
+
+## Release 5.1.2 (EPICS V4.6, Aug 2016)
+
+The main changes since release 5.1.1 are:
+
+* NTUnionBuilder: Add missing value() function
+* Updated document: Now document all Normative Types
+
+
+## Release 5.1.1
+
+The main changes since release 5.0 are:
+
+* Linux shared library version added
+* Headers and source locations have changed
+* Missing is_a implementations added
+* NTAttribute::addTags() is now non-virtual
+* New license file replaces LICENSE and COPYRIGHT
+
+### Shared library version added
+
+Linux shared library version numbers have been added by setting SHRLIB_VERSION
+(to 5.1 in this case). So shared object will be libnt.so.5.1 instead of
+libpvData.so.
+
+### Headers and source locations have changed
+
+Source has moved out of nt directory directly into src.
+
+Headers have been moved into a pv directory. This facilitates using some IDEs
+such as Qt Creator.
+
+src/nt/ntscalar.cpp -> src/ntscalar.cpp
+src/nt/ntscalar.h   -> src/pv/ntscalar.h
+
+### Missing is_a implementations added
+
+is_a(PVStructurePtr const &) implementation has been added for each type.
+
+
+## Release 5.0 (EPICS V4.5, Oct 2015)

 This release adds support through wrapper classes and builders for the
 remaining Normative Types:
@@ -40,8 +98,7 @@ Other changes are:
  wrapper and builder respectively.
 * Unit tests for all new classes.

-Release 4.0
-===========
+## Release 4.0 (EPICS V4.4, Dec 2014)

 This is the first release of normativeTypesCPP that is part of an official
 EPICS V4 release.
--- a/documentation/ntCPP.html
+++ b/documentation/ntCPP.html
--- a/documentation/ntCPP_20140723.html
+++ b/documentation/ntCPP_20140723.html
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-  <title>EPICS pvDataCPP</title>
-  <link rel="stylesheet" type="text/css"
-  href="http://epics-pvdata.sourceforge.net/base.css" />
-  <link rel="stylesheet" type="text/css"
-  href="http://epics-pvdata.sourceforge.net/epicsv4.css" />
-  <style type="text/css">
-  /*<![CDATA[*/
-     .about { margin-left: 3em; margin-right: 3em; font-size: .83em}
-     table { margin-left: auto; margin-right: auto }
-     .diagram { text-align: center; margin: 2.5em 0 }
-     span.opt { color: grey }
-     span.nterm { font-style:italic }
-     span.term { font-family:courier }
-     span.user { font-family:courier }
-     span.user:before { content:"<" }
-     span.user:after { content:">" }
-     .nonnorm { font-style:italic }
-     p.ed { color: #AA0000 }
-     span.ed { color: #AA0000 }
-     p.ed.priv { display: inline; }
-     span.ed.priv { display: inline; }
-  /*]]>*/</style>
-  <!-- Script that generates the Table of Contents -->
-  <script type="text/javascript"
-  src="http://epics-pvdata.sourceforge.net/script/tocgen.js">
-  </script>
-</head>
-<body>
-
-<div class="head">
-<h1>EPICS pvDataCPP</h1>
-<!-- Maturity: Working Draft or Request for Comments, or Recommendation, and date.  -->
-
-<h2 class="nocount">EPICS v4 Working Group, Working Draft, 23-July-2014</h2>
-
-  <dl>
-    <dt>Latest version:</dt>
-    <dd><a
-      href="ntCPP.html">ntCPP.html</a>
-    </dd>
-    <dt>This version:</dt>
-    <dd><a
-      href="ntCPP_20140723.html">ntCPP_20140723.html</a>
-    </dd>
-    <dt>Previous version:</dt>
-     <dd>None</dd>
-    <dt>Editors:</dt>
-    <dd>Marty Kraimer, BNL</dd>
-    <dd>Michael Davidsaver, BNL</dd>
-    <dd>Matej Sekoranja, CosyLab</dd>
-  </dl>
-
-  <p class="copyright">This product is made available subject to acceptance of the <a
-href="http://epics-pvdata.sourceforge.net/LICENSE.html">EPICS open source
-license.</a></p>
-<hr />
-</div>
-<h2 class="nocount">Abstract</h2>
-
-<p>EPICS Version 4 provides efficient
-storage, access, and communication, of memory resident structured data.
-pvData is the storage compoment.
-pvDataCPP is the C++ implementation of pvData.
-It is one part of the set of related products in the EPICS
-V4 control system programming environment:<br />
-<a href="http://epics-pvdata.sourceforge.net/relatedDocumentsV4.html">relatedDocumentsV4.html</a>
-</p>
-
-
-<h2 class="nocount">Status of this Document</h2>
-
-<p>For now this is a working copy so it is not the same as "This version" shown above.</p>
-
-<p>This is the 23-July-2014 version of the C++ implementation of pvData.
-</p>
-
-<p>RELEASE_NOTES.md provides changes since the last release.
-TODO.md describes things to do before the next release.
-</p>
-
-
-
-<div id="toc">
-<h2 class="nocount" style="page-break-before: always">Table of Contents</h2>
-</div>
-<div id="contents" class="contents">
-
-<body>
-<h1 style="text-align: center">EPICS normative type C++ implementation
-</h1>
-
-<h2 class="nocount" id="L50">Draft, 4-Nov-2012</h2>
-<dl>
-<dt>This version:</dt>
-  <dd><a href="http://epics-pvdata.hg.sourceforge.net/hgweb/epics-pvdata/normativeTypesCPP/raw-file/tip/documentation/ntCPP.html">ntCPP.html</a></dd>
-<dt>Editors:</dt>
-  <dd>Matej Sekoranja, CosyLab<br>
-    Marty Kraimer, BNL
-  </dd>
-</dl>
-<hr />
-</div>
-
-<h2>Introduction</h2>
-
-<p>This section describes the C++ implemmentation of normative types. Two (2) helper classes are implemented,
-ntNameValue and NTTable respectively. </p>
-
-<h3>Normative Type Fields.</h3>
-
-<p>These are helper classes for creating standard fields for normative types.
-There is a single instance of this class, which is obtained via NTField::get().
-</p>
-<pre>class NTField: NoDefaultMethods {
-public:
-    static NTFieldPtr get();
-    ~NTField() {}
-
-    PVStructurePtr createEnumerated(StringArray const &amp; choices);
-    PVStructurePtr createTimeStamp();
-    PVStructurePtr createAlarm();
-    PVStructurePtr createDisplay();
-    PVStructurePtr createAlarmLimit();
-    PVStructurePtr createControl();
-
-    PVStructureArrayPtr createEnumeratedArray();
-    PVStructureArrayPtr createTimeStampArray();
-    PVStructureArrayPtr createAlarmArray();
-};</pre>
-
-<p>where</p>
-<dl>
-  <dt>createEnumerated</dt>
-    <dd>Create an introspection interface for an enumerated structure.</dd>
-  <dt>createTimeStamp</dt>
-    <dd>Create an interspection interface for a timeStamp structure.</dd>
-  <dt>createAlarm</dt>
-    <dd>Create an interspection interface for an alarm structure.</dd>
-  <dt>createDisplay</dt>
-    <dd>Create an introsepecion interface for a display structure.</dd>
-  <dt>createAlarmLimit</dt>
-    <dd>Create an introspection interface for an alarm limit structure.</dd>
-  <dt>createControl</dt>
-    <dd>Create an introspection interface for a control structure.</dd>
-  <dt>createEnumeratedArray</dt>
-    <dd>Create an introspection interface for an structureArray of enumerated
-      structures.</dd>
-  <dt>createTimeStampArray</dt>
-    <dd>Create an introspection interface for an structureArray of timeStamp
-      structures.</dd>
-  <dt>createAlarmArray</dt>
-    <dd>Create an introspection interface for an structureArray of alarm
-      structures.</dd>
-</dl>
-
-<h3>NTNameValue</h3>
-
-<p>These are helper classes for NTNameValue</p>
-<pre>class NTNameValue : private NoDefaultMethods
-{
-public:
-    static bool isNTNameValue(PVStructurePtr const & pvStructure);
-    static NTNameValuePtr create(
-        bool hasFunction,bool hasTimeStamp, bool hasAlarm);
-    static NTNameValuePtr create(
-        PVStructurePtr const & pvStructure);
-    ~NTNameValue();
-    PVStringPtr getFunction();
-    void attachTimeStamp(PVTimeStamp &amp;pvTimeStamp);
-    void attachAlarm(PVAlarm &amp;pvAlarm);
-    PVStructurePtr getPVStructure();
-    PVStructurePtr getTimeStamp();
-    PVStructurePtr getAlarm();
-    PVStringArrayPtr getNames();
-    PVStringArrayPtr getValues();
-};</pre>
-
-<p>where</p>
-<dl>
-  <dt>isNTNameValue</dt>
-    <dd>Is the structure a NTNameValue structure?</dd>
-  <dt>create</dt>
-    <dd>Create an NTNameValue that has the associated fields.</dd>
-  <dt>~NTNameValue</dt>
-    <dd>The destructor.</dd>
-  <dt>getFunction</dt>
-    <dd>Get the function field. This can be null.</dd>
-  <dt>attachTimeStamp</dt>
-    <dd>The timeStamp field of the NTNameValue is atttached to the
-    pvTimeStamp.</dd>
-  <dt>attachAlarm</dt>
-    <dd>The alarm field of the NTNameValue is atttached to the alarm.</dd>
-  <dt>getPVStructure</dt>
-    <dd>Get the pvStructure that this NTNameValue contains.</dd>
-  <dt>getTimeStamp</dt>
-    <dd>Get the timeStamp field.</dd>
-  <dt>getAlarm</dt>
-    <dd>Get the alarm field.</dd>
-  <dt>getNames</dt>
-    <dd>Get the names field.</dd>
-  <dt>getValues</dt>
-    <dd>Get the values field.</dd>
-</dl>
-
-<h3>NTTable</h3>
-
-<p>These are helper classes for NTTable</p>
-<pre>class NTTable: private NoDefaultMethods
-{
-public:
-    static bool isNTTable(PVStructurePtr const & pvStructure);
-    static PVStructure::shared_pointer create(
-        bool hasFunction,bool hasTimeStamp, bool hasAlarm,
-        int numberValues,
-        FieldConstPtrArray valueFields);
-        static NTTablePtr create(
-            bool hasFunction,bool hasTimeStamp, bool hasAlarm,
-            StringArray const & valueNames,
-            FieldConstPtrArray const &valueFields);
-        static NTTablePtr clone(PVStructurePtr const &);
-    ~NTTable();
-    PVStringPtr getFunction();
-    void attachTimeStamp(PVTimeStamp &amp;pvTimeStamp);
-    void attachAlarm(PVAlarm &amp;pvAlarm);
-    PVStructurePtr getPVStructure();
-    PVStructurePtr getTimeStamp();
-    PVStructurePtr getAlarm();
-    PVStringArrayPtr getLabel();
-    size_t getNumberValues();
-    FieldConstPtr getField(int index);
-    PVFieldPtr getPVField(int index);
-};</pre>
-
-<p>where</p>
-<dl>
-  <dt>isNTTable</dt>
-    <dd>y</dd>
-  <dt>create</dt>
-    <dd>Create an NTTable that has the associated fields.</dd>
-  <dt>~NTTable</dt>
-    <dd>The destructor.</dd>
-  <dt>getFunction</dt>
-    <dd>Get the function field. This can be null.</dd>
-  <dt>attachTimeStamp</dt>
-    <dd>The timeStamp field of the NTTable is atttached to the pvTimeStamp.</dd>
-  <dt>attachAlarm</dt>
-    <dd>The alarm field of the NTTable is atttached to the alarm.</dd>
-  <dt>getPVStructure</dt>
-    <dd>Get the pvStructure that this NTTable contains.</dd>
-  <dt>getTimeStamp</dt>
-    <dd>Get the timeStamp field.</dd>
-  <dt>getAlarm</dt>
-    <dd>Get the alarm field.</dd>
-  <dt>getLabel</dt>
-    <dd>Get the label field.</dd>
-  <dt>getNumberValues</dt>
-    <dd>Get the number of value fields.</dd>
-  <dt>getField</dt>
-    <dd>Get the introspection interface for the specified field.</dd>
-  <dt>getPVField</dt>
-    <dd>Get the data field for the specified field.</dd>
-</dl>
-
-<h2>MTMultiChannel</h2>
-<pre>
-structure NTMultiChannel
-  union_t[] value       
-  string[]  channelName    
-  time_t    timeStamp        :opt // time when data collected
-  alarm_t   alarm            :opt // alarm associated with data collection
-  int[]     severity         :opt // alarm severity for each value
-  int[]     status           :opt // alarm status for each value
-  string[]  message          :opt // alarm message for each value
-  long[]    secondsPastEpoch :opt // seconds for each value.
-  int[]     nanoseconds      :opt // nanoseconds for each value
-  string    descriptor       :opt // descriptor data
-</pre>
-
-
-
-</div>
-</body>
-</html>
--- a/documentation/ntCPP_20140919.html
+++ b/documentation/ntCPP_20140919.html
--- a/documentation/ntCPP_20141009.html
+++ b/documentation/ntCPP_20141009.html
--- a/documentation/ntCPP_20151016.html
+++ b/documentation/ntCPP_20151016.html
--- a/jenkins/cloudbees_build
+++ b/jenkins/cloudbees_build
@@ -6,20 +6,35 @@
 #
 # Author: Ralph Lange <ralph.lange@gmx.de>
 # Copyright (C) 2013 Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
-# Copyright (C) 2014-2015 ITER Organization.
+# Copyright (C) 2014-2016 ITER Organization.
 # All rights reserved. Use is subject to license terms.

+installTool () {
+    local module=$1
+    local version=$2
+
+    wget -nv https://openepics.ci.cloudbees.com/job/${module}-${version}_Build/lastSuccessfulBuild/artifact/${module,,}-${version}.CB-dist.tar.gz
+    tar -xzf ${module,,}-${version}.CB-dist.tar.gz
+}
+
+installE4 () {
+    local module=$1
+    local branch=$2
+
+    wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE}/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
+    tar -xzf ${module}.CB-dist.tar.gz
+}
+
 ###########################################
-# Determine EPICS Base version
+# Defaults for EPICS Base

-DEFAULT_BASE=3.14.12.5
+DEFAULT_BASE=3.15.4
+BASE=${BASE:-${DEFAULT_BASE}}

-BASE=${1:-${DEFAULT_BASE}}
-USE_MB=${2:-"MB_NO"}
+###########################################
+# Dependent module branches

-# Dependent module branches (empty = master)
-PVCOMMON_BRANCH=""
-PVDATA_BRANCH=""
+PVDATA_BRANCH="master"

 ###########################################
 # Fetch and unpack dependencies
@@ -30,15 +45,10 @@ rm -fr ${STUFF}
 mkdir -p ${STUFF}
 cd ${STUFF}

-wget -nv https://openepics.ci.cloudbees.com/job/Base-${BASE}_Build/lastSuccessfulBuild/artifact/base-${BASE}.CB-dist.tar.gz
-wget -nv https://openepics.ci.cloudbees.com/job/pvDataCPP_${PVDATA_BRANCH}Build/BASE=${BASE},USE_MB=MB_NO/lastSuccessfulBuild/artifact/pvData.CB-dist.tar.gz
-tar -xzf base-${BASE}.CB-dist.tar.gz
-tar -xzf pvData.CB-dist.tar.gz
+installTool Boost 1.61.0
+installTool Base ${BASE}

-if [ "${USE_MB}" = "MB_YES" ]; then
-    wget -nv https://openepics.ci.cloudbees.com/job/pvCommonCPP_${PVCOMMON_BRANCH}Build/BASE=${BASE},USE_MB=MB_YES/lastSuccessfulBuild/artifact/pvCommon.CB-dist.tar.gz
-    tar -xzf pvCommon.CB-dist.tar.gz
-fi
+installE4 pvData ${PVDATA_BRANCH}

 ###########################################
 # Build
@@ -62,6 +72,6 @@ make distclean all
 make runtests

 ###########################################
-# Create distribution
+# Create cache

 tar --exclude=test* -czf normativeTypes.CB-dist.tar.gz lib include
--- a/jenkins/cloudbees_doc
+++ b/jenkins/cloudbees_doc
@@ -6,14 +6,31 @@
 #
 # Author: Ralph Lange <ralph.lange@gmx.de>
 # Copyright (C) 2013 Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
-# Copyright (C) 2014-2015 ITER Organization.
+# Copyright (C) 2014-2016 ITER Organization.
 # All rights reserved. Use is subject to license terms.

-###########################################
-# Set EPICS Base version and upload target
+installTool () {
+    local module=$1
+    local version=$2

-BASE=3.15.2
-PUBLISH=${1:-DONT}
+    wget -nv https://openepics.ci.cloudbees.com/job/${module}-${version}_Build/lastSuccessfulBuild/artifact/${module,,}-${version}.CB-dist.tar.gz
+    tar -xzf ${module,,}-${version}.CB-dist.tar.gz
+}
+
+installE4 () {
+    local module=$1
+    local branch=$2
+
+    wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE}/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
+    tar -xzf ${module}.CB-dist.tar.gz
+}
+
+###########################################
+# Defaults for EPICS Base and parameters
+
+BASE=3.15.4
+PUBLISH=${PUBLISH:-NO}
+BRANCH=${BRANCH:-master}

 ###########################################
 # Fetch and unpack dependencies
@@ -24,16 +41,14 @@ rm -fr ${STUFF}
 mkdir -p ${STUFF}
 cd ${STUFF}

-wget -nv https://openepics.ci.cloudbees.com/job/Doxygen-1.8.3_Build/lastSuccessfulBuild/artifact/doxygen-1.8.3.CB-dist.tar.gz
-tar -xzf doxygen-1.8.3.CB-dist.tar.gz
+installTool Doxygen 1.8.11

 ###########################################
 # Generate

 cd ${WORKSPACE}

-wget -nv https://openepics.ci.cloudbees.com/job/normativeTypesCPP_Build/BASE=${BASE},USE_MB=MB_NO/lastSuccessfulBuild/artifact/normativeTypes.CB-dist.tar.gz
-tar -xzf normativeTypes.CB-dist.tar.gz
+installE4 normativeTypes ${BRANCH}

 export PATH=${STUFF}/bin:${PATH}

--- a/src/Makefile
+++ b/src/Makefile
@@ -1,30 +1,26 @@
 TOP = ..
 include $(TOP)/configure/CONFIG

-SRC = $(TOP)/src
-
-SRC_DIRS += $(SRC)/nt
-
-INC += nt.h
-INC += ntutils.h
-INC += ntid.h
-INC += ntfield.h
-INC += ntscalar.h
-INC += ntscalarArray.h
-INC += ntnameValue.h
-INC += nttable.h
-INC += ntmultiChannel.h
-INC += ntscalarMultiChannel.h
-INC += ntndarray.h
-INC += ntmatrix.h
-INC += ntenum.h
-INC += ntunion.h
-INC += ntaggregate.h
-INC += ntattribute.h
-INC += ntcontinuum.h
-INC += nthistogram.h
-INC += nturi.h
-INC += ntndarrayAttribute.h
+INC += pv/nt.h
+INC += pv/ntutils.h
+INC += pv/ntid.h
+INC += pv/ntfield.h
+INC += pv/ntscalar.h
+INC += pv/ntscalarArray.h
+INC += pv/ntnameValue.h
+INC += pv/nttable.h
+INC += pv/ntmultiChannel.h
+INC += pv/ntscalarMultiChannel.h
+INC += pv/ntndarray.h
+INC += pv/ntmatrix.h
+INC += pv/ntenum.h
+INC += pv/ntunion.h
+INC += pv/ntaggregate.h
+INC += pv/ntattribute.h
+INC += pv/ntcontinuum.h
+INC += pv/nthistogram.h
+INC += pv/nturi.h
+INC += pv/ntndarrayAttribute.h

 LIBSRCS += ntutils.cpp
 LIBSRCS += ntid.cpp
@@ -50,5 +46,8 @@ LIBRARY = nt

 nt_LIBS += pvData Com

+# shared library ABI version.
+SHRLIB_VERSION ?= 5.2.2
+
 include $(TOP)/configure/RULES

--- a/src/nt/ntaggregate.cpp
+++ b/src/nt/ntaggregate.cpp
@@ -1,8 +1,7 @@
 /* ntaggregate.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #define epicsExportSharedSymbols
@@ -187,6 +186,12 @@ bool NTAggregate::is_a(StructureConstPtr const & structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTAggregate::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}
+
+
 bool NTAggregate::isCompatible(StructureConstPtr const &structure)
 {
    if (structure.get() == 0) return false;
--- a/src/nt/ntattribute.cpp
+++ b/src/nt/ntattribute.cpp
@@ -1,8 +1,7 @@
 /* ntattribute.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #define epicsExportSharedSymbols
@@ -124,6 +123,11 @@ bool NTAttribute::is_a(StructureConstPtr const & structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTAttribute::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}
+
 bool NTAttribute::isCompatible(StructureConstPtr const & structure)
 {
    if (structure.get() == 0) return false;
--- a/src/nt/ntcontinuum.cpp
+++ b/src/nt/ntcontinuum.cpp
@@ -1,8 +1,7 @@
 /* ntcontinuum.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #define epicsExportSharedSymbols
@@ -116,6 +115,11 @@ bool NTContinuum::is_a(StructureConstPtr const & structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTContinuum::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}
+
 bool NTContinuum::isCompatible(StructureConstPtr const & structure)
 {
    if (structure.get() == 0) return false;
--- a/src/nt/ntenum.cpp
+++ b/src/nt/ntenum.cpp
@@ -1,8 +1,7 @@
 /* ntenum.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #define epicsExportSharedSymbols
@@ -115,6 +114,11 @@ bool NTEnum::is_a(StructureConstPtr const & structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTEnum::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}
+
 bool NTEnum::isCompatible(StructureConstPtr const &structure)
 {
    if (structure.get() == 0) return false;
--- a/src/nt/ntfield.cpp
+++ b/src/nt/ntfield.cpp
@@ -1,8 +1,7 @@
 /* ntfield.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <pv/lock.h>
--- a/src/nt/nthistogram.cpp
+++ b/src/nt/nthistogram.cpp
@@ -1,8 +1,7 @@
 /* ntcontinuum.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #define epicsExportSharedSymbols
@@ -129,6 +128,11 @@ bool NTHistogram::is_a(StructureConstPtr const & structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTHistogram::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}
+
 bool NTHistogram::isCompatible(StructureConstPtr const &structure)
 {
    if(!structure.get()) return false;
--- a/src/nt/ntid.cpp
+++ b/src/nt/ntid.cpp
@@ -1,7 +1,7 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/* ntid.cpp */
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <pv/ntid.h>
--- a/src/nt/ntmatrix.cpp
+++ b/src/nt/ntmatrix.cpp
@@ -1,8 +1,7 @@
 /* ntmatrix.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #define epicsExportSharedSymbols
@@ -133,6 +132,11 @@ bool NTMatrix::is_a(StructureConstPtr const & structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTMatrix::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}
+
 bool NTMatrix::isCompatible(StructureConstPtr const & structure)
 {
    if (structure.get() == 0) return false;
--- a/src/nt/ntmultiChannel.cpp
+++ b/src/nt/ntmultiChannel.cpp
@@ -1,8 +1,7 @@
 /* ntmultiChannel.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <algorithm>
@@ -226,6 +225,10 @@ bool NTMultiChannel::is_a(StructureConstPtr const &structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTMultiChannel::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}

 bool NTMultiChannel::isCompatible(StructureConstPtr const & structure)
 {
--- a/src/nt/ntnameValue.cpp
+++ b/src/nt/ntnameValue.cpp
@@ -1,8 +1,7 @@
 /* ntnameValue.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #define epicsExportSharedSymbols
@@ -128,6 +127,11 @@ bool NTNameValue::is_a(StructureConstPtr const & structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTNameValue::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}
+
 bool NTNameValue::isCompatible(StructureConstPtr const & structure)
 {
    if (structure.get() == 0) return false;
--- a/src/nt/ntndarray.cpp
+++ b/src/nt/ntndarray.cpp
@@ -1,12 +1,13 @@
 /* ntndarray.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <algorithm>

+#include <pv/lock.h>
+
 #define epicsExportSharedSymbols
 #include <pv/ntndarray.h>
 #include <pv/ntndarrayAttribute.h>
@@ -296,6 +297,11 @@ bool NTNDArray::is_a(StructureConstPtr const & structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTNDArray::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}
+
 bool NTNDArray::isCompatible(StructureConstPtr const &structure)
 {
    if(!structure.get()) return false;
@@ -346,10 +352,10 @@ bool NTNDArray::isCompatible(StructureConstPtr const &structure)


    StructureArrayConstPtr attributeField = structure->getField<StructureArray>( "attribute");
+    if (!attributeField)
+        return false;

-    StructureConstPtr attributeElementStruc = attributeField->getStructure();
-
-    if (!NTNDArrayAttribute::isCompatible(attributeElementStruc))
+    if (!NTNDArrayAttribute::isCompatible(attributeField->getStructure()))
        return false;


@@ -357,7 +363,7 @@ bool NTNDArray::isCompatible(StructureConstPtr const &structure)
    if (field.get())
    {
        ScalarConstPtr descriptorField = structure->getField<Scalar>("descriptor");
-        if (!descriptorField.get() || descriptorField->getScalarType() != pvString)
+        if (!descriptorField || descriptorField->getScalarType() != pvString)
            return false;
    }

--- a/src/nt/ntndarrayAttribute.cpp
+++ b/src/nt/ntndarrayAttribute.cpp
@@ -1,8 +1,7 @@
 /* ntndarrayAttribute.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #define epicsExportSharedSymbols
@@ -94,6 +93,7 @@ NTNDArrayAttributeBuilder::NTNDArrayAttributeBuilder()

 void NTNDArrayAttributeBuilder::reset()
 {
+    tags = false;
    descriptor = false;
    alarm = false;
    timeStamp = false;
@@ -127,6 +127,11 @@ bool NTNDArrayAttribute::is_a(StructureConstPtr const & structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTNDArrayAttribute::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}
+
 bool NTNDArrayAttribute::isCompatible(StructureConstPtr const & structure)
 {
    if (!NTAttribute::isCompatible(structure)) return false;
--- a/src/nt/ntscalar.cpp
+++ b/src/nt/ntscalar.cpp
@@ -1,8 +1,7 @@
 /* ntscalar.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #define epicsExportSharedSymbols
@@ -146,6 +145,11 @@ bool NTScalar::is_a(StructureConstPtr const & structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTScalar::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}
+
 bool NTScalar::isCompatible(StructureConstPtr const &structure)
 {
    if (structure.get() == 0) return false;
--- a/src/nt/ntscalarArray.cpp
+++ b/src/nt/ntscalarArray.cpp
@@ -1,8 +1,7 @@
 /* ntscalarArray.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #define epicsExportSharedSymbols
@@ -155,6 +154,11 @@ bool NTScalarArray::is_a(StructureConstPtr const & structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTScalarArray::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}
+
 bool NTScalarArray::isCompatible(StructureConstPtr const & structure)
 {
    if (structure.get() == 0) return false;
--- a/src/nt/ntscalarMultiChannel.cpp
+++ b/src/nt/ntscalarMultiChannel.cpp
@@ -1,10 +1,8 @@
 /* ntscalarMultiChannel.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
-
 #include <algorithm>

 #define epicsExportSharedSymbols
@@ -223,6 +221,10 @@ bool NTScalarMultiChannel::is_a(StructureConstPtr const &structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTScalarMultiChannel::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}

 bool NTScalarMultiChannel::isCompatible(StructureConstPtr const & structure)
 {
--- a/src/nt/nttable.cpp
+++ b/src/nt/nttable.cpp
@@ -1,8 +1,7 @@
 /* nttable.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <algorithm>
@@ -143,6 +142,11 @@ bool NTTable::is_a(StructureConstPtr const & structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTTable::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}
+
 bool NTTable::isCompatible(StructureConstPtr const & structure)
 {
    if (!structure.get()) return false;
@@ -266,7 +270,7 @@ PVStringArrayPtr NTTable::getLabels() const

 StringArray const & NTTable::getColumnNames() const
 {
-    return pvNTTable->getStructure()->getFieldNames();
+    return pvValue->getStructure()->getFieldNames();
 }

 PVFieldPtr NTTable::getColumn(std::string const & columnName) const
--- a/src/nt/ntunion.cpp
+++ b/src/nt/ntunion.cpp
@@ -1,8 +1,7 @@
 /* ntunion.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #define epicsExportSharedSymbols
@@ -19,6 +18,12 @@ static NTFieldPtr ntField = NTField::get();
 namespace detail {


+NTUnionBuilder::shared_pointer NTUnionBuilder::value(UnionConstPtr unionType)
+{
+    valueType = unionType;
+    return shared_from_this();
+}
+
 StructureConstPtr NTUnionBuilder::createStructure()
 {
    FieldBuilderPtr builder =
@@ -116,6 +121,11 @@ bool NTUnion::is_a(StructureConstPtr const & structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTUnion::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}
+
 bool NTUnion::isCompatible(StructureConstPtr const &structure)
 {
    if (structure.get() == 0) return false;
--- a/src/nt/nturi.cpp
+++ b/src/nt/nturi.cpp
@@ -1,8 +1,7 @@
 /* nturi.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <algorithm>
@@ -143,6 +142,11 @@ bool NTURI::is_a(StructureConstPtr const & structure)
    return NTUtils::is_a(structure->getID(), URI);
 }

+bool NTURI::is_a(PVStructurePtr const & pvStructure)
+{
+    return is_a(pvStructure->getStructure());
+}
+
 bool NTURI::isCompatible(StructureConstPtr const & structure)
 {
    if (!structure.get()) return false;
--- a/src/nt/ntutils.cpp
+++ b/src/nt/ntutils.cpp
@@ -1,8 +1,7 @@
 /* ntutils.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #define epicsExportSharedSymbols
--- a/src/pv/nt.h
+++ b/src/pv/nt.h
@@ -1,8 +1,7 @@
 /* nt.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NT_H
 #define NT_H
--- a/src/pv/ntaggregate.h
+++ b/src/pv/ntaggregate.h
@@ -1,8 +1,7 @@
 /* ntaggregate.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTAGGREGATE_H
 #define NTAGGREGATE_H
--- a/src/pv/ntattribute.h
+++ b/src/pv/ntattribute.h
@@ -1,8 +1,7 @@
 /* ntattribute.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTATTRIBUTE_H
 #define NTATTRIBUTE_H
@@ -45,7 +44,7 @@ namespace detail {
         * Adds tags field to the NTAttribute.
         * @return this instance of <b>NTAttributeBuilder</b>.
         */
-        virtual shared_pointer addTags();
+        shared_pointer addTags();

        /**
         * Adds descriptor field to the NTAttribute.
--- a/src/pv/ntcontinuum.h
+++ b/src/pv/ntcontinuum.h
@@ -1,8 +1,7 @@
 /* ntcontinuum.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTCONTINUUM_H
 #define NTCONTINUUM_H
@@ -94,7 +93,6 @@ namespace detail {

        void reset();

-        bool dim;
        bool descriptor;
        bool alarm;
        bool timeStamp;
--- a/src/pv/ntenum.h
+++ b/src/pv/ntenum.h
@@ -1,8 +1,7 @@
 /* ntenum.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTENUM_H
 #define NTENUM_H
--- a/src/pv/ntfield.h
+++ b/src/pv/ntfield.h
@@ -1,8 +1,7 @@
 /* ntfield.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTFIELD_H
 #define NTFIELD_H
@@ -198,12 +197,6 @@ public:
     */
    epics::pvData::PVStructurePtr createDisplay();

-    /**
-     * Creates an alarmLimit PVStructure.
-     * @return an alarmLimit PVStructure.
-     */
-    epics::pvData::PVStructurePtr createAlarmLimit();
-
    /**
     * Creates a control PVStructure.
     * @return a control PVStructure.
--- a/src/pv/nthistogram.h
+++ b/src/pv/nthistogram.h
@@ -1,8 +1,7 @@
 /* nthistogram.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTHISTOGRAM_H
 #define NTHISTOGRAM_H
@@ -104,7 +103,6 @@ namespace detail {
        bool valueTypeSet;
        epics::pvData::ScalarType valueType;

-        bool dim;
        bool descriptor;
        bool alarm;
        bool timeStamp;
--- a/src/pv/ntid.h
+++ b/src/pv/ntid.h
@@ -1,7 +1,7 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/* ntid.h */
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTID_H
 #define NTID_H
--- a/src/pv/ntmatrix.h
+++ b/src/pv/ntmatrix.h
@@ -1,8 +1,7 @@
 /* ntmatrix.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTMATRIX_H
 #define NTMATRIX_H
--- a/src/pv/ntmultiChannel.h
+++ b/src/pv/ntmultiChannel.h
@@ -1,8 +1,7 @@
 /* ntmultiChannel.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTMULTICHANNEL_H
 #define NTMULTICHANNEL_H
--- a/src/pv/ntnameValue.h
+++ b/src/pv/ntnameValue.h
@@ -1,8 +1,7 @@
 /* ntnameValue.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTNAMEVALUE_H
 #define NTNAMEVALUE_H
--- a/src/pv/ntndarray.h
+++ b/src/pv/ntndarray.h
@@ -1,8 +1,7 @@
 /* ntndarray.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTNDARRAY_H
 #define NTNDARRAY_H
--- a/src/pv/ntndarrayAttribute.h
+++ b/src/pv/ntndarrayAttribute.h
@@ -1,8 +1,7 @@
 /* ntndarrayAttribute.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTNDARRAYATTRIBUTE_H
 #define NTNDARRAYATTRIBUTE_H
@@ -45,7 +44,7 @@ namespace detail {
         * Adds tags field to the NTNDArrayAttribute.
         * @return this instance of <b>NTNDArrayAttributeBuilder</b>.
         */
-        virtual shared_pointer addTags();
+        shared_pointer addTags();

        /**
         * Adds descriptor field to the NTNDArrayAttribute.
--- a/src/pv/ntscalar.h
+++ b/src/pv/ntscalar.h
@@ -1,8 +1,7 @@
 /* ntscalar.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTSCALAR_H
 #define NTSCALAR_H
--- a/src/pv/ntscalarArray.h
+++ b/src/pv/ntscalarArray.h
@@ -1,8 +1,7 @@
 /* ntscalarArray.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTSCALARARRAY_H
 #define NTSCALARARRAY_H
--- a/src/pv/ntscalarMultiChannel.h
+++ b/src/pv/ntscalarMultiChannel.h
@@ -1,8 +1,7 @@
 /* ntscalarMultiChannel.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTSCALARMULTICHANNEL_H
 #define NTSCALARMULTICHANNEL_H
--- a/src/pv/nttable.h
+++ b/src/pv/nttable.h
@@ -1,8 +1,7 @@
 /* nttable.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTTABLE_H
 #define NTTABLE_H
--- a/src/pv/ntunion.h
+++ b/src/pv/ntunion.h
@@ -1,8 +1,7 @@
 /* ntunion.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTUNION_H
 #define NTUNION_H
@@ -41,6 +40,14 @@ namespace detail {
    public:
        POINTER_DEFINITIONS(NTUnionBuilder);

+        /**
+         * Specifies the union for the value field.
+         * If this is not called then a variant union is the default.
+         * @param unionType  the introspection object for the union value field
+         * @return this      instance of  NTUnionBuilder
+         */
+        shared_pointer value(epics::pvData::UnionConstPtr unionType);
+
        /**
         * Adds descriptor field to the NTUnion.
         * @return this instance of <b>NTUnionBuilder</b>.
--- a/src/pv/nturi.h
+++ b/src/pv/nturi.h
@@ -1,8 +1,7 @@
 /* nturi.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTURI_H
 #define NTURI_H
--- a/src/pv/ntutils.h
+++ b/src/pv/ntutils.h
@@ -1,8 +1,7 @@
 /* ntutils.h */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #ifndef NTUTILS_H
 #define NTUTILS_H
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,80 @@
-TOP = ..
-include $(TOP)/configure/CONFIG
-DIRS += nt
-include $(TOP)/configure/RULES_DIRS
+TOP=..
+
+include $(TOP)/configure/CONFIG
+
+PROD_LIBS += nt pvData Com
+
+TESTPROD_HOST += ntfieldTest
+ntfieldTest_SRCS += ntfieldTest.cpp
+TESTS += ntfieldTest
+
+TESTPROD_HOST += ntscalarTest
+ntscalarTest_SRCS += ntscalarTest.cpp
+TESTS += ntscalarTest
+
+TESTPROD_HOST += ntscalarArrayTest
+ntscalarArrayTest_SRCS += ntscalarArrayTest.cpp
+TESTS += ntscalarArrayTest
+
+TESTPROD_HOST += ntnameValueTest
+ntnameValueTest_SRCS += ntnameValueTest.cpp
+TESTS += ntnameValueTest
+
+TESTPROD_HOST += ntmultiChannelTest
+ntmultiChannelTest_SRCS += ntmultiChannelTest.cpp
+TESTS += ntmultiChannelTest
+
+TESTPROD_HOST += ntscalarMultiChannelTest
+ntscalarMultiChannelTest_SRCS += ntscalarMultiChannelTest.cpp
+TESTS += ntscalarMultiChannelTest
+
+TESTPROD_HOST += nttableTest
+nttableTest_SRCS = nttableTest.cpp
+TESTS += nttableTest
+
+TESTPROD_HOST += ntndarrayTest
+ntndarrayTest_SRCS = ntndarrayTest.cpp
+TESTS += ntndarrayTest
+
+TESTPROD_HOST += ntmatrixTest
+ntmatrixTest_SRCS = ntmatrixTest.cpp
+TESTS += ntmatrixTest
+
+TESTPROD_HOST += ntenumTest
+ntenumTest_SRCS = ntenumTest.cpp
+TESTS += ntenumTest
+
+TESTPROD_HOST += ntunionTest
+ntunionTest_SRCS = ntunionTest.cpp
+TESTS += ntunionTest
+
+TESTPROD_HOST += ntaggregateTest
+ntaggregateTest_SRCS = ntaggregateTest.cpp
+TESTS += ntaggregateTest
+
+TESTPROD_HOST += ntattributeTest
+ntattributeTest_SRCS = ntattributeTest.cpp
+TESTS += ntattributeTest
+
+TESTPROD_HOST += ntndarrayAttributeTest
+ntndarrayAttributeTest_SRCS = ntndarrayAttributeTest.cpp
+TESTS += ntndarrayAttributeTest
+
+TESTPROD_HOST += ntcontinuumTest
+ntcontinuumTest = ntcontinuumTest.cpp
+TESTS += ntcontinuumTest
+
+TESTPROD_HOST += nthistogramTest
+nthistogramTest_SRCS = nthistogramTest.cpp
+TESTS += nthistogramTest
+
+TESTPROD_HOST += ntutilsTest
+ntutilsTest_SRCS = ntutilsTest.cpp
+TESTS += ntutilsTest
+
+TESTSCRIPTS_HOST += $(TESTS:%=%.t)
+
+include $(TOP)/configure/RULES
+#----------------------------------------
+#  ADD RULES AFTER THIS LINE

--- a/test/nt/Makefile
+++ b/test/nt/Makefile
@@ -1,80 +0,0 @@
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-PROD_LIBS += nt pvData Com
-
-TESTPROD_HOST += ntfieldTest
-ntfieldTest_SRCS += ntfieldTest.cpp
-TESTS += ntfieldTest
-
-TESTPROD_HOST += ntscalarTest
-ntscalarTest_SRCS += ntscalarTest.cpp
-TESTS += ntscalarTest
-
-TESTPROD_HOST += ntscalarArrayTest
-ntscalarArrayTest_SRCS += ntscalarArrayTest.cpp
-TESTS += ntscalarArrayTest
-
-TESTPROD_HOST += ntnameValueTest
-ntnameValueTest_SRCS += ntnameValueTest.cpp
-TESTS += ntnameValueTest
-
-TESTPROD_HOST += ntmultiChannelTest
-ntmultiChannelTest_SRCS += ntmultiChannelTest.cpp
-TESTS += ntmultiChannelTest
-
-TESTPROD_HOST += ntscalarMultiChannelTest
-ntscalarMultiChannelTest_SRCS += ntscalarMultiChannelTest.cpp
-TESTS += ntscalarMultiChannelTest
-
-TESTPROD_HOST += nttableTest
-nttableTest_SRCS = nttableTest.cpp
-TESTS += nttableTest
-
-TESTPROD_HOST += ntndarrayTest
-ntndarrayTest_SRCS = ntndarrayTest.cpp
-TESTS += ntndarrayTest
-
-TESTPROD_HOST += ntmatrixTest
-ntmatrixTest_SRCS = ntmatrixTest.cpp
-TESTS += ntmatrixTest
-
-TESTPROD_HOST += ntenumTest
-ntenumTest_SRCS = ntenumTest.cpp
-TESTS += ntenumTest
-
-TESTPROD_HOST += ntunionTest
-ntunionTest_SRCS = ntunionTest.cpp
-TESTS += ntunionTest
-
-TESTPROD_HOST += ntaggregateTest
-ntaggregateTest_SRCS = ntaggregateTest.cpp
-TESTS += ntaggregateTest
-
-TESTPROD_HOST += ntattributeTest
-ntattributeTest_SRCS = ntattributeTest.cpp
-TESTS += ntattributeTest
-
-TESTPROD_HOST += ntndarrayAttributeTest
-ntndarrayAttributeTest_SRCS = ntndarrayAttributeTest.cpp
-TESTS += ntndarrayAttributeTest
-
-TESTPROD_HOST += ntcontinuumTest
-ntattributeTest_SRCS = ntcontinuumTest.cpp
-TESTS += ntcontinuumTest
-
-TESTPROD_HOST += nthistogramTest
-ntattributeTest_SRCS = nthistogramTest.cpp
-TESTS += nthistogramTest
-
-TESTPROD_HOST += ntutilsTest
-ntutilsTest_SRCS = ntutilsTest.cpp
-TESTS += ntutilsTest
-
-TESTSCRIPTS_HOST += $(TESTS:%=%.t)
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-
--- a/test/nt/ntaggregateTest.cpp
+++ b/test/nt/ntaggregateTest.cpp
@@ -1,7 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <epicsUnitTest.h>
@@ -66,6 +65,9 @@ void test_ntaggregate()
            create();
    testOk1(ntAggregate.get() != 0);

+    testOk1(NTAggregate::is_a(ntAggregate->getPVStructure()));
+    testOk1(NTAggregate::isCompatible(ntAggregate->getPVStructure()));
+
    testOk1(ntAggregate->getPVStructure().get() != 0);
    testOk1(ntAggregate->getValue().get() != 0);
    testOk1(ntAggregate->getDescriptor().get() != 0);
@@ -165,7 +167,7 @@ void test_wrap()
 }

 MAIN(testNTAggregate) {
-    testPlan(28);
+    testPlan(30);
    test_builder();
    test_ntaggregate();
    test_wrap();
--- a/test/nt/ntattributeTest.cpp
+++ b/test/nt/ntattributeTest.cpp
@@ -1,8 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
- *
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #include <epicsUnitTest.h>
 #include <testMain.h>
@@ -76,6 +74,9 @@ void test_ntattribute()
            create();
    testOk1(ntAttribute.get() != 0);

+    testOk1(NTAttribute::is_a(ntAttribute->getPVStructure()));
+    testOk1(NTAttribute::isCompatible(ntAttribute->getPVStructure()));
+
    testOk1(ntAttribute->getPVStructure().get() != 0);
    testOk1(ntAttribute->getName().get() != 0);
    testOk1(ntAttribute->getValue().get() != 0);
@@ -166,7 +167,7 @@ void test_wrap()
 }

 MAIN(testNTAttribute) {
-    testPlan(33);
+    testPlan(35);
    test_builder();
    test_ntattribute();
    test_wrap();
--- a/test/nt/ntcontinuumTest.cpp
+++ b/test/nt/ntcontinuumTest.cpp
@@ -1,7 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <epicsUnitTest.h>
@@ -72,6 +71,9 @@ void test_ntcontinuum()
            create();
    testOk1(ntContinuum.get() != 0);

+    testOk1(NTContinuum::is_a(ntContinuum->getPVStructure()));
+    testOk1(NTContinuum::isCompatible(ntContinuum->getPVStructure()));
+
    testOk1(ntContinuum->getPVStructure().get() != 0);
    testOk1(ntContinuum->getDescriptor().get() != 0);
    testOk1(ntContinuum->getAlarm().get() != 0);
@@ -265,7 +267,7 @@ void test_extra()


 MAIN(testNTContinuum) {
-    testPlan(59);
+    testPlan(61);
    test_builder();
    test_ntcontinuum();
    test_wrap();
--- a/test/nt/ntenumTest.cpp
+++ b/test/nt/ntenumTest.cpp
@@ -1,9 +1,7 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
-
 #include <epicsUnitTest.h>
 #include <testMain.h>

@@ -67,6 +65,9 @@ void test_ntenum()
            create();
    testOk1(ntEnum.get() != 0);

+    testOk1(NTEnum::is_a(ntEnum->getPVStructure()));
+    testOk1(NTEnum::isCompatible(ntEnum->getPVStructure()));
+
    testOk1(ntEnum->getPVStructure().get() != 0);
    testOk1(ntEnum->getValue().get() != 0);
    testOk1(ntEnum->getDescriptor().get() != 0);
@@ -178,7 +179,7 @@ void test_wrap()
 }

 MAIN(testNTEnum) {
-    testPlan(30);
+    testPlan(32);
    test_builder();
    test_ntenum();
    test_wrap();
--- a/test/nt/ntfieldTest.cpp
+++ b/test/nt/ntfieldTest.cpp
@@ -1,7 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 /*
 * ntfieldTest.cpp
--- a/test/nt/nthistogramTest.cpp
+++ b/test/nt/nthistogramTest.cpp
@@ -1,7 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <epicsUnitTest.h>
@@ -84,6 +83,9 @@ void test_nthistogram()
            create();
    testOk1(ntHistogram.get() != 0);

+    testOk1(NTHistogram::is_a(ntHistogram->getPVStructure()));
+    testOk1(NTHistogram::isCompatible(ntHistogram->getPVStructure()));
+
    testOk1(ntHistogram->getPVStructure().get() != 0);
    testOk1(ntHistogram->getDescriptor().get() != 0);
    testOk1(ntHistogram->getAlarm().get() != 0);
@@ -250,7 +252,7 @@ void test_extra()


 MAIN(testNTHistogram) {
-    testPlan(50);
+    testPlan(52);
    test_builder();
    test_nthistogram();
    test_wrap();
--- a/test/nt/ntmatrixTest.cpp
+++ b/test/nt/ntmatrixTest.cpp
@@ -1,9 +1,7 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
-
 #include <epicsUnitTest.h>
 #include <testMain.h>

@@ -59,7 +57,7 @@ void test_ntmatrix()
    NTMatrixBuilderPtr builder = NTMatrix::createBuilder();
    testOk(builder.get() != 0, "Got builder");

-    NTMatrixPtr ntScalarArray = builder->
+    NTMatrixPtr ntMatrix = builder->
            //arrayValue(pvInt)->
            addDim()->
            addDescriptor()->
@@ -67,15 +65,18 @@ void test_ntmatrix()
            addTimeStamp()->
            addDisplay()->
            create();
-    testOk1(ntScalarArray.get() != 0);
+    testOk1(ntMatrix.get() != 0);

-    testOk1(ntScalarArray->getPVStructure().get() != 0);
-    testOk1(ntScalarArray->getValue().get() != 0);
-    testOk1(ntScalarArray->getDim().get() != 0);
-    testOk1(ntScalarArray->getDescriptor().get() != 0);
-    testOk1(ntScalarArray->getAlarm().get() != 0);
-    testOk1(ntScalarArray->getTimeStamp().get() != 0);
-    testOk1(ntScalarArray->getDisplay().get() != 0);
+    testOk1(NTMatrix::is_a(ntMatrix->getPVStructure()));
+    testOk1(NTMatrix::isCompatible(ntMatrix->getPVStructure()));
+
+    testOk1(ntMatrix->getPVStructure().get() != 0);
+    testOk1(ntMatrix->getValue().get() != 0);
+    testOk1(ntMatrix->getDim().get() != 0);
+    testOk1(ntMatrix->getDescriptor().get() != 0);
+    testOk1(ntMatrix->getAlarm().get() != 0);
+    testOk1(ntMatrix->getTimeStamp().get() != 0);
+    testOk1(ntMatrix->getDisplay().get() != 0);

    //
    // example how to set values
@@ -85,7 +86,7 @@ void test_ntmatrix()
    newValues.push_back(2.0);
    newValues.push_back(8.0);

-    PVDoubleArrayPtr pvValueField = ntScalarArray->getValue();
+    PVDoubleArrayPtr pvValueField = ntMatrix->getValue();
    pvValueField->replace(freeze(newValues));

    //
@@ -102,7 +103,7 @@ void test_ntmatrix()
    // timeStamp ops
    //
    PVTimeStamp pvTimeStamp;
-    if (ntScalarArray->attachTimeStamp(pvTimeStamp))
+    if (ntMatrix->attachTimeStamp(pvTimeStamp))
    {
        testPass("timeStamp attach");

@@ -123,7 +124,7 @@ void test_ntmatrix()
    // alarm ops
    //
    PVAlarm pvAlarm;
-    if (ntScalarArray->attachAlarm(pvAlarm))
+    if (ntMatrix->attachAlarm(pvAlarm))
    {
        testPass("alarm attach");

@@ -141,7 +142,7 @@ void test_ntmatrix()
    // display ops
    //
    PVDisplay pvDisplay;
-    if (ntScalarArray->attachDisplay(pvDisplay))
+    if (ntMatrix->attachDisplay(pvDisplay))
    {
        testPass("display attach");

@@ -160,10 +161,10 @@ void test_ntmatrix()
    //
    // set descriptor
    //
-    ntScalarArray->getDescriptor()->put("This is a test NTMatrix");
+    ntMatrix->getDescriptor()->put("This is a test NTMatrix");

-    // dump ntScalarArray
-    std::cout << *ntScalarArray->getPVStructure() << std::endl;
+    // dump ntMatrix
+    std::cout << *ntMatrix->getPVStructure() << std::endl;

 }

@@ -201,7 +202,7 @@ void test_wrap()
 }

 MAIN(testNTMatrix) {
-    testPlan(36);
+    testPlan(38);
    test_builder();
    test_ntmatrix();
    test_wrap();
--- a/test/nt/ntmultiChannelTest.cpp
+++ b/test/nt/ntmultiChannelTest.cpp
@@ -1,7 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 /*
 * ntmutiChannelTest.cpp
@@ -54,6 +53,9 @@ static void test()
            create();
    testOk1(multiChannel.get() != 0);

+    testOk1(NTMultiChannel::is_a(multiChannel->getPVStructure()));
+    testOk1(NTMultiChannel::isCompatible(multiChannel->getPVStructure()));
+
    PVStructurePtr pvStructure = multiChannel->getPVStructure();
    testOk1(pvStructure.get()!=NULL);
    testOk1(NTMultiChannel::is_a(pvStructure->getStructure()));
@@ -186,7 +188,7 @@ void test_wrap()

 MAIN(testCreateRequest)
 {
-    testPlan(25);
+    testPlan(27);
    test();
    test_wrap();
    return testDone();
--- a/test/nt/ntnameValueTest.cpp
+++ b/test/nt/ntnameValueTest.cpp
@@ -1,7 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <epicsUnitTest.h>
@@ -81,6 +80,9 @@ void test_ntnameValue()
            create();
    testOk1(ntNameValue.get() != 0);

+    testOk1(NTNameValue::is_a(ntNameValue->getPVStructure()));
+    testOk1(NTNameValue::isCompatible(ntNameValue->getPVStructure()));
+
    testOk1(ntNameValue->getPVStructure().get() != 0);
    testOk1(ntNameValue->getDescriptor().get() != 0);
    testOk1(ntNameValue->getAlarm().get() != 0);
@@ -245,7 +247,7 @@ void test_extra()


 MAIN(testNTNameValue) {
-    testPlan(48);
+    testPlan(50);
    test_builder();
    test_ntnameValue();
    test_wrap();
--- a/test/nt/ntndarrayAttributeTest.cpp
+++ b/test/nt/ntndarrayAttributeTest.cpp
@@ -1,8 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
- *
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 #include <epicsUnitTest.h>
 #include <testMain.h>
@@ -76,6 +74,9 @@ void test_ntndarrayAttribute()
            create();
    testOk1(ntNDArrayAttribute.get() != 0);

+    testOk1(NTNDArrayAttribute::is_a(ntNDArrayAttribute->getPVStructure()));
+    testOk1(NTNDArrayAttribute::isCompatible(ntNDArrayAttribute->getPVStructure()));
+
    testOk1(ntNDArrayAttribute->getPVStructure().get() != 0);
    testOk1(ntNDArrayAttribute->getName().get() != 0);
    testOk1(ntNDArrayAttribute->getValue().get() != 0);
@@ -168,7 +169,7 @@ void test_wrap()
 }

 MAIN(testNTNDArrayAttribute) {
-    testPlan(37);
+    testPlan(39);
    test_builder();
    test_ntndarrayAttribute();
    test_wrap();
--- a/test/nt/ntndarrayTest.cpp
+++ b/test/nt/ntndarrayTest.cpp
@@ -1,7 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <epicsUnitTest.h>
@@ -75,7 +74,7 @@ void test_all()
            add("extra1",fieldCreate->createScalar(pvString)) ->
            add("extra2",fieldCreate->createScalarArray(pvString)) ->
            createPVStructure();
-    std::cout << *pvStructure << std::endl;
+    testOk1(NTNDArray::is_a(pvStructure)==true);
    testOk1(NTNDArray::isCompatible(pvStructure)==true);
 }

@@ -113,7 +112,7 @@ void test_wrap()
 }

 MAIN(testNTNDArray) {
-    testPlan(59);
+    testPlan(60);
    test_builder(true);
    test_builder(false);
    test_builder(false); // called twice to test caching
--- a/test/nt/ntscalarArrayTest.cpp
+++ b/test/nt/ntscalarArrayTest.cpp
@@ -1,7 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <epicsUnitTest.h>
@@ -84,6 +83,9 @@ void test_ntscalarArray()
            create();
    testOk1(ntScalarArray.get() != 0);

+    testOk1(NTScalarArray::is_a(ntScalarArray->getPVStructure()));
+    testOk1(NTScalarArray::isCompatible(ntScalarArray->getPVStructure()));
+
    testOk1(ntScalarArray->getPVStructure().get() != 0);
    testOk1(ntScalarArray->getValue().get() != 0);
    testOk1(ntScalarArray->getDescriptor().get() != 0);
@@ -235,7 +237,7 @@ void test_wrap()
 }

 MAIN(testNTScalarArray) {
-    testPlan(38);
+    testPlan(40);
    test_builder();
    test_ntscalarArray();
    test_wrap();
--- a/test/nt/ntscalarMultiChannelTest.cpp
+++ b/test/nt/ntscalarMultiChannelTest.cpp
@@ -1,7 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */
 /*
 * ntscalarMultiChannelTest.cpp
@@ -54,6 +53,9 @@ static void test()
            create();
    testOk1(multiChannel.get() != 0);

+    testOk1(NTScalarMultiChannel::is_a(multiChannel->getPVStructure()));
+    testOk1(NTScalarMultiChannel::isCompatible(multiChannel->getPVStructure()));
+
    PVStructurePtr pvStructure = multiChannel->getPVStructure();
    testOk1(pvStructure.get()!=NULL);
    testOk1(NTScalarMultiChannel::is_a(pvStructure->getStructure()));
@@ -173,7 +175,7 @@ void test_wrap()

 MAIN(testCreateRequest)
 {
-    testPlan(25);
+    testPlan(27);
    test();
    test_wrap();
    return testDone();
--- a/test/nt/ntscalarTest.cpp
+++ b/test/nt/ntscalarTest.cpp
@@ -1,7 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <epicsUnitTest.h>
@@ -86,6 +85,9 @@ void test_ntscalar()
            create();
    testOk1(ntScalar.get() != 0);

+    testOk1(NTScalar::is_a(ntScalar->getPVStructure()));
+    testOk1(NTScalar::isCompatible(ntScalar->getPVStructure()));
+
    testOk1(ntScalar->getPVStructure().get() != 0);
    testOk1(ntScalar->getValue().get() != 0);
    testOk1(ntScalar->getDescriptor().get() != 0);
@@ -226,7 +228,7 @@ void test_wrap()
 }

 MAIN(testNTScalar) {
-    testPlan(35);
+    testPlan(37);
    test_builder();
    test_ntscalar();
    test_wrap();
--- a/test/nt/nttableTest.cpp
+++ b/test/nt/nttableTest.cpp
@@ -1,7 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <epicsUnitTest.h>
@@ -119,6 +118,9 @@ void test_nttable()
            create();
    testOk1(ntTable.get() != 0);

+    testOk1(NTTable::is_a(ntTable->getPVStructure()));
+    testOk1(NTTable::isCompatible(ntTable->getPVStructure()));
+
    testOk1(ntTable->getPVStructure().get() != 0);
    testOk1(ntTable->getDescriptor().get() != 0);
    testOk1(ntTable->getAlarm().get() != 0);
@@ -236,7 +238,7 @@ void test_wrap()
 }

 MAIN(testNTTable) {
-    testPlan(48);
+    testPlan(50);
    test_builder();
    test_labels();
    test_nttable();
--- a/test/nt/ntunionTest.cpp
+++ b/test/nt/ntunionTest.cpp
@@ -1,7 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <epicsUnitTest.h>
@@ -48,7 +47,6 @@ void test_builder()
    testOk(valueField.get() != 0, "value is enum");

    std::cout << *structure << std::endl;
-
 }

 void test_ntunion()
@@ -65,6 +63,9 @@ void test_ntunion()
            create();
    testOk1(ntUnion.get() != 0);

+    testOk1(NTUnion::is_a(ntUnion->getPVStructure()));
+    testOk1(NTUnion::isCompatible(ntUnion->getPVStructure()));
+
    testOk1(ntUnion->getPVStructure().get() != 0);
    testOk1(ntUnion->getValue().get() != 0);
    testOk1(ntUnion->getDescriptor().get() != 0);
@@ -156,11 +157,43 @@ void test_wrap()
    testOk(ptr.get() != 0, "wrapUnsafe OK");
 }

+
+void test_variant_union()
+{
+    StructureConstPtr structure = NTUnion::createBuilder()->
+            addDescriptor()->
+            addAlarm()->
+            addTimeStamp()->
+            createStructure();
+    testOk1(structure->getField<Union>("value")->isVariant());
+}
+
+void test_regular_union()
+{
+    UnionConstPtr u = getFieldCreate()->createFieldBuilder()->
+        add("x", pvDouble)->
+        add("i", pvInt)->
+        createUnion();
+
+    StructureConstPtr structure = NTUnion::createBuilder()->
+            value(u)->
+            addDescriptor()->
+            addAlarm()->
+            addTimeStamp()->
+            createStructure();
+    testOk1(!structure->getField<Union>("value")->isVariant());
+    testOk1(structure->getField<Union>("value") == u);
+}
+
+
+
 MAIN(testNTUnion) {
-    testPlan(27);
+    testPlan(32);
    test_builder();
    test_ntunion();
    test_wrap();
+    test_variant_union();
+    test_regular_union();
    return testDone();
 }

--- a/test/nt/ntutilsTest.cpp
+++ b/test/nt/ntutilsTest.cpp
@@ -1,7 +1,6 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * This software is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
 */

 #include <epicsUnitTest.h>
Author	SHA1	Message	Date
Andrew Johnson	e803240fbf	Update SHRLIB_VERSION	2019-03-20 13:57:00 -05:00
Michael Davidsaver	54c07f705f	update docs	2019-03-12 19:45:30 -07:00
Michael Davidsaver	fa23ddd370	NTTable::getColumnNames() wrong field	2019-03-12 17:42:36 -07:00
Andrew Johnson	41d56fdf89	Update version numbers and formatting in documentation	2018-12-17 16:05:45 -06:00
Andrew Johnson	a65fc3ef30	Update and unify README.md	2018-12-17 16:04:09 -06:00
Michael Davidsaver	b69bc44974	5.2.1	2018-11-26 11:52:01 -08:00
Michael Davidsaver	a90f0173a7	drop redundant generated html	2018-11-26 11:50:39 -08:00
Michael Davidsaver	83342beb7e	travis-ci dropped 3.14	2018-10-29 19:42:12 -07:00
Michael Davidsaver	f6e6cf037f	update travis-ci	2018-10-29 17:57:18 -07:00
Andrew Johnson	80920ae0b0	Clean up warnings Removed unused member variables 'bool dim'.	2018-01-04 17:16:34 -06:00
Michael Davidsaver	1f7667b22d	drop prototype PVNTField::createAlarmLimit not implemented.	2017-12-19 17:15:37 -06:00
Ralph Lange	e15e84fb14	jenkins-ci: fix/update CloudBees jobs	2017-12-19 09:58:49 +01:00
Andrew Johnson	ba2e1c8a1d	Update documentation for 5.2.0 release	2017-12-14 17:30:55 -06:00
Andrew Johnson	fb6873e9a3	Applied documentation changes since 5.0.0 to the master branch	2017-12-14 17:21:40 -06:00
Michael Davidsaver	2f4c0eea9d	missing include	2017-12-12 09:43:25 -06:00
Andrew Johnson	a2b635c2fe	Include <top>/../RELEASE.<host>.local	2017-12-06 20:35:26 -06:00
Andrew Johnson	abd029aa71	Use 'make test-results' in travis-build script	2017-11-30 12:00:28 -06:00
Andrew Johnson	57c6d07a93	Unify .gitignore file	2017-11-30 11:59:45 -06:00
Michael Davidsaver	91c5136883	Test for missing "attribute" array in NTNDArray	2017-11-21 10:59:23 -06:00
Ralph Lange	5e151c3b7a	jenkins: remove microbench option and pvCommon dependency from CB build	2017-11-15 17:25:51 +01:00
Ralph Lange	fc4b51cb49	travis-ci: consolidate travis configuration	2017-09-28 15:10:04 +02:00
Ralph Lange	fc703958b3	travis-ci: minor configuration fix	2017-09-27 15:34:02 +02:00
Ralph Lange	1b156c92cd	travis-ci: update/streamline configuration for EPICS 7	2017-09-27 12:00:06 +02:00
Marty Kraimer	2c75f1d1e9	Merge pull request #13 from mrkraimer/master create travis files	2017-09-13 05:31:22 -04:00
mrkraimer	e03096c35e	create travis files	2017-09-13 05:14:10 -04:00
Bruno Martins	4b0970ffcb	Set tags to false inside reset. Fixes #11	2017-07-26 17:19:45 +02:00
Dave Hickin	048d6ef737	NTUnionBuilder: Add missing value() function Add missing function NTUnionBuilder::value() to allow the union type of the NTUnion's value field to be specified.	2016-09-09 18:07:59 +01:00
Ralph Lange	4768444b8a	Add QtCreator wildcard to .gitignore	2016-07-28 11:56:26 +02:00
Dave Hickin	0ce3613acc	SHRLIB: Set version to 5.2	2016-07-22 17:06:37 +01:00
Dave Hickin	d13696f943	SHRLIB: Add ABI version (5.1)	2016-07-22 17:01:38 +01:00
Dave Hickin	e6597bc2f0	Update source boilerplate for new LICENSE file	2016-07-22 16:56:01 +01:00
Dave Hickin	3d4083221d	Remove COPYRIGHT file Copyright is now in LICENSE file	2016-07-22 16:43:57 +01:00
Dave Hickin	6b64adc150	Update LICENSE to new version	2016-07-22 16:43:24 +01:00
Ralph Lange	c35e78b797	jenkins: update CloudBees jobs to new standard	2016-07-22 14:56:24 +02:00
Dave Hickin	08234150dc	Add tests for is_a and isCompatible for PVStructures	2016-04-12 03:24:47 +01:00
Dave Hickin	5dfc4ffd16	Rename ntScalarArray ntMatrix in NTMatrix tests	2016-04-12 03:23:03 +01:00
Dave Hickin	ff4b88754f	Add missing is_a(PVStructurePtr) implementations	2016-04-12 03:19:42 +01:00
Dave Hickin	8794d5b6c0	Run NTAttribute and NTContinuum unit tests	2016-04-12 03:16:48 +01:00
Dave Hickin	00aab51203	Documentation: Remove old versions	2016-03-18 22:00:29 +00:00
Dave Hickin	df023e6103	Documentation: Change to release-based versioning Replace dated documentation scheme by one using release version.	2016-03-18 21:56:15 +00:00
Ralph Lange	e07a42fb48	jenkins: switch to Base 3.15.3	2016-02-16 10:17:24 +01:00
Dave Hickin	6dd63a74a6	Make addTags() non-virtual	2016-02-16 08:32:27 +00:00
dhickin	f90549aba8	Merge pull request #7 from mdavidsaver/master Move headers to pv/	2016-02-10 20:45:01 +00:00
Michael Davidsaver	4f3f6784d4	adjust Makefiles	2016-02-09 19:25:37 -05:00
Michael Davidsaver	cfe939ca7a	Moves source and headers src/nt/.h => src/pv/.h src/nt/.cpp => src/.cpp test/nt/. => test/.	2016-02-09 19:25:37 -05:00