Commit dbd2625f authored by unknown's avatar unknown
Browse files

Compile fix sol9x86 


ndb/src/kernel/blocks/grep/Grep.hpp:
  Remove own addRecSignal-methods
ndb/src/kernel/blocks/grep/GrepInit.cpp:
  Remove own addRecSignal-methods
ndb/src/mgmsrv/MgmtSrvr.cpp:
  #ifdef SUNPRO_CC 5.6
ndb/src/ndbapi/NdbEventOperation.cpp:
  Compile fix
ndb/src/ndbapi/NdbScanFilter.cpp:
  #ifdef SUNPRO_CC 5.6
ndb/src/ndbapi/TransporterFacade.hpp:
  Compile fix
ndb/test/ndbapi/testIndex.cpp:
  Compile fix
parent d7dd19aa

ndb/src/kernel/blocks/grep/Grep.hpp

+1 −14
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ private: 
 */

class Grep : public SimulatedBlock //GrepParticipant

{

  //BLOCK_DEFINES(Grep);

  BLOCK_DEFINES(Grep);



public:

  Grep(const Configuration & conf);
@@ -519,19 +519,6 @@ public: 
  typedef void (Grep::* ExecSignalLocal1) (Signal* signal); 

  typedef void (Grep::PSCoord::* ExecSignalLocal2) (Signal* signal); 

  typedef void (Grep::PSPart::* ExecSignalLocal4) (Signal* signal); 



  void 

  addRecSignal(GlobalSignalNumber gsn, ExecSignalLocal1 f, bool force = false){

    addRecSignalImpl(gsn, (ExecFunction)f, force);

  }

  void 

  addRecSignal(GlobalSignalNumber gsn, ExecSignalLocal2 f, bool force = false){

    addRecSignalImpl(gsn, (ExecFunction)f, force);

  }

  void 

  addRecSignal(GlobalSignalNumber gsn, ExecSignalLocal4 f, bool force = false){

    addRecSignalImpl(gsn, (ExecFunction)f, force);

  }

};

ndb/src/kernel/blocks/grep/GrepInit.cpp

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ Grep::~Grep() 
{

}



//BLOCK_FUNCTIONS(Grep);

BLOCK_FUNCTIONS(Grep);



Grep::PSPart::PSPart(Grep * sb) :

  BlockComponent(sb),

ndb/src/mgmsrv/MgmtSrvr.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2885,4 +2885,6 @@ MgmtSrvr::setDbParameter(int node, int param, const char * value, 
}



template class Vector<SigMatch>;

#if __SUNPRO_CC != 0x560

template bool SignalQueue::waitFor<SigMatch>(Vector<SigMatch>&, SigMatch*&, NdbApiSignal*&, unsigned);

#endif

ndb/src/ndbapi/NdbEventOperation.cpp

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 


NdbEventOperation::NdbEventOperation(Ndb *theNdb, 

				     const char* eventName, 

				     const int bufferLength) 

				     int bufferLength) 

  : m_impl(* new NdbEventOperationImpl(*this,theNdb, 

				       eventName, 

				       bufferLength))

ndb/src/ndbapi/NdbScanFilter.cpp

+2 −1
Original line number Diff line number Diff line
@@ -778,7 +778,8 @@ main(void){ 
#endif



template class Vector<NdbScanFilterImpl::State>;

#if __SUNPRO_CC != 0x560

template int NdbScanFilterImpl::cond_col_const(Interpreter::BinaryCondition, Uint32 attrId, Uint32);

template int NdbScanFilterImpl::cond_col_const(Interpreter::BinaryCondition, Uint32 attrId, Uint64);



#endif