dbertoni 2005/04/25 12:52:01
Modified: c/src/xalanc/Include PlatformDefinitions.hpp
c/src/xalanc/PlatformSupport ReusableArenaBlock.hpp
Log:
Fix for Jira issue XALANC-493.
Revision Changes Path
1.12 +10 -0 xml-xalan/c/src/xalanc/Include/PlatformDefinitions.hpp
Index: PlatformDefinitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/PlatformDefinitions.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PlatformDefinitions.hpp 11 Apr 2005 02:16:55 -0000 1.11
+++ PlatformDefinitions.hpp 25 Apr 2005 19:52:01 -0000 1.12
@@ -119,9 +119,19 @@
// UTF-16 character...
typedef unsigned short XalanDOMChar;
#endif
+
+template<bool value>
+struct XalanCompileErrorBoolean
+{
+ char foo[value];
+};
+
XALAN_CPP_NAMESPACE_END
+#define XALAN_STATIC_ASSERT(expr) XALAN_CPP_NAMESPACE_QUALIFIER
XalanCompileErrorBoolean<bool(expr)>()
+
+
#endif // __cplusplus
1.15 +1 -6
xml-xalan/c/src/xalanc/PlatformSupport/ReusableArenaBlock.hpp
Index: ReusableArenaBlock.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/ReusableArenaBlock.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ReusableArenaBlock.hpp 14 Nov 2004 21:13:04 -0000 1.14
+++ ReusableArenaBlock.hpp 25 Apr 2005 19:52:01 -0000 1.15
@@ -28,11 +28,6 @@
XALAN_CPP_NAMESPACE_BEGIN
-template<bool> struct CompileTimeError;
-
-template<> struct CompileTimeError<true>{};
-
-#define XALAN_STATIC_CHECK(expr) CompileTimeError<bool(expr)>()
template <class ObjectType,
@@ -100,7 +95,7 @@
m_nextFreeBlock(0)
{
- XALAN_STATIC_CHECK(sizeof(ObjectType) >= sizeof(NextBlock));
+ XALAN_STATIC_ASSERT(sizeof(ObjectType) >= sizeof(NextBlock));
for( size_type i = 0; i < this->m_blockSize; ++i )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
