[asterisk-commits] russell: branch 1.6.1 r176634 - in /branches/1.6.1: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Feb 17 14:52:24 2009
New Revision: 176634

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=176634
Log:
Merged revisions 176632 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r176632 | russell | 2009-02-17 14:51:10 -0600 (Tue, 17 Feb 2009) | 8 lines

Add an implementation of the heap data structure.

A heap is a convenient data structure for implementing a priority queue.

Code from svn/asterisk/team/russell/heap/.

Review: http://reviewboard.digium.com/r/160/

........

Added:
    branches/1.6.1/include/asterisk/heap.h
      - copied unchanged from r176632, trunk/include/asterisk/heap.h
    branches/1.6.1/main/heap.c
      - copied unchanged from r176632, trunk/main/heap.c
Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/Makefile

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/Makefile
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/Makefile?view=diff&rev=176634&r1=176633&r2=176634
==============================================================================
--- branches/1.6.1/main/Makefile (original)
+++ branches/1.6.1/main/Makefile Tue Feb 17 14:52:24 2009
@@ -18,7 +18,7 @@
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
 OBJS= tcptls.o io.o sched.o logger.o frame.o loader.o config.o channel.o \
-	translate.o file.o pbx.o cli.o md5.o term.o \
+	translate.o file.o pbx.o cli.o md5.o term.o heap.o \
 	ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
 	cdr.o tdd.o acl.o rtp.o udptl.o manager.o asterisk.o \
 	dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \