Ignore:
Timestamp:
Apr 15, 2009, 8:40:22 PM (16 years ago)
Author:
nipo
Message:

Sync up with trunk changes

Location:
branches/with_autoconf/src
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • branches/with_autoconf/src/alias.cc

    r8 r20  
    3434
    3535#include "alias.h"
    36 #include <string>
    37 //#include <cstdarg.h>
    38 //#include <cstdio.h>
    3936#include <iostream>
    4037#ifdef HAVE_CONFIG_H

  • branches/with_autoconf/src/bit2string.cc

    r8 r20  
    66|                                                             |
    77| Author  :                 Kingbo Paul-Jerome                |
     8|                           Buchmann Richard                  |
    89|                                                             |
    910| Date    :                   09_07_2004                      |
    … …  
    3637#include "bit2string.h"
    3738#include "sc_unit.h"
    38 #include <string>
    39 #include <stdarg.h>
    40 #include <stdio.h>
    41 #include <stdlib.h>
     39#include <cstdarg>
     40#include <cstdio>
     41#include <cstdlib>
    4242#include <iostream>
    4343#ifdef HAVE_CONFIG_H

  • branches/with_autoconf/src/dump_used_env.cc

    r8 r20  
    3434 */
    3535
     36#include <cstdlib>
    3637#include "dump_used_env.h"
    3738#ifdef HAVE_CONFIG_H

  • branches/with_autoconf/src/entity.cc

    r8 r20  
    3535 */
    3636
     37#include <cstring>
    3738#include <iomanip>
    3839#include <list>

  • branches/with_autoconf/src/gen_code.cc

    r10 r20  
    3434 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    3535 */
    36 
    37 #include <stdio.h>
    38 #include <stdlib.h>
     36#if defined(__linux__)
     37#include <linux/limits.h>
     38#elif defined(WIN32)
     39#include <windows.h>
     40#endif
     41#include <cstring>
     42#include <cstdio>
     43#include <cstdlib>
    3944#include <iostream>
    4045#include <fstream>
    … …  
    267272  o << "// generated by " << sc_version () << endl
    268273                << "#include <casc.h>\n\n"
    269                 << "#include <stdio.h>\n\n"
     274                << "#include <cstdio>\n\n"
    270275//              << "#include <iostream>\n\n"
    271276                << "namespace sc_core {\n"
    … …  
    328333  o << "// generated by " << sc_version () << endl
    329334                << "#include <casc.h>\n\n"
    330                 << "#include <stdio.h>\n\n"
     335                << "#include <cstdio>\n\n"
    331336//              << "#include <iostream>\n\n"
    332337                << "namespace sc_core {\n"

  • branches/with_autoconf/src/graph.cc

    r8 r20  
    105105 */
    106106
    107 #include <stdio.h>
     107#include <cstdio>
     108#include <cstring>
    108109#include <map>
    109 #include <string>
    110110
    111111#include "graph.h"

  • branches/with_autoconf/src/graph_cass.cc

    r8 r20  
    118118#include <iostream>
    119119#include <fstream>
    120 #include <stdio.h>
     120#include <cstdio>
     121#include <cstring>
    121122#include <map>
    122123#include <string>

  • branches/with_autoconf/src/graph_signals.cc

    r8 r20  
    130130 */
    131131
    132 #include <stdio.h>
     132#include <cstdio>
    133133#include <map>
    134 #include <string>
    135134
    136135#include "graph_signals.h"

  • branches/with_autoconf/src/hex2string.cc

    r8 r20  
    3636#include "hex2string.h"
    3737
    38 #include <string>
     38//#include <string>
    3939#include <stdarg.h>
    40 #include <stdio.h>
    41 #include <stdlib.h>
     40#include <cstdio>
     41#include <cstdlib>
    4242#include <iostream>
    4343#ifdef HAVE_CONFIG_H

  • branches/with_autoconf/src/internal.h

    r1 r20  
    1515#include "internal_ext.h"
    1616#include <map>
     17#include <string>
     18#include <vector>
    1719
    1820namespace sc_core {

  • branches/with_autoconf/src/module_hierarchy.cc

    r8 r20  
    4141#include "config.h"
    4242#endif
     43#include <cstdlib>
     44#include <cstring>
    4345
    4446using namespace std;

  • branches/with_autoconf/src/port_dependency.cc

    r8 r20  
    3434 */
    3535
     36#include <cstring>
    3637#include <list>
    3738#include <iostream>

  • branches/with_autoconf/src/sc_event.h

    r8 r20  
    1414
    1515#include "sc_fwd.h"
     16#include <iostream>
    1617
    1718namespace sc_core {

  • branches/with_autoconf/src/sc_interface.cc

    r8 r20  
    4242#include "config.h"
    4343#endif
     44#include <cstdlib>  //exit
    4445
    4546using namespace std;

  • branches/with_autoconf/src/sc_main.cc

    r8 r20  
    3636
    3737#include <sstream>
    38 #include <string>
    3938#include <list>
    4039#include <set>
     40#include <cstring> // strcmp
     41
    4142#include "internal.h"
    4243#include "global_functions.h"

  • branches/with_autoconf/src/sc_module.cc

    r8 r20  
    3535 */
    3636
     37#include <stdarg.h>
     38#include <vector>
     39#include <set>
    3740
    3841#include "sc_module.h"
    … …  
    4144#include "module_hierarchy.h"
    4245#include "serialization.h" // set_save_handler
    43 #include <stdarg.h>
    44 #include <vector>
    45 #include <string>
    46 #include <set>
    4746#include "sc_port.h"
    4847#include "sc_signal.h"

  • branches/with_autoconf/src/sc_object.cc

    r8 r20  
    3535
    3636
    37 #include <stdio.h>
     37#include <cstdio>
     38#include <cstring> //strdup
    3839#include <string>
    3940#include <map>

  • branches/with_autoconf/src/sc_pat_trace.cc

    r8 r20  
    4141#include "internal.h" // notrace
    4242
    43 #include <time.h>
    44 #include <string>
     43#include <ctime>
    4544#ifdef HAVE_CONFIG_H
    4645#include "config.h"
    … …  
    5655
    5756//#include "malloc.h" // NO LONGER SUPPORTED
    58 #include <stdlib.h>
    59 #include "stdio.h"
     57#include <cstdlib>
     58#include <cstdio>
    6059
    6160//-----------------------------------------

  • branches/with_autoconf/src/sc_port.cc

    r8 r20  
    3737
    3838#include <iomanip>
    39 #include <list>
    4039#include <map>
    41 #include <vector>
    4240
    4341#include "sc_port.h"

  • branches/with_autoconf/src/sc_port_ext.h

    r8 r20  
    1616// Define registers writing method
    1717#include <iostream>
     18#include <cstdlib>
    1819#include "sc_fwd.h"
    1920#include "sc_nbdefs.h"

  • branches/with_autoconf/src/sc_signal.h

    r8 r20  
    1616// Define registers writing method
    1717#include <iostream>
     18#include <cstdlib>
    1819#include "sc_fwd.h"
    1920#include "sc_nbdefs.h"

  • branches/with_autoconf/src/sc_time.cc

    r8 r20  
    3636
    3737#include "sc_time.h"
    38 #include <time.h>
     38#include <ctime>
    3939#include <sys/time.h>
    4040#include <string>

  • branches/with_autoconf/src/sc_trace.cc

    r8 r20  
    4444
    4545#include <list>
    46 #include <stdio.h>
     46#include <cstdio>
    4747#include <iostream>
     48#include <cstring> //strlen
    4849#ifdef HAVE_CONFIG_H
    4950#include "config.h"
    … …  
    6263
    6364//#include "malloc.h" // NO LONGER SUPPORTED
    64 #include <stdlib.h>
    65 #include <stdio.h>
     65#include <cstdlib>
     66#include <cstdio>
    6667
    6768#endif // CONFIG_PAT_TRACE_FORMAT

  • branches/with_autoconf/src/sc_uint.h

    r8 r20  
    1818#include <sc_logic.h>
    1919#include <sc_bv.h>
     20#include <cstdlib>
    2021
    2122// ----------------------------------------------------------------------------
    … …  
    126127  sc_uint ()                { val = 0; }
    127128//  sc_uint (data_type val_)  { val = 0; write (val_); }
    128   sc_uint (const char *a)   { val = 0; write (atoi (a)); }
     129  sc_uint (const char *a)   { val = 0; write (std::atoi (a)); }
    129130  sc_uint (unsigned short a){ val = 0; write (a); }
    130131  sc_uint (short a)         { val = 0; write (a); }

  • branches/with_autoconf/src/sc_vcd_trace.cc

    r8 r20  
    4242#include <cassert>
    4343
    44 #include <time.h>
     44#include <ctime>
    4545#include <string>
    4646#ifdef HAVE_CONFIG_H

  • branches/with_autoconf/src/sc_ver.cc

    r8 r20  
    3636
    3737#include "sc_ver.h"
    38 #include <string>
    3938#include <iostream>
    4039#ifdef HAVE_CONFIG_H
    4140#include "config.h"
    4241#endif
     42#include <cstring> //strcmp
     43#include <cstdlib> //exit
    4344
    4445namespace sc_core {

  • branches/with_autoconf/src/schedulers.cc

    r8 r20  
    3636
    3737#include <iostream>
     38#include <algorithm> //std::sort
    3839#include "sc_module.h" // method_process_t
    3940#include "gen_code.h"  // gen_scheduling_code_for_dynamic_link & gen_scheduling_code_for_static_func

  • branches/with_autoconf/src/serialization.cc

    r8 r20  
    3535
    3636
    37 #include <vector>
    3837#include <map>
    39 #include <fstream> // save_module_hierarchy
     38#include <fstream>
     39//#include <vector> // save_module_hierarchy
     40
    4041#include "internal_ext.h" // tab_t
    4142#include "serialization.h"

  • branches/with_autoconf/src/signal_dependency.cc

    r8 r20  
    3434 */
    3535
    36 #include <set>
    3736#include <iostream>
    3837#include <fstream>
     38
    3939#include "signal_dependency.h"
    4040#include "simplify_string.h"
Note: See TracChangeset for help on using the changeset viewer.