Commit 59ee75bd authored by unknown's avatar unknown
Browse files

wl1744 - fix compiler problems 


ndb/include/debugger/GrepError.hpp:
  prexif
ndb/include/kernel/LogLevel.hpp:
  fix correct type prototype
ndb/include/kernel/signaldata/FsCloseReq.hpp:
  remove usage of true
ndb/include/mgmapi/mgmapi.h:
  use Uint64 instead of long long
ndb/include/mgmcommon/IPCConfig.hpp:
  correct type
ndb/include/portlib/NdbTCP.h:
  fix #elif
ndb/include/transporter/TransporterRegistry.hpp:
  correct type
ndb/include/util/Parser.hpp:
  correct type
  made stuff public as vc++ couldn't handle template friends
ndb/include/util/SimpleProperties.hpp:
  correct type
ndb/src/common/debugger/EventLogger.cpp:
  Prefix GrepError::Code as GrepError::GE_Code
ndb/src/common/debugger/GrepError.cpp:
  Prefix GrepError::Code as GrepError::GE_Code
ndb/src/common/debugger/signaldata/FsCloseReq.cpp:
  removed usage of true
ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp:
  removed usage of true
ndb/src/common/logger/LogHandlerList.hpp:
  use ndb_global
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  removed ConfigRetriever::get_config(file) from windows
ndb/src/common/transporter/TransporterRegistry.cpp:
  interface is a reserved word in vc++
ndb/src/kernel/blocks/grep/Grep.hpp:
  Prefix GrepError::Code as GrepError::GE_Code
ndb/src/kernel/vm/Configuration.cpp:
  Use BaseString::snprintf
ndb/src/kernel/vm/Configuration.hpp:
  correct type
ndb/src/kernel/vm/SimplePropertiesSection.cpp:
  correct type
ndb/src/mgmapi/mgmapi_configuration.cpp:
  use Uin6t4
ndb/src/mgmapi/mgmapi_configuration.hpp:
  use Uin6t4
ndb/src/mgmsrv/ConfigInfo.cpp:
  Prefix
ndb/src/mgmsrv/ConfigInfo.hpp:
  prefix
ndb/src/ndbapi/Ndb.cpp:
  removed usued include
ndb/src/ndbapi/NdbImpl.hpp:
  prefix
ndb/src/ndbapi/ObjectMap.hpp:
  Better typecast
parent f0614a9f

ndb/include/debugger/GrepError.hpp

+4 −4
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
 */

class GrepError {

public:

  enum Code {

    NO_ERROR = 0,

  enum GE_Code {

    GE_NO_ERROR = 0,

    SUBSCRIPTION_ID_NOMEM = 1,

    SUBSCRIPTION_ID_NOT_FOUND = 2,

    SUBSCRIPTION_ID_NOT_UNIQUE = 3,
@@ -82,12 +82,12 @@ public: 
  };

  

  struct ErrorDescription {

    Code errCode;

    GE_Code errCode;

    const char * name;

  };

  static const ErrorDescription errorDescriptions[];

  static const Uint32 noOfErrorDescs;

  static const char * getErrorDesc(GrepError::Code err);

  static const char * getErrorDesc(GrepError::GE_Code err);

  

};

ndb/include/kernel/LogLevel.hpp

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public: 
    return memcmp(this, &l, sizeof(* this)) == 0;

  }



  LogLevel& operator=(const class EventSubscribeReq & req);

  LogLevel& operator=(const struct EventSubscribeReq & req);

  

private:

  /**

ndb/include/kernel/signaldata/FsCloseReq.hpp

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ inline 
void

FsCloseReq::setRemoveFileFlag(UintR & fileflag, bool removefile){

//  ASSERT_BOOL(removefile, "FsCloseReq::setRemoveFileFlag");

  if (removefile == true)

  if (removefile)

    fileflag = 1;

  else

    fileflag = 0;

ndb/include/mgmapi/mgmapi.h

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ extern "C" { 
  int ndb_mgm_get_int_parameter(const ndb_mgm_configuration_iterator*, 

				int param, unsigned * value);

  int ndb_mgm_get_int64_parameter(const ndb_mgm_configuration_iterator*,

				  int param, unsigned long long * value);

				  int param, Uint64 * value);

  int ndb_mgm_get_string_parameter(const ndb_mgm_configuration_iterator*,

				   int param, const char  ** value);

#ifdef __cplusplus

ndb/include/mgmcommon/IPCConfig.hpp

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public: 
  void print() const { props->print(); }



  static Uint32 configureTransporters(Uint32 nodeId,

				      const class ndb_mgm_configuration &,

				      const struct ndb_mgm_configuration &,

				      class TransporterRegistry &);

  

private: