[Pkg-electronics-commits] [gnucap] 21/43: clang: fix warnings that show when using clang

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository gnucap.

commit 624a241ce3b67d7c6e8b7a60d5113231b6c27db3
Author: al davis <ad211 at freeelectron.net>
Date:   Tue Apr 18 17:07:19 2017 -0400

    clang: fix warnings that show when using clang
---
 include/l_dispatcher.h     |  2 +-
 include/patchlev.h         |  2 +-
 lib/d_subckt.cc            | 14 ++++----------
 lib/m_expression_reduce.cc |  3 ++-
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/include/l_dispatcher.h b/include/l_dispatcher.h
index c99a825..d4f0be8 100644
--- a/include/l_dispatcher.h
+++ b/include/l_dispatcher.h
@@ -55,7 +55,7 @@ public:
     _map = NULL;
   }
 
-  typedef typename std::map<std::string, CKT_BASE*>::const_iterator const_iterator;
+  typedef std::map<std::string, CKT_BASE*>::const_iterator const_iterator;
   //class const_iterator : public std::map<std::string, CKT_BASE*>::const_iterator {};
 
   const_iterator begin()const		{assert(_map); return _map->begin();}
diff --git a/include/patchlev.h b/include/patchlev.h
index 5e8f9c3..20956be 100644
--- a/include/patchlev.h
+++ b/include/patchlev.h
@@ -1 +1 @@
-#define PATCHLEVEL "clang-bsd 2017.04.16"
+#define PATCHLEVEL "clang 2017.04.18"
diff --git a/lib/d_subckt.cc b/lib/d_subckt.cc
index 2d2650d..ebee784 100644
--- a/lib/d_subckt.cc
+++ b/lib/d_subckt.cc
@@ -86,10 +86,10 @@ public:
   explicit	DEV_SUBCKT_PROTO();
 		~DEV_SUBCKT_PROTO(){}
 public: // override virtual
-  char		id_letter()const	{untested();untested();return '\0';}
+  char		id_letter()const	{untested();return '\0';}
   CARD*		clone_instance()const;
   bool		print_type_in_spice()const {unreachable(); return false;}
-  std::string   value_name()const	{incomplete(); return "";}
+  std::string   value_name()const	{untested();incomplete(); return "";}
   std::string   dev_type()const		{untested(); return "";}
   int		max_nodes()const	{return PORTS_PER_SUBCKT;}
   int		min_nodes()const	{return 0;}
@@ -119,13 +119,7 @@ private: // no-ops for prototype
   bool do_tr(){ return true;}
   bool tr_needs_eval()const{untested(); return false;}
   void tr_queue_eval(){}
-  std::string port_name(int)const {return "";}
-public:
-  static int	count()			{return _count;}
-
-private:
-  node_t	_nodes[PORTS_PER_SUBCKT];
-  static int	_count;
+  std::string port_name(int)const {untested();return "";}
 } pp;
 DISPATCHER<CARD>::INSTALL d1(&device_dispatcher, "X|subckt", &pp);
 /*--------------------------------------------------------------------------*/
@@ -184,7 +178,7 @@ std::string DEV_SUBCKT::port_name(int i)const
   if (const DEV_SUBCKT* p=dynamic_cast<const DEV_SUBCKT*>(_parent)) {
     if (i<p->net_nodes()){
       return p->port_value(i);
-    }else{ 
+    }else{untested(); 
       return "";
     }
   }else if(_parent){untested(); untested();
diff --git a/lib/m_expression_reduce.cc b/lib/m_expression_reduce.cc
index 3952bf0..ece1428 100644
--- a/lib/m_expression_reduce.cc
+++ b/lib/m_expression_reduce.cc
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
  *------------------------------------------------------------------
- * Reconstructs an infix expression from the RPN.
+ * Constructs a simplified (reduced) version of an expression.
  * Incomplete:
  *	Expressions in arg-lists print as ####false####
  *	Not sure what should happen when expression is empty
@@ -277,6 +277,7 @@ void Token_UNARY::stack_op(Expression* E)const
 void Token_CONSTANT::stack_op(Expression* E)const
 {
   unreachable();
+  (void)(E);
   assert(E);
 }
 /*--------------------------------------------------------------------------*/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gnucap.git