Changeset 4feee0a in git


Ignore:
Timestamp:
Jul 16, 2009, 9:58:46 AM (14 years ago)
Author:
Christian Eder
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
40f856763215f79e7dbf5992da04ba55904357b1
Parents:
0179d569cebe4081f964479a71818cd5d80626ee
Message:
fixed inlining


git-svn-id: file:///usr/local/Singular/svn/trunk@11982 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • kernel/F5cData.cc

    r0179d5 r4feee0a  
    3535
    3636// constructor / destructor of class Label
    37 Label::Label(unsigned int* expVec) {
     37Label::Label(int* expVec) {
    3838  m_pExpVec       = expVec;
    3939  m_nShortExpVec  = computeShortExpVec(m_pExpVec);
    … …  
    4646
    4747
    48 // GETTER of class Label
    49 unsigned int* Label::getExpVec() {
    50   return m_pExpVec;
    51 }
    52 
    53 unsigned long Label::getShortExpVec() {
    54   return m_nShortExpVec;
    55 }
    56 
    57 
    58 // SETTER of class Label
    59 
    6048
    6149// MISC of class Label
    62 unsigned long Label::computeShortExpVec(unsigned int* expVec) {
     50unsigned long Label::computeShortExpVec(int* expVec) {
    6351  //if (p == NULL) return 0;
    6452  unsigned long ev = 0; // short exponent vector
    … …  
    10290}
    10391
    104 unsigned long Label::getBitFields(unsigned int e, unsigned int s, unsigned int n) {
     92unsigned long Label::getBitFields(int e, unsigned int s, unsigned int n) {
    10593#define Sy_bit_L(x)     (((unsigned long)1L)<<(x))
    10694  unsigned int i = 0;

  • kernel/F5cData.h

    r0179d5 r4feee0a  
    4646class Label {
    4747  private:
    48     unsigned int* m_pExpVec;
     48    int* m_pExpVec;
    4949    unsigned long m_nShortExpVec;
    5050  public:
    … …  
    5454     * \brief Constructor of an object of class \c Label
    5555     */
    56     Label(unsigned int* expVec);
     56    Label(int* expVec);
    5757    /*!
    5858     * \fn ~Label();
    … …  
    6565     * \brief Getter of the \c integer vector at the address \c m_pExpVec
    6666     */
    67     inline unsigned int* getExpVec();
     67    inline int* getExpVec();
    6868    /*!
    6969     * \fn static inline long getShortExpVec();
    … …  
    8383     * polys as input data.
    8484     */
    85     inline unsigned long computeShortExpVec(unsigned int* expVec);
     85    unsigned long computeShortExpVec(int* expVec);
    8686    /*!
    8787     * \fn static inline unsigned long getBitFields(int e, unsigned int s,
    … …  
    101101     * polys as input data.
    102102     */
    103     inline unsigned long getBitFields(unsigned int e, unsigned int s, unsigned int n);
     103    unsigned long getBitFields(int e, unsigned int s, unsigned int n);
    104104}; // end Label
    105105
    … …  
    143143
    144144}; // end LPoly
     145
     146
     147// ---INLINE IMPLEMENTATIONS OF LABEL---
     148
     149// GETTER of class Label
     150int* Label::getExpVec() {
     151  return m_pExpVec;
     152}
     153
     154unsigned long Label::getShortExpVec() {
     155  return m_nShortExpVec;
     156}
     157
     158
     159// SETTER of class Label
     160
     161// ---END LABEL IMPLEMENTATIONS---
     162
    145163#endif
    146164// HAVE_F5C
Note: See TracChangeset for help on using the changeset viewer.