firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 23:23:04 +01:00
Code Issues

Restore inlines

Browse Source
This commit is contained in:
brodsom 2003-02-25 00:05:06 +00:00
parent 04cb7a73c5
commit 89702f3e88
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/alice/alice.cpp
View File

@ -24,7 +24,7 @@
//
//____________________________________________________________
//
// $Id: alice.cpp,v 1.22 2003-02-13 22:40:30 brodsom Exp $
// $Id: alice.cpp,v 1.23 2003-02-25 00:01:30 brodsom Exp $
//
// 2001.07.06 Sean Leyne - Code Cleanup, removed "#ifdef READONLY_DATABASE"
// conditionals, as the engine now fully supports
@ -104,7 +104,7 @@ static bool fAnsiCP = false;
#endif
static void ALICE_error(USHORT number); // overloaded to keep down param count
static void translate_cp(TEXT* sz);
static inline void translate_cp(TEXT* sz);
static void expand_filename(TEXT*, TEXT*);
static int output_thread(SLONG, UCHAR*);
static int output_main(SLONG, UCHAR*);
@ -822,7 +822,7 @@ static void alice_output(const SCHAR * format, ...)
// 2. The macro GUI_TOOLS is NOT defined AND
// 3. The static variable fAnsiCP is false.
//
static void translate_cp(TEXT* sz)
static inline void translate_cp(TEXT* sz)
{
#if defined (WIN95)
if (!fAnsiCP) {

2
src/common/config/config_impl.h
View File

@ -71,7 +71,7 @@ public:
static bool asBoolean(const string&);
static const char* asString(const string&);
static const ConfigImpl& instance();
inline static const ConfigImpl& instance();
private:
ConfigImpl();

4
src/dsql/ddl.cpp
View File

@ -20,7 +20,7 @@
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* $Id: ddl.cpp,v 1.40 2003-02-15 15:10:20 dimitr Exp $
* $Id: ddl.cpp,v 1.41 2003-02-25 00:03:38 brodsom Exp $
* 2001.5.20 Claudio Valderrama: Stop null pointer that leads to a crash,
* caused by incomplete yacc syntax that allows ALTER DOMAIN dom SET;
*
@ -166,7 +166,7 @@ static void set_nod_value_attributes(DSQL_NOD, DSQL_FLD);
#endif
#ifdef DEV_BUILD
static void BLKCHK(const void* p, USHORT type)
static inline void BLKCHK(const void* p, USHORT type)
{
if (p && MemoryPool::blk_type(p) != type) {
ERRD_bugcheck("Invalid block type");

6
src/dsql/dsql.h
View File

@ -381,9 +381,9 @@ class dsql_req : public pool_alloc<dsql_type_req>
{
public:
// begin - member functions that should be private
void append_uchar(UCHAR byte);
void append_ushort(USHORT val);
void append_ulong(ULONG val);
inline void append_uchar(UCHAR byte);
inline void append_ushort(USHORT val);
inline void append_ulong(ULONG val);
void append_cstring(UCHAR verb, const char* string);
void append_string(UCHAR verb, const char* string, USHORT len);
void append_number(UCHAR verb, SSHORT number);

4
src/dsql/user_dsql.cpp
View File

@ -114,13 +114,13 @@ static NAME statement_names = NULL;
static NAME cursor_names = NULL;
static DBB databases = NULL;
static void set_global_private_status(STATUS* user_status, STATUS* local_status)
static inline void set_global_private_status(STATUS* user_status, STATUS* local_status)
{
UDSQL_error->dsql_user_status = user_status;
UDSQL_error->dsql_status = (user_status) ? user_status : local_status;
}
static void INIT_DSQL(STATUS* user_status, STATUS* local_status)
static inline void INIT_DSQL(STATUS* user_status, STATUS* local_status)
{
init(0);
set_global_private_status(user_status, local_status);

4
src/jrd/block_cache.h
View File

@ -25,7 +25,7 @@ private:
};
template <class T>
T* BlockCache<T>::newBlock()
inline T* BlockCache<T>::newBlock()
{
lock.aquire();
if (head)
@ -40,7 +40,7 @@ T* BlockCache<T>::newBlock()
}
template<class T>
void BlockCache<T>::returnBlock(T* back)
inline void BlockCache<T>::returnBlock(T* back)
{
Node* returned = reinterpret_cast<Node*>(back);
lock.aquire();

10
src/jrd/jrd.cpp
View File

@ -424,14 +424,14 @@ static void check_autocommit(JRD_REQ request, struct tdbb* tdbb)
}
}
static void api_entry_point_init(STATUS* user_status)
inline static void api_entry_point_init(STATUS* user_status)
{
user_status[0] = gds_arg_gds;
user_status[1] = FB_SUCCESS;
user_status[2] = gds_arg_end;
}
static struct tdbb* set_thread_data(struct tdbb& thd_context)
inline static struct tdbb* set_thread_data(struct tdbb& thd_context)
{
struct tdbb* tdbb = &thd_context;
MOVE_CLEAR(tdbb, sizeof(struct tdbb));
@ -463,14 +463,14 @@ static TDBB get_thread_data()
return (TDBB)p1;
}
static void CHECK_DBB(DBB dbb)
inline static void CHECK_DBB(DBB dbb)
{
#ifdef DEV_BUILD
assert(dbb && MemoryPool::blk_type(dbb) == type_dbb);
#endif // DEV_BUILD
}
static void check_tdbb(TDBB tdbb)
inline static void check_tdbb(TDBB tdbb)
{
#ifdef DEV_BUILD
assert(tdbb &&
@ -480,7 +480,7 @@ static void check_tdbb(TDBB tdbb)
#endif // DEV_BUILD
}
static DBB get_dbb()
inline static DBB get_dbb()
{
return get_thread_data()->tdbb_database;
}

8
src/jrd/why.cpp
View File

@ -42,7 +42,7 @@
*
*/
/*
$Id: why.cpp,v 1.15 2003-02-15 00:55:10 brodsom Exp $
$Id: why.cpp,v 1.16 2003-02-25 00:05:04 brodsom Exp $
*/
#include "firebird.h"
@ -195,17 +195,17 @@ typedef struct teb
} TEB;
static WHY_HNDL allocate_handle(int, int);
WHY_HNDL allocate_handle(int implementation, why_hndl *h, int handle_type) {
inline WHY_HNDL allocate_handle(int implementation, why_hndl *h, int handle_type) {
WHY_HNDL handle = allocate_handle(implementation, handle_type);
handle->handle.h_why = h;
return handle;
}
WHY_HNDL allocate_handle(int implementation, dsql_req *h, int handle_type) {
inline WHY_HNDL allocate_handle(int implementation, dsql_req *h, int handle_type) {
WHY_HNDL handle = allocate_handle(implementation, handle_type);
handle->handle.h_dsql = h;
return handle;
}
WHY_HNDL allocate_handle(int implementation, class jrd_tra *h, int handle_type) {
inline WHY_HNDL allocate_handle(int implementation, class jrd_tra *h, int handle_type) {
WHY_HNDL handle = allocate_handle(implementation, handle_type);
handle->handle.h_tra = h;
return handle;