From ee652b583c5d2af3b47c1c3d6896c64a6518caa6 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 14:54:04 -0700
Subject: Update to build on Xcode 6.0: how did this ever compile...

---
 indra/llvfs/llvfs_objc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llvfs')

diff --git a/indra/llvfs/llvfs_objc.h b/indra/llvfs/llvfs_objc.h
index 90101eb2e9..56cdbebfc5 100755
--- a/indra/llvfs/llvfs_objc.h
+++ b/indra/llvfs/llvfs_objc.h
@@ -40,4 +40,4 @@ std::string* getSystemResourceFolder();
 std::string* getSystemExecutableFolder();
 
 
-#endif LL_LLVFS_OBJC_H
+#endif // LL_LLVFS_OBJC_H
-- 
cgit v1.2.3


From f29280923974021f36365db386e37448b720d4f6 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 14:57:22 -0700
Subject: Update to build on Xcode 6.0: variable (result) can be unitialized if
 condition is false [-Wsometimes-uninitialized]

---
 indra/llvfs/llvfs_objc.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llvfs')

diff --git a/indra/llvfs/llvfs_objc.mm b/indra/llvfs/llvfs_objc.mm
index 47b0e73978..d66c440367 100755
--- a/indra/llvfs/llvfs_objc.mm
+++ b/indra/llvfs/llvfs_objc.mm
@@ -48,7 +48,7 @@ std::string* findSystemDirectory(NSSearchPathDirectory searchPathDirectory,
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     
-    std::string *result;
+    std::string *result="";
     NSString *path = nil;
     
     // Search for the path
-- 
cgit v1.2.3


From 6fadab686dc60190b842942f9f0478d8b665c906 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 15:00:14 -0700
Subject: Update to build on Xcode 6.0: variable (result) can be unitialized if
 condition is false (TAKE 2) [-Wsometimes-uninitialized]

---
 indra/llvfs/llvfs_objc.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llvfs')

diff --git a/indra/llvfs/llvfs_objc.mm b/indra/llvfs/llvfs_objc.mm
index d66c440367..282ea41339 100755
--- a/indra/llvfs/llvfs_objc.mm
+++ b/indra/llvfs/llvfs_objc.mm
@@ -48,7 +48,7 @@ std::string* findSystemDirectory(NSSearchPathDirectory searchPathDirectory,
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     
-    std::string *result="";
+    std::string *result = nil;
     NSString *path = nil;
     
     // Search for the path
-- 
cgit v1.2.3


From 77d7edd415bad394a9311b86937d124123badf19 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 15:07:19 -0700
Subject: Update to build on Xcode 6.0: using an assignment in an expressions
 without parens

---
 indra/llvfs/lldiriterator.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/llvfs')

diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp
index a9d96c9807..76296ff877 100755
--- a/indra/llvfs/lldiriterator.cpp
+++ b/indra/llvfs/lldiriterator.cpp
@@ -127,7 +127,8 @@ bool LLDirIterator::Impl::next(std::string &fname)
 		{
 			boost::smatch match;
 			std::string name = mIter->path().filename().string();
-			if (found = boost::regex_match(name, match, mFilterExp))
+			found = boost::regex_match(name, match, mFilterExp);
+			if (found)
 			{
 				fname = name;
 			}
-- 
cgit v1.2.3