Attachment #634542 for bug #649700

Lines 2-8 Link Here

(-)freehdl-0.0.8.orig/fire/test-fire.cc (-1 / +1 lines)
2	#include <stdio.h>	2	#include <stdio.h>
3	#include <freehdl/fire.h>	3	#include <freehdl/fire.h>
4		4
5	using namespace std;	5	using std::cout;
6		6
7	extern tree_chunk_info fire_chunk_info;	7	extern tree_chunk_info fire_chunk_info;
8		8

Lines 7-13 Link Here

(-)freehdl-0.0.8.orig/freehdl/cdfggen-chunk.h (-1 / +3 lines)
7	#include <string>	7	#include <string>
8	#include <vector>	8	#include <vector>
9	typedef enum {to, downto} cdfgg_direction;	9	typedef enum {to, downto} cdfgg_direction;
10	using namespace std;	10	using std::string;
		11	using std::vector;
		12	using std::pair;
11		13
12	extern tree_chunk_info cdfggen_chunk_info;	14	extern tree_chunk_info cdfggen_chunk_info;
13	extern tree_ctype_info int_ctype_info;	15	extern tree_ctype_info int_ctype_info;

Lines 13-20 Link Here

(-)freehdl-0.0.8.orig/freehdl/cdfggen-chunk.t (-2 / +1 lines)
13	(header-add "#include <freehdl/tree-supp.h>"	13	(header-add "#include <freehdl/tree-supp.h>"
14	"#include <string>"	14	"#include <string>"
15	"#include <vector>"	15	"#include <vector>"
16	"typedef enum {to, downto} cdfgg_direction;"	16	"typedef enum {to, downto} cdfgg_direction;")
17	"using namespace std;")
18		17
19	(impl-add "#include <freehdl/cdfggen-chunk.h>")	18	(impl-add "#include <freehdl/cdfggen-chunk.h>")
20		19

Lines 1-6 Link Here

(-)freehdl-0.0.8.orig/freehdl/kernel-attributes.hh (+2 lines)
1	#ifndef FREEHDL_KERNEL_ATTRIBUTES_H	1	#ifndef FREEHDL_KERNEL_ATTRIBUTES_H
2	#define FREEHDL_KERNEL_ATTRIBUTES_H	2	#define FREEHDL_KERNEL_ATTRIBUTES_H
3		3
		4	using std::max;
		5
4	/* *************************************************************	6	/* *************************************************************
5	* Function kind attributes for signals	7	* Function kind attributes for signals
6	* ************************************************************* */	8	* ************************************************************* */

Lines 3-8 Link Here

(-)freehdl-0.0.8.orig/freehdl/kernel-db.hh (-5 / +18 lines)
3		3
4	#include <assert.h>	4	#include <assert.h>
5		5
		6	#include <string>
		7	#include <vector>
		8	using std::string;
		9	using std::pair;
		10	using std::vector;
6		11
7	/* This header file includes the definitions that are required to	12	/* This header file includes the definitions that are required to
8	* setup a kernel database. This database will be used by the kernel	13	* setup a kernel database. This database will be used by the kernel
Lines 39-44 Link Here
39		44
40	define_db_entry_type(driver_data, driver_data_entry)	45	define_db_entry_type(driver_data, driver_data_entry)
41		46
		47	#include <string>
		48	#include <vector>
		49	using std::string;
		50	using std::pair;
		51	using std::vector;
42		52
43	// Now, create an database explorer instance. The database explorer is	53	// Now, create an database explorer instance. The database explorer is
44	// used to search and manipulate the database. The explorer is	54	// used to search and manipulate the database. The explorer is
Lines 80-88 Link Here
80	#include <freehdl/kernel-util.hh>	90	#include <freehdl/kernel-util.hh>
81		91
82	#if !defined __GNUC__ \|\| __GNUC__ != 2	92	#if !defined __GNUC__ \|\| __GNUC__ != 2
83	#include <ext/hash_map>	93	//#include <ext/hash_map>
		94	#include <unordered_map>
84	#else	95	#else
85	#include <hash_map>	96	//#include <hash_map>
		97	#include <unordered_map>
86	#endif	98	#endif
87		99
88	// Macro used to define a key type. K is the actual type of the key	100	// Macro used to define a key type. K is the actual type of the key
Lines 254-263 Link Here
254		266
255	// A hash function template used tp generate a hash number from	267	// A hash function template used tp generate a hash number from
256	// d	268	// d
257	class db_basic_key_hash : public hash<unsigned long> {	269	class db_basic_key_hash : public std::hash<unsigned long> {
258	public:	270	public:
259	size_t operator()(const db_basic_key& x) const {	271	size_t operator()(const db_basic_key& x) const {
260	return ((hash<unsigned long> )this)(((unsigned long)x.value)>>2);	272	return ((std::hash<unsigned long> )this)(((unsigned long)x.value)>>2);
261	}	273	}
262	};	274	};
263		275
Lines 266-272 Link Here
266	class db : public db_base	278	class db : public db_base
267	{	279	{
268	// This mappes is the actual database.	280	// This mappes is the actual database.
269	typedef hash_map<void*, db_key_entry_pair, db_basic_key_hash> db_data_map_type;	281	//typedef hash_map<void*, db_key_entry_pair, db_basic_key_hash> db_data_map_type;
		282	typedef std::unordered_map<void*, db_key_entry_pair, db_basic_key_hash> db_data_map_type;
270	db_data_map_type data_map;	283	db_data_map_type data_map;
271		284
272	// The transaction id is incremented each time a new key is added or	285	// The transaction id is incremented each time a new key is added or

Lines 13-21 Link Here

(-)freehdl-0.0.8.orig/freehdl/kernel-dump.hh (-2 / +2 lines)
13	#include <string>	13	#include <string>
14	#include <fstream>	14	#include <fstream>
15		15
16	using namespace std;	16	using std::fstream;
17		17
18	typedef map<string, char*, less<string> > Tmap;	18	typedef map<string, const char*, less<string> > Tmap;
19	extern Tmap mapping_translation_table;	19	extern Tmap mapping_translation_table;
20		20
21	// For each signal which is dumped an virtual process is created. This	21	// For each signal which is dumped an virtual process is created. This

Lines 9-15 Link Here

(-)freehdl-0.0.8.orig/freehdl/kernel-fhdl-stream.hh (-1 / +3 lines)
9	#include <string>	9	#include <string>
10	#include <iostream>	10	#include <iostream>
11		11
12	using namespace std;	12	using std::istream;
		13	using std::ostream;
		14	using std::string;
13		15
14	struct fhdl_ostream_t {	16	struct fhdl_ostream_t {
15	union {	17	union {




#include <freehdl/kernel-acl.hh>
#include <freehdl/kernel-sig-info.hh>

using namespace std;
//using namespace __gnu_cxx;

// A signal_link instance describes the connection

#include <list>

#if !defined __GNUC__ || __GNUC__ != 2
//#include <ext/hash_map>
#include <unordered_map>
#else
//#include <hash_map>
#include <unordered_map>
#endif

#include <freehdl/kernel-util.hh>

};


typedef std::unordered_map<sig_info_base *, list<fl_link>, pointer_hash<sig_info_base *> > port_signal_link_map_t;

// Stores the father signal(s) of port signals
extern port_signal_link_map_t port_signal_link_map;

Lines 3-9 Link Here

(-)freehdl-0.0.8.orig/freehdl/kernel-name-stack.hh (-1 / +1 lines)
3		3
4	#include <string>	4	#include <string>
5		5
6	using namespace std;	6	using std::string;
7		7
8	#define NAME_STACK_INCREMENT 10	8	#define NAME_STACK_INCREMENT 10
9		9




#ifdef KERNEL

#if !defined __GNUC__ || __GNUC__ != 2
//#include <ext/hash_map>
#include <unordered_map>
#else
//#include <hash_map>
#include <unordered_map>
#endif

#include <list>
#include <freehdl/kernel-util.hh>
#include <freehdl/kernel-source-descriptor.hh>

using namespace std;
//using namespace __gnu_cxx;

// signal_source stores information about a source of a signal. Note

// a map stores the sources for each signal. Note that each signal is
// associated with a vector of signal_source_list pointers (included
// in signal_source_list_array).
typedef std::unordered_map<sig_info_base *, signal_source_list_array, pointer_hash<sig_info_base *> > signal_source_map_t;
extern signal_source_map_t signal_source_map;

#endif




#include <string>

#if !defined __GNUC__ || __GNUC__ != 2
//#include <ext/hash_map>
#include <unordered_map>
#else
//#include <hash_map>
#include <unordered_map>
#endif

using std::stringstream;
using std::string;


#if !defined __GNUC__ || __GNUC__ != 2
//using namespace __gnu_cxx;
#endif

// A hash function template used tp generate a hash number from
// pointer values.
template<class T>
class pointer_hash : public std::hash<unsigned long> {
public:
  size_t operator()(const T& x) const {
    return (*(std::hash<unsigned long> *)this)(((unsigned long)x)>>2);
  }
};

Lines 1-7 Link Here

(-)freehdl-0.0.8.orig/freehdl/std.h (-1 lines)
1	#ifndef FREEHDL_STD_H	1	#ifndef FREEHDL_STD_H
2	#define FREEHDL_STD_H	2	#define FREEHDL_STD_H
3		3
4	using namespace std;
5		4
6	#include <freehdl/std-standard.hh>	5	#include <freehdl/std-standard.hh>
7	#include <freehdl/std-vhdl-types.hh>	6	#include <freehdl/std-vhdl-types.hh>

Lines 6-18 Link Here

(-)freehdl-0.0.8.orig/freehdl/std-vhdl-types.hh (-1 / +12 lines)
6	#include <float.h>	6	#include <float.h>
7	#include <math.h>	7	#include <math.h>
8	#include <iostream>	8	#include <iostream>
		9	#include <map>
		10	#include <list>
		11	#include <functional>
9	#include <string.h>	12	#include <string.h>
10		13
11	#include <freehdl/std-memory.hh>	14	#include <freehdl/std-memory.hh>
12	#include <freehdl/kernel-error.hh>	15	#include <freehdl/kernel-error.hh>
13	#include <freehdl/kernel-acl.hh>	16	#include <freehdl/kernel-acl.hh>
14		17
15	using namespace std;	18	using std::string;
		19	using std::istream;
		20	using std::ostream;
		21	using std::min;
		22	using std::map;
		23	using std::stringstream;
		24	using std::list;
		25	using std::less;
		26	using std::iostream;
16		27
17	typedef long long int lint;	28	typedef long long int lint;
18	const int BUFFER_STREAM_SIZE_INCREMENT = 1024;	29	const int BUFFER_STREAM_SIZE_INCREMENT = 1024;

Lines 32-38 Link Here

(-)freehdl-0.0.8.orig/freehdl/vaul-lexer.h (-1 lines)
32	#include <stdarg.h>	32	#include <stdarg.h>
33	#include <string.h>	33	#include <string.h>
34		34
35	using namespace std;
36		35
37	#undef yyFlexLexer	36	#undef yyFlexLexer
38	#define yyFlexLexer vaul_FlexLexer	37	#define yyFlexLexer vaul_FlexLexer

Lines 5-10 Link Here

(-)freehdl-0.0.8.orig/kernel/attributes.cc (+1 lines)
5	#include <freehdl/kernel-kernel-class.hh>	5	#include <freehdl/kernel-kernel-class.hh>
6	#include <freehdl/kernel-reader-info.hh>	6	#include <freehdl/kernel-reader-info.hh>
7	#include <freehdl/kernel-driver-info.hh>	7	#include <freehdl/kernel-driver-info.hh>
		8	using std::max;
8	#include <freehdl/kernel-attributes.hh>	9	#include <freehdl/kernel-attributes.hh>
9		10
10		11

Lines 1-6 Link Here

(-)freehdl-0.0.8.orig/kernel/db.cc (-1 lines)
1	#define KERNEL // Include internal kernel definitions	1	#define KERNEL // Include internal kernel definitions
2		2
3	using namespace std;
4	#include <freehdl/kernel-db.hh>	3	#include <freehdl/kernel-db.hh>
5		4
6		5

Lines 7-12 Link Here

(-)freehdl-0.0.8.orig/kernel/fhdl_stream.cc (+3 lines)
7	#include <freehdl/kernel-error.hh>	7	#include <freehdl/kernel-error.hh>
8	#include <freehdl/kernel-fhdl-stream.hh>	8	#include <freehdl/kernel-fhdl-stream.hh>
9		9
		10	using std::cin;
		11	using std::cout;
		12	using std::stringstream;
10		13
11	// Error stream to output error messages generated by the kernel,	14	// Error stream to output error messages generated by the kernel,
12	// e.g. to print error messages due to invalid simulator commands	15	// e.g. to print error messages due to invalid simulator commands




#include <freehdl/kernel-resolver-process.hh>
#include <freehdl/kernel-resolver-descriptor.hh>
#include <freehdl/kernel-fhdl-stream.hh>
#include <algorithm>

using std::cerr;
using std::pair;
using std::binary_function;

using std::cerr;
using std::pair;
using std::binary_function;

// Arguments that are passed in form the command line
int main_argc;

  // list associated with the various reader infos. Identical lists
  // are replaced by appropriate pointers to a single list in order to
  // save memory.
  typedef std::unordered_multimap<unsigned int, reader_info *> wait_elements_map_t;
  wait_elements_map_t wait_elements_map;

  // Setup connection to the kernel data base

Lines 34-39 Link Here

(-)freehdl-0.0.8.orig/kernel/main.cc (+9 lines)
34	#include <freehdl/kernel-error.hh>	34	#include <freehdl/kernel-error.hh>
35	#include <freehdl/kernel-fhdl-stream.hh>	35	#include <freehdl/kernel-fhdl-stream.hh>
36		36
		37	using std::ios;
		38	using std::ifstream;
		39	using std::ofstream;
		40	using std::ostringstream;
		41	using std::cin;
		42	using std::cerr;
		43	using std::cout;
		44	using std::endl;
		45
37	#ifdef PERFMON_STATISTICS	46	#ifdef PERFMON_STATISTICS
38	#include "pcounter.hh"	47	#include "pcounter.hh"
39	#endif	48	#endif

Lines 3-8 Link Here

(-)freehdl-0.0.8.orig/kernel/map_list.cc (+6 lines)
3	#include <freehdl/kernel-error.hh>	3	#include <freehdl/kernel-error.hh>
4	#include <freehdl/kernel-sig-info.hh>	4	#include <freehdl/kernel-sig-info.hh>
5	#include <freehdl/kernel-resolver-descriptor.hh>	5	#include <freehdl/kernel-resolver-descriptor.hh>
		6	#include <algorithm>
		7
		8
		9	using std::max;
		10
		11	using std::max;
6		12
7	// Stores the father signal(s) of port signals	13	// Stores the father signal(s) of port signals
8	port_signal_link_map_t port_signal_link_map;	14	port_signal_link_map_t port_signal_link_map;

Lines 1-8 Link Here

(-)freehdl-0.0.8.orig/kernel/name_stack.cc (+2 lines)
1	#include <stdlib.h>	1	#include <stdlib.h>
2	#include <stdio.h>	2	#include <stdio.h>
		3	#include <stack>
3	#include <freehdl/kernel-error.hh>	4	#include <freehdl/kernel-error.hh>
4	#include <freehdl/kernel-name-stack.hh>	5	#include <freehdl/kernel-name-stack.hh>
5		6
		7	using std::stack;
6		8
7	name_stack instance_name;	9	name_stack instance_name;
8		10

Lines 3-8 Link Here

(-)freehdl-0.0.8.orig/kernel/persistent_cdfg_dump.cc (+1 lines)
3	#include <freehdl/kernel-persistent-cdfg-dump.hh>	3	#include <freehdl/kernel-persistent-cdfg-dump.hh>
4	#include <freehdl/kernel-persistent-dump.hh>	4	#include <freehdl/kernel-persistent-dump.hh>
5		5
		6	using std::endl;
6		7
7	buffer_stream register_cdfg_tmp_buffer;	8	buffer_stream register_cdfg_tmp_buffer;
8		9

Lines 1-6 Link Here

(-)freehdl-0.0.8.orig/kernel/sig_info.cc (-1 lines)
1	#define KERNEL // Include internal kernel definitions	1	#define KERNEL // Include internal kernel definitions
2		2
3	using namespace std;
4	#include <freehdl/kernel-error.hh>	3	#include <freehdl/kernel-error.hh>
5	#include <freehdl/kernel-db.hh>	4	#include <freehdl/kernel-db.hh>
6	#include <freehdl/kernel-sig-info.hh>	5	#include <freehdl/kernel-sig-info.hh>

Lines 10-15 Link Here

(-)freehdl-0.0.8.orig/std/internal_textio.cc (+4 lines)
10	#include <freehdl/kernel-name-stack.hh>	10	#include <freehdl/kernel-name-stack.hh>
11	#include <freehdl/kernel-register.hh>	11	#include <freehdl/kernel-register.hh>
12		12
		13	using std::ios;
		14	using std::cin;
		15	using std::cout;
		16
13	/* package :std:textio */	17	/* package :std:textio */
14		18
15	/* Definitions for access type :std:textio:line */	19	/* Definitions for access type :std:textio:line */

Lines 12-17 Link Here

(-)freehdl-0.0.8.orig/std/vhdl_types.cc (+3 lines)
12	#include <freehdl/kernel-register.hh>	12	#include <freehdl/kernel-register.hh>
13		13
14		14
		15	using std::ios;
		16	using std::ifstream;
		17	using std::ofstream;
15		18
16	/* *************************************************************	19	/* *************************************************************
17	* Some global functions	20	* Some global functions

Lines 34-40 Link Here

(-)freehdl-0.0.8.orig/v2cc/mapping.cc (-1 / +6 lines)
34	#include <iostream>	34	#include <iostream>
35	#include <stdlib.h>	35	#include <stdlib.h>
36		36
37	using namespace std;	37	using std::string;
		38	using std::list;
		39	using std::map;
		40	using std::istream;
		41	using std::ifstream;
		42	using std::cerr;
38		43
39	v2cc_mapper::v2cc_mapper ()	44	v2cc_mapper::v2cc_mapper ()
40	{	45	{

Lines 35-41 Link Here

(-)freehdl-0.0.8.orig/v2cc/v2cc.cc (-1 lines)
35		35
36	*/	36	*/
37		37
38	using namespace std;
39		38
40	#if HAVE_MALLOC_H	39	#if HAVE_MALLOC_H
41	#include <malloc.h>	40	#include <malloc.h>

Lines 16-21 Link Here

(-)freehdl-0.0.8.orig/v2cc/v2cc-const-fold.cc (+3 lines)
16	#include "v2cc-util.h"	16	#include "v2cc-util.h"
17		17
18		18
		19	using std::cerr;
		20	using std::max;
		21	using std::min;
19		22
20	// Used to generate error messages	23	// Used to generate error messages
21	extern vaul_error_printer codegen_error;	24	extern vaul_error_printer codegen_error;

Lines 13-18 Link Here

(-)freehdl-0.0.8.orig/v2cc/v2cc-decl.cc (+3 lines)
13	#include "mapping.h"	13	#include "mapping.h"
14	#include "v2cc-util.h"	14	#include "v2cc-util.h"
15		15
		16	using std::endl;
		17	using std::min;
		18	using std::max;
16		19
17	void test (RegionStack &rstack)	20	void test (RegionStack &rstack)
18	{	21	{

Lines 15-21 Link Here

(-)freehdl-0.0.8.orig/v2cc/v2cc-explore.cc (-1 lines)
15	#include "mapping.h"	15	#include "mapping.h"
16	#include "v2cc-util.h"	16	#include "v2cc-util.h"
17		17
18	using namespace std;
19		18
20	// Used to generate error messages	19	// Used to generate error messages
21	extern vaul_error_printer codegen_error;	20	extern vaul_error_printer codegen_error;




#ifndef V2CC_HEADER
#define V2CC_HEADER

using std::vector;
using std::list;
using std::string;
using std::pair;
using std::string;
using std::set;
using std::less;
using std::deque;
using std::binary_function;
using std::map;
using std::binary_function;

#include <freehdl/vaul.h>
#include "mapping.h"

Lines 4-9 Link Here

(-)freehdl-0.0.8.orig/v2cc/v2cc-qid.cc (+1 lines)
4	#include "v2cc-util.h"	4	#include "v2cc-util.h"
5		5
6		6
		7	using std::endl;
7		8
8	// ******************************************************************************************	9	// ******************************************************************************************
9	// Name: m_qid , generic function	10	// Name: m_qid , generic function

Lines 9-14 Link Here

(-)freehdl-0.0.8.orig/v2cc/v2cc-util.cc (+3 lines)
9		9
10	#include "v2cc-util.h"	10	#include "v2cc-util.h"
11		11
		12	using std::endl;
		13	using std::hex;
		14	using std::dec;
12		15
13	// ******************************************************************************************	16	// ******************************************************************************************
14	// Some global variables	17	// Some global variables




#ifndef V2CC_UTIL_H 
#define V2CC_UTIL_H

using namespace std;

#include <sstream>
#include <iomanip>
#include <freehdl/vaul.h>
#include "v2cc-chunk.h"
#include <type_traits>

using std::stringstream;
using std::setprecision;
using std::showpoint;
using std::ofstream;
using std::cout;
using std::to_string;

// ******************************************************************************************
// Some global variables


/* Convert an integer value into a string */
template <class T>
//inline string
inline typename std::enable_if<!std::is_floating_point<T>::value, std::string>::type
to_string(T i)
{
  stringstream lstr;

  return lstr.str();
}


/*
inline string
to_string(double i)
{

    return str + ".0";
#endif
}
*/

/* Print scalar value into a string */
string

Lines 86-92 Link Here

(-)freehdl-0.0.8.orig/vaul/bison-parser.cc (-1 lines)
86	#include <malloc.h>	86	#include <malloc.h>
87	#endif	87	#endif
88		88
89	using namespace std;
90		89
91	#define YYINITDEPTH 10000	90	#define YYINITDEPTH 10000
92	#define YYMAXDEPTH 100000	91	#define YYMAXDEPTH 100000

Lines 49-55 Link Here

(-)freehdl-0.0.8.orig/vaul/bison-parser.yy (-1 lines)
49	#include <malloc.h>	49	#include <malloc.h>
50	#endif	50	#endif
51		51
52	using namespace std;
53		52
54	#define YYINITDEPTH 10000	53	#define YYINITDEPTH 10000
55	#define YYMAXDEPTH 100000	54	#define YYMAXDEPTH 100000

Lines 27-33 Link Here

(-)freehdl-0.0.8.orig/vaul/printer.cc (-1 / +2 lines)
27	#include <string.h>	27	#include <string.h>
28	#include <sstream>	28	#include <sstream>
29		29
30	using namespace std;	30	using std::ostringstream;
		31	using std::ostream;
31		32
32	void vaul_printer::printf (const char *fmt, ...)	33	void vaul_printer::printf (const char *fmt, ...)
33	{	34	{

Lines 31-37 Link Here

(-)freehdl-0.0.8.orig/vaul/tree.cc (-1 / +1 lines)
31	#include <assert.h>	31	#include <assert.h>
32	#include <stdlib.h>	32	#include <stdlib.h>
33		33
34	using namespace std;	34	using std::ostream;
35		35
36	vaul_id_set::vaul_id_set(int dummy)	36	vaul_id_set::vaul_id_set(int dummy)
37	{	37	{

Return to bug 649700

Lines 7-13 Link Here

(-)freehdl-0.0.8.orig/freehdl/kernel-map-list.hh (-4 / +5 lines)
7	#include <freehdl/kernel-acl.hh>	7	#include <freehdl/kernel-acl.hh>
8	#include <freehdl/kernel-sig-info.hh>	8	#include <freehdl/kernel-sig-info.hh>
9		9
10	using namespace std;
11	//using namespace __gnu_cxx;	10	//using namespace __gnu_cxx;
12		11
13	// A signal_link instance describes the connection	12	// A signal_link instance describes the connection
Lines 163-171 Link Here
163	#include <list>	162	#include <list>
164		163
165	#if !defined __GNUC__ \|\| __GNUC__ != 2	164	#if !defined __GNUC__ \|\| __GNUC__ != 2
166	#include <ext/hash_map>	165	//#include <ext/hash_map>
		166	#include <unordered_map>
167	#else	167	#else
168	#include <hash_map>	168	//#include <hash_map>
		169	#include <unordered_map>
169	#endif	170	#endif
170		171
171	#include <freehdl/kernel-util.hh>	172	#include <freehdl/kernel-util.hh>
Lines 262-268 Link Here
262	};	263	};
263		264
264		265
265	typedef hash_map<sig_info_base , list<fl_link>, pointer_hash<sig_info_base > > port_signal_link_map_t;	266	typedef std::unordered_map<sig_info_base , list<fl_link>, pointer_hash<sig_info_base > > port_signal_link_map_t;
266		267
267	// Stores the father signal(s) of port signals	268	// Stores the father signal(s) of port signals
268	extern port_signal_link_map_t port_signal_link_map;	269	extern port_signal_link_map_t port_signal_link_map;

Lines 4-19 Link Here

(-)freehdl-0.0.8.orig/freehdl/kernel-signal-source-list-array.hh (-4 / +5 lines)
4	#ifdef KERNEL	4	#ifdef KERNEL
5		5
6	#if !defined __GNUC__ \|\| __GNUC__ != 2	6	#if !defined __GNUC__ \|\| __GNUC__ != 2
7	#include <ext/hash_map>	7	//#include <ext/hash_map>
		8	#include <unordered_map>
8	#else	9	#else
9	#include <hash_map>	10	//#include <hash_map>
		11	#include <unordered_map>
10	#endif	12	#endif
11		13
12	#include <list>	14	#include <list>
13	#include <freehdl/kernel-util.hh>	15	#include <freehdl/kernel-util.hh>
14	#include <freehdl/kernel-source-descriptor.hh>	16	#include <freehdl/kernel-source-descriptor.hh>
15		17
16	using namespace std;
17	//using namespace __gnu_cxx;	18	//using namespace __gnu_cxx;
18		19
19	// signal_source stores information about a source of a signal. Note	20	// signal_source stores information about a source of a signal. Note
Lines 105-111 Link Here
105	// a map stores the sources for each signal. Note that each signal is	106	// a map stores the sources for each signal. Note that each signal is
106	// associated with a vector of signal_source_list pointers (included	107	// associated with a vector of signal_source_list pointers (included
107	// in signal_source_list_array).	108	// in signal_source_list_array).
108	typedef hash_map<sig_info_base , signal_source_list_array, pointer_hash<sig_info_base > > signal_source_map_t;	109	typedef std::unordered_map<sig_info_base , signal_source_list_array, pointer_hash<sig_info_base > > signal_source_map_t;
109	extern signal_source_map_t signal_source_map;	110	extern signal_source_map_t signal_source_map;
110		111
111	#endif	112	#endif

Lines 10-33 Link Here

(-)freehdl-0.0.8.orig/freehdl/kernel-util.hh (-6 / +10 lines)
10	#include <string>	10	#include <string>
11		11
12	#if !defined __GNUC__ \|\| __GNUC__ != 2	12	#if !defined __GNUC__ \|\| __GNUC__ != 2
13	#include <ext/hash_map>	13	//#include <ext/hash_map>
		14	#include <unordered_map>
14	#else	15	#else
15	#include <hash_map>	16	//#include <hash_map>
		17	#include <unordered_map>
16	#endif	18	#endif
17		19
18	using namespace std;	20	using std::stringstream;
		21	using std::string;
		22
19		23
20	#if !defined __GNUC__ \|\| __GNUC__ != 2	24	#if !defined __GNUC__ \|\| __GNUC__ != 2
21	using namespace __gnu_cxx;	25	//using namespace __gnu_cxx;
22	#endif	26	#endif
23		27
24	// A hash function template used tp generate a hash number from	28	// A hash function template used tp generate a hash number from
25	// pointer values.	29	// pointer values.
26	template<class T>	30	template<class T>
27	class pointer_hash : public hash<unsigned long> {	31	class pointer_hash : public std::hash<unsigned long> {
28	public:	32	public:
29	size_t operator()(const T& x) const {	33	size_t operator()(const T& x) const {
30	return ((hash<unsigned long> )this)(((unsigned long)x)>>2);	34	return ((std::hash<unsigned long> )this)(((unsigned long)x)>>2);
31	}	35	}
32	};	36	};

Lines 15-20 Link Here

(-)freehdl-0.0.8.orig/kernel/kernel_class.cc (-1 / +10 lines)
15	#include <freehdl/kernel-resolver-process.hh>	15	#include <freehdl/kernel-resolver-process.hh>
16	#include <freehdl/kernel-resolver-descriptor.hh>	16	#include <freehdl/kernel-resolver-descriptor.hh>
17	#include <freehdl/kernel-fhdl-stream.hh>	17	#include <freehdl/kernel-fhdl-stream.hh>
		18	#include <algorithm>
		19
		20	using std::cerr;
		21	using std::pair;
		22	using std::binary_function;
		23
		24	using std::cerr;
		25	using std::pair;
		26	using std::binary_function;
18		27
19	// Arguments that are passed in form the command line	28	// Arguments that are passed in form the command line
20	int main_argc;	29	int main_argc;
Lines 678-684 Link Here
678	// list associated with the various reader infos. Identical lists	687	// list associated with the various reader infos. Identical lists
679	// are replaced by appropriate pointers to a single list in order to	688	// are replaced by appropriate pointers to a single list in order to
680	// save memory.	689	// save memory.
681	typedef hash_multimap<unsigned int, reader_info *> wait_elements_map_t;	690	typedef std::unordered_multimap<unsigned int, reader_info *> wait_elements_map_t;
682	wait_elements_map_t wait_elements_map;	691	wait_elements_map_t wait_elements_map;
683		692
684	// Setup connection to the kernel data base	693	// Setup connection to the kernel data base

Lines 1-7 Link Here

(-)freehdl-0.0.8.orig/v2cc/v2cc.h (-1 / +11 lines)
1	#ifndef V2CC_HEADER	1	#ifndef V2CC_HEADER
2	#define V2CC_HEADER	2	#define V2CC_HEADER
3		3
4	using namespace std;	4	using std::vector;
		5	using std::list;
		6	using std::string;
		7	using std::pair;
		8	using std::string;
		9	using std::set;
		10	using std::less;
		11	using std::deque;
		12	using std::binary_function;
		13	using std::map;
		14	using std::binary_function;
5		15
6	#include <freehdl/vaul.h>	16	#include <freehdl/vaul.h>
7	#include "mapping.h"	17	#include "mapping.h"

Lines 2-13 Link Here

(-)freehdl-0.0.8.orig/v2cc/v2cc-util.h (-2 / +13 lines)
2	#ifndef V2CC_UTIL_H	2	#ifndef V2CC_UTIL_H
3	#define V2CC_UTIL_H	3	#define V2CC_UTIL_H
4		4
5	using namespace std;
6		5
7	#include <sstream>	6	#include <sstream>
8	#include <iomanip>	7	#include <iomanip>
9	#include <freehdl/vaul.h>	8	#include <freehdl/vaul.h>
10	#include "v2cc-chunk.h"	9	#include "v2cc-chunk.h"
		10	#include <type_traits>
		11
		12	using std::stringstream;
		13	using std::setprecision;
		14	using std::showpoint;
		15	using std::ofstream;
		16	using std::cout;
		17	using std::to_string;
11		18
12	// ******************************************************************************************	19	// ******************************************************************************************
13	// Some global variables	20	// Some global variables
Lines 242-248 Link Here
242		249
243	/* Convert an integer value into a string */	250	/* Convert an integer value into a string */
244	template <class T>	251	template <class T>
245	inline string	252	//inline string
		253	inline typename std::enable_if<!std::is_floating_point<T>::value, std::string>::type
246	to_string(T i)	254	to_string(T i)
247	{	255	{
248	stringstream lstr;	256	stringstream lstr;
Lines 250-255 Link Here
250	return lstr.str();	258	return lstr.str();
251	}	259	}
252		260
		261
		262	/*
253	inline string	263	inline string
254	to_string(double i)	264	to_string(double i)
255	{	265	{
Lines 266-271 Link Here
266	return str + ".0";	276	return str + ".0";
267	#endif	277	#endif
268	}	278	}
		279	*/
269		280
270	/* Print scalar value into a string */	281	/* Print scalar value into a string */
271	string	282	string