fix dependencies between include files

This commit is contained in:
Marty Kraimer
2010-11-09 14:38:34 -05:00
parent 5a7438e028
commit 5b4c642b5b
5 changed files with 8 additions and 8 deletions

View File

@@ -1,7 +1,6 @@
/* linkedList.h */
#ifndef LINKEDLIST_H
#define LINKEDLIST_H
#include "pvIntrospect.h"
#include "linkedListVoid.h"
namespace epics { namespace pvData {

View File

@@ -4,10 +4,10 @@
#include <cstddef>
#include <string>
#include <cstdio>
#include <stdexcept>
#include "lock.h"
#include "pvType.h"
#include "pvIntrospect.h"
#include "linkedListVoid.h"
namespace epics { namespace pvData {

View File

@@ -1,8 +1,8 @@
/* linkedListVoid.h */
#include "pvType.h"
#ifndef LINKEDLISTVOID_H
#define LINKEDLISTVOID_H
#include "pvIntrospect.h"
#include "noDefaultMethods.h"
namespace epics { namespace pvData {
class LinkedListVoid;

View File

@@ -1,4 +1,5 @@
/* pvType.h */
#include <string>
#ifndef PVTYPE_H
#define PVTYPE_H
@@ -11,6 +12,10 @@ namespace epics { namespace pvData {
typedef unsigned int uint32;
typedef unsigned long long uint64;
typedef std::string String;
typedef std::string * StringBuilder;
typedef String* StringArray;
}}
#endif /* PVTYPE_H */

View File

@@ -13,10 +13,6 @@ namespace epics { namespace pvData {
class Structure;
class StructureArray;
typedef std::string String;
typedef std::string * StringBuilder;
typedef String* StringArray;
typedef Field const * FieldConstPtr;
typedef FieldConstPtr * FieldConstPtrArray;
typedef Scalar const * ScalarConstPtr;