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

moved pvType.h from misc to pv.

Browse Source 
Made changes to make it clear that is defining the pvData primitive types for pvData.
This commit is contained in:
Marty Kraimer
2011-01-28 08:22:46 -05:00
parent 62e0495c3d
commit ad9633c8f6
10 changed files with 312 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvDataApp/Makefile
+1 -1
View File
@@ -5,7 +5,6 @@ PVDATA = $(TOP)/pvDataApp/
SRC_DIRS += $(PVDATA)/misc
INC += pvType.h
INC += noDefaultMethods.h
INC += linkedListVoid.h
INC += linkedList.h
@@ -46,6 +45,7 @@ LIBSRCS += StatusCreateFactory.cpp
SRC_DIRS += $(PVDATA)/pv
INC += pvType.h
INC += pvIntrospect.h
INC += pvData.h
INC += convert.h
pvDataApp/misc/pvType.h
-28
View File
@@ -1,28 +0,0 @@
/* pvType.h */
/**
* Copyright - See the COPYRIGHT that is included with this distribution.
* EPICS pvDataCPP is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
*/
#include <string>
#ifndef PVTYPE_H
#define PVTYPE_H
namespace epics { namespace pvData {
typedef signed char int8;
typedef short int16;
typedef int int32;
typedef long long int64;
typedef unsigned int uint32;
typedef unsigned long long uint64;
typedef std::string String;
typedef std::string * StringBuilder;
typedef String* StringArray;
}}
#endif /* PVTYPE_H */
pvDataApp/pv/pvData.h
+1 -8
View File
@@ -9,6 +9,7 @@
#include <map>
#ifndef PVDATA_H
#define PVDATA_H
#include "pvType.h"
#include "pvIntrospect.h"
#include "noDefaultMethods.h"
#include "requester.h"
@@ -49,14 +50,6 @@ typedef PVStructure * PVStructurePtr;
typedef PVStructurePtr* PVStructurePtrArray;
typedef PVField* PVFieldPtr;
typedef PVFieldPtr * PVFieldPtrArray;
typedef bool * BooleanArray;
typedef int8 * ByteArray;
typedef int16 * ShortArray;
typedef int32 * IntArray;
typedef int64 * LongArray;
typedef float * FloatArray;
typedef double * DoubleArray;
//typedef String * StringArray; already defined in pvType.h
class PVAuxInfo : private NoDefaultMethods {
public:
pvDataApp/pv/pvType.h
+46
View File
@@ -0,0 +1,46 @@
/* pvType.h */
/**
* Copyright - See the COPYRIGHT that is included with this distribution.
* EPICS pvDataCPP is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
*/
/* Definitions for the primitive types for pvData.
* It also defines the arrays of the primitive types
*/
#include <string>
#include <stdint.h>
#ifndef PVTYPE_H
#define PVTYPE_H
namespace epics { namespace pvData {
typedef bool boolean;
typedef int8_t int8;
typedef int16_t int16;
typedef int32_t int32;
typedef int64_t int64;
typedef uint32_t uint32;
typedef uint64_t uint64;
// float and double are types
typedef std::string String;
typedef bool * BooleanArray;
typedef int8 * ByteArray;
typedef int16 * ShortArray;
typedef int32 * IntArray;
typedef int64 * LongArray;
typedef float * FloatArray;
typedef double * DoubleArray;
typedef String* StringArray;
// convenience definition for toString methods
typedef std::string * StringBuilder;
}}
#endif /* PVTYPE_H */