diff --git a/pvDataApp/factory/TypeFunc.cpp b/pvDataApp/factory/TypeFunc.cpp index 2fa0872..3d1a51a 100644 --- a/pvDataApp/factory/TypeFunc.cpp +++ b/pvDataApp/factory/TypeFunc.cpp @@ -14,6 +14,7 @@ #include #include +#include #include "dbDefs.h" // for NELEMENTS diff --git a/pvDataApp/misc/sharedVector.h b/pvDataApp/misc/sharedVector.h index 953660d..5f921a9 100644 --- a/pvDataApp/misc/sharedVector.h +++ b/pvDataApp/misc/sharedVector.h @@ -9,6 +9,7 @@ #include #include "pv/sharedPtr.h" +#include "pv/pvIntrospect.h" namespace epics { namespace pvData { @@ -573,6 +574,22 @@ const_shared_vector_cast(const shared_vector& src) } + +namespace ScalarTypeFunc { + //! Allocate an untyped array based on ScalarType + shared_vector allocArray(ScalarType id, size_t len); + + //! Allocate an untyped array based on ScalarType + template + inline + shared_vector::type> + allocArray(size_t len) + { + shared_vector raw(allocArray(ID, len)); + return static_shared_vector_cast::type>(raw); + } +} + }} // namespace epics::pvData // Global operators for shared_vector diff --git a/pvDataApp/pv/pvIntrospect.h b/pvDataApp/pv/pvIntrospect.h index f1df915..b897325 100644 --- a/pvDataApp/pv/pvIntrospect.h +++ b/pvDataApp/pv/pvIntrospect.h @@ -16,7 +16,6 @@ #include #include #include -#include namespace epics { namespace pvData { @@ -583,21 +582,5 @@ OP(pvDouble, double); OP(pvString, String); #undef OP - -namespace ScalarTypeFunc { - //! Allocate an untyped array based on ScalarType - shared_vector allocArray(ScalarType id, size_t len); - - //! Allocate an untyped array based on ScalarType - template - inline - shared_vector::type> - allocArray(size_t len) - { - shared_vector raw(allocArray(ID, len)); - return static_shared_vector_cast::type>(raw); - } -} - }} #endif /* PVINTROSPECT_H */