diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-04-25 13:18:27 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-04-25 13:18:27 -0400 |
| commit | 88bc54192fa274bb1617801e4aeddbbf4e9e7944 (patch) | |
| tree | d72c7f65a8bae92accf7fc90f502408d5ea34889 | |
| parent | c09669da921f24e8e2693d8652fc56465d5fa19c (diff) | |
Get Mac building. Unused variable in boost and missing return
value which wasn't caught in other environments.
| -rw-r--r-- | indra/llcorehttp/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | indra/llcorehttp/_thread.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index 8d21007ca0..b3f2d8234c 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -58,6 +58,11 @@ set(llcorehttp_HEADER_FILES set_source_files_properties(${llcorehttp_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) +if (APPLE) + # Boost headers define unused members so... + set_source_files_properties(${llcorehttp_SOURCE_FILES} + PROPERTIES COMPILE_FLAGS -Wno-unused-variable) +endif (APPLE) list(APPEND llcorehttp_SOURCE_FILES ${llcorehttp_HEADER_FILES}) diff --git a/indra/llcorehttp/_thread.h b/indra/llcorehttp/_thread.h index 5960f0dcdb..0937d698c7 100644 --- a/indra/llcorehttp/_thread.h +++ b/indra/llcorehttp/_thread.h @@ -91,7 +91,7 @@ public: inline bool joinable() const { - mThread->joinable(); + return mThread->joinable(); } private: |