Commit ebe79c0b authored by unknown's avatar unknown
Browse files

Compile fixes for irix

parent ec9cd4ec

ndb/include/util/Bitmask.hpp

+19 −19
Original line number Diff line number Diff line
@@ -488,14 +488,14 @@ template <unsigned size> 
inline void

BitmaskPOD<size>::assign(const typename BitmaskPOD<size>::Data & src)

{

  assign(rep.data, src.data);

  BitmaskPOD<size>::assign(rep.data, src.data);

}



template <unsigned size>

inline void

BitmaskPOD<size>::assign(const BitmaskPOD<size> & src)

{

  assign(rep.data, src.rep.data);

  BitmaskPOD<size>::assign(rep.data, src.rep.data);

}



template <unsigned size>
@@ -523,7 +523,7 @@ template <unsigned size> 
inline bool

BitmaskPOD<size>::get(unsigned n) const

{

  return get(rep.data, n);

  return BitmaskPOD<size>::get(rep.data, n);

}



template <unsigned size>
@@ -537,7 +537,7 @@ template <unsigned size> 
inline void

BitmaskPOD<size>::set(unsigned n, bool value)

{

  set(rep.data, n, value);

  BitmaskPOD<size>::set(rep.data, n, value);

}



template <unsigned size>
@@ -551,7 +551,7 @@ template <unsigned size> 
inline void

BitmaskPOD<size>::set(unsigned n)

{

  set(rep.data, n);

  BitmaskPOD<size>::set(rep.data, n);

}



template <unsigned size>
@@ -565,7 +565,7 @@ template <unsigned size> 
inline void

BitmaskPOD<size>::set()

{

  set(rep.data);

  BitmaskPOD<size>::set(rep.data);

}



template <unsigned size>
@@ -579,7 +579,7 @@ template <unsigned size> 
inline void

BitmaskPOD<size>::clear(unsigned n)

{

  clear(rep.data, n);

  BitmaskPOD<size>::clear(rep.data, n);

}



template <unsigned size>
@@ -593,7 +593,7 @@ template <unsigned size> 
inline void

BitmaskPOD<size>::clear()

{

  clear(rep.data);

  BitmaskPOD<size>::clear(rep.data);

}



template <unsigned size>
@@ -607,7 +607,7 @@ template <unsigned size> 
inline bool

BitmaskPOD<size>::isclear() const

{

  return isclear(rep.data);

  return BitmaskPOD<size>::isclear(rep.data);

}



template <unsigned size>
@@ -621,7 +621,7 @@ template <unsigned size> 
inline unsigned

BitmaskPOD<size>::count() const

{

  return count(rep.data);

  return BitmaskPOD<size>::count(rep.data);

}



template <unsigned size>
@@ -635,7 +635,7 @@ template <unsigned size> 
inline unsigned

BitmaskPOD<size>::find(unsigned n) const

{

  return find(rep.data, n);

  return BitmaskPOD<size>::find(rep.data, n);

}



template <unsigned size>
@@ -649,7 +649,7 @@ template <unsigned size> 
inline bool

BitmaskPOD<size>::equal(const BitmaskPOD<size>& mask2) const

{

  return equal(rep.data, mask2.rep.data);

  return BitmaskPOD<size>::equal(rep.data, mask2.rep.data);

}



template <unsigned size>
@@ -663,7 +663,7 @@ template <unsigned size> 
inline BitmaskPOD<size>&

BitmaskPOD<size>::bitOR(const BitmaskPOD<size>& mask2)

{

  bitOR(rep.data, mask2.rep.data);

  BitmaskPOD<size>::bitOR(rep.data, mask2.rep.data);

  return *this;

}
@@ -678,7 +678,7 @@ template <unsigned size> 
inline BitmaskPOD<size>&

BitmaskPOD<size>::bitAND(const BitmaskPOD<size>& mask2)

{

  bitAND(rep.data, mask2.rep.data);

  BitmaskPOD<size>::bitAND(rep.data, mask2.rep.data);

  return *this;

}
@@ -693,7 +693,7 @@ template <unsigned size> 
inline BitmaskPOD<size>&

BitmaskPOD<size>::bitANDC(const BitmaskPOD<size>& mask2)

{

  bitANDC(rep.data, mask2.rep.data);

  BitmaskPOD<size>::bitANDC(rep.data, mask2.rep.data);

  return *this;

}
@@ -708,7 +708,7 @@ template <unsigned size> 
inline BitmaskPOD<size>&

BitmaskPOD<size>::bitXOR(const BitmaskPOD<size>& mask2)

{

  bitXOR(rep.data, mask2.rep.data);

  BitmaskPOD<size>::bitXOR(rep.data, mask2.rep.data);

  return *this;

}
@@ -723,7 +723,7 @@ template <unsigned size> 
inline char *

BitmaskPOD<size>::getText(char* buf) const

{

  return getText(rep.data, buf);

  return BitmaskPOD<size>::getText(rep.data, buf);

}



template <unsigned size>
@@ -737,7 +737,7 @@ template <unsigned size> 
inline bool

BitmaskPOD<size>::contains(BitmaskPOD<size> that)

{

  return contains(this->rep.data, that.rep.data);

  return BitmaskPOD<size>::contains(this->rep.data, that.rep.data);

}



template <unsigned size>
@@ -751,7 +751,7 @@ template <unsigned size> 
inline bool

BitmaskPOD<size>::overlaps(BitmaskPOD<size> that)

{

  return overlaps(this->rep.data, that.rep.data);

  return BitmaskPOD<size>::overlaps(this->rep.data, that.rep.data);

}



template <unsigned size>

ndb/src/common/debugger/signaldata/SignalDataPrint.cpp

+3 −1
Original line number Diff line number Diff line
@@ -261,4 +261,6 @@ const unsigned short NO_OF_PRINT_FUNCTIONS = sizeof(SignalDataPrintFunctions)/si 
template class Bitmask<1>;

template class Bitmask<2>;

template class Bitmask<4>;

template struct BitmaskPOD<1>;

template struct BitmaskPOD<2>;

template struct BitmaskPOD<4>;

ndb/src/ndbapi/NdbDictionaryImpl.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2822,6 +2822,7 @@ NdbDictInterface::execLIST_TABLES_CONF(NdbApiSignal* signal, 
  }

}



template class Vector<int>;

template class Vector<Uint32>;

template class Vector<Vector<Uint32> >;

template class Vector<NdbTableImpl*>;

ndb/test/ndbapi/flexAsynch.cpp

+7 −7
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ tellThreads(StartType what) 
NDB_COMMAND(flexAsynch, "flexAsynch", "flexAsynch", "flexAsynch", 65535)

{

  ThreadNdb*            pThreadData;

  int                   tLoops=0;

  int                   tLoops=0, i;

  int                   returnValue = NDBT_OK;



  flexAsynchErrorData = new ErrorData;
@@ -256,7 +256,7 @@ NDB_COMMAND(flexAsynch, "flexAsynch", "flexAsynch", "flexAsynch", 65535) 
      PRINT_TIMER("insert", noOfTransacts, tNoOfOpsPerTrans);



      if (0 < failed) {

        int i = retry_opt ;

        i = retry_opt ;

        int ci = 1 ;

        while (0 < failed && 0 < i){

          ndbout << failed << " of the transactions returned errors!"
@@ -293,7 +293,7 @@ NDB_COMMAND(flexAsynch, "flexAsynch", "flexAsynch", "flexAsynch", 65535) 
      PRINT_TIMER("read", noOfTransacts, tNoOfOpsPerTrans);



      if (0 < failed) {

        int i = retry_opt ;

        i = retry_opt ;

        int cr = 1;

        while (0 < failed && 0 < i){

          ndbout << failed << " of the transactions returned errors!"<<endl ;
@@ -330,7 +330,7 @@ NDB_COMMAND(flexAsynch, "flexAsynch", "flexAsynch", "flexAsynch", 65535) 
      PRINT_TIMER("update", noOfTransacts, tNoOfOpsPerTrans) ;



      if (0 < failed) {

        int i = retry_opt ;

        i = retry_opt ;

        int cu = 1 ;

        while (0 < failed && 0 < i){

          ndbout << failed << " of the transactions returned errors!"<<endl ;
@@ -366,7 +366,7 @@ NDB_COMMAND(flexAsynch, "flexAsynch", "flexAsynch", "flexAsynch", 65535) 
      PRINT_TIMER("read", noOfTransacts, tNoOfOpsPerTrans);



      if (0 < failed) {

        int i = retry_opt ;

        i = retry_opt ;

        int cr2 = 1 ;

        while (0 < failed && 0 < i){

          ndbout << failed << " of the transactions returned errors!"<<endl ;
@@ -403,7 +403,7 @@ NDB_COMMAND(flexAsynch, "flexAsynch", "flexAsynch", "flexAsynch", 65535) 
      PRINT_TIMER("delete", noOfTransacts, tNoOfOpsPerTrans);



      if (0 < failed) {

        int i = retry_opt ;

        i = retry_opt ;

        int cd = 1 ;

        while (0 < failed && 0 < i){

          ndbout << failed << " of the transactions returned errors!"<< endl ;
@@ -438,7 +438,7 @@ NDB_COMMAND(flexAsynch, "flexAsynch", "flexAsynch", "flexAsynch", 65535) 
    

    execute(stStop);

    void * tmp;

    for(int i = 0; i<tNoOfThreads; i++){

    for(i = 0; i<tNoOfThreads; i++){

      NdbThread_WaitFor(threadLife[i], &tmp);

      NdbThread_Destroy(&threadLife[i]);

    }

ndb/test/ndbapi/flexBench.cpp

+11 −9
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ tellThreads(ThreadData* pt, StartType what) 
NDB_COMMAND(flexBench, "flexBench", "flexBench", "flexbench", 65535)

{

  ThreadData*           pThreadsData;

  int                   tLoops = 0;

  int                   tLoops = 0, i;

  int                   returnValue = NDBT_OK;

    

  if (readArguments(argc, argv) != 0){
@@ -355,7 +355,7 @@ NDB_COMMAND(flexBench, "flexBench", "flexBench", "flexbench", 65535) 
     ****************************************************************/

    resetThreads(pThreadsData);

    

    for (unsigned int i = 0; i < tNoOfThreads; i++){  

    for (i = 0; i < tNoOfThreads; i++){  

      pThreadsData[i].threadNo = i;

      pThreadsData[i].threadLife = NdbThread_Create(flexBenchThread,

                                                    (void**)&pThreadsData[i],
@@ -531,7 +531,7 @@ NDB_COMMAND(flexBench, "flexBench", "flexBench", "flexbench", 65535) 
    waitForThreads(pThreadsData);



    void * tmp;

    for(Uint32 i = 0; i<tNoOfThreads; i++){

    for(i = 0; i<tNoOfThreads; i++){

      NdbThread_WaitFor(pThreadsData[i].threadLife, &tmp);

      NdbThread_Destroy(&pThreadsData[i].threadLife);

    }
@@ -540,7 +540,7 @@ NDB_COMMAND(flexBench, "flexBench", "flexBench", "flexbench", 65535) 
  if (useLongKeys == true) {

    // Only free these areas if they have been allocated

    // Otherwise cores will happen

    for (Uint32 i = 0; i < tNoOfLongPK; i++)

    for (i = 0; i < tNoOfLongPK; i++)

      free(longKeyAttrName[i]);

    free(longKeyAttrName);

  } // if
@@ -629,9 +629,10 @@ static void* flexBenchThread(void* pArg) 
  if(useLongKeys){

    // Allocate and populate the longkey array.

    longKeyAttrValue = (unsigned ***) malloc(sizeof(unsigned**) * tNoOfOperations );

    for (Uint32 n = 0; n < tNoOfOperations; n++)

    Uint32 n;

    for (n = 0; n < tNoOfOperations; n++)

      longKeyAttrValue[n] = (unsigned **) malloc(sizeof(unsigned*) * tNoOfLongPK );

    for (Uint32 n = 0; n < tNoOfOperations; n++){

    for (n = 0; n < tNoOfOperations; n++){

      for (Uint32 i = 0; i < tNoOfLongPK ; i++) {

	longKeyAttrValue[n][i] = (unsigned *) malloc(sizeof(unsigned) * tSizeOfLongPK);

	memset(longKeyAttrValue[n][i], 0, sizeof(unsigned) * tSizeOfLongPK);
@@ -1064,13 +1065,14 @@ static void sleepBeforeStartingTest(int seconds){ 


static int

createTables(Ndb* pMyNdb){

  for (Uint32 i = 0; i < tNoOfAttributes; i++){

  int i;

  for (i = 0; i < tNoOfAttributes; i++){

    snprintf(attrName[i], MAXSTRLEN, "COL%d", i);

  }



  // Note! Uses only uppercase letters in table name's

  // so that we can look at the tables with SQL

  for (Uint32 i = 0; i < tNoOfTables; i++){

  for (i = 0; i < tNoOfTables; i++){

    if (theStdTableNameFlag == 0){

      snprintf(tableName[i], MAXSTRLEN, "TAB%d_%d", i, 

	       (int)(NdbTick_CurrentMillisecond() / 1000));
@@ -1079,7 +1081,7 @@ createTables(Ndb* pMyNdb){ 
    }

  }

  

  for(unsigned i = 0; i < tNoOfTables; i++){

  for(i = 0; i < tNoOfTables; i++){

    ndbout << "Creating " << tableName[i] << "... ";

    

    NdbDictionary::Table tmpTable(tableName[i]);