From 7b483e69d842aea1bf89ea5f0813aedfda6a5e55 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Wed, 23 Sep 2015 11:53:00 +0200
Subject: [PATCH] vhdlpp: Minor changes.

---
 vhdlpp/std_funcs.cc       | 3 ++-
 vhdlpp/std_types.cc       | 6 +++---
 vhdlpp/std_types.h        | 1 -
 vhdlpp/subprogram_emit.cc | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vhdlpp/std_funcs.cc b/vhdlpp/std_funcs.cc
index 7d7a5ab91..b75aa1ae0 100644
--- a/vhdlpp/std_funcs.cc
+++ b/vhdlpp/std_funcs.cc
@@ -141,7 +141,8 @@ void preload_std_funcs(void)
     fn_resize = new SubprogramSizeCast(perm_string::literal("resize"));
     std_subprograms[fn_resize->name()] = fn_resize;
 
-    /* function conv_std_logic_vector
+    /* std_logic_arith library
+     * function conv_std_logic_vector(arg: integer; size: integer) return std_logic_vector;
      */
     fn_conv_std_logic_vector = new SubprogramSizeCast(perm_string::literal("conv_std_logic_vector"));
     std_subprograms[fn_conv_std_logic_vector->name()] = fn_conv_std_logic_vector;
diff --git a/vhdlpp/std_types.cc b/vhdlpp/std_types.cc
index 311c74f1e..0454a65e0 100644
--- a/vhdlpp/std_types.cc
+++ b/vhdlpp/std_types.cc
@@ -21,9 +21,9 @@
 #include "std_types.h"
 #include "scope.h"
 
-static std::map<perm_string, VTypeDef*> std_types;
+static map<perm_string, VTypeDef*> std_types;
 // this list contains enums used by typedefs in the std_types map
-static std::list<const VTypeEnum*> std_enums;
+static list<const VTypeEnum*> std_enums;
 
 const VTypePrimitive primitive_BIT(VTypePrimitive::BIT, true);
 const VTypePrimitive primitive_INTEGER(VTypePrimitive::INTEGER);
@@ -45,7 +45,7 @@ const VTypeArray primitive_UNSIGNED(&primitive_STDLOGIC,        vector<VTypeArra
 void generate_global_types(ActiveScope*res)
 {
     // boolean
-      std::list<perm_string>*enum_BOOLEAN_vals = new std::list<perm_string>;
+      list<perm_string>*enum_BOOLEAN_vals = new list<perm_string>;
       enum_BOOLEAN_vals->push_back(perm_string::literal("false"));
       enum_BOOLEAN_vals->push_back(perm_string::literal("true"));
       VTypeEnum*enum_BOOLEAN = new VTypeEnum(enum_BOOLEAN_vals);
diff --git a/vhdlpp/std_types.h b/vhdlpp/std_types.h
index 72bfa2075..80aef1e17 100644
--- a/vhdlpp/std_types.h
+++ b/vhdlpp/std_types.h
@@ -29,7 +29,6 @@ bool is_global_type(perm_string type_name);
 void delete_global_types();
 const VTypeEnum*find_std_enum_name(perm_string name);
 
-extern const VTypePrimitive primitive_BOOLEAN;
 extern const VTypePrimitive primitive_BIT;
 extern const VTypePrimitive primitive_INTEGER;
 extern const VTypePrimitive primitive_NATURAL;
diff --git a/vhdlpp/subprogram_emit.cc b/vhdlpp/subprogram_emit.cc
index 6c880e90f..907550475 100644
--- a/vhdlpp/subprogram_emit.cc
+++ b/vhdlpp/subprogram_emit.cc
@@ -31,7 +31,7 @@ int SubprogramBody::emit_package(ostream&fd) const
 
       for (map<perm_string,Variable*>::const_iterator cur = new_variables_.begin()
          ; cur != new_variables_.end() ; ++cur) {
-        // Workaround to enable reg_flag for variables
+        // Enable reg_flag for variables
         cur->second->count_ref_sequ();
         errors += cur->second->emit(fd, NULL, NULL);
       }