From 5b4c642b5bb7b96205af0f4bd280a2a9cbd39f4e Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Tue, 9 Nov 2010 14:38:34 -0500
Subject: [PATCH] fix dependencies between include files

---
 pvDataApp/misc/linkedList.h       | 1 -
 pvDataApp/misc/linkedListVoid.cpp | 2 +-
 pvDataApp/misc/linkedListVoid.h   | 4 ++--
 pvDataApp/misc/pvType.h           | 5 +++++
 pvDataApp/pv/pvIntrospect.h       | 4 ----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pvDataApp/misc/linkedList.h b/pvDataApp/misc/linkedList.h
index 40380fa..8dbf33b 100644
--- a/pvDataApp/misc/linkedList.h
+++ b/pvDataApp/misc/linkedList.h
@@ -1,7 +1,6 @@
 /* linkedList.h */
 #ifndef LINKEDLIST_H
 #define LINKEDLIST_H
-#include "pvIntrospect.h"
 #include "linkedListVoid.h"
 namespace epics { namespace pvData { 
 
diff --git a/pvDataApp/misc/linkedListVoid.cpp b/pvDataApp/misc/linkedListVoid.cpp
index bd0a96f..6840850 100644
--- a/pvDataApp/misc/linkedListVoid.cpp
+++ b/pvDataApp/misc/linkedListVoid.cpp
@@ -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 { 
diff --git a/pvDataApp/misc/linkedListVoid.h b/pvDataApp/misc/linkedListVoid.h
index 1c0c315..e37e56d 100644
--- a/pvDataApp/misc/linkedListVoid.h
+++ b/pvDataApp/misc/linkedListVoid.h
@@ -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;
diff --git a/pvDataApp/misc/pvType.h b/pvDataApp/misc/pvType.h
index bc76ec6..7fb3a5d 100644
--- a/pvDataApp/misc/pvType.h
+++ b/pvDataApp/misc/pvType.h
@@ -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 */
 
diff --git a/pvDataApp/pv/pvIntrospect.h b/pvDataApp/pv/pvIntrospect.h
index 84c67c0..df05c2b 100644
--- a/pvDataApp/pv/pvIntrospect.h
+++ b/pvDataApp/pv/pvIntrospect.h
@@ -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;