vhdlpp: Workaround to avoid translation of variables to wires in functions.

vhdlpp/subprogram_emit.cc

@@ -62,7 +62,8 @@ int Subprogram::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
+        cur->second->count_ref_sequ();
         errors += cur->second->emit(fd, NULL, NULL);
       }
 

vhdlpp/vtype.h

@@ -86,7 +86,7 @@ class VType {
       virtual bool can_be_packed() const { return false; }
 
     private:
-      friend class decl_t;
+      friend struct decl_t;
 	// This virtual method is called to emit the declaration. This
 	// is used by the decl_t object to emit variable/wire/port declarations.
       virtual int emit_decl(std::ostream&out, perm_string name, bool reg_flag) const;