database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Compile fix sol9x86

Browse Source 
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
This commit is contained in:
unknown
2004-08-24 14:48:07 +02:00
parent d7dd19aa07
commit dbd2625fd7
7 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ndb/src/kernel/blocks/grep/Grep.hpp
View File

@ -148,7 +148,7 @@ private:
*/ */
class Grep : public SimulatedBlock //GrepParticipant class Grep : public SimulatedBlock //GrepParticipant
{ {
//BLOCK_DEFINES(Grep); BLOCK_DEFINES(Grep);
public: public:
Grep(const Configuration & conf); Grep(const Configuration & conf);
@ -519,19 +519,6 @@ public:
typedef void (Grep::* ExecSignalLocal1) (Signal* signal); typedef void (Grep::* ExecSignalLocal1) (Signal* signal);
typedef void (Grep::PSCoord::* ExecSignalLocal2) (Signal* signal); typedef void (Grep::PSCoord::* ExecSignalLocal2) (Signal* signal);
typedef void (Grep::PSPart::* ExecSignalLocal4) (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);
}
}; };

2
ndb/src/kernel/blocks/grep/GrepInit.cpp
View File

@ -132,7 +132,7 @@ Grep::~Grep()
{ {
} }
//BLOCK_FUNCTIONS(Grep); BLOCK_FUNCTIONS(Grep);
Grep::PSPart::PSPart(Grep * sb) : Grep::PSPart::PSPart(Grep * sb) :
BlockComponent(sb), BlockComponent(sb),

2
ndb/src/mgmsrv/MgmtSrvr.cpp
View File

@ -2885,4 +2885,6 @@ MgmtSrvr::setDbParameter(int node, int param, const char * value,
} }
template class Vector<SigMatch>; template class Vector<SigMatch>;
#if __SUNPRO_CC != 0x560
template bool SignalQueue::waitFor<SigMatch>(Vector<SigMatch>&, SigMatch*&, NdbApiSignal*&, unsigned); template bool SignalQueue::waitFor<SigMatch>(Vector<SigMatch>&, SigMatch*&, NdbApiSignal*&, unsigned);
#endif

2
ndb/src/ndbapi/NdbEventOperation.cpp
View File

@ -37,7 +37,7 @@
NdbEventOperation::NdbEventOperation(Ndb *theNdb, NdbEventOperation::NdbEventOperation(Ndb *theNdb,
const char* eventName, const char* eventName,
const int bufferLength) int bufferLength)
: m_impl(* new NdbEventOperationImpl(*this,theNdb, : m_impl(* new NdbEventOperationImpl(*this,theNdb,
eventName, eventName,
bufferLength)) bufferLength))

3
ndb/src/ndbapi/NdbScanFilter.cpp
View File

@ -778,7 +778,8 @@ main(void){
#endif #endif
template class Vector<NdbScanFilterImpl::State>; 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, Uint32);
template int NdbScanFilterImpl::cond_col_const(Interpreter::BinaryCondition, Uint32 attrId, Uint64); template int NdbScanFilterImpl::cond_col_const(Interpreter::BinaryCondition, Uint32 attrId, Uint64);
#endif

2
ndb/src/ndbapi/TransporterFacade.hpp
View File

@ -161,7 +161,9 @@ private:
/** /**
* Block number handling * Block number handling
*/ */
public:
static const unsigned MAX_NO_THREADS = 4711; static const unsigned MAX_NO_THREADS = 4711;
private:
struct ThreadData { struct ThreadData {
static const Uint32 ACTIVE = (1 << 16) | 1; static const Uint32 ACTIVE = (1 << 16) | 1;

2
ndb/test/ndbapi/testIndex.cpp
View File

@ -386,6 +386,7 @@ sync_down(NDBT_Context* ctx){
if(threads){ if(threads){
ctx->decProperty("PauseThreads"); ctx->decProperty("PauseThreads");
} }
return 0;
} }
int int
@ -397,6 +398,7 @@ sync_up_and_wait(NDBT_Context* ctx){
if(threads){ if(threads){
ndbout_c("wait completed"); ndbout_c("wait completed");
} }
return 0;
} }
int int