From 8938c3b7b2a33002b0453c67dbe48fe69762c8cd Mon Sep 17 00:00:00 2001
From: Alex Lin <alexander.s.lin@nasa.gov>
Date: Thu, 12 Apr 2018 08:41:25 -0500
Subject: [PATCH] Clang no longer supports -Wno-unused-but-set-variable #600
Removed the compile time flag.
---
include/trick/MessageThreadedCout.hh | 4 ++--
libexec/trick/make_makefile_swig | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/trick/MessageThreadedCout.hh b/include/trick/MessageThreadedCout.hh
index 640ef2a5..740fc9d1 100644
--- a/include/trick/MessageThreadedCout.hh
+++ b/include/trick/MessageThreadedCout.hh
@@ -59,9 +59,9 @@ namespace Trick {
size_t max_len ;
StringNode * next ;
StringNode(size_t str_len) : max_len(str_len) { buffer.reserve(max_len) ; } ;
- void copy( std::string &header, std::string & color_code, std::string & message ) {
+ void copy( std::string &header, std::string & in_color_code, std::string & message ) {
buffer.assign(header, 0, max_len) ;
- buffer.append(color_code, 0, max_len - buffer.length()) ;
+ buffer.append(in_color_code, 0, max_len - buffer.length()) ;
buffer.append(message, 0, max_len - buffer.length()) ;
buffer.append("\033[00m", 0, max_len - buffer.length()) ;
} ;
diff --git a/libexec/trick/make_makefile_swig b/libexec/trick/make_makefile_swig
index 72f17c2c..cf5033cd 100755
--- a/libexec/trick/make_makefile_swig
+++ b/libexec/trick/make_makefile_swig
@@ -169,10 +169,12 @@ sub write_makefile_swig() {
print PY_LINK_LIST "build/init_swig_modules.o\n" ;
print PY_LINK_LIST "build/top.o\n" ;
- print MAKEFILE "SWIG_CFLAGS := -I../include \${PYTHON_INCLUDES} -Wno-shadow -Wno-missing-field-initializers -Wno-unused-but-set-variable
+ print MAKEFILE "SWIG_CFLAGS := -I../include \${PYTHON_INCLUDES} -Wno-shadow -Wno-missing-field-initializers
ifeq (\$(IS_CC_CLANG), 1)
SWIG_CFLAGS += -Wno-self-assign -Wno-sometimes-uninitialized -Wno-deprecated-register
+else
+ SWIG_CFLAGS += -Wno-unused-but-set-variable
endif
ifndef TRICK_VERBOSE_BUILD