consolidate definitions of STRING_DELIM

Nicholas Reed · Nicholas Reed · commit 0ffd0d7ac208 · 2012-05-15T22:04:21.000Z
diff --git a/src/clstepcore/STEPaggregate.cc b/src/clstepcore/STEPaggregate.cc
@@ -20,8 +20,6 @@
 
 const int Real_Num_Precision = REAL_NUM_PRECISION; // from STEPattribute.h
 
-#define STRING_DELIM '\''
-
 
 /******************************************************************************
 **    \file STEPaggregate.cc Functions for manipulating aggregate attributes
diff --git a/src/clstepcore/read_func.cc b/src/clstepcore/read_func.cc
@@ -1,9 +1,9 @@
 
-#include <errordesc.h>
 #include <stdio.h>
-#include <sdai.h>
-#include <read_func.h>
-#include <STEPattribute.h>
+#include "errordesc.h"
+#include "sdai.h"
+#include "read_func.h"
+#include "STEPattribute.h"
 
 const int RealNumPrecision = REAL_NUM_PRECISION;
 
diff --git a/src/clstepcore/sdai.h b/src/clstepcore/sdai.h
@@ -18,19 +18,19 @@
 * values for the EXPRESS base types.
 */
 
-#include <scl_cf.h>
+#include "scl_cf.h"
 
 extern const char * SCLversion;
 
 #include <ctype.h>
 #include <string>
 
 
-#include <dictdefs.h>
+#include "dictdefs.h"
 
-#include <baseType.h>
-#include <Str.h>
-#include <errordesc.h>
+#include "baseType.h"
+#include "Str.h"
+#include "errordesc.h"
 
 typedef std::string Express_id;
 
@@ -39,7 +39,7 @@ class EntityDescriptor;
 class SelectTypeDescriptor;
 class InstMgr;
 
-#include <STEPattributeList.h>
+#include "STEPattributeList.h"
 
 class STEPattributeList;
 class STEPattribute;
@@ -48,14 +48,6 @@ class STEPattribute;
 #define BINARY_DELIM '\"'
 #endif
 
-#ifndef STRING_DELIM
-#define STRING_DELIM '\''
-#endif
-
-//  STRING
-#define S_STRING_NULL        ""
-
-
 typedef long           SDAI_Integer;
 typedef short          SDAI_Short;
 typedef unsigned short SDAI_UShort;
diff --git a/src/clutils/Str.h b/src/clutils/Str.h
@@ -13,9 +13,6 @@
 * and is not subject to copyright.
 */
 
-/* $Id: Str.h,v 3.0.1.3 1997/11/05 22:33:52 sauderd DP3.1 $  */
-
-
 #include <ctype.h>
 
 //#include <std.h> // not found in CenterLine C++
@@ -27,6 +24,10 @@
 #include <string.h>
 #include <errordesc.h>
 
+#ifndef STRING_DELIM
+#define STRING_DELIM '\''
+#endif
+
 char         ToLower( const char c );
 char         ToUpper( const char c );
 char    *    StrToLower( const char *, char * );
