From 9e1ebf8d0fbb9107cdade2d5a9071aa88d715ce3 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Fri, 30 May 2014 12:36:50 -0500
Subject: [PATCH] Clean up build warnings from Darwin (clang).

---
 src/ca/client/iocinf.h                      | 4 +---
 src/ca/client/oldAccess.h                   | 2 +-
 src/ca/client/tcpiiu.cpp                    | 2 ++
 src/ca/legacy/pcas/generic/casStrmClient.cc | 2 --
 src/libCom/log/logClient.c                  | 3 ---
 src/libCom/osi/devLibVME.c                  | 2 --
 src/libCom/test/epicsCalcTest.cpp           | 8 ++++----
 7 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/ca/client/iocinf.h b/src/ca/client/iocinf.h
index 8a26fdbf5..c0c33d6c2 100644
--- a/src/ca/client/iocinf.h
+++ b/src/ca/client/iocinf.h
@@ -63,9 +63,7 @@ static const unsigned contiguousMsgCountWhichTriggersFlowControl = 10u;
 
 class caErrorCode { 
 public:
-    caErrorCode ( int status ) : code ( status ) {};
-private:
-    int code;
+    caErrorCode ( int ) {};
 };
 
 /*
diff --git a/src/ca/client/oldAccess.h b/src/ca/client/oldAccess.h
index 19074e27f..04f551839 100644
--- a/src/ca/client/oldAccess.h
+++ b/src/ca/client/oldAccess.h
@@ -591,7 +591,7 @@ void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO (
     }
     else {
         // dont reverse the lock hierarchy
-        epicsGuardRelease < epicsMutex > guardRelease ();
+        epicsGuardRelease < epicsMutex > guardRelease ( guard );
         {
             //
             // we will definately stall out here if all of the
diff --git a/src/ca/client/tcpiiu.cpp b/src/ca/client/tcpiiu.cpp
index 377e3ac3c..58b1b0c0f 100644
--- a/src/ca/client/tcpiiu.cpp
+++ b/src/ca/client/tcpiiu.cpp
@@ -44,8 +44,10 @@
 
 using namespace std;
 
+#if 0
 const unsigned mSecPerSec = 1000u;
 const unsigned uSecPerSec = 1000u * mSecPerSec;
+#endif
 
 tcpSendThread::tcpSendThread ( 
         class tcpiiu & iiuIn, const char * pName, 
diff --git a/src/ca/legacy/pcas/generic/casStrmClient.cc b/src/ca/legacy/pcas/generic/casStrmClient.cc
index 849cf3cfa..6b1de3629 100644
--- a/src/ca/legacy/pcas/generic/casStrmClient.cc
+++ b/src/ca/legacy/pcas/generic/casStrmClient.cc
@@ -34,8 +34,6 @@ const nothrow_t  nothrow ;
 }
 #endif
 
-static const caHdr nill_msg = { 0u, 0u, 0u, 0u, 0u, 0u };
-
 casStrmClient::pCASMsgHandler const casStrmClient::msgHandlers[] =
 {
     & casStrmClient::versionAction,
diff --git a/src/libCom/log/logClient.c b/src/libCom/log/logClient.c
index 6aa223b5d..ee1c9209f 100644
--- a/src/libCom/log/logClient.c
+++ b/src/libCom/log/logClient.c
@@ -34,9 +34,6 @@
 
 #include "logClient.h"
 
-static const int logClientSuccess = 0;
-static const int logClientError = -1;
-
 typedef struct {
     char                msgBuf[0x4000];
     struct sockaddr_in  addr;
diff --git a/src/libCom/osi/devLibVME.c b/src/libCom/osi/devLibVME.c
index f59de68a7..a935e4857 100644
--- a/src/libCom/osi/devLibVME.c
+++ b/src/libCom/osi/devLibVME.c
@@ -20,8 +20,6 @@
  * .01  06-14-93    joh needs devAllocInterruptVector() routine
  */
 
-static const char sccsID[] = "@(#) $Revision-Id$";
-
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/libCom/test/epicsCalcTest.cpp b/src/libCom/test/epicsCalcTest.cpp
index 12bc585f0..4d01666e8 100644
--- a/src/libCom/test/epicsCalcTest.cpp
+++ b/src/libCom/test/epicsCalcTest.cpp
@@ -407,8 +407,8 @@ MAIN(epicsCalcTest)
     testExpr(MAX( 1., 2.,Inf, 4., 5., 3.));
     testExpr(MAX( 1.,Inf, 3., 4., 5., 2.));
     testExpr(MAX(Inf, 2., 3., 4., 5., 1.));
-    testExpr(MAX(1,2,3,4,5,6,7,8,9,10));
-    testExpr(MAX(5,4,3,2,1,0,-1,-2,-3,-4));
+    testExpr(MAX(1,2,3,4,5,6,7,8,9,10,11,12));
+    testExpr(MAX(5,4,3,2,1,0,-1,-2,-3,-4,-5,-6));
     testExpr(MAX(-1,1,0));
 
     testExpr(MIN(99));
@@ -468,8 +468,8 @@ MAIN(epicsCalcTest)
     testExpr(MIN( 1., 2.,-Inf, 4., 5., 3.));
     testExpr(MIN( 1.,-Inf, 3., 4., 5., 2.));
     testExpr(MIN(-Inf, 2., 3., 4., 5., 1.));
-    testExpr(MIN(1,2,3,4,5,6,7,8,9,10));
-    testExpr(MIN(5,4,3,2,1,0,-1,-2,-3,-4));
+    testExpr(MIN(1,2,3,4,5,6,7,8,9,10,11,12));
+    testExpr(MIN(5,4,3,2,1,0,-1,-2,-3,-4,-5,-6));
     testExpr(MIN(1,-1,0));
     testExpr(MAX(MIN(0,2),MAX(0),MIN(3,2,1)));