Ignore:
Timestamp:
Sep 28, 2010, 1:19:10 PM (14 years ago)
Author:
rosiere
Message:

1) compatible gcc 4.4.3
2) Translation file in MORPHEO_PREFIX directory

Location:
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Multiplier/src/Multiplier_transition.cpp

    r116 r144  
    184184          default :
    185185            {
     186              data.LSB = 0;
     187              data.MSB = 0;
     188
    186189              break;
    187190            }
  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Shifter/src/Shifter.cpp

    r132 r144  
    88#include "Behavioural/Generic/Shifter/include/Shifter.h"
    99
    10 namespace morpheo                    {
     10namespace morpheo {
    1111namespace behavioural {
    1212namespace generic {
    1313namespace shifter {
    14 
    1514
    1615#undef  FUNCTION
     
    8180        sensitive << (*(in_SHIFTER_CARRY     [i]));
    8281        if (param->_carry       == external_completion)
    83           if (_param->_type_completion_bool == true)
    84             sensitive << (*(in_SHIFTER_CARRY_IN  [i]));
    85           else
    86             sensitive << (*(in_SHIFTER_COMPLETION[i]));
     82          {// BURP : ajout de la parenthèse
     83            if (_param->_type_completion_bool == true)
     84              sensitive << (*(in_SHIFTER_CARRY_IN  [i]));
     85            else
     86              sensitive << (*(in_SHIFTER_COMPLETION[i]));
     87          }
    8788      }
    8889
  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Sort/src/Sort_genMealy.cpp

    r132 r144  
    88
    99#include "Behavioural/Generic/Sort/include/Sort.h"
     10#include <algorithm>
    1011
    1112namespace morpheo                    {
Note: See TracChangeset for help on using the changeset viewer.