8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 10:43:03 +01:00

Looking for extra ; at namespace declaration end

This commit is contained in:
brodsom 2004-06-13 23:45:02 +00:00
parent 7dc4cc1ab9
commit 1aa7b9452c
21 changed files with 37 additions and 34 deletions

View File

@ -32,7 +32,7 @@
* Contributor(s): * Contributor(s):
* *
* *
* $Id: alloc.cpp,v 1.51 2004-05-13 14:04:51 kkuznetsov Exp $ * $Id: alloc.cpp,v 1.52 2004-06-13 23:38:13 brodsom Exp $
* *
*/ */
@ -164,7 +164,7 @@ Firebird::Vector<void*, MAP_CACHE_SIZE> extents_cache;
Mutex cache_mutex; Mutex cache_mutex;
#endif #endif
} } // namespace
namespace Firebird { namespace Firebird {
@ -1236,7 +1236,7 @@ void MemoryPool::deallocate(void *block)
lock.leave(); lock.leave();
} }
} /* namespace Firebird */ } // namespace Firebird
/******************************** Global functions *****************************/ /******************************** Global functions *****************************/

View File

@ -266,7 +266,7 @@ public:
Array<T, InlineStorage<T, InlineCapacity> > (InitialCapacity) {} Array<T, InlineStorage<T, InlineCapacity> > (InitialCapacity) {}
}; };
} // Firebird } // namespace Firebird
#endif // CLASSES_ARRAY_H #endif // CLASSES_ARRAY_H

View File

@ -47,7 +47,7 @@ namespace {
} }
return 0; return 0;
} }
} } // namespace
#define STRNCASECMP StringIgnoreCaseCompare #define STRNCASECMP StringIgnoreCaseCompare
#endif // HAVE_STRICMP #endif // HAVE_STRICMP
#endif // HAVE_STRCASECMP #endif // HAVE_STRCASECMP
@ -72,7 +72,7 @@ namespace {
return m[c >> 3] & (1 << (c & 7)); return m[c >> 3] & (1 << (c & 7));
} }
}; };
} } // namespace
namespace Firebird { namespace Firebird {
const AbstractString::size_type AbstractString::npos = ~0; const AbstractString::size_type AbstractString::npos = ~0;

View File

@ -193,6 +193,7 @@ namespace Firebird
return inherited::find(item, pos); return inherited::find(item, pos);
} }
}; };
}
} // namespace Firebird
#endif // CLASSES_OBJECTS_ARRAY_H #endif // CLASSES_OBJECTS_ARRAY_H

View File

@ -32,7 +32,7 @@
* Contributor(s): * Contributor(s):
* *
* *
* $Id: rwlock.h,v 1.19 2004-05-03 17:05:56 skidder Exp $ * $Id: rwlock.h,v 1.20 2004-06-13 23:38:13 brodsom Exp $
* *
*/ */
@ -157,7 +157,7 @@ public:
}; };
} } // namespace Firebird
#else #else
@ -338,7 +338,7 @@ public:
void endWrite() { } void endWrite() { }
}; };
} } // namespace Firebird
#endif /*MULTI_THREAD*/ #endif /*MULTI_THREAD*/
@ -368,7 +368,7 @@ private:
RWLock *lock; RWLock *lock;
}; };
} } // namespace Firebird
#endif // #ifndef CLASSES_RWLOCK_H #endif // #ifndef CLASSES_RWLOCK_H

View File

@ -32,7 +32,7 @@
* Contributor(s): * Contributor(s):
* *
* *
* $Id: semaphore.h,v 1.12 2004-05-24 11:23:38 kkuznetsov Exp $ * $Id: semaphore.h,v 1.13 2004-06-13 23:38:14 brodsom Exp $
* *
*/ */
@ -76,7 +76,7 @@ public:
}; };
} } // namespace Firebird
#else #else
@ -240,7 +240,7 @@ public:
} }
}; };
} } // namespace Firebird
#else #else
@ -319,7 +319,7 @@ public:
} }
}; };
} } // namespace Firebird
#endif /*Solaris*/ #endif /*Solaris*/
#endif /*MULTI_THREAD*/ #endif /*MULTI_THREAD*/

View File

@ -533,7 +533,8 @@ namespace Firebird {
return AutoStorage::getPool(); return AutoStorage::getPool();
} }
}; };
}
} // namespace Firebird
#endif // CLASSES_STACK_H #endif // CLASSES_STACK_H

View File

@ -162,7 +162,7 @@ void ConfigFile::checkLoadConfig()
namespace { namespace {
class FileClose class FileClose
{ {
public: public:
static void clear(FILE *f) static void clear(FILE *f)
{ {
if (f) { if (f) {
@ -170,7 +170,7 @@ public:
} }
} }
}; };
} } // namespace
void ConfigFile::loadConfig() void ConfigFile::loadConfig()
{ {

View File

@ -29,7 +29,7 @@ private:
Firebird::Mutex buffer_lock; Firebird::Mutex buffer_lock;
}; };
} } // namespace
namespace Firebird { namespace Firebird {

View File

@ -41,7 +41,7 @@ namespace fb_utils {
str.rtrim(); str.rtrim();
} }
char* fb_exact_name_limit(char* const str, size_t bufsize); char* fb_exact_name_limit(char* const str, size_t bufsize);
} } // namespace fb_utils
#endif // INCLUDE_UTILS_PROTO_H #endif // INCLUDE_UTILS_PROTO_H

View File

@ -502,7 +502,7 @@ namespace internal
} }
return v; return v;
} }
} } // namespace internal
FBUDF_API ISC_TIMESTAMP* addMilliSecond(ISC_TIMESTAMP* v, int& nmseconds) FBUDF_API ISC_TIMESTAMP* addMilliSecond(ISC_TIMESTAMP* v, int& nmseconds)
{ {

View File

@ -11,6 +11,6 @@ namespace Firebird
class list : public std::list<T, Firebird::allocator<T> > class list : public std::list<T, Firebird::allocator<T> >
{ {
}; };
}; } // namespace
#endif // FB_LIST_H #endif // FB_LIST_H

View File

@ -21,6 +21,6 @@ namespace Firebird
public std::map<A, B, std::less<A>, Firebird::allocator<std::pair<A,B> > > public std::map<A, B, std::less<A>, Firebird::allocator<std::pair<A,B> > >
{ {
}; };
}; } // namespace
#endif // FB_MAP_H #endif // FB_MAP_H

View File

@ -32,7 +32,7 @@
* Contributor(s): * Contributor(s):
* *
* *
* $Id: evl_string.h,v 1.12 2004-05-12 19:37:17 brodsom Exp $ * $Id: evl_string.h,v 1.13 2004-06-13 23:42:20 brodsom Exp $
* *
*/ */
@ -531,6 +531,6 @@ bool LikeEvaluator<CharType>::processNextChunk(const CharType* data, SSHORT data
return true; return true;
} }
} } // namespace Firebird
#endif // JRD_EVL_STRING_H #endif // JRD_EVL_STRING_H

View File

@ -88,7 +88,7 @@ namespace {
return fopen(filename, mode); return fopen(filename, mode);
} }
} } // namespace
#ifdef WIN_NT #ifdef WIN_NT
static const char* FOPEN_TYPE = "a+b"; static const char* FOPEN_TYPE = "a+b";

View File

@ -573,7 +573,7 @@ const UCHAR LOG_end = HDR_end;
//const int LOG_grp_cmt_wait 8 /* Group commit wait time */ //const int LOG_grp_cmt_wait 8 /* Group commit wait time */
const int LOG_max = 8; /* Maximum LOG_clump value */ const int LOG_max = 8; /* Maximum LOG_clump value */
} //namespace Jrd } //namespace Ods
#endif // JRD_ODS_H #endif // JRD_ODS_H

View File

@ -31,6 +31,7 @@ public:
enum Severity {Warning, Error}; enum Severity {Warning, Error};
static void Record(Severity, string); static void Record(Severity, string);
}; };
} } // namespace Firebird
#endif // FIREBIRD_SYSLOG_H #endif // FIREBIRD_SYSLOG_H

View File

@ -37,4 +37,4 @@ void Syslog::Record(Severity level, string Msg) {
} }
syslog(priority|LOG_LOCAL3, "%s (%m)", Msg.c_str()); syslog(priority|LOG_LOCAL3, "%s (%m)", Msg.c_str());
} }
} } // namespace Firebird

View File

@ -61,7 +61,7 @@ bool getRootFromRegistry(string& root)
return false; return false;
} }
} } // namespace
void ConfigRoot::osConfigRoot() void ConfigRoot::osConfigRoot()
{ {

View File

@ -83,7 +83,7 @@ void SyslogAccess::Record(WORD wType, Firebird::string Msg) {
} }
class SyslogAccess iSyslogAccess; class SyslogAccess iSyslogAccess;
} } // namespace
namespace Firebird { namespace Firebird {
void Syslog::Record(Severity level, Firebird::string Msg) { void Syslog::Record(Severity level, Firebird::string Msg) {
@ -99,4 +99,4 @@ namespace Firebird {
} }
iSyslogAccess.Record(wType, Msg); iSyslogAccess.Record(wType, Msg);
} }
} } // namespace Firebird

View File

@ -52,7 +52,7 @@ namespace {
USHORT DecrementSharedCount(const TEXT* gds32, bool sw_force, USHORT DecrementSharedCount(const TEXT* gds32, bool sw_force,
USHORT(*err_handler)(ULONG, const TEXT *)); USHORT(*err_handler)(ULONG, const TEXT *));
}; } // namespace
// //
// --- Public Functions --- // --- Public Functions ---
@ -750,7 +750,7 @@ USHORT DecrementSharedCount(const TEXT* filename, bool sw_force,
} }
} }
}; // namespace { } } // namespace { }
// //
// EOF // EOF