From 2bc8d36a55adce0f4338e17dd87b3bbb7be9c753 Mon Sep 17 00:00:00 2001
From: sam hatchett <samhatchett@gmail.com>
Date: Thu, 23 May 2013 19:40:56 -0400
Subject: [PATCH] vars and project settings -- incorporating lemon tiger
 changes

---
 .../epanet/epanet.xcodeproj/project.pbxproj   | 22 +++++++++++++------
 src/hash.h                                    |  4 ++++
 src/vars.h                                    |  1 +
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/build/Xcode/epanet/epanet.xcodeproj/project.pbxproj b/build/Xcode/epanet/epanet.xcodeproj/project.pbxproj
index bb0c2b8..b5b34ba 100644
--- a/build/Xcode/epanet/epanet.xcodeproj/project.pbxproj
+++ b/build/Xcode/epanet/epanet.xcodeproj/project.pbxproj
@@ -219,6 +219,9 @@
 /* Begin PBXProject section */
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0460;
+			};
 			buildConfigurationList = 1DEB914E08733D8E0010E9CD /* Build configuration list for PBXProject "epanet" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
@@ -295,10 +298,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = lib;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -312,6 +315,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EXECUTABLE_PREFIX = lib;
 				GCC_MODEL_TUNING = G5;
@@ -326,14 +330,18 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = macinclude;
 				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
 				SDKROOT = "";
 			};
 			name = Debug;
@@ -342,12 +350,16 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = macinclude;
-				PREBINDING = NO;
 				SDKROOT = "";
 			};
 			name = Release;
@@ -358,14 +370,12 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = CLE;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_PREPROCESSOR_DEFINITIONS = "";
 				INSTALL_PATH = /usr/local/bin;
-				PREBINDING = NO;
 				PRODUCT_NAME = runepanet;
 			};
 			name = Debug;
@@ -376,13 +386,11 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_PREPROCESSOR_DEFINITIONS = CLE;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_PREPROCESSOR_DEFINITIONS = "";
 				INSTALL_PATH = /usr/local/bin;
-				PREBINDING = NO;
 				PRODUCT_NAME = runepanet;
 				ZERO_LINK = NO;
 			};
diff --git a/src/hash.h b/src/hash.h
index 8195afd..38999d1 100755
--- a/src/hash.h
+++ b/src/hash.h
@@ -4,6 +4,9 @@
 **
 */
 
+#ifndef HASH_H
+#define HASH_H
+
 #define HTMAXSIZE 1999
 #define NOTFOUND  0
 
@@ -22,3 +25,4 @@ int 	HTfind(HTtable *, char *);
 char    *HTfindKey(HTtable *, char *);
 void	HTfree(HTtable *);
 	
+#endif
\ No newline at end of file
diff --git a/src/vars.h b/src/vars.h
index ef15924..6ca5be4 100755
--- a/src/vars.h
+++ b/src/vars.h
@@ -150,6 +150,7 @@ EXTERN double   *D,                    /* Node actual demand           */
                 *K,                    /* Link settings                */
                 *Q,                    /* Link flows                   */
                 *R,                    /* Pipe reaction rate           */
+                *X,                    /* General purpose array        */
                 *XC;                    /* General purpose array        */
 EXTERN double   *H;                    /* Node heads                   */
 EXTERN double *QTankVolumes;