Fixes to lists so an empty constructor is not needed + reenable debug…

…ging git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@208 d0cd1f9f-072b-0410-8dd7-cf729c803f20
lzpfmh · Dec 30, 2008 · de46248 · de46248
1 parent 51ed033
commit de46248
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 35 deletions.
diff --git a/ccutil/errcode.h b/ccutil/errcode.h
@@ -82,7 +82,7 @@ const ERRCODE ASSERT_FAILED = "Assert failed";
 
 #define ASSERT_HOST(x) if (!(x))										\
 {																			\
-	ASSERT_FAILED.error(#x,TESSLOG,"in file %s, line %d",		\
+	ASSERT_FAILED.error(#x,ABORT,"in file %s, line %d",		\
 		__FILE__,__LINE__);											\
 }
 

diff --git a/ccutil/lsterr.h b/ccutil/lsterr.h
@@ -27,7 +27,7 @@ const ERRCODE DONT_CONSTRUCT_LIST_BY_COPY =
 const ERRCODE DONT_ASSIGN_LISTS = "Can't assign to lists";
 const ERRCODE SERIALISE_LINKS = "Attempted to (de)serialise a link element";
 
-#ifdef _DEBUG
+#ifndef NDEBUG
 
 const ERRCODE NO_LIST = "Iterator not set to a list";
 const ERRCODE NULL_OBJECT = "List found this = NULL!";

diff --git a/ccutil/serialis.h b/ccutil/serialis.h
@@ -58,38 +58,38 @@ Replace <parm> with "<parm>".  <parm> may be an arbitrary number of tokens
 
 #define QUOTE_IT( parm ) #parm
 
-#define make_serialise( CLASSNAME )													\
-																									\
-	NEWDELETE2(CLASSNAME)                                                 \
-																									\
-void						serialise(														\
-	FILE*					f)																	\
-{																								\
-	CLASSNAME*			shallow_copy;													\
-																									\
-	shallow_copy = (CLASSNAME*) alloc_struct( sizeof( *this ) );				\
-		memmove( shallow_copy, this, sizeof( *this ) );								\
-																									\
-	shallow_copy->prep_serialise();													\
-		if (fwrite( (char*) shallow_copy, sizeof( *shallow_copy ), 1, f ) != 1)\
-		WRITEFAILED.error( QUOTE_IT( CLASSNAME::serialise ),              \
-									ABORT, NULL );											\
-																									\
-	free_struct( shallow_copy, sizeof( *this ) );								\
-		this->dump( f );																			\
-}																								\
-																									\
-	static CLASSNAME*		de_serialise(										\
-	FILE*					f)																	\
-{																								\
-	CLASSNAME*			restored;											\
-																									\
-		restored = (CLASSNAME*) alloc_struct( sizeof( CLASSNAME ) );				\
-		if (fread( (char*) restored, sizeof( CLASSNAME ), 1, f ) != 1)				\
-		READFAILED.error( QUOTE_IT( CLASSNAME::de_serialise ),            \
-									ABORT, NULL );												\
-																									\
-	restored->de_dump( f );																	\
-		return restored;																			\
+#define make_serialise( CLASSNAME )                                            \
+                                                                               \
+  NEWDELETE2(CLASSNAME)                                                        \
+                                                                               \
+void            serialise(                                                     \
+  FILE*          f)                                                            \
+{                                                                              \
+  CLASSNAME*      shallow_copy;                                                \
+                                                                               \
+  shallow_copy = (CLASSNAME*) alloc_struct( sizeof( *this ) );                 \
+    memmove( shallow_copy, this, sizeof( *this ) );                            \
+                                                                               \
+  shallow_copy->prep_serialise();                                              \
+    if (fwrite( (char*) shallow_copy, sizeof( *shallow_copy ), 1, f ) != 1)    \
+    WRITEFAILED.error( QUOTE_IT( CLASSNAME::serialise ),                       \
+                  ABORT, NULL );                                               \
+                                                                               \
+  free_struct( shallow_copy, sizeof( *this ) );                                \
+    this->dump( f );                                                           \
+}                                                                              \
+                                                                               \
+  static CLASSNAME*    de_serialise(                                           \
+  FILE*          f)                                                            \
+{                                                                              \
+  CLASSNAME*      restored;                                                    \
+                                                                               \
+    restored = (CLASSNAME*) alloc_struct( sizeof( CLASSNAME ) );               \
+    if (fread( (char*) restored, sizeof( CLASSNAME ), 1, f ) != 1)             \
+    READFAILED.error( QUOTE_IT( CLASSNAME::de_serialise ),                     \
+                  ABORT, NULL );                                               \
+                                                                               \
+  restored->de_dump( f );                                                      \
+    return restored;                                                           \
 }
 #endif