From aca7976b8770aa7464bdba717d508372732f0e39 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 13:05:04 -0700
Subject: [PATCH] Update to build on Xcode 6.0: turn BACK ON warnings as errors
for overloaded virtuals [-Woverloaded-virtual] and fix up first (of many)
files
---
indra/cmake/00-Common.cmake | 2 +-
indra/llcommon/llfile.cpp | 2 +-
indra/llcommon/llfile.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 008e27f0610..39e318fa6b5 100755
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -213,7 +213,7 @@ if (LINUX OR DARWIN)
set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
elseif (CMAKE_COMPILER_IS_CLANGXX)
# These unused warnings really ought to be cleaned up over time
- set(UNUSED_WARNINGS "-Wno-overloaded-virtual")
+ # set(UNUSED_WARNINGS "-Wno-overloaded-virtual")
set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs ${UNUSED_WARNINGS}")
endif()
diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp
index 259187c52f6..aabc195ba8e 100755
--- a/indra/llcommon/llfile.cpp
+++ b/indra/llcommon/llfile.cpp
@@ -807,7 +807,7 @@ std::streamsize llstdio_filebuf::xsgetn(char_type* __s, std::streamsize __n)
return __ret;
}
-std::streamsize llstdio_filebuf::xsputn(char_type* __s, std::streamsize __n)
+std::streamsize llstdio_filebuf::xsputn(const char_type* __s, std::streamsize __n)
{
// Optimization in the always_noconv() case, to be generalized in the
// future: when __n is sufficiently large we write directly instead of
diff --git a/indra/llcommon/llfile.h b/indra/llcommon/llfile.h
index f56b22bf9af..0612071d674 100755
--- a/indra/llcommon/llfile.h
+++ b/indra/llcommon/llfile.h
@@ -188,7 +188,7 @@ class LL_COMMON_API llstdio_filebuf : public _Myfb
/*virtual*/ int sync();
std::streamsize xsgetn(char_type*, std::streamsize);
- std::streamsize xsputn(char_type*, std::streamsize);
+ std::streamsize xsputn(const char_type*, std::streamsize);
#endif
};
--
GitLab