fix compatiblity with clang

include/astar.h

@@ -49,7 +49,6 @@ namespace alg {
 			};
 
 			static const unsigned char WALL = 0xFF;
-			static const float SQRT2 = 1.414213562373095;
 
 		private:
 			const Array2D<unsigned char> & m_grid;	
@@ -72,6 +71,7 @@ namespace alg {
 			 * a integer representing path is returned, you should delete it after. 
 			 */
 			AStarResult * run(uint32_t x1, uint32_t y1, uint32_t x2, uint32_t y2) {
+				static float SQRT2 = 1.414213562373095;
 				uint32_t nrow = m_grid.row();
 				uint32_t ncol = m_grid.col();
 				m_closedset.clear(false);

include/binary_search_tree.h

@@ -46,11 +46,10 @@ namespace alg {
 						virtual const char * what() const throw() {
 							return "key does not exist";
 						}
-				};
+				} excp_key;
 
 			private:
 				treeNode * m_root;		// the root
-				const BSTException error;
 			private:
 				BST(const BST&);
 				BST& operator=(const BST&);

include/dijkstra.h

@@ -38,7 +38,7 @@ namespace alg {
 		public:
 			static const int UNDEFINED = -1;
 			// run dijkstra algorithm, and return the previous table
-			static HashTable<int32_t, int32_t> * run(const struct Graph & g, uint32_t src_id) {
+			static HashTable<int32_t, int32_t> * run(const Graph & g, uint32_t src_id) {
 				// a binary heap
 				Heap<uint32_t> Q(g.vertex_count() + g.edge_count());
 				// distance hash table

include/fib-heap.h

@@ -83,7 +83,7 @@ namespace alg {
 					H->m_root = H1->m_root;
 					list_splice(&H->m_root, &H1->m_root);	// concat 2 root-list
 					list_splice(&H->m_root, &H2->m_root);
-					if (H1->min == NULL || (H2.min != NULL && H2->min.key < H1->min.key)) {
+					if (H1->min == NULL || (H2->min != NULL && H2->min.key < H1->min.key)) {
 						H->min = H2->min;
 					}
 					H->n = H1->n + H2->n;

include/lcs.h

@@ -64,7 +64,7 @@ namespace alg {
 	 * pass an empty stack, pop out the result in sequential order. 
 	 */
 	template<typename T>
-		static void lcs_backtrack(Stack<int> & S, struct Array2D<uint32_t> & A,
+		static void lcs_backtrack(Stack<int> & S, Array2D<uint32_t> & A,
 				const T X[], const T Y[], 
 				const uint32_t i, uint32_t j) {
 			if (i==0 || j==0) return;

include/perfect_hash.h

@@ -29,10 +29,10 @@ namespace alg {
 						virtual const char * what() const throw() {
 							return "key does not exist";
 						}
-				};
+				} excp_key;
 
 				// Level-2 Slot definition
-				class SlotL2 {
+				struct SlotL2 {
 					public:
 						uint32_t cnt;	// collison count
 						uint32_t key;	//key
@@ -57,8 +57,6 @@ namespace alg {
 				struct SlotL1 * slots;	// level 1 slots
 				struct UHash params;   // 1st level 
 				uint32_t num_slots;
-				const PerfHTException error;
-
 			public:
 				PerfHT(uint32_t keys[], uint32_t len) {
 					// remove duplicate keys
@@ -105,7 +103,7 @@ namespace alg {
 						}
 					}
 
-					throw error;
+					throw excp_key;
 				}
 
 				/**

include/queue.h

@@ -32,7 +32,7 @@ namespace alg {
 						virtual const char * what() const throw() {
 							return "Queue is empty.";
 						}
-				};
+				} excp_empty;
 
 			private:
 				uint32_t m_capacity;		// queue capacity
@@ -41,8 +41,6 @@ namespace alg {
 				uint32_t m_rear;			// index of the last element
 				T * m_elements;	// the elements
 
-				const QueueEmptyException exp_empty;
-
 			public:
 				/**
 				 * constructor takes argument the maximum number of elements the Queue
@@ -88,7 +86,7 @@ namespace alg {
 				 * return the front element.
 				 */
 				inline const T& front() const {
-					if (m_size==0) throw exp_empty;
+					if (m_size==0) throw excp_empty;
 					return m_elements[m_front];	
 				};
 

include/skiplist.h

@@ -40,8 +40,7 @@ namespace alg {
 			virtual const char * what() const throw() {
 				return "cannot find the element in skiplist";
 			}
-		};
-		const NotFoundException 			excp_notfound;
+		} excp_notfound;
 
 	public:
 		SkipList() {

include/stack.h

@@ -36,21 +36,19 @@ namespace alg {
 						{
 							return "stack is empty";
 						}
-				};
+				} excp_empty;
 
 				class StackIndexOutOfBoundException: public std::exception {
 					public:
 						virtual const char * what() const throw()
 						{
 							return "Index out of bound.";
 						}
-				};
+				} excp_ioob;
 
 				uint32_t m_capacity;		// the total capacity
 				uint32_t m_size;			// current stack size
 				T * m_elements;		// the elements
-				const StackEmptyException 			exp_empty;
-				const StackIndexOutOfBoundException exp_ioob;
 
 			public:
 				/**
@@ -90,7 +88,7 @@ namespace alg {
 				 * get the top element
 				 */
 				inline const T& top() const {
-					if (m_size==0) throw exp_empty;
+					if (m_size==0) throw excp_empty;
 					return m_elements[m_size-1]; 
 				}
 
@@ -115,7 +113,7 @@ namespace alg {
 				 * return value by index
 				 */
 				inline const T& operator[] (uint32_t idx) const {
-					if (idx<0 || idx >= m_capacity) throw exp_ioob;
+					if (idx >= m_capacity) throw excp_ioob;
 					return m_elements[m_size-1-idx]; 
 				}
 		};

include/word_seg.h

@@ -123,8 +123,6 @@ namespace alg {
 			 */
 		private:
 			HashTable<uint32_t, WordEP> wordht;	// a WORD-> WordEP hashtable
-			uint32_t words[GB18030_NR];	// every char in GB18030
-
 		public:
 			WordSeg() : wordht(GB18030_NR){ }