Ticket #457: geospatial2.patch

win32msvc/win32_api.mak

@@ -23 +23 @@
     $(INTDIR)/error.obj \
     $(INTDIR)/errorhandler.obj \
     $(INTDIR)/expanddecider.obj \
-    $(INTDIR)/keymaker.obj \
     $(INTDIR)/leafpostlist.obj \
     $(INTDIR)/matchspy.obj \
     $(INTDIR)/omdatabase.obj \
@@ -39 +38 @@
     $(INTDIR)/registry.obj \
     $(INTDIR)/replication.obj \
     $(INTDIR)/sortable-serialise.obj \
+    $(INTDIR)/sorter.obj \
     $(INTDIR)/termlist.obj \
     $(INTDIR)/valueiterator.obj\
     $(INTDIR)/valuerangeproc.obj \
@@ -53 +53 @@
     $(INTDIR)/error.cc\
     $(INTDIR)/errorhandler.cc\
     $(INTDIR)/expanddecider.cc\
-    $(INTDIR)/keymaker.cc\
     $(INTDIR)/leafpostlist.cc\
     $(INTDIR)/matchspy.cc \
     $(INTDIR)/omdatabase.cc\
@@ -68 +67 @@
     $(INTDIR)/postlist.cc\
     $(INTDIR)/registry.cc \
     $(INTDIR)/replication.cc \
+    $(INTDIR)/sorter.cc \
     $(INTDIR)/sortable-serialise.cc\
     $(INTDIR)/termlist.cc\
     $(INTDIR)/valueiterator.cc\

win32msvc/win32_backends_multi.mak

@@ -16 +16 @@
 OBJS= \
                 $(INTDIR)\multi_postlist.obj \
                 $(INTDIR)\multi_termlist.obj \
-                $(INTDIR)\multi_valuelist.obj \
                 $(INTDIR)\multi_alltermslist.obj
 
 SRCS= \
                 $(INTDIR)\multi_postlist.cc \
                 $(INTDIR)\multi_termlist.cc \
-                $(INTDIR)\multi_valuelist.cc \
                 $(INTDIR)\multi_alltermslist.cc
         
 CLEAN :

win32msvc/win32_matcher.mak

@@ -35 +35 @@
     $(INTDIR)\synonympostlist.obj\
     $(INTDIR)\valuerangepostlist.obj\
     $(INTDIR)\valuegepostlist.obj\
-    $(INTDIR)\valuestreamdocument.obj\
     $(INTDIR)\xorpostlist.obj\
     $(INTDIR)\remotesubmatch.obj
 
@@ -61 +60 @@
     $(INTDIR)\synonympostlist.cc\
     $(INTDIR)\valuerangepostlist.cc\
     $(INTDIR)\valuegepostlist.cc\
-    $(INTDIR)\valuestreamdocument.cc\
     $(INTDIR)\xorpostlist.cc\
     $(INTDIR)\remotesubmatch.cc
 

win32msvc/win32_tests.mak

@@ -64 +64 @@
     "$(INTDIR)\api_replicate.obj" \
     "$(INTDIR)\api_serialise.obj" \
     "$(OUTDIR)\api_sorting.obj" \
-    "$(OUTDIR)\api_sortingold.obj" \
     "$(OUTDIR)\api_spelling.obj" \
     "$(OUTDIR)\api_transdb.obj" \
     "$(OUTDIR)\api_unicode.obj" \
@@ -97 +96 @@
     "$(INTDIR)\api_replicate.cc" \
     "$(INTDIR)\api_serialise.cc" \
     "$(INTDIR)\api_sorting.cc" \
-    "$(INTDIR)\api_sortingold.cc" \
     "$(INTDIR)\api_spelling.cc" \
     "$(INTDIR)\api_transdb.cc" \
     "$(INTDIR)\api_unicode.cc" \
@@ -125 +123 @@
     "$(INTDIR)\api_replicate.cc" \
     "$(INTDIR)\api_serialise.cc" \
     "$(INTDIR)\api_sorting.cc" \
-    "$(INTDIR)\api_sortingold.cc" \
     "$(INTDIR)\api_spelling.cc" \
     "$(INTDIR)\api_transdb.cc" \
     "$(INTDIR)\api_unicode.cc" \
@@ -147 +144 @@
     "$(INTDIR)\api_replicate.h" \
     "$(INTDIR)\api_serialise.h" \
     "$(INTDIR)\api_sorting.h" \
-    "$(INTDIR)\api_sortingold.h" \
     "$(INTDIR)\api_spelling.h" \
     "$(INTDIR)\api_transdb.h" \
     "$(INTDIR)\api_unicode.h" \