Merge pull request #559 from mantidproject/11509_xcode_6p3_fixes

Fixes for Xcode 6.3
mantidproject · Apr 10, 2015 · fa6491d · fa6491d
2 parents 972d076 + d932e33
commit fa6491d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/src/Segfault.cpp b/Code/Mantid/Framework/Algorithms/src/Segfault.cpp
@@ -48,16 +48,9 @@ void Segfault::exec() {
   g_log.error("Crashing mantid now");
 
   if (!dryrun) {
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++11-compat-deprecated-writable-strings"
-#endif
-    // writing to read-only memory
-    char *s = "hello world";
-    *s = 'H';
-#if __clang__
-#pragma clang diagnostic pop
-#endif
+    // NULL pointer dereference
+    int *ptr = NULL;
+    *ptr = 1;
   }
 }
 

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/BinaryOperations.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/BinaryOperations.cpp
@@ -143,7 +143,7 @@ namespace Mantid
       alg->setChild(false);
       alg->initialize();
       alg->setProperty<double>("DataValue",value);
-      const std::string & tmp_name("__tmp_binary_operation_double");
+      const std::string tmp_name("__tmp_binary_operation_double");
       alg->setPropertyValue("OutputWorkspace", tmp_name);
       alg->execute();
       MatrixWorkspace_sptr singleValue;