diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index e0620523..f01e39d1 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -2,6 +2,8 @@ name: Linux
 
 on:
   push:
+    branches: [ "master", "new-build-system", "new-build-system-no-pr" ]
+  pull_request:
     branches: [ "master" ]
 
 permissions:
@@ -18,16 +20,17 @@ jobs:
     - name: Install UnixODBC package
       run: sudo apt-get install -y unixodbc unixodbc-dev
 
-    - name: Go to build folder & make
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: |
-        cd Builds/Gcc.lin
-        cp makefile.linux makefile
-        make
-    
+    - name: Configure CMake
+      run: cmake -B build -DCMAKE_BUILD_TYPE=Release
+
+    - name: Build
+      run: cmake --build build --config Release
+
+    - name: Run tests (no database — all tests skip)
+      run: ctest --test-dir build --output-on-failure
+
     - uses: actions/upload-artifact@v4
       with:
-          name: linux_libs
+          name: linux_x64_libs
           path: |
-            ./Builds/Gcc.lin/Release_*
-            !./Builds/Gcc.lin/Release_*/obj
+            ./build/libOdbcFb.so
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index b1b57e51..aa8780ef 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -7,6 +7,8 @@ name: MSBuild
 
 on:
   push:
+    branches: [ "master", "new-build-system", "new-build-system-no-pr" ]
+  pull_request:
     branches: [ "master" ]
 
 env:
@@ -43,6 +45,10 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: nuget restore ${{env.SOLUTION_FILE_PATH}}
 
+    - name: Fetch Firebird headers (required by .vcxproj include paths)
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: cmake -B build -DBUILD_TESTING=OFF
+
     - name: Stub
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: |
diff --git a/.github/workflows/rpi_arm64.yml b/.github/workflows/rpi_arm64.yml
index 40dcb38c..c6ca0bb2 100644
--- a/.github/workflows/rpi_arm64.yml
+++ b/.github/workflows/rpi_arm64.yml
@@ -2,6 +2,8 @@ name: RaspberryPI
 
 on:
   push:
+    branches: [ "master", "new-build-system", "new-build-system-no-pr" ]
+  pull_request:
     branches: [ "master" ]
 
 permissions:
@@ -19,17 +21,17 @@ jobs:
         base_image: raspios_lite_arm64:latest
         copy_repository_path: /opt/fb_odbc
         copy_artifact_path: |
-                    Builds/Gcc.lin/Release_*
+                    build/libOdbcFb.so
         commands: |
-            sudo apt-get install -y unixodbc unixodbc-dev
-            cd /opt/fb_odbc/Builds/Gcc.lin
-            cp makefile.linux makefile
-            make
+            sudo apt-get update
+            sudo apt-get install -y cmake unixodbc unixodbc-dev
+            cd /opt/fb_odbc
+            cmake -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF
+            cmake --build build --config Release
     
     - uses: actions/upload-artifact@v4
       with:
           name: linux_arm64_libs
           path: |
-              Release_*
-              !Release_*/obj
+              libOdbcFb.so
 
diff --git a/.gitignore b/.gitignore
index 5b15010c..eee5caef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,33 @@ Install/Win32/install_image/
 build_*.log
 OdbcJdbcSetup_*.iss
 .vs/*
+
+# CMake
+build/
+build-*/
+Build/
+out/
+cmake-build-*/
+CMakeCache.txt
+CMakeFiles/
+cmake_install.cmake
+CTestTestfile.cmake
+_deps/
+install_manifest.txt
+Testing/
+tests/Testing/
+
+# Build artifacts
+*.o
+*.obj
+*.dll
+*.lib
+*.exe
+*.pdb
+*.ilk
+*.exp
+
+# IDE
+.idea/
+.vscode/
+CMakeUserPresets.json
diff --git a/Builds/Bcc55.win/HowToCompileGuide-BCC55.txt b/Builds/Bcc55.win/HowToCompileGuide-BCC55.txt
deleted file mode 100644
index 03474947..00000000
--- a/Builds/Bcc55.win/HowToCompileGuide-BCC55.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-   How to compile guide with free Borland C++ Command Line 
-                     Tool version 5.5.1
-
-   In order to compile OdbcJdbc Firebird driver with free Borland C++ 
-Command Line Tool version 5.5.1, few steps are necessary to be followed. 
-This is complete guide, from compiler download, compiler installation, 
-few preparation to compile and compiling driver itself. Complete process 
-is organized in few sections.
-
-I hope this little guide will be useful.
-
-Installing Borland C++ free Commandline tool v 5.5.1 
-
-1. Download Borland C++ free Commandline tool v 5.5.1 from Borland's 
-   official site at www.borland.com. File is named as 
-   freecommandLinetools.exe
-
-2. Execute freecommandLinetools.exe and follow instructions. 
-   Assuming chosen folder is:
-
-	 c:\Borland\BCC55
-
-
-   Creating needed odbccp32.lib file. File odbccp32.lib need 
-to be created in order to compile driver
-
-1. Find odbccp32.dll library in Windows system folder (in W2000, 
-   it is usually in c:\winnt\system32) and copy it into temp folder.
-
-2. Create odbccp32.lib file from odbccp32.dll with following command:
-
-	c:\Borland\Bcc55\Bin\implib -c odbccp32.lib odbccp32.dll
-
-3. Copy created file odbccp32.lib to following folder:
-
-	c:\Borland\Bcc55\lib\PSDK 
-
-
-Compiling OdbcJdbc driver itself
-
-
-1. Create temp folder, for example:
-
-	md C:\FBODBC
-
-2. Create following sub folders:
-
-	md C:\FBODBC\Firebird
-        md C:\FBODBC\Firebird\Include
-	md C:\FBODBC\OdbcJdbc
-
-3. Extract OdbcJdbc sources to C:\FBODBC\OdbcJdbc
-
-4. Download Firebird sources from official site www.firebird.org.
-
-5. Extract Firebird sources to some other temp folder and copy to
-
-	C:\FBODBC\Firebird\Include only following files:
-
-	blr.h
-	fb_types.h
-	ibase.h
-	iberror.h
-
-6. Check and change paths to your correspondent paths from file:
-
-	c:\FBODBC\OdbcJdbc\Builds\makefile.environ
-
-	In this case, paths are follows: 
-
-	FBINCDIR	= c:\FBODBC\Firebird\include
-	FBLIBDIR	= c:\FBODBC\Firebird\lib
-
-
-7. Depending on chosen environment, execute one of the following 
-   batches in order to create OdbcJdbc DLLs:
-
-	From folder c:\FBODBC\OdbcJdbc\Builds\Bcc55.win
-
-	For NT (W2000/XP/w2003) - BuildNT.bat
-	For W98/Me              - Build98.bat
-
-
-	Resulting DLLs are in folder:
-
-	c:\FBODBC\OdbcJdbc\Builds\Bcc55.win\Release
-
-8. Install driver with following command (not recommended):
-
-	From folder c:\FBODBC\OdbcJdbc\Builds\Bcc55.win
-
-	RegSvr32 .\OdbcJdbcSetup.dll
-
-9. If last command fails, using full paths to regsvr32 and 
-   OdbcJdbcSetup.dll may be of help. For W2000, that is following 
-   command (recommended):
-
-	c:\winnt\system32\RegSvr32 /i c:\FBODBC\OdbcJdbc\Builds\Bcc55.win\Release\OdbcJdbcSetup.dll
-
-10. Enjoy using Firebird through ODBC!
-
-
-
-    Special thanks to Vladimir Tsvigun for wonderful job maintaining 
-and improving this driver, for all his help and support.
-
-Contributor	: Sasa Zeman
-Contact 	: public@szutils.net
-Web site	: www.szutils.net
diff --git a/Builds/Bcc55.win/build.bat b/Builds/Bcc55.win/build.bat
deleted file mode 100644
index b45181b4..00000000
--- a/Builds/Bcc55.win/build.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-rem
-rem  Examples Win98/Me
-rem          build C:\Borland\BCC55 WIN98
-rem
-rem
-rem  Examples Win XP/2000/2003/...
-rem          build C:\Borland\BCC55
-rem
-
-
-%1\bin\make -f makefile.bcc55 COMPDIR=%1 VER_NT=%2
-
-@echo on
diff --git a/Builds/Bcc55.win/build98.bat b/Builds/Bcc55.win/build98.bat
deleted file mode 100644
index 02b44073..00000000
--- a/Builds/Bcc55.win/build98.bat
+++ /dev/null
@@ -1 +0,0 @@
-@call build C:\Borland\BCC55 WIN98
diff --git a/Builds/Bcc55.win/buildNT.bat b/Builds/Bcc55.win/buildNT.bat
deleted file mode 100644
index 10b37076..00000000
--- a/Builds/Bcc55.win/buildNT.bat
+++ /dev/null
@@ -1 +0,0 @@
-@call build C:\Borland\BCC55
diff --git a/Builds/Bcc55.win/makefile.bcc55 b/Builds/Bcc55.win/makefile.bcc55
deleted file mode 100644
index 92e4fee6..00000000
--- a/Builds/Bcc55.win/makefile.bcc55
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-.PHONY: all createdirs IscDbc OdbcJdbc OdbcJdbcSetup clean
-#
-#DEBUG		= 1
-#
-!if(VER_NT == "WIN98")
-# Win98/Me
-VER_WINNT	= "_WIN32_WINNT=0x0400"
-!else
-# Windows 2000/NT
-VER_WINNT	= "_WIN32_WINNT=0x0500"
-!endif
-#
-!include ../makefile.environ
-!include ../makefile.sources
-#
-!ifdef DEBUG
-TARGETDIR	= Debug
-!else
-TARGETDIR	= Release
-!endif
-#
-BUILDDIR 	= $(TARGETDIR)\obj
-#
-COMPFLAGS	= -n$(BUILDDIR) \
-		  -w- -a8 -jb -j1 -Hc -H=$(BUILDDIR)\bcc.csm \
-		  -DWIN32 -D_WIN32 -D_WINDOWS -D$(VER_WINNT) -DISOLATION_AWARE_ENABLED \
-		  -I.\ -I$(FBINCDIR) -I$(COMPDIR)\Include -I$(ISCDBCDIR) -I$(ODBCJDBCDIR)
-#		  -w- -a8 -VM -VF -jb -j1 -Hc -H=$(BUILDDIR)\bcc.csm \
-#
-RCINCLUDE       = -i$(COMPDIR)\Include
-BRCC 		= $(COMPDIR)\bin\brcc32 -dWIN32 -d_WIN32
-LD		= $(COMPDIR)\bin\ilink32
-BCC 		= $(COMPDIR)\bin\bcc32
-LINKFLAGS	= -q -Gn -Gi -Tpd -ad -L$(COMPDIR)\lib -L$(COMPDIR)\lib\PSDK -x
-STARTUP		= c0d32.obj
-LIBRARIES	= import32.lib cw32mt.lib wsock32.lib
-ISCDBCDLL       = $(TARGETDIR)\IscDbc.dll
-ODBCJDBCDLL     = $(TARGETDIR)\OdbcFb.dll
-ODBCJDBCSDLL    = $(TARGETDIR)\OdbcJdbcSetup.dll
-#
-!ifdef DEBUG
-COMPFLAGS	= $(COMPFLAGS) -v -N -x -xp -D_DEBUG -DDEBUG
-!else
-COMPFLAGS	= $(COMPFLAGS) -DNDEBUG
-!endif
-#
-COMPFLAGS	= $(COMPFLAGS) -tWCR -lGn -tWM -q
-#
-.rc.res:
-  	@$(BRCC) $(RCINCLUDE) -fo$@ $*.rc
-#
-.cpp.obj :
-	@$(BCC) $(COMPFLAGS) $(COMPEXTFLAGS) -c $*.cpp
-#
-ISCDBCLIB       	= $(ISCDBCDLL:.dll=.lib)
-ISCDBCDIRBCC 		= $(ISCDBCDIR:/=\)
-ODBCJDBCDIRBCC 		= $(ODBCJDBCDIR:/=\)
-ODBCJDBCSDIRBCC		= $(ODBCJDBCSETUPDIR:/=\)
-LIST_ISCDBCOBJ 		= $(ISCDBCSRC:.cpp=.obj)
-LIST_ODBCJDBCOBJ	= $(ODBCJDBCSRC:.cpp=.obj)
-LIST_ODBCJDBCSOBJ	= $(ODBCJDBCSETUPSRC:.cpp=.obj)
-#
-.PATH.cpp	= $(ISCDBCDIRBCC);$(ODBCJDBCDIRBCC);$(ODBCJDBCSDIRBCC)
-.PATH.obj	= $(BUILDDIR)
-.PATH.rc	= $(ISCDBCDIRBCC);$(ODBCJDBCDIRBCC);$(ODBCJDBCSDIRBCC)
-.PATH.res	= $(BUILDDIR)
-#
-ISCDBCDEFFILE	= 
-#ISCDBCDEFFILE	= $(ISCDBCDIRBCC)\IscDbc.def
-ODBCJDBCDEFFILE	= $(ODBCJDBCDIRBCC)\OdbcJdbc.def
-ODBCJDBCSDEFFILE= 
-#ODBCJDBCSDEFFILE= $(ODBCJDBCSDIRBCC)\OdbcJdbcSetup.def
-#
-all :	createdirs IscDbc OdbcJdbc OdbcJdbcSetup
-#
-# Silently creates the target and build directories
-createdirs :
-	@-if not exist $(TARGETDIR)\*.* mkdir $(TARGETDIR) > nul
-	@-if not exist $(BUILDDIR)\*.* mkdir $(BUILDDIR) > nul
-#
-# Silently cleanup and deletes the target and build directories
-clean :
-	@if exist $(BUILDDIR) rm -fr $(TARGETDIR)
-#
-IscDbc 		: $(BUILDDIR)\IscDbc.res $(ISCDBCDLL)
-OdbcJdbc 	: $(BUILDDIR)\OdbcJdbc.res $(ODBCJDBCDLL)
-OdbcJdbcSetup 	: $(BUILDDIR)\OdbcJdbcSetup.res $(ODBCJDBCSDLL)
-#
-# Build the library from the object modules
-#
-$(ISCDBCDLL) 	: $(LIST_ISCDBCOBJ)
-#	@$(LD) $(LINKFLAGS) $(STARTUP) $(**:$(ISCDBCDIRBCC)=$(BUILDDIR)) ,$(ISCDBCDLL),,$(LIBRARIES),$(ISCDBCDEFFILE), $(BUILDDIR)\IscDbc.res
-#
-$(ODBCJDBCDLL) 	: $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSOBJ)
-	@$(LD) $(LINKFLAGS) $(STARTUP) $(**:$(ODBCJDBCDIRBCC)=$(BUILDDIR)),$(ODBCJDBCDLL),,$(LIBRARIES) odbccp32.lib ,$(ODBCJDBCDEFFILE), $(BUILDDIR)\OdbcJdbc.res
-#
-$(ODBCJDBCSDLL)	: $(LIST_ODBCJDBCSOBJ)
-#	@$(LD) $(LINKFLAGS) $(STARTUP) $(BUILDDIR)\JString.obj $(**:$(ODBCJDBCSDIRBCC)=$(BUILDDIR)) ,$(ODBCJDBCSDLL),,$(LIBRARIES) gdi32.lib shell32.lib advapi32.lib user32.lib comdlg32.lib comctl32.lib odbccp32.lib,$(ODBCJDBCSDEFFILE),$(BUILDDIR)\OdbcJdbcSetup.res
-#
-# End
-#
diff --git a/Builds/CC.solaris/makefile.solaris b/Builds/CC.solaris/makefile.solaris
deleted file mode 100644
index 57126925..00000000
--- a/Builds/CC.solaris/makefile.solaris
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# To build set the following environment variables
-# ODBCMANAGER (either iODBC or unixODBC)
-# ODBCMANAGERDIR (set to installation folder of required ODBC driver, as per above)
-#
-
-#
-#DEBUG=1
-#
-.PHONY: all createdirs IscDbc OdbcJdbc OdbcJdbcSetup clean postbuild
-#
-CC		= CC
-#
-# Start build
-#
-include ../makefile.sources
-include ../makefile.environ
-#
-
-INCLUDEDIR      = -I$(FBINCDIR) + -I$(ODBCMANAGERDIR)/include
-EXTLIBDIR       = -L$(FBLIBDIR) + -L$(ODBCMANAGERDIR/lib
-
-ifeq (iODBC,$ODBCMANAGER))
-LIBODBCINST 	= -liodbcinst
-else
-LIBODBCINST 	= -lodbcinst
-endif
-
-ifdef DEBUG
-TARGETDIR	= Debug
-else
-TARGETDIR	= Release
-endif
-#
-BUILDDIR 	= $(TARGETDIR)/obj
-#
-LIST_ISCDBCSRC 		= $(addprefix $(ISCDBCDIR)/, $(ISCDBCSRC))
-LIST_ISCDBCOBJ 		= $(addprefix $(BUILDDIR)/, $(ISCDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSRC	= $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSRC))
-LIST_ODBCJDBCOBJ	= $(addprefix $(BUILDDIR)/, $(ODBCJDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSETUPSRC	= $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
-LIST_ODBCJDBCSETUPOBJ	= $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
-#
-COMPFLAGS	= -m64 -xarch=sparcvis -mt -lpthread -KPIC -w -D_REENTRANT -D_PTHREADS -DEXTERNAL  $(INCLUDEDIR) 
-#
-LINKFLAGS	= -G -m64
-EXTLIBS		= $(EXTLIBDIR) -lcrypt -ldl -lCstd
-#
-ISCDBCDLL       = $(TARGETDIR)/IscDbc.so
-ODBCJDBCDLL     = $(TARGETDIR)/libOdbcFb.so
-ODBCJDBCSETUPDLL= $(TARGETDIR)/OdbcJdbcS.so
-ISCDBCDEFFILE	= $(ISCDBCDIR)/IscDbc.def
-ODBCJDBCDEFFILE	= $(ODBCJDBCDIR)/OdbcJdbc.def
-ODBCJDBCSDEFFILE= $(ODBCJDBCSETUPDIR)/OdbcJdbcSetup.def
-#
-ifdef DEBUG
-DEBUGFLAGS	= -g -D_DEBUG -DDEBUG -DLOGGING -fexceptions 
-else
-DEBUGFLAGS	= -DNDEBUG
-endif
-#
-$(BUILDDIR)/%.o: $(ISCDBCDIR)/%.cpp
-	$(CC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-$(BUILDDIR)/%.o: $(ODBCJDBCDIR)/%.cpp
-	$(CC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-ISCDBCLIB       = $(ISCDBCDLL:.so=.a)
-ODBCJDBCLIB     = $(ODBCJDBCDLL:.so=.a)
-ODBCJDBCSETUPLIB= $(ODBCJDBCSETUPDLL:.so=.a)
-#
-all :	createdirs $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-#
-# Silently creates the target and build directories
-createdirs :
-	@-mkdir $(TARGETDIR)
-	@-mkdir $(BUILDDIR)
-#
-# Silently cleanup and deletes the target and build directories
-clean :
-	@-rm -fr $(TARGETDIR)
-#
-IscDbc : $(ISCDBCDLL)
-OdbcJdbc : $(ODBCJDBCDLL)
-OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
-#
-# Build the library from the object modules
-#
-$(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
-#	ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
-#	$(CC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) -o $(ISCDBCDLL)
-#
-#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
-#	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-#	$(CC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) -lodbcinst -o $(ODBCJDBCDLL)
-#
-$(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
-#	ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
-#	$(CC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
-#
-$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
-	$(CC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) $(LIBODBCINST) -o $(ODBCJDBCDLL)
-#
-postbuild : $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-	@-strip -s $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-	@-tar -cf OdbcJdbc_Snapshot.tar $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-	@-gzip -9 -S .gz OdbcJdbc_Snapshot.tar
-#
-# End
-#
diff --git a/Builds/Gcc.darwin/lipo.sh b/Builds/Gcc.darwin/lipo.sh
deleted file mode 100644
index de3eb765..00000000
--- a/Builds/Gcc.darwin/lipo.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-lipo release_i386/libOdbcFB.dylib release_x86_64/libOdbcFB.dylib -output libOdbcFB.dylib -create
diff --git a/Builds/Gcc.darwin/makefile.darwin b/Builds/Gcc.darwin/makefile.darwin
deleted file mode 100644
index 60416875..00000000
--- a/Builds/Gcc.darwin/makefile.darwin
+++ /dev/null
@@ -1,210 +0,0 @@
-#
-#     The contents of this file are subject to the Initial
-#     Developer's Public License Version 1.0 (the "License");
-#     you may not use this file except in compliance with the
-#     License. You may obtain a copy of the License at
-#     http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl
-#
-#     Software distributed under the License is distributed on
-#     an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
-#     express or implied.  See the License for the specific
-#     language governing rights and limitations under the License.
-#
-#
-#     The Original Code was created by Vladimir Tsvigun.
-#
-#     Copyright (c) 2003 Vladimir Tsvigun
-#     All Rights Reserved.
-#	This file modified to support MacOSX by Paul Beach
-#
-#
-#
-#
-#
-DEBUG = No
-#
-.PHONY: all createdirs IscDbc OdbcJdbc OdbcJdbcSetup clean postbuild install uninstall package
-#
-GCC		= g++
-
-
-#Override default variables for this build
-ARCH=x86_64
-#ARCH=i386
-#FIREBIRD=/usr/lib64/firebird
-
-# Get version info
-MAJOR_VERSION = $(shell cat ../../SetupAttributes.h | grep "define MAJOR_VERSION" | cut -f 3)
-MINOR_VERSION = $(shell cat ../../SetupAttributes.h | grep "define MINOR_VERSION" | cut -f 3)
-REVISION = $(shell cat ../../SetupAttributes.h | grep "define REVNO_VERSION" | cut -f 3)
-BUILD_NUMBER = $(shell cat ../../WriteBuildNo.h | grep "define BUILDNUM_VERSION" | cut -f 3)
-#and use it
-LIB_ROOT_NAME = OdbcFb
-PACKAGE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(REVISION).$(BUILD_NUMBER)
-LIB_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(REVISION)
-PACKAGE_NAME = $(LIB_ROOT_NAME)-$(PACKAGE_VERSION).tar
-#
-# Start build
-#
-include ../makefile.sources
-#
-
-UNIXODBCDIR=/usr/lib
-ODBCMANAGER=iODBC
-FBINCDIR=/Library/Frameworks/Firebird.framework/Versions/A/Headers
-FBLIBDIR=/Library/Frameworks/Firebird.framework/Versions/A/Libraries
-ISCDBCDIR=../../IscDbc
-ODBCJDBCDIR=../..
-ODBCJDBCSETUPDIR=../../OdbcJdbcSetup
-
-LIB=lib
-
-ifeq (iODBC,$(ODBCMANAGER))
-LIBODBCINST 	= -liodbcinst
-INCLUDEDIR      = -I/usr/local/include \
-                  -I/usr/include
-#EXTLIBDIR       = -L/usr/local/$(LIB) \
-                  -L/usr/$(LIB)
-else
-LIBODBCINST	    = -lodbcinst
-INCLUDEDIR      = -I/usr/include
-EXTLIBDIR       = -L/usr/$(LIB)
-endif
-
-ALLINCLUDEDIR      = -I$(FBINCDIR) -I/usr/include/odbc $(INCLUDEDIR)
-EXTLIBDIR       := -L$(FBLIBDIR -L$(UNIXODBCDIR) $(EXTLIBDIR)
-
-ifeq (Yes,$(DEBUG))
-TARGETDIR	    = Debug_$(ARCH)
-else
-TARGETDIR	    = Release_$(ARCH)
-endif
-#
-BUILDDIR 	    = $(TARGETDIR)/obj
-#
-DRVTMPL			= ../../Install/Linux/DriverTemplate.ini
-
-LIST_ISCDBCSRC 		= $(addprefix $(ISCDBCDIR)/, $(ISCDBCSRC))
-LIST_ISCDBCOBJ 		= $(addprefix $(BUILDDIR)/, $(ISCDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSRC	= $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSRC))
-LIST_ODBCJDBCOBJ	= $(addprefix $(BUILDDIR)/, $(ODBCJDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSETUPSRC	= $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
-LIST_ODBCJDBCSETUPOBJ	= $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
-#
-COMPFLAGS	= -g -w -fPIC -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(ALLINCLUDEDIR) -I$(FBINCDIR)
-
-ifeq (x86_64,$(ARCH))
-COMPFLAGS	+= -m64 -arch x86_64
-LINKFLAGS	= -m64 -arch x86_64
-else
-COMPFLAGS	+= -m32 -arch i386
-LINKFLAGS	=  -m32 -arch i386
-endif
-#
-LINKFLAGS	+= -shared 
-
-EXTLIBS		= -ldl
-
-#
-#ISCDBC		= libIscDbc.dylib
-ISCDBCDLL       = $(TARGETDIR)/$(ISCDBC)
-ODBCJDBC	= lib$(LIB_ROOT_NAME).dylib
-ODBCJDBCDLL     = $(TARGETDIR)/$(ODBCJDBC)
-#ODBCJDBCSETUP	= libOdbcFbS.dylib
-ODBCJDBCSETUPDLL= $(TARGETDIR)/$(ODBCJDBCSETUP)
-ISCDBCDEFFILE	= $(ISCDBCDIR)/IscDbc.def
-ODBCJDBCDEFFILE	= $(ODBCJDBCDIR)/OdbcJdbc.def
-ODBCJDBCSDEFFILE= $(ODBCJDBCSETUPDIR)/OdbcJdbcSetup.def
-#
-ifeq (Yes,$(DEBUG))
-DEBUGFLAGS	= -D_DEBUG -DDEBUG -DLOGGING -fexceptions 
-else
-DEBUGFLAGS	= -DNDEBUG
-endif
-
-#
-$(BUILDDIR)/%.o: $(ISCDBCDIR)/%.cpp
-	$(GCC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-$(BUILDDIR)/%.o: $(ODBCJDBCDIR)/%.cpp
-	$(GCC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-ISCDBCLIB       = $(ISCDBCDLL:.dylib=.a)
-ODBCJDBCLIB     = $(ODBCJDBCDLL:.dylib=.a)
-ODBCJDBCSETUPLIB= $(ODBCJDBCSETUPDLL:.dylib=.a)
-
-
-
-#
-all :	createdirs $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-#
-# If required, print out the version info
-getVersion : 
-	$(warning MAJOR_VERSION is $(MAJOR_VERSION) )
-	$(warning MINOR_VERSION is $(MINOR_VERSION) )
-	$(warning REVISION is $(REVISION) )
-	$(warning BUILD_NUMBER is $(BUILD_NUMBER) )
-#
-# Silently creates the target and build directories
-createdirs :
-	@-mkdir $(TARGETDIR)
-	@-mkdir $(BUILDDIR)
-#
-# Silently cleanup and deletes the target and build directories
-clean :
-	@-rm -fr $(TARGETDIR)
-#
-IscDbc : $(ISCDBCDLL)
-OdbcJdbc : $(ODBCJDBCDLL)
-OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
-#
-# Build the library from the object modules
-#
-$(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
-#	ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
-#	$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) --def $(ISCDBCDEFFILE) -o $(ISCDBCDLL)
-#
-#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
-#	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-#	$(GCC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) $(LIBODBCINST) --def $(ODBCJDBCDEFFILE) -o $(ODBCJDBCDLL)
-#
-$(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
-#	ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
-#	$(GCC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
-#
-$(ODBCJDBCDLL) : $(ISCDBCDLL) $(ODBCJDBCSETUPDLL) $(LIST_ODBCJDBCOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
-	$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) $(LIBODBCINST) --def $(ODBCJDBCDEFFILE) -o $(ODBCJDBCDLL)
-#
-postbuild : $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-	@-strip -s $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-	@-tar -cf OdbcJdbc_Snapshot.tar $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-	@-gzip -9 -S .gz OdbcJdbc_Snapshot.tar
-#
-install : 
-	cp $(ODBCJDBCDLL) $(UNIXODBCDIR)/$(ODBCJDBC).$(LIB_VERSION)
-	ln -s $(UNIXODBCDIR)/$(ODBCJDBC).$(LIB_VERSION) $(UNIXODBCDIR)/$(ODBCJDBC)
-	ln -s $(UNIXODBCDIR)/$(ODBCJDBC).$(LIB_VERSION) $(UNIXODBCDIR)/$(ODBCJDBC).$(MAJOR_VERSION)
-#
-uninstall : 
-	@-rm -f $(UNIXODBCDIR)/$(ODBCJDBC)*.* 
-#
-package :
-	-strip -s $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-	-rm $(PACKAGE_NAME).gz
-	chmod 740 ../../Install/Linux/install.sh
-	tar -C $(TARGETDIR) -cvf OdbcJdbcLibs.tar $(ISCDBC) $(ODBCJDBC) $(ODBCJDBCSETUP)
-	tar -C ../../Install/HtmlHelp --exclude=CVS -cvf OdbcJdbcDocs.tar html/ 
-	tar -C ../../Install -uf OdbcJdbcDocs.tar ReleaseNotes_v2.0.html
-	cat $(DRVTMPL) | grep -v "^Driver.*=.*" >$(DRVTMPL).tmp && echo "Driver = $(UNIXODBCDIR)/$(ODBCJDBC)" >>$(DRVTMPL).tmp && mv $(DRVTMPL).tmp $(DRVTMPL)
-	tar -C ../../Install/Linux -cf $(PACKAGE_NAME) install.sh readme.txt DriverTemplate.ini FirebirdDSNTemplate.ini InterBaseDSNTemplate.ini
-	tar -uf $(PACKAGE_NAME) OdbcJdbcLibs.tar OdbcJdbcDocs.tar
-	rm OdbcJdbcLibs.tar  OdbcJdbcDocs.tar
-	gzip -9 -S .gz $(PACKAGE_NAME) 
-#
-
-#
-# End
-#
diff --git a/Builds/Gcc.darwin/readme.darwin b/Builds/Gcc.darwin/readme.darwin
deleted file mode 100644
index 439caf73..00000000
--- a/Builds/Gcc.darwin/readme.darwin
+++ /dev/null
@@ -1,75 +0,0 @@
-These instructions should allow a user to get a working user DSN for ODBC to connect 
-to Firebird on MacOS. Comments please to Paul Beach (pbeach at ibphoenix.com.
-
-To build the library, edit makefile.darwin, and select the ARCH (i386 or X86_64).
-then make -B -f makefile.darwin all
-
-The Firebird ODBC library can be built in both 64bit or 32bit format. 
-lipo.sh creates a fat libary that can be used on either version of Firebird.
-
-1. Download the MacOSX ODBC Administrator from support.apple.com
-http://support.apple.com/downloads/ODBC_Administrator_Tool_for_Mac_OS_X
-and install.
-
-2. Once installed it can be accessed via Applications/Utilities/ODBC Administrator
-
-3. Place the libOdbcFB.dylib in $HOME/odbc for example then add the Firebird driver 
-(dylib) name and location to the Drivers tab in the Administrator.
-e.g 
-Description: Firebird ODBC Driver
-Driver file: /Users/username/odbc/libOdbcFB.dylib
-Define as: User
-This will create an odbcinst.ini file in $HOME/Library/ODBC
-
-4. Now you need to create a User DSN via an odbc.ini file.
-Use the text below as an example, copy and paste into an odbc.ini
-file placed in $HOME/Library/ODBC
-Make sure that you modify the text so it points to your database 
-and uses your username and password.
-
-
-[ODBC Data Sources]
-Test = Firebird
-
-[Test]
-Driver               = /Users/username/odbc/libOdbcFb.dylib
-Description          = Test Firebird ODBC
-Dbname               = localhost:/Users/databases/test.fdb
-Client               = 
-User                 = SYSDBA
-Password             = masterkey
-Role                 = 
-CharacterSet         = NONE
-ReadOnly             = No
-NoWait               = No
-Dialect              = 3
-QuotedIdentifier     = Yes
-SensitiveIdentifier  = No
-AutoQuotedIdentifier = No
-
-[ODBC]
-Trace         = 0
-TraceAutoStop = 0
-TraceFile     = 
-TraceLibrary  = 
-
-This User DSN should appear in the User DSN tab the next time you load the 
-ODBC Administrator.
-
-5. You can test whether it works using iodbctest and then using the dsn
-dsn=Test, if all is well it should connect and you can issue SQL statements.
-
-To create a System wide version of the ODBC driver, copy the libOdbcFB.dylib
-to /usr/lib make sure the Administrators Drivers tab now points to this file.
-
-Copy the DSN above to /Library/ODBC and modify.
-
-Note: (13th June 2012)
-The ODBC library is linked to libfbclient.dylib found in the Firebird framework
-Libraries directory. Not all SuperServer builds of Firebird have this library installed
-by default. If this is the case get a copy of the Firebird Classic build and extract
-the libfbclient library and place it in 
-/Library/Frameworks/Firebird.framework/Versions/A/Libraries
-
-Newer versions of SuperServer will already have the library available.
-
diff --git a/Builds/Gcc.freeBSD/makefile.freeBSD b/Builds/Gcc.freeBSD/makefile.freeBSD
deleted file mode 100644
index dfaf1ac6..00000000
--- a/Builds/Gcc.freeBSD/makefile.freeBSD
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-#DEBUG=1
-#
-.PHONY: all createdirs IscDbc OdbcJdbc OdbcJdbcSetup clean
-#
-GCC = g++
-#
-# Start build
-#
-include ../makefile.sources
-include ../makefile.environ
-#
-ifdef DEBUG
-TARGETDIR = Debug
-else
-TARGETDIR = Release
-endif
-#
-BUILDDIR = $(TARGETDIR)/obj
-#
-LIST_ISCDBCSRC = $(addprefix $(ISCDBCDIR)/, $(ISCDBCSRC))
-LIST_ISCDBCOBJ = $(addprefix $(BUILDDIR)/, $(ISCDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSRC))
-LIST_ODBCJDBCOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSETUPSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
-LIST_ODBCJDBCSETUPOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
-#
-COMPFLAGS = -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -pthread
-#
-LINKFLAGS = -rdynamic -export-dynamic -shared
-EXTLIBS = -lcrypt -lgds -lcompat
-#
-ISCDBCDLL       = $(TARGETDIR)/IscDbc.so
-ODBCJDBCDLL     = $(TARGETDIR)/OdbcFb.so
-ODBCJDBCSETUPDLL= $(TARGETDIR)/OdbcJdbcS.so
-#
-ifdef DEBUG
-DEBUGFLAGS = -D_DEBUG -DDEBUG -DLOGGING -fexceptions
-else
-DEBUGFLAGS = -DNDEBUG
-endif
-#
-$(BUILDDIR)/%.o: $(ISCDBCDIR)/%.cpp
-	$(GCC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-$(BUILDDIR)/%.o: $(ODBCJDBCDIR)/%.cpp
-	$(GCC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-ISCDBCLIB       = $(ISCDBCDLL:.so=.a)
-ODBCJDBCLIB     = $(ODBCJDBCDLL:.so=.a)
-ODBCJDBCSETUPLIB= $(ODBCJDBCSETUPDLL:.so=.a)
-#
-all : createdirs $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-#
-# Silently creates the target and build directories
-createdirs :
-	@-mkdir $(TARGETDIR)
-	@-mkdir $(BUILDDIR)
-#
-# Silently cleanup and deletes the target and build directories
-clean :
-	@-rm -fr $(TARGETDIR)
-#
-IscDbc : $(ISCDBCDLL)
-OdbcJdbc : $(ODBCJDBCDLL)
-OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
-#
-# Build the library from the object modules
-#
-$(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
-#	ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
-#	$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) -o $(ISCDBCDLL)
-#
-#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
-#	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-#	$(GCC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) -o $(ODBCJDBCDLL)
-#
-$(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
-#	ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
-#	$(GCC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
-#
-$(ODBCJDBCDLL) : $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
-	$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCDLL)
-#
-# End
-#
diff --git a/Builds/Gcc.freeBSD/readme.freeBSD b/Builds/Gcc.freeBSD/readme.freeBSD
deleted file mode 100644
index e62fbd18..00000000
--- a/Builds/Gcc.freeBSD/readme.freeBSD
+++ /dev/null
@@ -1,12 +0,0 @@
-
-1) Uses -pthread flag
-
-Problem: 
-	But my simple client working over OTL-wrapper (otl.sf.net) sigfaults on exit,
-	and on linux works fine.
-
-Writen by Dmitriy Nikitinskiy
-All clients *must be* complied with -pthread flag:
-g++ -pthread -o client client.cpp
-
-2)
\ No newline at end of file
diff --git a/Builds/Gcc.lin/makefile.linux b/Builds/Gcc.lin/makefile.linux
deleted file mode 100644
index 2eaf897d..00000000
--- a/Builds/Gcc.lin/makefile.linux
+++ /dev/null
@@ -1,211 +0,0 @@
-#
-#     The contents of this file are subject to the Initial
-#     Developer's Public License Version 1.0 (the "License");
-#     you may not use this file except in compliance with the
-#     License. You may obtain a copy of the License at
-#     http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl
-#
-#     Software distributed under the License is distributed on
-#     an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
-#     express or implied.  See the License for the specific
-#     language governing rights and limitations under the License.
-#
-#
-#     The Original Code was created by Vladimir Tsvigun.
-#
-#     Copyright (c) 2003 Vladimir Tsvigun
-#     All Rights Reserved.
-#
-#
-#
-#
-#
-ifndef DEBUG
-DEBUG = No
-endif
-#
-.PHONY: all createdirs IscDbc OdbcJdbc OdbcJdbcSetup clean postbuild install uninstall package
-#
-GCC		= g++
-
-#Override default variables for this build
-#ARCH = x86
-FIREBIRD=../../FBClient.Headers
-
-# Get version info
-MAJOR_VERSION = $(shell cat ../../SetupAttributes.h | grep "define MAJOR_VERSION" | cut -f 3)
-MINOR_VERSION = $(shell cat ../../SetupAttributes.h | grep "define MINOR_VERSION" | cut -f 3)
-REVISION = $(shell cat ../../SetupAttributes.h | grep "define REVNO_VERSION" | cut -f 3)
-BUILD_NUMBER = $(shell cat ../../WriteBuildNo.h | grep "define BUILDNUM_VERSION" | cut -f 3)
-#and use it
-LIB_ROOT_NAME = OdbcFb
-PACKAGE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(REVISION).$(BUILD_NUMBER)
-LIB_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(REVISION)
-PACKAGE_NAME = $(LIB_ROOT_NAME)-$(PACKAGE_VERSION).tar
-#
-# Start build
-#
-include ../makefile.sources
-include ../makefile.environ
-#
-
-ifndef ODBCMANAGER
-ODBCMANAGER	= unixODBC
-#ODBCMANAGER	= iODBC
-endif
-
-ifndef ODBCMANAGERDIR
-INCLUDEDIR      = -I/usr/include -I$(FBINCDIR)
-EXTLIBDIR       = -L/usr/$(LIB) -L$(FBLIBDIR)
-endif
-
-ifeq ($(ARCH),x86_64)
-LIB = lib64
-else
-LIB = lib
-endif
-
-ifeq (iODBC,$(ODBCMANAGER))
-LIBODBCINST 	= -liodbcinst
-else
-LIBODBCINST	    = -lodbcinst
-endif
-
-INCLUDEDIR      = -I/usr/include -I$(FBINCDIR) -I$(ODBCMANAGERDIR)/include
-EXTLIBDIR       = -L/usr/$(LIB) -L$(FBLIBDIR) -L$(ODBCMANAGERDIR)/lib
-
-ifeq (Yes,$(DEBUG))
-TARGETDIR	    = Debug_$(ARCH)
-else
-TARGETDIR	    = Release_$(ARCH)
-endif
-#
-BUILDDIR 	    = $(TARGETDIR)/obj
-#
-DRVTMPL			= ../../Install/Linux/DriverTemplate.ini
-
-LIST_ISCDBCSRC 		= $(addprefix $(ISCDBCDIR)/, $(ISCDBCSRC))
-LIST_ISCDBCOBJ 		= $(addprefix $(BUILDDIR)/, $(ISCDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSRC	= $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSRC))
-LIST_ODBCJDBCOBJ	= $(addprefix $(BUILDDIR)/, $(ODBCJDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSETUPSRC	= $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
-LIST_ODBCJDBCSETUPOBJ	= $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
-#
-COMPFLAGS  = -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
-
-ifeq ($(ARCH),x86_64)
-COMPFLAGS   += -fPIC -m64
-LINKFLAGS= -shared -m64
-else ifeq ($(ARCH),aarch64)
-COMPFLAGS   += -fPIC
-LINKFLAGS= -shared
-else
-COMPFLAGS   += -m32
-LINKFLAGS= -shared -m32
-endif
-#
-#LINKFLAGS	= -rdynamic -export-dynamic -shared 
-
-EXTLIBS		= $(EXTLIBDIR) -lcrypt -ldl
-
-#
-#ISCDBC		= libIscDbc.so
-ISCDBCDLL       = $(TARGETDIR)/$(ISCDBC)
-ODBCJDBC	= lib$(LIB_ROOT_NAME).so
-ODBCJDBCDLL     = $(TARGETDIR)/$(ODBCJDBC)
-#ODBCJDBCSETUP	= libOdbcFbS.so
-ODBCJDBCSETUPDLL= $(TARGETDIR)/$(ODBCJDBCSETUP)
-ISCDBCDEFFILE	= $(ISCDBCDIR)/IscDbc.def
-ODBCJDBCDEFFILE	= $(ODBCJDBCDIR)/OdbcJdbc.def
-ODBCJDBCSDEFFILE= $(ODBCJDBCSETUPDIR)/OdbcJdbcSetup.def
-#
-ifeq (Yes,$(DEBUG))
-DEBUGFLAGS   = -g3 -O0 -D_DEBUG -DDEBUG -DLOGGING -fexceptions
-else
-DEBUGFLAGS	= -DNDEBUG -O3
-endif
-
-#
-$(BUILDDIR)/%.o: $(ISCDBCDIR)/%.cpp
-	$(GCC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-$(BUILDDIR)/%.o: $(ODBCJDBCDIR)/%.cpp
-	$(GCC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-ISCDBCLIB       = $(ISCDBCDLL:.so=.a)
-ODBCJDBCLIB     = $(ODBCJDBCDLL:.so=.a)
-ODBCJDBCSETUPLIB= $(ODBCJDBCSETUPDLL:.so=.a)
-
-#
-all :	createdirs $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-#
-# If required, print out the version info
-getVersion : 
-	$(warning MAJOR_VERSION is $(MAJOR_VERSION) )
-	$(warning MINOR_VERSION is $(MINOR_VERSION) )
-	$(warning REVISION is $(REVISION) )
-	$(warning BUILD_NUMBER is $(BUILD_NUMBER) )
-#
-# Silently creates the target and build directories
-createdirs :
-	@-mkdir $(TARGETDIR)
-	@-mkdir $(BUILDDIR)
-#
-# Silently cleanup and deletes the target and build directories
-clean :
-	@-rm -fr $(TARGETDIR)
-#
-IscDbc : $(ISCDBCDLL)
-OdbcJdbc : $(ODBCJDBCDLL)
-OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
-#
-# Build the library from the object modules
-#
-$(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
-#	ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
-#	$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) --def $(ISCDBCDEFFILE) -o $(ISCDBCDLL)
-#
-#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
-#	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-#	$(GCC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) $(LIBODBCINST) --def $(ODBCJDBCDEFFILE) -o $(ODBCJDBCDLL)
-#
-$(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
-#	ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
-#	$(GCC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
-#
-$(ODBCJDBCDLL) : $(ISCDBCDLL) $(ODBCJDBCSETUPDLL) $(LIST_ODBCJDBCOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
-	$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) $(LIBODBCINST) -o $(ODBCJDBCDLL)
-#
-postbuild : $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-	@-strip -s $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-	@-tar -cf OdbcJdbc_Snapshot.tar $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-	@-gzip -9 -S .gz OdbcJdbc_Snapshot.tar
-#
-install : 
-	cp $(ODBCJDBCDLL) $(UNIXODBCDIR)/$(ODBCJDBC).$(LIB_VERSION)
-	ln -s $(UNIXODBCDIR)/$(ODBCJDBC).$(LIB_VERSION) $(UNIXODBCDIR)/$(ODBCJDBC)
-	ln -s $(UNIXODBCDIR)/$(ODBCJDBC).$(LIB_VERSION) $(UNIXODBCDIR)/$(ODBCJDBC).$(MAJOR_VERSION)
-#
-uninstall : 
-	@-rm -f $(UNIXODBCDIR)/$(ODBCJDBC)*.* 
-#
-package :
-	-strip -s $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-	-rm $(PACKAGE_NAME).gz
-	chmod 740 ../../Install/Linux/install.sh
-	tar -C $(TARGETDIR) -cvf OdbcJdbcLibs.tar $(ISCDBC) $(ODBCJDBC) $(ODBCJDBCSETUP)
-	tar -C ../../Install/HtmlHelp --exclude=CVS -cvf OdbcJdbcDocs.tar html/ 
-	tar -C ../../Install -uf OdbcJdbcDocs.tar ReleaseNotes_v2.0.html
-	cat $(DRVTMPL) | grep -v "^Driver.*=.*" >$(DRVTMPL).tmp && echo "Driver = $(UNIXODBCDIR)/$(ODBCJDBC)" >>$(DRVTMPL).tmp && mv $(DRVTMPL).tmp $(DRVTMPL)
-	tar -C ../../Install/Linux -cf $(PACKAGE_NAME) install.sh readme.txt DriverTemplate.ini FirebirdDSNTemplate.ini InterBaseDSNTemplate.ini
-	tar -uf $(PACKAGE_NAME) OdbcJdbcLibs.tar OdbcJdbcDocs.tar
-	rm OdbcJdbcLibs.tar  OdbcJdbcDocs.tar
-	gzip -9 -S .gz $(PACKAGE_NAME) 
-#
-
-#
-# End
-#
diff --git a/Builds/Gcc.lin/readme.linux b/Builds/Gcc.lin/readme.linux
deleted file mode 100644
index 03d94a4f..00000000
--- a/Builds/Gcc.lin/readme.linux
+++ /dev/null
@@ -1,77 +0,0 @@
-====== ODBC v3.0 driver notes ======================================
-
-Version 3.0 has no significant changes to the build sequence compared to the previous version.
-However, to build from source, you should use C++17.
-
-How to build:
- * Make sure you have Unix ODBC dev package installed. If not - install it (for example: `sudo apt install unixodbc-dev` for Ubuntu)
- * Move to Builds/Gcc.lin
- * Rename makefile.linux -> makefile
- * Set the DEBUG var if you need a Debug build instead of Release (by default)
- * Run `make`
- * Your libraries are in ./Release_<arch> or ./Debug_<arch> folder.
-
-===
-
-
-1)==================================================================
-  For connect from unixODBC :
-
-    Into share folder :
-    libOdbcFb.so
-
-2)==================================================================
-Conrtributed by On Tuesday 28 October 2003 19:23, Yves Glodt wrote:
-> Hi,
->
-> I downloaded the latest snapshot of the odbc/jdbc driver for Linux
-> from ibphoenix.com, but I fail to find information about the setup
-> in odbcinst.ini and odbc.ini.
->
-> Where could I find it?
-
-ok, in case you don't have the wonderful ODBCConfig, here is what it 
-takes to set it up manually (thanks to Vladimir Tsvigun):
-(On debian unstable, using the FB1.02 deb)
-
-first, untar the OdbcJdbc_Snapshot.tar.gz into /usr/lib
-
-Then you should have this in /usr/lib:
-libOdbcFb.so*
-
-
-The odbc-config-files in /etc shoud look like this:
-
-odbcinst.ini:
---------------------
-[Firebird]
-Description     = InterBase/Firebird ODBC Driver
-Driver          = /usr/lib/libOdbcFb.so
-Setup           = /usr/lib/libOdbcFb.so
-Threading 	= 1
-FileUsage       = 1
-CPTimeout       =
-CPReuse         =
-
-odbc.ini:
------------------
-[your_datasource_name]
-Description     = Firebird
-Driver          = Firebird
-Dbname          = localhost:/var/lib/firebird/data/bla.gdb
-User            =
-Password        =
-Role            =
-CharacterSet    =
-ReadOnly        = No
-NoWait          = No
-
-regards,
-Yves
-
-3)==================================================================
-
-To build the Firebird ODBC driver, the following environment variables should also be set:
-ODBCMANAGER      (should be set to either "iODBC" or "unixODBC")
-ODBCMANAGERDIR   (should be set according to the installation folder of the required ODBC driver manager specified above)
-
diff --git a/Builds/Gcc.solaris/makefile.solaris b/Builds/Gcc.solaris/makefile.solaris
deleted file mode 100644
index 7e8d0688..00000000
--- a/Builds/Gcc.solaris/makefile.solaris
+++ /dev/null
@@ -1,199 +0,0 @@
-#
-# To build set the following environment variables
-# ODBCMANAGER (either iODBC or unixODBC)
-# ODBCMANAGERDIR (set to installation folder of required ODBC driver, as per above)
-#
-
-ifndef DEBUG
-DEBUG = No
-endif
-#
-.PHONY: all createdirs IscDbc OdbcJdbc OdbcJdbcSetup clean postbuild install uninstall package
-#
-GCC          = g++
-
-
-#Override default variables for this build
-#ARCH = x86
-#FIREBIRD=/usr/lib64/firebird
-
-# Get version info
-#MAJOR_VERSION = $(shell cat ../../SetupAttributes.h | grep "define MAJOR_VERSION" | cut -f 3)
-#MINOR_VERSION = $(shell cat ../../SetupAttributes.h | grep "define MINOR_VERSION" | cut -f 3)
-#REVISION = $(shell cat ../../SetupAttributes.h | grep "define REVNO_VERSION" | cut -f 3)
-#BUILD_NUMBER = $(shell cat ../../WriteBuildNo.h | grep "define BUILDNUM_VERSION" | cut -f 3)
-#and use it
-LIB_ROOT_NAME = OdbcFb
-#PACKAGE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(REVISION).$(BUILD_NUMBER)
-#LIB_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(REVISION)
-#PACKAGE_NAME = $(LIB_ROOT_NAME)-$(PACKAGE_VERSION).tar
-#
-# Start build
-#
-include ../makefile.sources
-include ../makefile.environ
-#
-
-ifndef ODBCMANAGER
-ODBCMANAGER  = unixODBC
-#ODBCMANAGER = iODBC
-endif
-
-ifndef ODBCMANAGERDIR
-INCLUDEDIR      = -I/usr/include -I$(FBINCDIR)
-EXTLIBDIR       = -L/usr/$(LIB) -L$(FBLIBDIR)
-endif
-
-#ifeq ($(ARCH),x86_64)
-LIB = /usr/sfw/lib/sparcv9
-#LIB = lib64
-#LIB = /usr/ccs/lib/sparcv9
-#else
-#LIB = lib
-#endif
-
-ifeq (iODBC,$(ODBCMANAGER))
-LIBODBCINST    = -liodbcinst
-else
-LIBODBCINST    = -lodbcinst
-endif
-
-INCLUDEDIR      = -I$(FBINCDIR) -I$(ODBCMANAGERDIR)/include
-EXTLIBDIR       = -L$(FBLIBDIR) -L$(ODBCMANAGERDIR)/lib
-
-
-ifeq (Yes,$(DEBUG))
-TARGETDIR        = Debug_$(ARCH)
-else
-TARGETDIR        = Release_$(ARCH)
-endif
-#
-BUILDDIR         = $(TARGETDIR)/obj
-#
-DRVTMPL                      = ../../Install/Linux/DriverTemplate.ini
-
-LIST_ISCDBCSRC               = $(addprefix $(ISCDBCDIR)/, $(ISCDBCSRC))
-LIST_ISCDBCOBJ               = $(addprefix $(BUILDDIR)/, $(ISCDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSRC     = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSRC))
-LIST_ODBCJDBCOBJ     = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSETUPSRC        = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
-LIST_ODBCJDBCSETUPOBJ        = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
-#
-COMPFLAGS1   = -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
-
-#ifeq ($(ARCH),x86_64)
-COMPFLAGS    = -fPIC -m64 $(COMPFLAGS1)
-LINKFLAGS    = -shared -m64
-#LINKFLAGS   = --warn-section-align -shared -m64
-#else
-#COMPFLAGS   := -m32
-#LINKFLAGS   = -shared -m32 $(COMPFLAGS1)
-#endif
-#
-#LINKFLAGS   = -rdynamic -export-dynamic -shared
-
-EXTLIBS              = $(EXTLIBDIR) -lcrypt -ldl
-#EXTLIBS             = $(EXTLIBDIR) -lcrypt -ldl -lgds
-#
-#ISCDBC              = libIscDbc.so
-ISCDBCDLL       = $(TARGETDIR)/$(ISCDBC)
-ODBCJDBC     = lib$(LIB_ROOT_NAME).so
-ODBCJDBCDLL     = $(TARGETDIR)/$(ODBCJDBC)
-#ODBCJDBCSETUP       = libOdbcFbS.so
-ODBCJDBCSETUPDLL= $(TARGETDIR)/$(ODBCJDBCSETUP)
-ISCDBCDEFFILE        = $(ISCDBCDIR)/IscDbc.def
-ODBCJDBCDEFFILE      = $(ODBCJDBCDIR)/OdbcJdbc.def
-ODBCJDBCSDEFFILE= $(ODBCJDBCSETUPDIR)/OdbcJdbcSetup.def
-#
-ifeq (Yes,$(DEBUG))
-DEBUGFLAGS   = -g3 -O0 -D_DEBUG -DDEBUG -DLOGGING -fexceptions
-else
-DEBUGFLAGS   = -O3 -DNDEBUG
-endif
-
-#
-$(BUILDDIR)/%.o: $(ISCDBCDIR)/%.cpp
-     $(GCC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-$(BUILDDIR)/%.o: $(ODBCJDBCDIR)/%.cpp
-     $(GCC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-ISCDBCLIB       = $(ISCDBCDLL:.so=.a)
-ODBCJDBCLIB     = $(ODBCJDBCDLL:.so=.a)
-ODBCJDBCSETUPLIB= $(ODBCJDBCSETUPDLL:.so=.a)
-
-
-
-#
-all :        createdirs $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-#
-# If required, print out the version info
-getVersion :
-     $(warning MAJOR_VERSION is $(MAJOR_VERSION) )
-     $(warning MINOR_VERSION is $(MINOR_VERSION) )
-     $(warning REVISION is $(REVISION) )
-     $(warning BUILD_NUMBER is $(BUILD_NUMBER) )
-#
-# Silently creates the target and build directories
-createdirs :
-     @-mkdir $(TARGETDIR)
-     @-mkdir $(BUILDDIR)
-#
-# Silently cleanup and deletes the target and build directories
-clean :
-     @-rm -fr $(TARGETDIR)
-#
-IscDbc : $(ISCDBCDLL)
-OdbcJdbc : $(ODBCJDBCDLL)
-OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
-#
-# Build the library from the object modules
-#
-$(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
-#    ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
-#    $(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) --def $(ISCDBCDEFFILE) -o $(ISCDBCDLL)
-#
-#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
-#    ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-#    $(GCC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) $(LIBODBCINST) --def $(ODBCJDBCDEFFILE) -o $(ODBCJDBCDLL)
-#
-$(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
-#    ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
-#    $(GCC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
-#
-$(ODBCJDBCDLL) : $(ISCDBCDLL) $(ODBCJDBCSETUPDLL) $(LIST_ODBCJDBCOBJ)
-     ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
-     ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-     ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
-     $(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) $(LIBODBCINST) --def $(ODBCJDBCDEFFILE) -o $(ODBCJDBCDLL)
-#
-postbuild : $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-     @-strip -s $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-     @-tar -cf OdbcJdbc_Snapshot.tar $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-     @-gzip -9 -S .gz OdbcJdbc_Snapshot.tar
-#
-install :
-     cp $(ODBCJDBCDLL) $(UNIXODBCDIR)/$(ODBCJDBC).$(LIB_VERSION)
-     ln -s $(UNIXODBCDIR)/$(ODBCJDBC).$(LIB_VERSION) $(UNIXODBCDIR)/$(ODBCJDBC)
-     ln -s $(UNIXODBCDIR)/$(ODBCJDBC).$(LIB_VERSION) $(UNIXODBCDIR)/$(ODBCJDBC).$(MAJOR_VERSION)
-#
-uninstall :
-     @-rm -f $(UNIXODBCDIR)/$(ODBCJDBC)*.*
-#
-package :
-     -strip -s $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-     -rm $(PACKAGE_NAME).gz
-     chmod 740 ../../Install/Linux/install.sh
-     tar -C $(TARGETDIR) -cvf OdbcJdbcLibs.tar $(ISCDBC) $(ODBCJDBC) $(ODBCJDBCSETUP)
-     tar -C ../../Install/HtmlHelp --exclude=CVS -cvf OdbcJdbcDocs.tar html/
-     tar -C ../../Install -uf OdbcJdbcDocs.tar ReleaseNotes_v2.0.html
-     cat $(DRVTMPL) | grep -v "^Driver.*=.*" >$(DRVTMPL).tmp && echo "Driver = $(UNIXODBCDIR)/$(ODBCJDBC)" >>$(DRVTMPL).tmp && mv $(DRVTMPL).tmp $(DRVTMPL)
-     tar -C ../../Install/Linux -cf $(PACKAGE_NAME) install.sh readme.txt DriverTemplate.ini FirebirdDSNTemplate.ini InterBaseDSNTemplate.ini
-     tar -uf $(PACKAGE_NAME) OdbcJdbcLibs.tar OdbcJdbcDocs.tar
-     rm OdbcJdbcLibs.tar  OdbcJdbcDocs.tar
-     gzip -9 -S .gz $(PACKAGE_NAME)
-#
-
-#
-# End
-#
diff --git a/Builds/MinGW_Dev-Cpp.win/IscDbc.dev b/Builds/MinGW_Dev-Cpp.win/IscDbc.dev
deleted file mode 100644
index dbcb06a6..00000000
--- a/Builds/MinGW_Dev-Cpp.win/IscDbc.dev
+++ /dev/null
@@ -1,1146 +0,0 @@
-[Project]
-FileName=IscDbc.dev
-Name=IscDbc
-Ver=1
-IsCpp=1
-Type=3
-Compiler=-D__GNUWIN32__ -D_WIN32_WINNT=0x0400 -DWINVER=0x0400 -DWIN32 -D_WIN32 -DNDEBUG -D_WINDOWS_@@_
-CppCompiler=-D__GNUWIN32__ -D_WIN32_WINNT=0x0400 -DWINVER=0x0400 -DWIN32 -D_WIN32 -DNDEBUG -D_WINDOWS_@@_
-Includes=d:/firebird/include;../..
-Linker=-lwsock32_@@_--output-def ./Release/Obj/libIscDbc.def_@@_--output-lib Release/libIscDbc.a_@@_--def ../../IscDbc/IscDbc.def_@@_
-Libs=d:/firebird/lib
-UnitCount=109
-Folders="Header Files","Resource Files","Source Files"
-ObjFiles=
-PrivateResource=IscDbc_private.rc
-ResourceIncludes=
-MakeIncludes=
-Icon=
-ExeOutput=.\Release
-ObjectOutput=.\Release\obj
-OverrideOutput=1
-OverrideOutputName=IscDbc.dll
-HostApplication=
-CommandLine=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=1
-CompilerSettings=000000000000000000
-
-[Unit1]
-FileName=..\..\IscDbc\IscDbc.rc
-Folder="Resource Files"
-Compile=1
-CompileCpp=1
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit2]
-FileName=..\..\IscDbc\Attachment.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit3]
-FileName=..\..\IscDbc\BinaryBlob.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit4]
-FileName=..\..\IscDbc\BinToHexStr.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit5]
-FileName=..\..\IscDbc\Blob.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit6]
-FileName=..\..\IscDbc\Connection.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit7]
-FileName=..\..\IscDbc\DateTime.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit9]
-FileName=..\..\IscDbc\IscBlob.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit10]
-FileName=..\..\IscDbc\IscCallableStatement.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit11]
-FileName=..\..\IscDbc\IscColumnPrivilegesResultSet.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit12]
-FileName=..\..\IscDbc\IscColumnsResultSet.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit13]
-FileName=..\..\IscDbc\IscConnection.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit14]
-FileName=..\..\IscDbc\IscCrossReferenceResultSet.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit15]
-FileName=..\..\IscDbc\IscDatabaseMetaData.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit16]
-FileName=..\..\IscDbc\IscDbc.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit17]
-FileName=..\..\IscDbc\IscIndexInfoResultSet.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit18]
-FileName=..\..\IscDbc\IscMetaDataResultSet.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit19]
-FileName=..\..\IscDbc\IscPreparedStatement.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit20]
-FileName=..\..\IscDbc\IscPrimaryKeysResultSet.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit21]
-FileName=..\..\IscDbc\IscProcedureColumnsResultSet.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit22]
-FileName=..\..\IscDbc\IscProceduresResultSet.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit23]
-FileName=..\..\IscDbc\IscResultSet.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit24]
-FileName=..\..\IscDbc\IscSpecialColumnsResultSet.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit25]
-FileName=..\..\IscDbc\IscSqlType.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit26]
-FileName=..\..\IscDbc\IscStatement.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit27]
-FileName=..\..\IscDbc\IscStatementMetaData.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit28]
-FileName=..\..\IscDbc\IscTablePrivilegesResultSet.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit29]
-FileName=..\..\IscDbc\IscTablesResultSet.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit30]
-FileName=..\..\IscDbc\JavaType.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit31]
-FileName=..\..\IscDbc\JString.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit32]
-FileName=..\..\IscDbc\LinkedList.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit33]
-FileName=..\..\IscDbc\LoadFbClientDll.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit34]
-FileName=..\..\IscDbc\Lock.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit35]
-FileName=..\..\IscDbc\Mutex.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit36]
-FileName=..\..\IscDbc\Parameter.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit37]
-FileName=..\..\IscDbc\Parameters.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit38]
-FileName=..\..\IscDbc\Properties.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit39]
-FileName=..\..\IscDbc\Sqlda.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit40]
-FileName=..\..\IscDbc\SQLError.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit41]
-FileName=..\..\IscDbc\SQLException.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit42]
-FileName=..\..\IscDbc\SqlTime.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit43]
-FileName=..\..\IscDbc\Stream.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit44]
-FileName=..\..\IscDbc\TimeStamp.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit45]
-FileName=..\..\IscDbc\Types.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit46]
-FileName=..\..\IscDbc\TypesResultSet.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit47]
-FileName=..\..\IscDbc\Value.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit48]
-FileName=..\..\IscDbc\Attachment.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit49]
-FileName=..\..\IscDbc\BinaryBlob.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit50]
-FileName=..\..\IscDbc\Blob.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit51]
-FileName=..\..\IscDbc\DateTime.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit53]
-FileName=..\..\IscDbc\IscArray.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit54]
-FileName=..\..\IscDbc\IscBlob.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit55]
-FileName=..\..\IscDbc\IscCallableStatement.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit56]
-FileName=..\..\IscDbc\IscColumnPrivilegesResultSet.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit57]
-FileName=..\..\IscDbc\IscColumnsResultSet.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit58]
-FileName=..\..\IscDbc\IscConnection.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit59]
-FileName=..\..\IscDbc\IscCrossReferenceResultSet.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit60]
-FileName=..\..\IscDbc\IscDatabaseMetaData.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit61]
-FileName=..\..\IscDbc\IscIndexInfoResultSet.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit62]
-FileName=..\..\IscDbc\IscMetaDataResultSet.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit63]
-FileName=..\..\IscDbc\IscPreparedStatement.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit64]
-FileName=..\..\IscDbc\IscPrimaryKeysResultSet.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit65]
-FileName=..\..\IscDbc\IscProcedureColumnsResultSet.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit66]
-FileName=..\..\IscDbc\IscProceduresResultSet.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit67]
-FileName=..\..\IscDbc\IscResultSet.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit68]
-FileName=..\..\IscDbc\IscSpecialColumnsResultSet.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit69]
-FileName=..\..\IscDbc\IscSqlType.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit70]
-FileName=..\..\IscDbc\IscStatement.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit71]
-FileName=..\..\IscDbc\IscStatementMetaData.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit72]
-FileName=..\..\IscDbc\IscTablePrivilegesResultSet.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit73]
-FileName=..\..\IscDbc\IscTablesResultSet.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit74]
-FileName=..\..\IscDbc\JString.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit75]
-FileName=..\..\IscDbc\LinkedList.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit76]
-FileName=..\..\IscDbc\LoadFbClientDll.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit77]
-FileName=..\..\IscDbc\Lock.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit78]
-FileName=..\..\IscDbc\Mutex.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit79]
-FileName=..\..\IscDbc\Parameter.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit80]
-FileName=..\..\IscDbc\Parameters.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit81]
-FileName=..\..\IscDbc\Sqlda.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit82]
-FileName=..\..\IscDbc\SQLError.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit83]
-FileName=..\..\IscDbc\SqlTime.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit84]
-FileName=..\..\IscDbc\Stream.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit85]
-FileName=..\..\IscDbc\TimeStamp.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit86]
-FileName=..\..\IscDbc\TypesResultSet.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit87]
-FileName=..\..\IscDbc\Value.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit88]
-FileName=..\..\IscDbc\Values.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit89]
-FileName=..\..\IscDbc\IscOdbcStatement.cpp
-Folder=Source Files
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit90]
-FileName=..\..\IscDbc\IscOdbcStatement.h
-Folder=Header Files
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit91]
-FileName=..\..\IscDbc\IscResultSetMetaData.h
-Folder=Header Files
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit92]
-FileName=..\..\IscDbc\IscResultSetMetaData.cpp
-Folder=Source Files
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit93]
-FileName=..\..\IscDbc\IscOdbcStatement.h
-Folder=Header Files
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=0.1
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=IscDbc.exe
-ProductName=IscDbc
-ProductVersion=0.1
-AutoIncBuildNr=0
-
-[Unit8]
-FileName=..\..\IscDbc\IscArray.h
-CompileCpp=1
-Folder="Header Files"
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit52]
-FileName=..\..\IscDbc\extodbc.cpp
-CompileCpp=1
-Folder="Source Files"
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit93]
-FileName=..\..\IscDbc\Mlist.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit94]
-FileName=..\..\IscDbc\SupportFunctions.cpp
-CompileCpp=1
-Folder="Source Files"
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit95]
-FileName=..\..\IscDbc\SupportFunctions.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit96]
-FileName=..\..\IscDbc\EnvShare.cpp
-CompileCpp=1
-Folder="Source Files"
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit97]
-FileName=..\..\IscDbc\EnvShare.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit98]
-FileName=..\..\IscDbc\IscUserEvents.cpp
-CompileCpp=1
-Folder="Source Files"
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit99]
-FileName=..\..\IscDbc\IscUserEvents.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit100]
-FileName=..\..\IscDbc\ParameterEvent.cpp
-CompileCpp=1
-Folder="Source Files"
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit101]
-FileName=..\..\IscDbc\ParameterEvent.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit102]
-FileName=..\..\IscDbc\ParametersEvents.cpp
-CompileCpp=1
-Folder="Source Files"
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit103]
-FileName=..\..\IscDbc\ParametersEvents.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit104]
-FileName=..\..\IscDbc\ServiceManager.cpp
-CompileCpp=1
-Folder="Source Files"
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit105]
-FileName=..\..\IscDbc\ServiceManager.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit106]
-FileName=..\..\IscDbc\MultibyteConvert.cpp
-CompileCpp=1
-Folder="Source Files"
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit107]
-FileName=..\..\IscDbc\MultibyteConvert.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit108]
-FileName=..\..\IscDbc\IscColumnKeyInfo.cpp
-CompileCpp=1
-Folder="Source Files"
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit109]
-FileName=..\..\IscDbc\IscColumnKeyInfo.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
diff --git a/Builds/MinGW_Dev-Cpp.win/IscDbc.layout b/Builds/MinGW_Dev-Cpp.win/IscDbc.layout
deleted file mode 100644
index 6318277c..00000000
--- a/Builds/MinGW_Dev-Cpp.win/IscDbc.layout
+++ /dev/null
@@ -1,379 +0,0 @@
-[Editors]
-Order=
-Focused=-1
-
-[Editor_0]
-Open=0
-Top=0
-
-[Editor_1]
-Open=0
-Top=0
-
-[Editor_2]
-Open=0
-Top=0
-
-[Editor_3]
-Open=0
-Top=0
-
-[Editor_4]
-Open=0
-Top=0
-
-[Editor_5]
-Open=0
-Top=0
-
-[Editor_6]
-Open=0
-Top=0
-
-[Editor_7]
-Open=0
-Top=0
-
-[Editor_8]
-Open=0
-Top=0
-
-[Editor_9]
-Open=0
-Top=0
-
-[Editor_10]
-Open=0
-Top=0
-
-[Editor_11]
-Open=0
-Top=0
-
-[Editor_12]
-Open=0
-Top=0
-
-[Editor_13]
-Open=0
-Top=0
-
-[Editor_14]
-Open=0
-Top=0
-
-[Editor_15]
-Open=0
-Top=0
-
-[Editor_16]
-Open=0
-Top=0
-
-[Editor_17]
-Open=0
-Top=0
-
-[Editor_18]
-Open=0
-Top=0
-
-[Editor_19]
-Open=0
-Top=0
-
-[Editor_20]
-Open=0
-Top=0
-
-[Editor_21]
-Open=0
-Top=0
-
-[Editor_22]
-Open=0
-Top=0
-
-[Editor_23]
-Open=0
-Top=0
-
-[Editor_24]
-Open=0
-Top=0
-
-[Editor_25]
-Open=0
-Top=0
-
-[Editor_26]
-Open=0
-Top=0
-
-[Editor_27]
-Open=0
-Top=0
-
-[Editor_28]
-Open=0
-Top=0
-
-[Editor_29]
-Open=0
-Top=0
-
-[Editor_30]
-Open=0
-Top=0
-
-[Editor_31]
-Open=0
-Top=0
-
-[Editor_32]
-Open=0
-Top=0
-
-[Editor_33]
-Open=0
-Top=0
-
-[Editor_34]
-Open=0
-Top=0
-
-[Editor_35]
-Open=0
-Top=0
-
-[Editor_36]
-Open=0
-Top=0
-
-[Editor_37]
-Open=0
-Top=0
-
-[Editor_38]
-Open=0
-Top=0
-
-[Editor_39]
-Open=0
-Top=0
-
-[Editor_40]
-Open=0
-Top=0
-
-[Editor_41]
-Open=0
-Top=0
-
-[Editor_42]
-Open=0
-Top=0
-
-[Editor_43]
-Open=0
-Top=0
-
-[Editor_44]
-Open=0
-Top=0
-
-[Editor_45]
-Open=0
-Top=0
-
-[Editor_46]
-Open=0
-Top=0
-
-[Editor_47]
-Open=0
-Top=0
-
-[Editor_48]
-Open=0
-Top=0
-
-[Editor_49]
-Open=0
-Top=0
-
-[Editor_50]
-Open=0
-Top=0
-CursorCol=1
-CursorRow=33
-TopLine=20
-LeftChar=1
-
-[Editor_51]
-Open=0
-Top=0
-
-[Editor_52]
-Open=0
-Top=0
-
-[Editor_53]
-Open=0
-Top=0
-
-[Editor_54]
-Open=0
-Top=0
-
-[Editor_55]
-Open=0
-Top=0
-
-[Editor_56]
-Open=0
-Top=0
-
-[Editor_57]
-Open=0
-Top=0
-
-[Editor_58]
-Open=0
-Top=0
-
-[Editor_59]
-Open=0
-Top=0
-
-[Editor_60]
-Open=0
-Top=0
-
-[Editor_61]
-Open=0
-Top=0
-
-[Editor_62]
-Open=0
-Top=0
-
-[Editor_63]
-Open=0
-Top=0
-
-[Editor_64]
-Open=0
-Top=0
-
-[Editor_65]
-Open=0
-Top=0
-
-[Editor_66]
-Open=0
-Top=0
-
-[Editor_67]
-Open=0
-Top=0
-
-[Editor_68]
-Open=0
-Top=0
-
-[Editor_69]
-Open=0
-Top=0
-
-[Editor_70]
-Open=0
-Top=0
-
-[Editor_71]
-Open=0
-Top=0
-
-[Editor_72]
-Open=0
-Top=0
-
-[Editor_73]
-Open=0
-Top=0
-
-[Editor_74]
-Open=0
-Top=0
-
-[Editor_75]
-Open=0
-Top=0
-
-[Editor_76]
-Open=0
-Top=0
-
-[Editor_77]
-Open=0
-Top=0
-
-[Editor_78]
-Open=0
-Top=0
-
-[Editor_79]
-Open=0
-Top=0
-
-[Editor_80]
-Open=0
-Top=0
-
-[Editor_81]
-Open=0
-Top=0
-
-[Editor_82]
-Open=0
-Top=0
-
-[Editor_83]
-Open=0
-Top=0
-
-[Editor_84]
-Open=0
-Top=0
-
-[Editor_85]
-Open=0
-Top=0
-
-[Editor_86]
-Open=0
-Top=0
-
-[Editor_87]
-Open=0
-Top=0
-
-[Editor_88]
-Open=0
-Top=0
-
-[Editor_89]
-Open=0
-Top=0
-
-[Editor_90]
-Open=0
-Top=0
-
-[Editor_91]
-Open=0
-Top=0
-
-[Editor_92]
-Open=0
-Top=0
diff --git a/Builds/MinGW_Dev-Cpp.win/OdbcJdbc.dev b/Builds/MinGW_Dev-Cpp.win/OdbcJdbc.dev
deleted file mode 100644
index 33ff60e5..00000000
--- a/Builds/MinGW_Dev-Cpp.win/OdbcJdbc.dev
+++ /dev/null
@@ -1,1839 +0,0 @@
-[Project]
-FileName=OdbcJdbc.dev
-Name=OdbcFb32
-Ver=1
-IsCpp=1
-Type=3
-Compiler=-D__GNUWIN32__ -D_WIN32_WINNT=0x0400 -DWINVER=0x0400 -DWIN32 -DNDEBUG -D_WINDOWS_@@_
-CppCompiler=-D__GNUWIN32__ -D_WIN32_IE=0x0400 -D_WIN32_WINNT=0x0400 -DWINVER=0x0400 -DWIN32 -DNDEBUG -D_WINDOWS_@@_
-Includes=d:/firebird/include;../../IscDbc
-Linker=-lversion -lgdi32 -lshell32 -ladvapi32 -luser32 -lcomdlg32 -lcomctl32 -lstdc++ -lodbccp32_@@_--output-def ./Release/Obj/libOdbcFb32.def_@@_--output-lib ./Release/libOdbcFb32.a_@@_--def ../../OdbcJdbcMinGW.def_@@__@@_
-Libs=
-UnitCount=179
-Folders=IscDbc,"IscDbc/Header Files IscDbc","IscDbc/Source Files IscDbc",OdbcJdbc,"OdbcJdbc/Header Files Odbc","OdbcJdbc/Resource Files Odbc","OdbcJdbc/Source Files Odbc",OdbcJdbcSetup,"OdbcJdbcSetup/Header Files Setup","OdbcJdbcSetup/Source Files Setup"
-ObjFiles=
-PrivateResource=OdbcJdbc_private.rc
-ResourceIncludes=
-MakeIncludes=
-Icon=
-ExeOutput=./Release
-ObjectOutput=./Release/Obj
-OverrideOutput=1
-OverrideOutputName=OdbcFb32.dll
-HostApplication=
-CommandLine=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=1
-CompilerSettings=0000000000000000000000
-UseCustomMakefile=0
-CustomMakefile=
-
-[Unit1]
-FileName=..\..\ODbcJdbc.rc
-Folder=OdbcJdbc/Resource Files Odbc
-Compile=1
-CompileCpp=1
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit2]
-FileName=..\..\DescRecord.cpp
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit4]
-FileName=..\..\OdbcConnection.cpp
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit5]
-FileName=..\..\OdbcConvert.cpp
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit6]
-FileName=..\..\OdbcDateTime.cpp
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit7]
-FileName=..\..\OdbcDesc.cpp
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit8]
-FileName=..\..\OdbcEnv.cpp
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit9]
-FileName=..\..\OdbcError.cpp
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit10]
-FileName=..\..\OdbcInstGetProp.cpp
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit11]
-FileName=..\..\OdbcJdbc.def
-Folder=OdbcJdbc/Source Files Odbc
-Compile=0
-CompileCpp=1
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit12]
-FileName=..\..\OdbcObject.cpp
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit13]
-FileName=..\..\OdbcStatement.cpp
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit14]
-FileName=..\..\SafeEnvThread.cpp
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit15]
-FileName=..\..\ConnectDialog.cpp
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit16]
-FileName=..\..\DescRecord.h
-Folder=OdbcJdbc/Header Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit17]
-FileName=..\..\InfoItems.h
-Folder=OdbcJdbc/Header Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit18]
-FileName=..\..\OdbcConnection.h
-Folder=OdbcJdbc/Header Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit19]
-FileName=..\..\OdbcConvert.h
-Folder=OdbcJdbc/Header Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit22]
-FileName=..\..\OdbcEnv.h
-Folder=OdbcJdbc/Header Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit23]
-FileName=..\..\OdbcError.h
-Folder=OdbcJdbc/Header Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit24]
-FileName=..\..\OdbcJdbc.h
-Folder=OdbcJdbc/Header Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit25]
-FileName=..\..\OdbcObject.h
-Folder=OdbcJdbc/Header Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit26]
-FileName=..\..\OdbcStatement.h
-Folder=OdbcJdbc/Header Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit27]
-FileName=..\..\SafeEnvThread.h
-Folder=OdbcJdbc/Header Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit28]
-FileName=..\..\ConnectDialog.h
-Folder=OdbcJdbc/Header Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit29]
-FileName=..\..\SetupAttributes.h
-Folder=OdbcJdbc/Header Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit30]
-FileName=..\..\MainUnicode.cpp
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit31]
-FileName=..\..\IscDbc\Values.h
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit32]
-FileName=..\..\IscDbc\BinaryBlob.h
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit33]
-FileName=..\..\IscDbc\BinToHexStr.h
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=0.1
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=OdbcJdbc.dll
-ProductName=OdbcJdbc
-ProductVersion=0.1
-AutoIncBuildNr=0
-
-[Unit34]
-FileName=..\..\IscDbc\Blob.h
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit3]
-FileName=..\..\Main.cpp
-CompileCpp=1
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit20]
-FileName=..\..\OdbcDateTime.h
-CompileCpp=1
-Folder=OdbcJdbc/Header Files Odbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit21]
-FileName=..\..\OdbcDesc.h
-CompileCpp=1
-Folder=OdbcJdbc/Header Files Odbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit35]
-FileName=..\..\IscDbc\Connection.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit36]
-FileName=..\..\IscDbc\DateTime.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit37]
-FileName=..\..\IscDbc\Engine.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit38]
-FileName=..\..\IscDbc\EnvShare.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit40]
-FileName=..\..\IscDbc\IscBlob.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit41]
-FileName=..\..\IscDbc\IscCallableStatement.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit42]
-FileName=..\..\IscDbc\IscColumnKeyInfo.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit43]
-FileName=..\..\IscDbc\IscColumnPrivilegesResultSet.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit44]
-FileName=..\..\IscDbc\IscColumnsResultSet.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit45]
-FileName=..\..\IscDbc\IscConnection.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit46]
-FileName=..\..\IscDbc\IscCrossReferenceResultSet.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit47]
-FileName=..\..\IscDbc\IscDatabaseMetaData.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit48]
-FileName=..\..\IscDbc\IscDbc.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit49]
-FileName=..\..\IscDbc\IscHeadSqlVar.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit50]
-FileName=..\..\IscDbc\IscIndexInfoResultSet.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit51]
-FileName=..\..\IscDbc\IscMetaDataResultSet.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit52]
-FileName=..\..\IscDbc\IscOdbcStatement.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit53]
-FileName=..\..\IscDbc\IscPreparedStatement.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit54]
-FileName=..\..\IscDbc\IscPrimaryKeysResultSet.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit55]
-FileName=..\..\IscDbc\IscProcedureColumnsResultSet.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit56]
-FileName=..\..\IscDbc\IscProceduresResultSet.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit57]
-FileName=..\..\IscDbc\IscResultSet.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit58]
-FileName=..\..\IscDbc\IscResultSetMetaData.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit59]
-FileName=..\..\IscDbc\IscSpecialColumnsResultSet.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit60]
-FileName=..\..\IscDbc\IscSqlType.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit61]
-FileName=..\..\IscDbc\IscStatement.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit62]
-FileName=..\..\IscDbc\IscStatementMetaData.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit63]
-FileName=..\..\IscDbc\IscTablePrivilegesResultSet.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit64]
-FileName=..\..\IscDbc\IscTablesResultSet.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit65]
-FileName=..\..\IscDbc\IscUserEvents.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit66]
-FileName=..\..\IscDbc\JavaType.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit67]
-FileName=..\..\IscDbc\LinkedList.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit68]
-FileName=..\..\IscDbc\ListParamTransaction.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit69]
-FileName=..\..\IscDbc\LoadFbClientDll.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit70]
-FileName=..\..\IscDbc\Lock.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit71]
-FileName=..\..\IscDbc\MultibyteConvert.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit72]
-FileName=..\..\IscDbc\Mutex.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit73]
-FileName=..\..\IscDbc\Parameter.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit74]
-FileName=..\..\IscDbc\ParameterEvent.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit75]
-FileName=..\..\IscDbc\Parameters.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit76]
-FileName=..\..\IscDbc\ParametersEvents.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit77]
-FileName=..\..\IscDbc\Properties.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit78]
-FileName=..\..\IscDbc\resource.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit79]
-FileName=..\..\IscDbc\ServiceManager.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit80]
-FileName=..\..\IscDbc\Sqlda.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit81]
-FileName=..\..\IscDbc\SQLError.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit82]
-FileName=..\..\IscDbc\SQLException.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit83]
-FileName=..\..\IscDbc\SqlTime.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit84]
-FileName=..\..\IscDbc\Stream.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit85]
-FileName=..\..\IscDbc\SupportFunctions.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit86]
-FileName=..\..\IscDbc\TimeStamp.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit87]
-FileName=..\..\IscDbc\Types.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit88]
-FileName=..\..\IscDbc\TypesResultSet.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit89]
-FileName=..\..\IscDbc\Value.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit90]
-FileName=..\..\IscDbc\Attachment.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit91]
-FileName=..\..\IscDbc\JString.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit92]
-FileName=..\..\IscDbc\Mlist.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit93]
-FileName=..\..\IscDbc\Values.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit94]
-FileName=..\..\IscDbc\BinaryBlob.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit95]
-FileName=..\..\IscDbc\Blob.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit96]
-FileName=..\..\IscDbc\DateTime.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit97]
-FileName=..\..\IscDbc\EnvShare.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit99]
-FileName=..\..\IscDbc\IscArray.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit100]
-FileName=..\..\IscDbc\IscBlob.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit101]
-FileName=..\..\IscDbc\IscCallableStatement.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit102]
-FileName=..\..\IscDbc\IscColumnKeyInfo.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit103]
-FileName=..\..\IscDbc\IscColumnPrivilegesResultSet.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit104]
-FileName=..\..\IscDbc\IscColumnsResultSet.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit105]
-FileName=..\..\IscDbc\IscConnection.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit106]
-FileName=..\..\IscDbc\IscCrossReferenceResultSet.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit107]
-FileName=..\..\IscDbc\IscDatabaseMetaData.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit108]
-FileName=..\..\IscDbc\IscIndexInfoResultSet.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit109]
-FileName=..\..\IscDbc\IscMetaDataResultSet.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit110]
-FileName=..\..\IscDbc\IscOdbcStatement.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit111]
-FileName=..\..\IscDbc\IscPreparedStatement.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit112]
-FileName=..\..\IscDbc\IscPrimaryKeysResultSet.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit113]
-FileName=..\..\IscDbc\IscProcedureColumnsResultSet.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit114]
-FileName=..\..\IscDbc\IscProceduresResultSet.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit115]
-FileName=..\..\IscDbc\IscResultSet.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit116]
-FileName=..\..\IscDbc\IscResultSetMetaData.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit117]
-FileName=..\..\IscDbc\IscSpecialColumnsResultSet.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit118]
-FileName=..\..\IscDbc\IscSqlType.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit119]
-FileName=..\..\IscDbc\IscStatement.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit120]
-FileName=..\..\IscDbc\IscStatementMetaData.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit121]
-FileName=..\..\IscDbc\IscTablePrivilegesResultSet.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit122]
-FileName=..\..\IscDbc\IscTablesResultSet.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit123]
-FileName=..\..\IscDbc\IscUserEvents.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit124]
-FileName=..\..\IscDbc\JString.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit125]
-FileName=..\..\IscDbc\LinkedList.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit126]
-FileName=..\..\IscDbc\LoadFbClientDll.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit127]
-FileName=..\..\IscDbc\Lock.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit128]
-FileName=..\..\IscDbc\MultibyteConvert.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit129]
-FileName=..\..\IscDbc\Mutex.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit130]
-FileName=..\..\IscDbc\Parameter.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit131]
-FileName=..\..\IscDbc\ParameterEvent.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit132]
-FileName=..\..\IscDbc\Parameters.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit133]
-FileName=..\..\IscDbc\ParametersEvents.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit134]
-FileName=..\..\IscDbc\ServiceManager.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit135]
-FileName=..\..\IscDbc\Sqlda.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit136]
-FileName=..\..\IscDbc\SQLError.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit137]
-FileName=..\..\IscDbc\SqlTime.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit138]
-FileName=..\..\IscDbc\Stream.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit139]
-FileName=..\..\IscDbc\SupportFunctions.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit140]
-FileName=..\..\IscDbc\TimeStamp.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit141]
-FileName=..\..\IscDbc\TypesResultSet.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit142]
-FileName=..\..\IscDbc\Value.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit143]
-FileName=..\..\IscDbc\Attachment.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit144]
-FileName=..\..\OdbcJdbcSetup\UsersTabUsers.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit145]
-FileName=..\..\OdbcJdbcSetup\DsnDialog.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit146]
-FileName=..\..\OdbcJdbcSetup\OdbcJdbcSetup.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit147]
-FileName=..\..\OdbcJdbcSetup\ServiceClient.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit39]
-FileName=..\..\IscDbc\IscArray.h
-CompileCpp=1
-Folder=IscDbc/Header Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit98]
-FileName=..\..\IscDbc\extodbc.cpp
-CompileCpp=1
-Folder=IscDbc/Source Files IscDbc
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit148]
-FileName=..\..\OdbcJdbcSetup\ServiceTabBackup.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit149]
-FileName=..\..\OdbcJdbcSetup\ServiceTabChild.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit150]
-FileName=..\..\OdbcJdbcSetup\ServiceTabCtrl.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit151]
-FileName=..\..\OdbcJdbcSetup\ServiceTabRepair.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit152]
-FileName=..\..\OdbcJdbcSetup\ServiceTabRestore.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit153]
-FileName=..\..\OdbcJdbcSetup\ServiceTabStatistics.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit154]
-FileName=..\..\OdbcJdbcSetup\ServiceTabUsers.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit155]
-FileName=..\..\OdbcJdbcSetup\Setup.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit156]
-FileName=..\..\OdbcJdbcSetup\UserDialog.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit157]
-FileName=..\..\OdbcJdbcSetup\UsersTabChild.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit158]
-FileName=..\..\OdbcJdbcSetup\UsersTabMemberShips.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit159]
-FileName=..\..\OdbcJdbcSetup\UsersTabRoles.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit160]
-FileName=..\..\OdbcJdbcSetup\CommonUtil.cpp
-CompileCpp=1
-Folder=OdbcJdbcSetup/Source Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit161]
-FileName=..\..\OdbcJdbcSetup\UsersTabUsers.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit162]
-FileName=..\..\OdbcJdbcSetup\DsnDialog.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit163]
-FileName=..\..\OdbcJdbcSetup\OdbcJdbcSetup.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit164]
-FileName=..\..\OdbcJdbcSetup\resource.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit165]
-FileName=..\..\OdbcJdbcSetup\ServiceClient.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit166]
-FileName=..\..\OdbcJdbcSetup\ServiceTabBackup.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit167]
-FileName=..\..\OdbcJdbcSetup\ServiceTabChild.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit168]
-FileName=..\..\OdbcJdbcSetup\ServiceTabCtrl.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit169]
-FileName=..\..\OdbcJdbcSetup\ServiceTabRepair.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit170]
-FileName=..\..\OdbcJdbcSetup\ServiceTabRestore.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit171]
-FileName=..\..\OdbcJdbcSetup\ServiceTabStatistics.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit172]
-FileName=..\..\OdbcJdbcSetup\ServiceTabUsers.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit173]
-FileName=..\..\OdbcJdbcSetup\Setup.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit174]
-FileName=..\..\OdbcJdbcSetup\UserDialog.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit175]
-FileName=..\..\OdbcJdbcSetup\UsersTabChild.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit176]
-FileName=..\..\OdbcJdbcSetup\UsersTabMemberShips.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit177]
-FileName=..\..\OdbcJdbcSetup\UsersTabRoles.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit178]
-FileName=..\..\OdbcJdbcSetup\CommonUtil.h
-CompileCpp=1
-Folder=OdbcJdbcSetup/Header Files Setup
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit179]
-FileName=..\..\MbsAndWcs.cpp
-Folder=OdbcJdbc/Source Files Odbc
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
diff --git a/Builds/MinGW_Dev-Cpp.win/OdbcJdbc.layout b/Builds/MinGW_Dev-Cpp.win/OdbcJdbc.layout
deleted file mode 100644
index 8b4f1e56..00000000
--- a/Builds/MinGW_Dev-Cpp.win/OdbcJdbc.layout
+++ /dev/null
@@ -1,143 +0,0 @@
-[Editors]
-Order=
-Focused=-1
-
-[Editor_0]
-Open=0
-Top=0
-
-[Editor_1]
-Open=0
-Top=0
-
-[Editor_2]
-Open=0
-Top=0
-
-[Editor_3]
-Open=0
-Top=0
-
-[Editor_4]
-Open=0
-Top=0
-
-[Editor_5]
-Open=0
-Top=0
-
-[Editor_6]
-Open=0
-Top=0
-
-[Editor_7]
-Open=0
-Top=0
-CursorCol=1
-CursorRow=224
-TopLine=199
-LeftChar=1
-
-[Editor_8]
-Open=0
-Top=0
-
-[Editor_9]
-Open=0
-Top=0
-
-[Editor_10]
-Open=0
-Top=0
-
-[Editor_11]
-Open=0
-Top=0
-
-[Editor_12]
-Open=0
-Top=0
-
-[Editor_13]
-Open=0
-Top=0
-
-[Editor_14]
-Open=0
-Top=0
-
-[Editor_15]
-Open=0
-Top=0
-
-[Editor_16]
-Open=0
-Top=0
-
-[Editor_17]
-Open=0
-Top=0
-
-[Editor_18]
-Open=0
-Top=0
-CursorCol=3
-CursorRow=220
-TopLine=224
-LeftChar=1
-
-[Editor_19]
-Open=0
-Top=0
-
-[Editor_20]
-Open=0
-Top=0
-
-[Editor_21]
-Open=0
-Top=0
-
-[Editor_22]
-Open=0
-Top=0
-
-[Editor_23]
-Open=0
-Top=0
-
-[Editor_24]
-Open=0
-Top=0
-
-[Editor_25]
-Open=0
-Top=0
-
-[Editor_26]
-Open=0
-Top=0
-
-[Editor_27]
-Open=0
-Top=0
-
-[Editor_28]
-Open=0
-Top=0
-
-[Editor_29]
-Open=0
-Top=0
-
-[Editor_30]
-Open=0
-Top=0
-
-[Editor_31]
-Open=0
-Top=0
-
-[Editor_32]
-Open=0
-Top=0
diff --git a/Builds/MinGW_Dev-Cpp.win/OdbcJdbcSetup.dev b/Builds/MinGW_Dev-Cpp.win/OdbcJdbcSetup.dev
deleted file mode 100644
index 547f5c2e..00000000
--- a/Builds/MinGW_Dev-Cpp.win/OdbcJdbcSetup.dev
+++ /dev/null
@@ -1,426 +0,0 @@
-[Project]
-FileName=OdbcJdbcSetup.dev
-Name=OdbcJdbcSetup
-Ver=1
-IsCpp=1
-Type=3
-Compiler=-D__GNUWIN32__ -D_WIN32_WINNT=0x0400 -DWINVER=0x0400 -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -D_WINDLL_@@_
-CppCompiler=-D__GNUWIN32__ -D_WIN32_IE=0x0400 -D_WIN32_WINNT=0x0400 -DWINVER=0x0400 -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -D_WINDLL -DISOLATION_AWARE_ENABLED_@@_
-Includes=d:/firebird/include;../..;../../IscDbc
-Linker=-lversion -lgdi32 -lshell32 -ladvapi32 -luser32 -lcomdlg32 -lcomctl32 -lstdc++ -lodbccp32_@@_--output-def ./Release/Obj/libOdbcJdbcSetup.def_@@_--output-lib ./Release/libOdbcJdbcSetup.a_@@_--def ../../OdbcJdbcSetup/OdbcJdbcSetupMinGw.def_@@_
-Libs=
-UnitCount=38
-Folders="Header Files","Resource Files","Source Files"
-ObjFiles=
-PrivateResource=OdbcJdbcSetup_private.rc
-ResourceIncludes=
-MakeIncludes=
-Icon=
-ExeOutput=./Release
-ObjectOutput=./Release/Obj
-OverrideOutput=0
-OverrideOutputName=OdbcJdbcSetup.dll
-HostApplication=
-CommandLine=
-IncludeVersionInfo=1
-SupportXPThemes=0
-CompilerSet=1
-CompilerSettings=000000000000000000
-
-[Unit1]
-FileName=..\..\OdbcJdbcSetup\DsnDialog.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit2]
-FileName=..\..\IscDbc\JString.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit3]
-FileName=..\..\OdbcJdbcSetup\OdbcJdbcSetup.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit4]
-FileName=..\..\OdbcJdbcSetup\Setup.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit5]
-FileName=..\..\OdbcJdbcSetup\DsnDialog.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit6]
-FileName=..\..\OdbcJdbcSetup\OdbcJdbcSetup.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit7]
-FileName=..\..\OdbcJdbcSetup\Resource.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit8]
-FileName=..\..\OdbcJdbcSetup\Setup.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit9]
-FileName=..\..\SetupAttributes.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit10]
-FileName=..\..\OdbcJdbcSetup\OdbcJdbcSetup.rc
-Folder=Resource Files
-Compile=1
-CompileCpp=0
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=0.1
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=OdbcJdbcSetup.dll
-ProductName=OdbcJdbcSetup
-ProductVersion=0.1
-AutoIncBuildNr=0
-
-[Unit11]
-FileName=..\..\OdbcJdbcSetup\ServiceClient.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit12]
-FileName=..\..\OdbcJdbcSetup\ServiceClient.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit13]
-FileName=..\..\OdbcJdbcSetup\ServiceTabBackup.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit14]
-FileName=..\..\OdbcJdbcSetup\ServiceTabBackup.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit15]
-FileName=..\..\OdbcJdbcSetup\ServiceTabChild.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit16]
-FileName=..\..\OdbcJdbcSetup\ServiceTabChild.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit17]
-FileName=..\..\OdbcJdbcSetup\ServiceTabCtrl.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit18]
-FileName=..\..\OdbcJdbcSetup\ServiceTabCtrl.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit19]
-FileName=..\..\OdbcJdbcSetup\ServiceTabRepair.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit20]
-FileName=..\..\OdbcJdbcSetup\ServiceTabRepair.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit21]
-FileName=..\..\OdbcJdbcSetup\ServiceTabRestore.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit22]
-FileName=..\..\OdbcJdbcSetup\ServiceTabRestore.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit23]
-FileName=..\..\OdbcJdbcSetup\ServiceTabStatistics.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit24]
-FileName=..\..\OdbcJdbcSetup\ServiceTabStatistics.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit25]
-FileName=..\..\OdbcJdbcSetup\CommonUtil.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit26]
-FileName=..\..\OdbcJdbcSetup\CommonUtil.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit27]
-FileName=..\..\OdbcJdbcSetup\ServiceTabUsers.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit28]
-FileName=..\..\OdbcJdbcSetup\ServiceTabUsers.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit29]
-FileName=..\..\OdbcJdbcSetup\UserDialog.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit30]
-FileName=..\..\OdbcJdbcSetup\UserDialog.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit31]
-FileName=..\..\OdbcJdbcSetup\UsersTabChild.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit32]
-FileName=..\..\OdbcJdbcSetup\UsersTabChild.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit33]
-FileName=..\..\OdbcJdbcSetup\UsersTabMemberShips.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit34]
-FileName=..\..\OdbcJdbcSetup\UsersTabMemberShips.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit35]
-FileName=..\..\OdbcJdbcSetup\UsersTabRoles.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit36]
-FileName=..\..\OdbcJdbcSetup\UsersTabRoles.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit37]
-FileName=..\..\OdbcJdbcSetup\UsersTabUsers.cpp
-Folder="Source Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit38]
-FileName=..\..\OdbcJdbcSetup\UsersTabUsers.h
-Folder="Header Files"
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
diff --git a/Builds/MinGW_Dev-Cpp.win/OdbcJdbcSetup.layout b/Builds/MinGW_Dev-Cpp.win/OdbcJdbcSetup.layout
deleted file mode 100644
index f9a1fff8..00000000
--- a/Builds/MinGW_Dev-Cpp.win/OdbcJdbcSetup.layout
+++ /dev/null
@@ -1,59 +0,0 @@
-[Editors]
-Focused=-1
-Order=
-
-[Editor_0]
-Open=0
-Top=0
-CursorCol=11
-CursorRow=7
-TopLine=4
-LeftChar=1
-
-[Editor_1]
-Open=0
-Top=0
-CursorCol=5
-CursorRow=422
-TopLine=414
-LeftChar=1
-
-[Editor_2]
-Open=0
-Top=0
-
-[Editor_3]
-Open=0
-Top=0
-
-[Editor_4]
-Open=0
-Top=0
-
-[Editor_5]
-Open=0
-Top=0
-
-[Editor_6]
-Open=0
-Top=0
-
-[Editor_7]
-Open=0
-Top=0
-
-[Editor_8]
-Open=0
-Top=0
-
-[Editor_9]
-Open=0
-Top=0
-
-[Editor_10]
-Open=0
-Top=0
-CursorCol=1
-CursorRow=1
-TopLine=79
-LeftChar=1
diff --git a/Builds/MinGW_Dev-Cpp.win/build.bat b/Builds/MinGW_Dev-Cpp.win/build.bat
deleted file mode 100644
index a8843592..00000000
--- a/Builds/MinGW_Dev-Cpp.win/build.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-D:\MinGW\bin\mingw32-make -f makefile.mingw
-
diff --git a/Builds/MinGW_Dev-Cpp.win/makefile.mingw b/Builds/MinGW_Dev-Cpp.win/makefile.mingw
deleted file mode 100644
index 3174ebcf..00000000
--- a/Builds/MinGW_Dev-Cpp.win/makefile.mingw
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-#DEBUG=1
-#
-.PHONY: all createdirs IscDbc OdbcJdbc OdbcJdbcSetup clean
-#
-#    Init variables for compile MinGW
-#
-MINGWDIR	= "d:/MinGw"
-# Windows 2000/NT
-#VER_WINNT	= -D_WIN32_WINNT=0x0500 -DWINVER=0x0500
-# Win98/Me
-VER_WINNT	= -D_WIN32_WINNT=0x0400 -DWINVER=0x0400
-#
-# Start build
-#
-include ../makefile.sources
-include ../makefile.environ
-#
-MINGWDIRBIN	= $(MINGWDIR)/bin
-MINGWDIRLIB	= $(MINGWDIR)/lib
-#
-ifdef DEBUG
-TARGETDIR	= Debug
-else
-TARGETDIR	= Release
-endif
-#
-BUILDDIR 	= $(TARGETDIR)/obj
-#
-LIST_ISCDBCSRC 	=   $(addprefix $(ISCDBCDIR)/, $(ISCDBCSRC))
-LIST_ISCDBCOBJ 	=   $(addprefix $(BUILDDIR)/, $(ISCDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSRC=   $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSRC))
-LIST_ODBCJDBCOBJ=   $(addprefix $(BUILDDIR)/, $(ODBCJDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSSRC=  $(addprefix $(ODBCJDBCSETUPDIR)/, $(ODBCJDBCSETUPSRC))
-LIST_ODBCJDBCSOBJ=  $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC:.cpp=.o))
-#
-COMPFLAGS	= -I"$(MINGWDIR)/include/c++" -I"$(MINGWDIR)/include/c++/mingw32" \
-		  -I"$(MINGWDIR)/include/c++/backward" -I"$(MINGWDIR)/include" \
-		  -I$(ISCDBCDIR) -I$(ODBCJDBCDIR) -I$(FBINCDIR) \
-		  -D_WIN32_IE=0x0400 -DWIN32 -D_WIN32 -D_WINDOWS -DISOLATION_AWARE_ENABLED $(VER_WINNT)
-#
-LINKFLAGS	= -L"$(MINGWDIR)/lib" --add-stdcall-alias -mwindows --driver-name,g++
-#
-LD		= $(MINGWDIRBIN)/dllwrap.exe --mno-cygwin
-GCC		= $(MINGWDIRBIN)/g++.exe
-WINDRES		= $(MINGWDIRBIN)/windres.exe
-#
-ISCDBCDLL       = $(TARGETDIR)/IscDbc.dll
-ODBCJDBCDLL     = $(TARGETDIR)/OdbcFb32.dll
-ODBCJDBCSDLL    = $(TARGETDIR)/OdbcJdbcSetup.dll
-ISCDBCDEFFILE	= $(ISCDBCDIR)/IscDbc.def
-ODBCJDBCDEFFILE	= $(ODBCJDBCDIR)/OdbcJdbcMinGw.def
-ODBCJDBCSDEFFILE= $(ODBCJDBCSETUPDIR)/OdbcJdbcSetupMinGw.def
-#
-ifdef DEBUG
-DEBUGFLAGS	= -g -O2 -D_DEBUG -DDEBUG -DLOGGING -fexceptions 
-else
-DEBUGFLAGS	= -DNDEBUG
-endif
-#
-$(BUILDDIR)/%.res  : $(ISCDBCDIR)/%.rc
-	$(WINDRES) --include-dir "$(MINGWDIR)/include" -i $(firstword $<) -I rc -o $@ -O coff 
-#
-$(BUILDDIR)/%.res  : $(ODBCJDBCDIR)/%.rc
-	$(WINDRES) --include-dir "$(MINGWDIR)/include" -i $(firstword $<) -I rc -o $@ -O coff 
-#
-$(BUILDDIR)/%.res  : $(ODBCJDBCSETUPDIR)/%.rc
-	$(WINDRES) --include-dir "$(MINGWDIR)/include" -i $(firstword $<) -I rc -o $@ -O coff 
-#
-$(BUILDDIR)/%.o: $(ISCDBCDIR)/%.cpp
-	$(GCC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-$(BUILDDIR)/%.o: $(ODBCJDBCDIR)/%.cpp
-	$(GCC) $(COMPFLAGS) $(COMPEXTFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-$(BUILDDIR)/%.o: $(ODBCJDBCSETUPDIR)/%.cpp
-	$(GCC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-ISCDBCLIB       = $(ISCDBCDLL:.dll=.a)
-ODBCJDBCLIB     = $(ODBCJDBCDLL:.dll=.a)
-ODBCJDBCSLIB    = $(ODBCJDBCSDLL:.dll=.a)
-#
-all :	createdirs IscDbc OdbcJdbc OdbcJdbcSetup
-#
-# Silently creates the target and build directories
-createdirs :
-	@-mkdir $(TARGETDIR) > nul
-	@-mkdir $(BUILDDIR) > nul
-#
-# Silently cleanup and deletes the target and build directories
-clean :
-	@-rm -fr $(TARGETDIR)
-#
-IscDbc 		: $(ISCDBCDLL)
-OdbcJdbc 	: $(ODBCJDBCDLL)
-OdbcJdbcSetup 	: $(ODBCJDBCSDLL)
-#
-# Build the library from the object modules
-#
-$(ISCDBCDLL) : $(LIST_ISCDBCOBJ) $(BUILDDIR)/IscDbc.res
-#	$(LD) $(LINKFLAGS) --implib $(ISCDBCLIB) $(LIST_ISCDBCOBJ) $(BUILDDIR)/IscDbc.res -lwsock32 -lstdc++ --def $(ISCDBCDEFFILE) -o $(ISCDBCDLL)
-#
-#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ) $(BUILDDIR)/OdbcJdbc.res
-#	$(LD) $(LINKFLAGS) --implib $(ODBCJDBCLIB) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(BUILDDIR)/OdbcJdbc.res -lodbccp32 -lwsock32 -lstdc++ --def $(ODBCJDBCDEFFILE) -o $(ODBCJDBCDLL)
-#
-$(ODBCJDBCSDLL) : $(LIST_ODBCJDBCSOBJ) $(BUILDDIR)/OdbcJdbcSetup.res
-#	$(LD) $(LINKFLAGS) --implib $(ODBCJDBCSLIB) $(BUILDDIR)/JString.o $(LIST_ODBCJDBCSOBJ) $(BUILDDIR)/OdbcJdbcSetup.res -lversion -lgdi32 -lshell32 -ladvapi32 -luser32 -lcomdlg32 -lcomctl32 -lodbccp32 -lstdc++ --def $(ODBCJDBCSDEFFILE) -o $(ODBCJDBCSDLL)
-#
-$(ODBCJDBCDLL) : $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSOBJ) $(BUILDDIR)/OdbcJdbc.res
-	$(LD) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSOBJ) $(BUILDDIR)/OdbcJdbc.res -lversion -lgdi32 -lshell32 -ladvapi32 -luser32 -lcomdlg32 -lcomctl32 -lodbccp32 -lwsock32 -lstdc++ --def $(ODBCJDBCDEFFILE) -o $(ODBCJDBCDLL)
-#
-# End
-#
diff --git a/Builds/MinGW_Dev-Cpp.win/readme.mingw b/Builds/MinGW_Dev-Cpp.win/readme.mingw
deleted file mode 100644
index 1c302e46..00000000
--- a/Builds/MinGW_Dev-Cpp.win/readme.mingw
+++ /dev/null
@@ -1,7 +0,0 @@
-
-    For build from Dev-C++
-
-       - create d:/Firebird/include and copy ibase.h iberror.h 
-       - run Dev-C++
-       - open OdbcJdbc.dev
-       - build all
\ No newline at end of file
diff --git a/Builds/MsSDK64.win/BUILD.BAT b/Builds/MsSDK64.win/BUILD.BAT
deleted file mode 100644
index 1d2c9759..00000000
--- a/Builds/MsSDK64.win/BUILD.BAT
+++ /dev/null
@@ -1,7 +0,0 @@
-@rem 
-@rem Load D:\WINSDK\SetEnv.Bat /XP64
-@rem Create d:/Firebird/include and copy ibase.h iberror.h 
-@rem Run this file
-@rem
-@set COMPDIR=%MSSdk%
-@"%MSSdk%\Bin\Win64"\nmake -f makefile.mssdk64 %1
diff --git a/Builds/MsSDK64.win/makefile.mssdk64 b/Builds/MsSDK64.win/makefile.mssdk64
deleted file mode 100644
index f86e3e76..00000000
--- a/Builds/MsSDK64.win/makefile.mssdk64
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-.PHONY: all createdirs OdbcFb64
-#
-#DEBUG = 1
-#
-CL		= $(COMPDIR)\Bin\Win64\Cl.exe
-RSC		= $(COMPDIR)\Bin\Rc.exe
-LD		= $(COMPDIR)\bin\Win64\link
-#
-!include ../makefile.environ
-!include ../makefile.sources
-#
-!ifdef DEBUG
-TARGETDIR	= Debug
-!else
-TARGETDIR	= Release
-!endif
-#
-BUILDDIR 	= $(TARGETDIR)\obj
-#
-COMPFLAGS	= /nologo /W3 /GX \
-		  /I "$(COMPDIR)\Include" /I "$(COMPDIR)\ATL\Include" \
-		  /I "$(FBINCDIR)" /I "$(ISCDBCDIR)" /I "$(ODBCJDBCDIR)" \
-		  /D "WIN64" /D "_WIN64" /D "_WINDOWS" \
-		  /D "ISOLATION_AWARE_ENABLED" \
-		  /Fp"$(BUILDDIR)\OdbcFb64.pch" /YX /Fo"$(BUILDDIR)\\" \
-                  /Fd"$(BUILDDIR)\\" /FD /c 
-#
-LINKFLAGS	= /nologo /subsystem:windows /dll /machine:IA64 /libpath:"$(COMPDIR)\lib\IA64" 
-ODBCJDBCDLL     = $(TARGETDIR)\OdbcFb64.dll
-#
-!ifdef DEBUG
-DEBUGFLAGS	= /MTd /Gm /Zi /Od /D "_DEBUG" /D "DEBUG" /D "LOGGING" /FR"$(BUILDDIR)\\" 
-LINKFLAGS	= $(LINKFLAGS) /incremental:yes /debug /pdbtype:sept
-RSCFLAGS	= /l 0x409 /fo"$*.res" /I "$(COMPDIR)\Include" /I "$(COMPDIR)\MFC\Include" /d "DEBUG" /d "_DEBUG" /d "WIN64" /d "_WIN64" /d "_WINDOWS"
-!else
-DEBUGFLAGS	= /MT /O2 /D "NDEBUG"
-LINKFLAGS	= $(LINKFLAGS) /incremental:no
-RSCFLAGS	= /l 0x409 /fo"$*.res" /I "$(COMPDIR)\Include" /I "$(COMPDIR)\MFC\Include" /d "NDEBUG" /d "WIN64" /d "_WIN64" /d "_WINDOWS"
-!endif
-#
-ODBCJDBCLIB	= $(ODBCJDBCDLL:.dll=.lib)
-ISCDBCDIR	= $(ISCDBCDIR:/=\)
-ODBCJDBCDIR	= $(ODBCJDBCDIR:/=\)
-ODBCJDBCSDIR	= $(ODBCJDBCSETUPDIR:/=\)
-ISCDBCOBJ	= $(ISCDBCSRC:.cpp=.obj)
-ODBCJDBCOBJ	= $(ODBCJDBCSRC:.cpp=.obj)
-ODBCJDBCSOBJ	= $(ODBCJDBCSETUPSRC:.cpp=.obj)
-#
-!ifdef DEBUG
-OBJS_ISCDBC 	= $(BUILDDIR)\$(ISCDBCOBJ:  = Debug\Obj^\)
-OBJS_ODBCJDBC 	= $(BUILDDIR)\$(ODBCJDBCOBJ:  = Debug\Obj^\)
-OBJS_ODBCJDBCS	= $(BUILDDIR)\$(ODBCJDBCSOBJ:  = Debug\Obj^\)
-!else
-OBJS_ISCDBC 	= $(BUILDDIR)\$(ISCDBCOBJ:  = Release\Obj^\)
-OBJS_ODBCJDBC 	= $(BUILDDIR)\$(ODBCJDBCOBJ:  = Release\Obj^\)
-OBJS_ODBCJDBCS	= $(BUILDDIR)\$(ODBCJDBCSOBJ:  = Release\Obj^\)
-!endif
-#
-{$(ISCDBCDIR)}.cpp{$(BUILDDIR)}.obj ::
-	@$(CL) $(COMPFLAGS) $(DEBUGFLAGS) -c $<
-#
-{$(ODBCJDBCDIR)}.cpp{$(BUILDDIR)}.obj ::
-	@$(CL) $(COMPFLAGS) $(COMPEXTFLAGS) $(DEBUGFLAGS) -c $<
-#
-{$(ODBCJDBCSDIR)}.cpp{$(BUILDDIR)}.obj ::
-	@$(CL) /D "_USRDLL" /D "_WINDLL" $(COMPFLAGS) $(DEBUGFLAGS) -c $<
-#
-$(BUILDDIR)\OdbcFb64.res : $(ODBCJDBCDIR)\OdbcJdbc.rc
-	@$(RSC) $(RSCFLAGS) $(ODBCJDBCDIR)\OdbcJdbc.rc
-#
-ODBCJDBCDEFFILE	= $(ODBCJDBCDIR)\OdbcJdbc.def
-#
-all :	createdirs $(ODBCJDBCDLL)
-#
-# Silently creates the target and build directories
-createdirs :
-	@-if not exist "$(TARGETDIR)/$(NULL)" mkdir $(TARGETDIR) > nul
-	@-if not exist "$(BUILDDIR)/$(NULL)" mkdir $(BUILDDIR) > nul
-#
-# Silently cleanup and deletes the target and build directories
-clean :
-	@if exist $(BUILDDIR) rm -fr $(TARGETDIR)
-#
-OdbcFb64 : $(ODBCJDBCDLL)
-#
-# Build the library from the object modules
-#
-$(ODBCJDBCDLL) : $(OBJS_ISCDBC) $(OBJS_ODBCJDBC) $(BUILDDIR)\OdbcFb64.res $(OBJS_ODBCJDBCS)
-	@$(LD) version.lib wsock32.lib gdi32.lib shell32.lib advapi32.lib user32.lib comdlg32.lib comctl32.lib odbccp32.lib $(LINKFLAGS) $(**) /pdb:"$(BUILDDIR)\OdbcFb64.pdb" /def:"$(ODBCJDBCDEFFILE)" /out:"$(ODBCJDBCDLL)" /implib:"$(ODBCJDBCLIB)" /EXPORT:ConfigDSN /EXPORT:DllInstall,PRIVATE
-#
-# End
-#
diff --git a/Builds/MsVc2022.win/OdbcFb.vcxproj b/Builds/MsVc2022.win/OdbcFb.vcxproj
index b98796ab..cf825333 100644
--- a/Builds/MsVc2022.win/OdbcFb.vcxproj
+++ b/Builds/MsVc2022.win/OdbcFb.vcxproj
@@ -170,7 +170,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../IscDbc;../../FBClient.Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../IscDbc;../../build/_deps/firebird_headers-src/src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DEBUG;LOGGING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader />
@@ -217,7 +217,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../IscDbc;../../FBClient.Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../IscDbc;../../build/_deps/firebird_headers-src/src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DEBUG;LOGGING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader />
@@ -264,7 +264,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../IscDbc;../../FBClient.Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../IscDbc;../../build/_deps/firebird_headers-src/src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DEBUG;LOGGING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -313,7 +313,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../IscDbc;../../FBClient.Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../IscDbc;../../build/_deps/firebird_headers-src/src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;DEBUG;LOGGING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -363,7 +363,7 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../IscDbc;../../FBClient.Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../IscDbc;../../build/_deps/firebird_headers-src/src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -405,7 +405,7 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../IscDbc;../../FBClient.Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../IscDbc;../../build/_deps/firebird_headers-src/src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -448,7 +448,7 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../IscDbc;../../FBClient.Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../IscDbc;../../build/_deps/firebird_headers-src/src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -492,7 +492,7 @@
     </Midl>
     <ClCompile>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../IscDbc;../../FBClient.Headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../IscDbc;../../build/_deps/firebird_headers-src/src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -616,7 +616,7 @@
   <ItemGroup>
     <ClInclude Include="..\..\ConnectDialog.h" />
     <ClInclude Include="..\..\DescRecord.h" />
-    <ClInclude Include="..\..\Headers\OdbcUserEvents.h" />
+    <ClInclude Include="..\..\OdbcUserEvents.h" />
     <ClInclude Include="..\..\InfoItems.h" />
     <ClInclude Include="..\..\IscDbc\Attachment.h" />
     <ClInclude Include="..\..\IscDbc\BinaryBlob.h" />
diff --git a/Builds/MsVc2022.win/OdbcFb.vcxproj.filters b/Builds/MsVc2022.win/OdbcFb.vcxproj.filters
index 15379ec3..4758b426 100644
--- a/Builds/MsVc2022.win/OdbcFb.vcxproj.filters
+++ b/Builds/MsVc2022.win/OdbcFb.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="IscDbc">
@@ -497,7 +497,7 @@
     <ClInclude Include="..\..\OdbcStatement.h">
       <Filter>OdbcJdbc\Header Files Odbc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Headers\OdbcUserEvents.h">
+    <ClInclude Include="..\..\OdbcUserEvents.h">
       <Filter>OdbcJdbc\Header Files Odbc</Filter>
     </ClInclude>
     <ClInclude Include="..\..\ResourceManagerSink.h">
diff --git a/Builds/MsVc60.win/BuildAll.bat b/Builds/MsVc60.win/BuildAll.bat
deleted file mode 100644
index 36c10faa..00000000
--- a/Builds/MsVc60.win/BuildAll.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-::  Initial Developer's Public License.
-::  The contents of this file are subject to the  Initial Developer's Public
-::  License Version 1.0 (the "License"). You may not use this file except
-::  in compliance with the License. You may obtain a copy of the License at
-::    http://www.ibphoenix.com?a=ibphoenix&page=ibp_idpl
-::  Software distributed under the License is distributed on an "AS IS" basis,
-::  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-::  for the specific language governing rights and limitations under the
-::  License.
-::
-::  The Original Code is copyright 2004 Paul Reeves.
-::
-::  The Initial Developer of the Original Code is Paul Reeves
-::
-::  All Rights Reserved.
-::
-::=============================================================================
-::
-:: Build the ODBC driver
-::
-
-@echo off
-
-::Check if on-line help is required
-@if /I "%1"=="-h" (goto :HELP & goto :EOF)
-@if /I "%1"=="/h" (goto :HELP & goto :EOF)
-@if /I "%1"=="-?" (goto :HELP & goto :EOF)
-@if /I "%1"=="/?" (goto :HELP & goto :EOF)
-@if /I "%1"=="HELP" (goto :HELP & goto :EOF)
-
-
-@goto :MAIN
-@goto :EOF
-
-:SETUP
-::==========
-@set BUILDTYPE=Release
-@set CLEAN=/build
-for %%v in ( %1 %2 ) do (
-	@if /I "%%v"=="DEBUG" (set BUILDTYPE=Debug)
-	@if /I "%%v"=="CLEAN" (set CLEAN=/rebuild)
-)
-@goto :EOF
-
-:BUILD
-::==========
-@echo Building %BUILDTYPE%
-@msdev %~dp0\OdbcJdbc.dsw /MAKE "OdbcJdbcSetup - Win32 %BUILDTYPE%" "IscDbc - Win32 %BUILDTYPE%" "OdbcJdbc - Win32 %BUILDTYPE%" %CLEAN% /OUT %~dpn0.log
-
-@echo The following errors and warnings occurred during the build:
-@type %~dpn0.log | findstr error(s)
-@echo.
-@echo.
-@echo   If no errors occurred you may now proceed to package
-@echo   the driverby running
-@echo.
-@echo      ..\..\install\Win32\MakePackage.bat
-@echo.
-@echo.
-@goto :EOF
-
-:MAIN
-::==========
-call :SETUP %*
-call :BUILD
-goto :EOF
-
-
-:HELP
-::==========
-@echo.
-@echo.
-@echo   Parameters can be passed in any order.
-@echo   Parameters are NOT case-sensitive.
-@echo   Currently the recognised params are:
-@echo.
-@echo       DEBUG  Create a DEBUG build.
-@echo              This can be combined with CLEAN.
-@echo.
-@echo       CLEAN  Delete a previous build and rebuild
-@echo              This can be combined with DEBUG.
-@echo.
-@echo       HELP   This help screen
-@echo              This option excludes all others.
-@echo.
-@goto :EOF
-
-
-
-:EOF
diff --git a/Builds/MsVc60.win/IscDbc.dsp b/Builds/MsVc60.win/IscDbc.dsp
deleted file mode 100644
index 6a59d351..00000000
--- a/Builds/MsVc60.win/IscDbc.dsp
+++ /dev/null
@@ -1,545 +0,0 @@
-# Microsoft Developer Studio Project File - Name="IscDbc" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=IscDbc - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "IscDbc.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "IscDbc.mak" CFG="IscDbc - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "IscDbc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "IscDbc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "IscDbc - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release\Obj"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "$(INTERBASE)/include" /I "../.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 wsock32.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"$(INTERBASE)/lib" /EXPORT:createConnection /EXPORT:createServices
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "IscDbc - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug\Obj"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "$(INTERBASE)\include" /I "../.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "DEBUG" /D "LOGGING" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"$(INTERBASE)\lib" /EXPORT:createConnection /EXPORT:createServices
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "IscDbc - Win32 Release"
-# Name "IscDbc - Win32 Debug"
-# Begin Group "Resource Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscDbc.rc
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Attachment.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\BinaryBlob.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\BinToHexStr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Blob.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Connection.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\DateTime.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\EnvShare.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscArray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscBlob.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscCallableStatement.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscColumnKeyInfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscColumnPrivilegesResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscColumnsResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscConnection.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscCrossReferenceResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscDatabaseMetaData.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscDbc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscHeadSqlVar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscIndexInfoResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscMetaDataResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscOdbcStatement.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscPreparedStatement.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscPrimaryKeysResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscProcedureColumnsResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscProceduresResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscResultSetMetaData.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscSpecialColumnsResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscSqlType.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscStatement.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscStatementMetaData.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscTablePrivilegesResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscTablesResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscUserEvents.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\JavaType.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\JString.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\LinkedList.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\LoadFbClientDll.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Lock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Mlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\MultibyteConvert.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Mutex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Parameter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\ParameterEvent.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Parameters.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\ParametersEvents.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Properties.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\ServiceManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Sqlda.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\SQLError.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\SQLException.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\SqlTime.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\SupportFunctions.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\TimeStamp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\TypesResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Value.h
-# End Source File
-# End Group
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Attachment.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\BinaryBlob.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Blob.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\DateTime.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\EnvShare.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\extodbc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscArray.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscBlob.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscCallableStatement.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscColumnKeyInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscColumnPrivilegesResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscColumnsResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscConnection.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscCrossReferenceResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscDatabaseMetaData.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscIndexInfoResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscMetaDataResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscOdbcStatement.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscPreparedStatement.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscPrimaryKeysResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscProcedureColumnsResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscProceduresResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscResultSetMetaData.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscSpecialColumnsResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscSqlType.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscStatement.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscStatementMetaData.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscTablePrivilegesResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscTablesResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscUserEvents.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\JString.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\LinkedList.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\LoadFbClientDll.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Lock.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\MultibyteConvert.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Mutex.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Parameter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\ParameterEvent.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Parameters.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\ParametersEvents.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\ServiceManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Sqlda.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\SQLError.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\SqlTime.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Stream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\SupportFunctions.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\TimeStamp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\TypesResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Value.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Values.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/Builds/MsVc60.win/OdbcJdbc.dsp b/Builds/MsVc60.win/OdbcJdbc.dsp
deleted file mode 100644
index fa65e489..00000000
--- a/Builds/MsVc60.win/OdbcJdbc.dsp
+++ /dev/null
@@ -1,871 +0,0 @@
-# Microsoft Developer Studio Project File - Name="OdbcJdbc" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=OdbcJdbc - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "OdbcJdbc.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "OdbcJdbc.mak" CFG="OdbcJdbc - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "OdbcJdbc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "OdbcJdbc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "OdbcJdbc - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release\Obj"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../IscDbc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__MONITOR_EXECUTING" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 version.lib gdi32.lib shell32.lib user32.lib odbccp32.lib comdlg32.lib comctl32.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/OdbcFb32.dll" /EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "OdbcJdbc - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug\Obj"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../IscDbc" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "DEBUG" /D "LOGGING" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 version.lib gdi32.lib shell32.lib user32.lib odbccp32.lib comdlg32.lib comctl32.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/OdbcFb32.dll" /pdbtype:sept /libpath:"debug" /EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE /EXPORT:createConnection
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "OdbcJdbc - Win32 Release"
-# Name "OdbcJdbc - Win32 Debug"
-# Begin Group "IscDbc"
-
-# PROP Default_Filter "cpp;h;"
-# Begin Group "Source Files IscDbc"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Attachment.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\BinaryBlob.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Blob.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\DateTime.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\EnvShare.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\extodbc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscArray.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscBlob.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscCallableStatement.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscColumnKeyInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscColumnPrivilegesResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscColumnsResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscConnection.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscCrossReferenceResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscDatabaseMetaData.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscIndexInfoResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscMetaDataResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscOdbcStatement.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscPreparedStatement.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscPrimaryKeysResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscProcedureColumnsResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscProceduresResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscResultSetMetaData.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscSpecialColumnsResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscSqlType.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscStatement.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscStatementMetaData.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscTablePrivilegesResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscTablesResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscUserEvents.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\JString.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\LinkedList.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\LoadFbClientDll.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Lock.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\MultibyteConvert.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Mutex.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Parameter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\ParameterEvent.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Parameters.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\ParametersEvents.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\ServiceManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Sqlda.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\SQLError.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\SqlTime.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Stream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\SupportFunctions.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\TimeStamp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\TypesResultSet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Value.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Values.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files IscDbc"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Attachment.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\BinaryBlob.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\BinToHexStr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Blob.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Connection.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\DateTime.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\EnvShare.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscArray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscBlob.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscCallableStatement.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscColumnKeyInfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscColumnPrivilegesResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscColumnsResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscConnection.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscCrossReferenceResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscDatabaseMetaData.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscDbc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscHeadSqlVar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscIndexInfoResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscMetaDataResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscOdbcStatement.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscPreparedStatement.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscPrimaryKeysResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscProcedureColumnsResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscProceduresResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscResultSetMetaData.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscSpecialColumnsResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscSqlType.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscStatement.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscStatementMetaData.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscTablePrivilegesResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscTablesResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscUserEvents.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\JavaType.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\JString.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\LinkedList.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\LoadFbClientDll.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Lock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Mlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\MultibyteConvert.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Mutex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Parameter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\ParameterEvent.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Parameters.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\ParametersEvents.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Properties.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\ServiceManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Sqlda.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\SQLError.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\SQLException.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\SqlTime.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\SupportFunctions.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\TimeStamp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\TypesResultSet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\Value.h
-# End Source File
-# End Group
-# Begin Group "Resource Files IscDbc"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\IscDbc\IscDbc.rc
-# PROP Exclude_From_Build 1
-# End Source File
-# End Group
-# End Group
-# Begin Group "OdbcJdbc"
-
-# PROP Default_Filter "cpp;h;"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\ConnectDialog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\DescRecord.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\MainUnicode.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\MbsAndWcs.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcConnection.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcConvert.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcDateTime.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcDesc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcEnv.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcError.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbc.def
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcObject.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcStatement.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\ResourceManagerSink.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SafeEnvThread.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\TransactionResourceAsync.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\ConnectDialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\DescRecord.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\InfoItems.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcConnection.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcConvert.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcDateTime.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcDesc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcEnv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcError.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcObject.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcStatement.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Headers\OdbcUserEvents.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\ResourceManagerSink.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SafeEnvThread.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\TemplateConvert.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\TransactionResourceAsync.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter ".rc"
-# Begin Source File
-
-SOURCE=..\..\ODbcJdbc.rc
-# End Source File
-# End Group
-# End Group
-# Begin Group "OdbcJdbcSetup"
-
-# PROP Default_Filter "cpp;h;"
-# Begin Group "Source Files Setup"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\CommonUtil.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\DsnDialog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\OdbcJdbcSetup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\OdbcJdbcSetup.rc
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceClient.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabBackup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabChild.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabCtrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabRepair.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabRestore.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabStatistics.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabUsers.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\Setup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UserDialog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabChild.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabMemberShips.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabRoles.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabUsers.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files Setup"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\CommonUtil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\DsnDialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\OdbcJdbcSetup.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceClient.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabBackup.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabChild.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabCtrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabRepair.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabRestore.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabStatistics.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabUsers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\Setup.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SetupAttributes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UserDialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabChild.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabMemberShips.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabRoles.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabUsers.h
-# End Source File
-# End Group
-# Begin Group "Resource Files Setup"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# End Group
-# End Target
-# End Project
diff --git a/Builds/MsVc60.win/OdbcJdbc.dsw b/Builds/MsVc60.win/OdbcJdbc.dsw
deleted file mode 100644
index 950fa462..00000000
--- a/Builds/MsVc60.win/OdbcJdbc.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "OdbcJdbc"=.\OdbcJdbc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/Builds/MsVc60.win/OdbcJdbcSetup.dsp b/Builds/MsVc60.win/OdbcJdbcSetup.dsp
deleted file mode 100644
index 33f4ed04..00000000
--- a/Builds/MsVc60.win/OdbcJdbcSetup.dsp
+++ /dev/null
@@ -1,270 +0,0 @@
-# Microsoft Developer Studio Project File - Name="OdbcJdbcSetup" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=OdbcJdbcSetup - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "OdbcJdbcSetup.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "OdbcJdbcSetup.mak" CFG="OdbcJdbcSetup - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "OdbcJdbcSetup - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "OdbcJdbcSetup - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "OdbcJdbcSetup - Win32 Release"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 5
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release\Obj"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /I "../../IscDbc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_WINDLL" /D "ISOLATION_AWARE_ENABLED" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 version.lib gdi32.lib shell32.lib advapi32.lib user32.lib comdlg32.lib comctl32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "OdbcJdbcSetup - Win32 Debug"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 5
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug\Obj"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../.." /I "../../IscDbc" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_WINDLL" /D "ISOLATION_AWARE_ENABLED" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 version.lib gdi32.lib shell32.lib advapi32.lib user32.lib comdlg32.lib comctl32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "OdbcJdbcSetup - Win32 Release"
-# Name "OdbcJdbcSetup - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\DsnDialog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IscDbc\JString.cpp
-
-!IF  "$(CFG)" == "OdbcJdbcSetup - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "OdbcJdbcSetup - Win32 Debug"
-
-# SUBTRACT CPP /Fr
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\OdbcJdbcSetup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\OdbcJdbcSetup.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceClient.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\CommonUtil.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabBackup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabChild.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabCtrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabRepair.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabRestore.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabStatistics.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabUsers.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\Setup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UserDialog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabChild.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabMemberShips.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabRoles.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabUsers.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\DsnDialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\OdbcJdbcSetup.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceClient.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\CommonUtil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabBackup.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabChild.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabCtrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabRepair.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabRestore.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabStatistics.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\ServiceTabUsers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\Setup.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UserDialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabChild.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabMemberShips.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabRoles.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\OdbcJdbcSetup\UsersTabUsers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\SetupAttributes.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=..\..\change.log
-# End Source File
-# End Target
-# End Project
diff --git a/Builds/MsVc60.win/build.bat b/Builds/MsVc60.win/build.bat
deleted file mode 100644
index 55c3abc0..00000000
--- a/Builds/MsVc60.win/build.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@rem 
-@rem Load VCVARS32.BAT from "C:\Program Files\Microsoft Visual Studio\VC98\Bin"
-@rem Create d:/Firebird/include and copy ibase.h iberror.h 
-@rem Run this file
-@rem
-@set COMPDIR=%MSVCDir%
-@set COMPDIRDEV=%MSDevDir%
-@"%MSVCDir%\Bin"\nmake -f makefile.msvc6 %1
diff --git a/Builds/MsVc60.win/makefile.msvc6 b/Builds/MsVc60.win/makefile.msvc6
deleted file mode 100644
index 3966c460..00000000
--- a/Builds/MsVc60.win/makefile.msvc6
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-.PHONY: all createdirs IscDbc OdbcJdbc OdbcJdbcSetup clean
-#
-#DEBUG = 1
-#
-CL		= $(COMPDIR)\bin\cl.exe
-RSC		= $(COMPDIRDEV)\Bin\rc.exe
-#
-!include ../makefile.environ
-!include ../makefile.sources
-#
-!ifdef DEBUG
-TARGETDIR	= Debug
-!else
-TARGETDIR	= Release
-!endif
-#
-BUILDDIR 	= $(TARGETDIR)\obj
-#
-COMPFLAGS	= /nologo /W3 /GX \
-		  /I "$(COMPDIR)\Include" /I "$(COMPDIR)\ATL\Include" \
-		  /I "$(FBINCDIR)" /I "$(ISCDBCDIR)" /I "$(ODBCJDBCDIR)" \
-		  /D "WIN32" /D "_WIN32" /D "_WINDOWS" \
-		  /D "ISOLATION_AWARE_ENABLED" \
-		  /Fp"$(BUILDDIR)\IscDbc.pch" /YX /Fo"$(BUILDDIR)\\" \
-                  /Fd"$(BUILDDIR)\\" /FD /c 
-#
-LD		= $(COMPDIR)\bin\link
-#
-LINKFLAGS	= /nologo /subsystem:windows /dll /machine:I386 /libpath:"$(COMPDIR)\lib" 
-ISCDBCDLL       = $(TARGETDIR)\IscDbc.dll
-ODBCJDBCDLL     = $(TARGETDIR)\OdbcFb32.dll
-ODBCJDBCSDLL    = $(TARGETDIR)\OdbcJdbcSetup.dll
-#
-!ifdef DEBUG
-DEBUGFLAGS	= /MTd /Gm /Zi /Od /D "_DEBUG" /D "DEBUG" /D "LOGGING" /FR"$(BUILDDIR)\\" 
-LINKFLAGS	= $(LINKFLAGS) /incremental:yes /debug /pdbtype:sept
-RSCFLAGS	= /l 0x409 /fo"$*.res" /I "$(COMPDIR)\Include" /I "$(COMPDIR)\MFC\Include" /d "DEBUG" /d "_DEBUG" 
-!else
-DEBUGFLAGS	= /MT /O2 /D "NDEBUG"
-LINKFLAGS	= $(LINKFLAGS) /incremental:no
-RSCFLAGS	= /l 0x409 /fo"$*.res" /I "$(COMPDIR)\Include" /I "$(COMPDIR)\MFC\Include" /d "NDEBUG" 
-!endif
-#
-ISCDBCLIB	= $(ISCDBCDLL:.dll=.lib)
-ODBCJDBCLIB	= $(ODBCJDBCDLL:.dll=.lib)
-ODBCJDBCSLIB	= $(ODBCJDBCSDLL:.dll=.lib)
-ISCDBCDIR	= $(ISCDBCDIR:/=\)
-ODBCJDBCDIR	= $(ODBCJDBCDIR:/=\)
-ODBCJDBCSDIR	= $(ODBCJDBCSETUPDIR:/=\)
-ISCDBCOBJ	= $(ISCDBCSRC:.cpp=.obj)
-ODBCJDBCOBJ	= $(ODBCJDBCSRC:.cpp=.obj)
-ODBCJDBCSOBJ	= $(ODBCJDBCSETUPSRC:.cpp=.obj)
-#
-!ifdef DEBUG
-OBJS_ISCDBC 	= $(BUILDDIR)\$(ISCDBCOBJ:  = Debug\Obj^\)
-OBJS_ODBCJDBC 	= $(BUILDDIR)\$(ODBCJDBCOBJ:  = Debug\Obj^\)
-OBJS_ODBCJDBCS	= $(BUILDDIR)\$(ODBCJDBCSOBJ:  = Debug\Obj^\)
-!else
-OBJS_ISCDBC 	= $(BUILDDIR)\$(ISCDBCOBJ:  = Release\Obj^\)
-OBJS_ODBCJDBC 	= $(BUILDDIR)\$(ODBCJDBCOBJ:  = Release\Obj^\)
-OBJS_ODBCJDBCS	= $(BUILDDIR)\$(ODBCJDBCSOBJ:  = Release\Obj^\)
-!endif
-#
-{$(ISCDBCDIR)}.cpp{$(BUILDDIR)}.obj ::
-	@$(CL) $(COMPFLAGS) $(DEBUGFLAGS) -c $<
-#
-{$(ODBCJDBCDIR)}.cpp{$(BUILDDIR)}.obj ::
-	@$(CL) $(COMPFLAGS) $(COMPEXTFLAGS) $(DEBUGFLAGS) -c $<
-#
-{$(ODBCJDBCSDIR)}.cpp{$(BUILDDIR)}.obj ::
-	@$(CL) /D "_USRDLL" /D "_WINDLL" $(COMPFLAGS) $(DEBUGFLAGS) -c $<
-#
-$(BUILDDIR)\IscDbc.res : $(ISCDBCDIR)\IscDbc.rc
-	@$(RSC) $(RSCFLAGS) $(ISCDBCDIR)\IscDbc.rc
-#
-$(BUILDDIR)\OdbcJdbc.res : $(ODBCJDBCDIR)\OdbcJdbc.rc
-	@$(RSC) $(RSCFLAGS) $(ODBCJDBCDIR)\OdbcJdbc.rc
-#
-$(BUILDDIR)\OdbcJdbcSetup.res : $(ODBCJDBCSDIR)\OdbcJdbcSetup.rc
-	@$(RSC) $(RSCFLAGS) $(ODBCJDBCSDIR)\OdbcJdbcSetup.rc
-#
-ODBCJDBCDEFFILE	= $(ODBCJDBCDIR)\OdbcJdbc.def
-#
-all :	createdirs $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSDLL)
-#
-# Silently creates the target and build directories
-createdirs :
-	@-if not exist "$(TARGETDIR)/$(NULL)" mkdir $(TARGETDIR) > nul
-	@-if not exist "$(BUILDDIR)/$(NULL)" mkdir $(BUILDDIR) > nul
-#
-# Silently cleanup and deletes the target and build directories
-clean :
-	@if exist $(BUILDDIR) rm -fr $(TARGETDIR)
-#
-IscDbc : $(ISCDBCDLL)
-OdbcJdbc : $(ODBCJDBCDLL)
-OdbcJdbcSetup : $(ODBCJDBCSDLL)
-#
-# Build the library from the object modules
-#
-$(ISCDBCDLL) : 
-#$(ISCDBCDLL) : $(OBJS_ISCDBC) $(BUILDDIR)\IscDbc.res
-#	@$(LD) wsock32.lib $(LINKFLAGS) $(**) /pdb:"$(BUILDDIR)\IscDbc.pdb" /out:"$(ISCDBCDLL)" /implib:"$(ISCDBCLIB)" /EXPORT:createConnection /EXPORT:createServices
-#
-$(ODBCJDBCDLL) : $(OBJS_ISCDBC) $(OBJS_ODBCJDBC) $(BUILDDIR)\OdbcJdbc.res $(OBJS_ODBCJDBCS)
-	@$(LD) version.lib wsock32.lib gdi32.lib shell32.lib advapi32.lib user32.lib comdlg32.lib comctl32.lib odbccp32.lib $(LINKFLAGS) $(**) /pdb:"$(BUILDDIR)\OdbcJdbc.pdb" /def:"$(ODBCJDBCDEFFILE)" /out:"$(ODBCJDBCDLL)" /implib:"$(ODBCJDBCLIB)" /EXPORT:ConfigDSN /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE /EXPORT:ConfigDriver,PRIVATE
-#
-$(ODBCJDBCSDLL) :
-#$(ODBCJDBCSDLL) : $(OBJS_ODBCJDBCS) $(BUILDDIR)\OdbcJdbcSetup.res
-#	@$(LD) version.lib gdi32.lib shell32.lib advapi32.lib user32.lib comdlg32.lib comctl32.lib odbccp32.lib $(LINKFLAGS) /libpath:"$(COMPDIR)\MFC\lib" $(BUILDDIR)\JString.obj $(**) /pdb:"$(BUILDDIR)\OdbcJdbc.pdb" /out:"$(ODBCJDBCSDLL)" /implib:"$(ODBCJDBCSLIB)" /EXPORT:ConfigDSN /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE /EXPORT:ConfigDriver,PRIVATE
-#
-# End
-#
diff --git a/Builds/MsVc70.win/IscDbc.vcproj b/Builds/MsVc70.win/IscDbc.vcproj
deleted file mode 100644
index 9eee9ef6..00000000
--- a/Builds/MsVc70.win/IscDbc.vcproj
+++ /dev/null
@@ -1,490 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="IscDbc"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release\Obj"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(INTERBASE)/include,../.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release\Obj/IscDbc.pch"
-				AssemblerListingLocation=".\Release\Obj/"
-				ObjectFile=".\Release\Obj/"
-				ProgramDataBaseFileName=".\Release\Obj/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wsock32.lib /EXPORT:createConnection  /EXPORT:createServices"
-				OutputFile=".\Release/IscDbc.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="$(INTERBASE)/lib"
-				ProgramDatabaseFile=".\Release/IscDbc.pdb"
-				SubSystem="2"
-				ImportLibrary=".\Release/IscDbc.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/IscDbc.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug\Obj"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="$(INTERBASE)\include,../.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG;LOGGING"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough=""
-				PrecompiledHeaderFile=".\Debug\Obj/IscDbc.pch"
-				AssemblerListingLocation=".\Debug\Obj/"
-				ObjectFile=".\Debug\Obj/"
-				ProgramDataBaseFileName=".\Debug\Obj/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="wsock32.lib /EXPORT:createConnection  /EXPORT:createServices"
-				OutputFile=".\Debug/IscDbc.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="$(INTERBASE)\lib"
-				IgnoreAllDefaultLibraries="FALSE"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/IscDbc.pdb"
-				SubSystem="2"
-				EntryPointSymbol=""
-				ImportLibrary=".\Debug/IscDbc.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/IscDbc.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy debug\IscDbc.dll c:\windows\system32\IscDbc.dll"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="">
-			<File
-				RelativePath="..\..\IscDbc\IscDbc.rc">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\IscDbc;$(NoInherit)"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\IscDbc;$(NoInherit)"/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\IscDbc\Attachment.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\BinToHexStr.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\BinaryBlob.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Blob.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Connection.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\DateTime.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\EnvShare.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscArray.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscBlob.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscCallableStatement.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscColumnKeyInfo.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscColumnPrivilegesResultSet.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscColumnsResultSet.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscConnection.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscCrossReferenceResultSet.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscDatabaseMetaData.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscDbc.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscIndexInfoResultSet.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscMetaDataResultSet.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscOdbcStatement.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscPreparedStatement.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscPrimaryKeysResultSet.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscProcedureColumnsResultSet.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscProceduresResultSet.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscResultSet.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscResultSetMetaData.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscSpecialColumnsResultSet.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscSqlType.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscStatement.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscStatementMetaData.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscTablePrivilegesResultSet.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscTablesResultSet.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscUserEvents.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\JString.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\JavaType.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\LinkedList.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\LoadFbClientDll.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Lock.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Mlist.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\MultibyteConvert.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Mutex.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Parameter.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\ParameterEvent.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Parameters.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\ParametersEvents.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Properties.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\SQLError.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\SQLException.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\SqlTime.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\ServiceManager.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Sqlda.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Stream.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\SupportFunctions.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\TimeStamp.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Types.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\TypesResultSet.h">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Value.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\IscDbc\Attachment.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\BinaryBlob.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Blob.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\DateTime.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\EnvShare.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscArray.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscBlob.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscCallableStatement.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscColumnKeyInfo.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscColumnPrivilegesResultSet.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscColumnsResultSet.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscConnection.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscCrossReferenceResultSet.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscDatabaseMetaData.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscIndexInfoResultSet.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscMetaDataResultSet.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscOdbcStatement.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscPreparedStatement.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscPrimaryKeysResultSet.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscProcedureColumnsResultSet.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscProceduresResultSet.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscResultSet.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscResultSetMetaData.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscSpecialColumnsResultSet.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscSqlType.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscStatement.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscStatementMetaData.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscTablePrivilegesResultSet.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscTablesResultSet.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\IscUserEvents.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\JString.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\LinkedList.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\LoadFbClientDll.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Lock.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\MultibyteConvert.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Mutex.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Parameter.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\ParameterEvent.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Parameters.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\ParametersEvents.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\SQLError.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\SqlTime.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\ServiceManager.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Sqlda.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Stream.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\SupportFunctions.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\TimeStamp.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\TypesResultSet.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Value.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\Values.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\extodbc.cpp">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/Builds/MsVc70.win/OdbcJdbc.sln b/Builds/MsVc70.win/OdbcJdbc.sln
deleted file mode 100644
index 53b3857c..00000000
--- a/Builds/MsVc70.win/OdbcJdbc.sln
+++ /dev/null
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdbcJdbc", "OdbcJdbc.vcproj", "{C6127398-654D-4196-B8C1-5BB32D75D7FD}"
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		ConfigName.0 = Debug
-		ConfigName.1 = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug.ActiveCfg = Debug|Win32
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug.Build.0 = Debug|Win32
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release.ActiveCfg = Release|Win32
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/Builds/MsVc70.win/OdbcJdbc.vcproj b/Builds/MsVc70.win/OdbcJdbc.vcproj
deleted file mode 100644
index 868a5474..00000000
--- a/Builds/MsVc70.win/OdbcJdbc.vcproj
+++ /dev/null
@@ -1,730 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="Firebird Odbc"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug\Obj"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../IscDbc"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG;LOGGING"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug\Obj/OdbcFb32.pch"
-				AssemblerListingLocation=".\Debug\Obj/"
-				ObjectFile=".\Debug\Obj/"
-				ProgramDataBaseFileName=".\Debug\Obj/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386
-/EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE"
-				AdditionalDependencies="version.lib wsock32.lib comctl32.lib"
-				OutputFile=".\Debug/OdbcFb32.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="debug"
-				ModuleDefinitionFile="..\..\OdbcJdbc.def"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/OdbcFb32.pdb"
-				SubSystem="2"
-				ImportLibrary=".\Debug/OdbcFb32.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/OdbcFb32.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Registering Server"
-				CommandLine="regsvr32 /s $(TargetDir)&#1040;&#1080;Odbc.dll
-copy debug\OdbcFb32.dll c:\windows\system32\OdbcFb32.dll
-
-"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release\Obj"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../IscDbc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release\Obj/OdbcFb32.pch"
-				AssemblerListingLocation=".\Release\Obj/"
-				ObjectFile=".\Release\Obj/"
-				ProgramDataBaseFileName=".\Release\Obj/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386
-/EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE"
-				AdditionalDependencies="version.lib wsock32.lib comctl32.lib"
-				OutputFile=".\Release/OdbcFb32.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				ModuleDefinitionFile="..\..\OdbcJdbc.def"
-				ProgramDatabaseFile=".\Release/OdbcFb32.pdb"
-				SubSystem="2"
-				ImportLibrary=".\Release/OdbcFb32.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/OdbcFb32.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="IscDbc"
-			Filter="">
-			<Filter
-				Name="Source Files IscDbc">
-				<File
-					RelativePath="..\..\IscDbc\Attachment.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\BinaryBlob.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Blob.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\DateTime.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\EnvShare.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\extodbc.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscArray.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscBlob.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscCallableStatement.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnKeyInfo.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnPrivilegesResultSet.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnsResultSet.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscConnection.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscCrossReferenceResultSet.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscDatabaseMetaData.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscIndexInfoResultSet.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscMetaDataResultSet.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscOdbcStatement.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscPreparedStatement.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscPrimaryKeysResultSet.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscProcedureColumnsResultSet.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscProceduresResultSet.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscResultSet.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscResultSetMetaData.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscSpecialColumnsResultSet.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscSqlType.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscStatement.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscStatementMetaData.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscTablePrivilegesResultSet.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscTablesResultSet.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscUserEvents.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\JString.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\LinkedList.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\LoadFbClientDll.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Lock.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\MultibyteConvert.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Mutex.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Parameter.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ParameterEvent.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Parameters.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ParametersEvents.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ServiceManager.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Sqlda.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SQLError.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SqlTime.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Stream.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SupportFunctions.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\TimeStamp.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\TypesResultSet.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Value.cpp">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Values.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files IscDbc">
-				<File
-					RelativePath="..\..\IscDbc\Attachment.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\BinaryBlob.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\BinToHexStr.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Blob.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Connection.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\DateTime.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\EnvShare.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscArray.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscBlob.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscCallableStatement.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnKeyInfo.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnPrivilegesResultSet.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnsResultSet.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscConnection.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscCrossReferenceResultSet.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscDatabaseMetaData.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscDbc.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscIndexInfoResultSet.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscMetaDataResultSet.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscOdbcStatement.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscPreparedStatement.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscPrimaryKeysResultSet.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscProcedureColumnsResultSet.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscProceduresResultSet.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscResultSet.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscResultSetMetaData.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscSpecialColumnsResultSet.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscSqlType.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscStatement.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscStatementMetaData.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscTablePrivilegesResultSet.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscTablesResultSet.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscUserEvents.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\JavaType.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\JString.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\LinkedList.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\LoadFbClientDll.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Lock.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Mlist.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\MultibyteConvert.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Mutex.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Parameter.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ParameterEvent.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Parameters.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ParametersEvents.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Properties.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ServiceManager.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Sqlda.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SQLError.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SQLException.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SqlTime.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Stream.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SupportFunctions.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\TimeStamp.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Types.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\TypesResultSet.h">
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Value.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="OdbcJdbc"
-			Filter="">
-			<Filter
-				Name="Header Files Odbc"
-				Filter="h;hpp;hxx;hm;inl">
-				<File
-					RelativePath="..\..\ConnectDialog.h">
-				</File>
-				<File
-					RelativePath="..\..\DescRecord.h">
-				</File>
-				<File
-					RelativePath="..\..\InfoItems.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcConnection.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcConvert.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcDateTime.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcDesc.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcEnv.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcError.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbc.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcObject.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcStatement.h">
-				</File>
-				<File
-					RelativePath="..\..\Headers\OdbcUserEvents.h">
-				</File>
-				<File
-					RelativePath="..\..\ResourceManagerSink.h">
-				</File>
-				<File
-					RelativePath="..\..\SafeEnvThread.h">
-				</File>
-				<File
-					RelativePath="..\..\SetupAttributes.h">
-				</File>
-				<File
-					RelativePath="..\..\TemplateConvert.h">
-				</File>
-				<File
-					RelativePath="..\..\TransactionResourceAsync.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="Source Files Odbc"
-				Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-				<File
-					RelativePath="..\..\ConnectDialog.cpp">
-				</File>
-				<File
-					RelativePath="..\..\DescRecord.cpp">
-				</File>
-				<File
-					RelativePath="..\..\Main.cpp">
-				</File>
-				<File
-					RelativePath="..\..\MainUnicode.cpp">
-				</File>
-				<File
-					RelativePath="..\..\MbsAndWcs.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcConnection.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcConvert.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcDateTime.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcDesc.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcEnv.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcError.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbc.def">
-				</File>
-				<File
-					RelativePath="..\..\OdbcObject.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcStatement.cpp">
-				</File>
-				<File
-					RelativePath="..\..\ResourceManagerSink.cpp">
-				</File>
-				<File
-					RelativePath="..\..\SafeEnvThread.cpp">
-				</File>
-				<File
-					RelativePath="..\..\TransactionResourceAsync.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="Resource Files Odbc"
-				Filter=".rc">
-				<File
-					RelativePath="..\..\ODbcJdbc.rc">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCResourceCompilerTool"
-							AdditionalIncludeDirectories="..\..;$(NoInherit)"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCResourceCompilerTool"
-							AdditionalIncludeDirectories="..\..;$(NoInherit)"/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="OdbcJdbcSetup"
-			Filter="">
-			<Filter
-				Name="Source Files Setup"
-				Filter="">
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\CommonUtil.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\DsnDialog.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\OdbcJdbcSetup.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceClient.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabBackup.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabChild.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabCtrl.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabRepair.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabRestore.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabStatistics.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabUsers.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\Setup.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UserDialog.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabChild.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabMemberShips.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabRoles.cpp">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabUsers.cpp">
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files Setup"
-				Filter="">
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\CommonUtil.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\DsnDialog.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\OdbcJdbcSetup.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\resource.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceClient.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabBackup.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabChild.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabCtrl.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabRepair.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabRestore.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabStatistics.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabUsers.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\Setup.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UserDialog.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabChild.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabMemberShips.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabRoles.h">
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabUsers.h">
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/Builds/MsVc70.win/OdbcJdbcSetup.vcproj b/Builds/MsVc70.win/OdbcJdbcSetup.vcproj
deleted file mode 100644
index 2ad58bcb..00000000
--- a/Builds/MsVc70.win/OdbcJdbcSetup.vcproj
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="OdbcJdbcSetup"
-	SccProjectName=""
-	SccLocalPath=""
-	Keyword="MFCProj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug\Obj"
-			ConfigurationType="2"
-			UseOfMFC="1"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../..,../../IscDbc"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug\Obj/OdbcJdbcSetup.pch"
-				AssemblerListingLocation=".\Debug\Obj/"
-				ObjectFile=".\Debug\Obj/"
-				ProgramDataBaseFileName=".\Debug\Obj/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="version.lib gdi32.lib shell32.lib advapi32.lib user32.lib comdlg32.lib odbccp32.lib /EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE"
-				OutputFile=".\Debug/OdbcJdbcSetup.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/OdbcJdbcSetup.pdb"
-				SubSystem="2"
-				ImportLibrary=".\Debug/OdbcJdbcSetup.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/OdbcJdbcSetup.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release\Obj"
-			ConfigurationType="2"
-			UseOfMFC="1"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../..,../../IscDbc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release\Obj/OdbcJdbcSetup.pch"
-				AssemblerListingLocation=".\Release\Obj/"
-				ObjectFile=".\Release\Obj/"
-				ProgramDataBaseFileName=".\Release\Obj/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="version.lib gdi32.lib shell32.lib advapi32.lib user32.lib comdlg32.lib odbccp32.lib /EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE"
-				OutputFile=".\Release/OdbcJdbcSetup.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/OdbcJdbcSetup.pdb"
-				SubSystem="2"
-				ImportLibrary=".\Release/OdbcJdbcSetup.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/OdbcJdbcSetup.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\DsnDialog.cpp">
-			</File>
-			<File
-				RelativePath="..\..\IscDbc\JString.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						BrowseInformation="0"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\OdbcJdbcSetup.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceClient.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\OdbcJdbcSetup.rc">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\OdbcJdbcSetup;$(NoInherit)"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\..\OdbcJdbcSetup;$(NoInherit)"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\CommonUtil.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceTabBackup.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceTabChild.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceTabCtrl.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceTabRepair.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceTabRestore.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceTabStatistics.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceTabUsers.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\Setup.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\UserDialog.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\UsersTabChild.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\UsersTabMemberShips.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\UsersTabRoles.cpp">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\UsersTabUsers.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\DsnDialog.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\OdbcJdbcSetup.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceClient.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\CommonUtil.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceTabBackup.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceTabChild.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceTabCtrl.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceTabRepair.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceTabRestore.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceTabStatistics.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\Resource.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\ServiceTabUsers.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\Setup.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\UserDialog.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\UsersTabChild.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\UsersTabMemberShips.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\UsersTabRoles.h">
-			</File>
-			<File
-				RelativePath="..\..\OdbcJdbcSetup\UsersTabUsers.h">
-			</File>
-			<File
-				RelativePath="..\..\SetupAttributes.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe">
-		</Filter>
-		<File
-			RelativePath="..\..\change.log">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/Builds/MsVc70.win/build.bat b/Builds/MsVc70.win/build.bat
deleted file mode 100644
index e17e9203..00000000
--- a/Builds/MsVc70.win/build.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@rem 
-@rem Load VCVARS32.BAT from "D:\Program Files\Microsoft Visual Studio .NET\Vc7\bin"
-@rem Create d:/Firebird/include and copy ibase.h iberror.h 
-@rem Run this file
-@rem
-@set COMPDIR=%MSVCDir%
-@"%MSVCDir%\Bin"\nmake -f makefile.msvc7 %1
diff --git a/Builds/MsVc70.win/makefile.msvc7 b/Builds/MsVc70.win/makefile.msvc7
deleted file mode 100644
index 550112f3..00000000
--- a/Builds/MsVc70.win/makefile.msvc7
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-.PHONY: createdirs IscDbc OdbcJdbc OdbcJdbcSetup
-#
-#DEBUG = 1
-#
-COMPDIRSDK	= $(COMPDIR)\PLATFO~1
-#
-CL		= "$(COMPDIR)"\bin\cl.exe
-RSC		= "$(COMPDIR)"\bin\rc.exe
-#
-!include ../makefile.environ
-!include ../makefile.sources
-#
-!ifdef DEBUG
-TARGETDIR	= Debug
-!else
-TARGETDIR	= Release
-!endif
-#
-BUILDDIR 	= $(TARGETDIR)\obj
-#
-COMPFLAGS	= /nologo /W3 /GX \
-		  /I "$(COMPDIR)\Include" /I "$(COMPDIR)\MFC\Include" \
-		  /I "$(COMPDIRSDK)"\Include /I "$(COMPDIR)\ATLMFC\Include"  \
-		  /I "$(FBINCDIR)" /I "$(ISCDBCDIR)" /I "$(ODBCJDBCDIR)" \
-		  /D "WIN32" /D "_WIN32" /D "_WINDOWS" /D "_WINDLL" \
-		  /D "ISOLATION_AWARE_ENABLED" \
-		  /Fp"$(BUILDDIR)\IscDbc.pch" /EHsc /YX /Fo"$(BUILDDIR)\\" \
-                  /Fd"$(BUILDDIR)\\" /FD /c 
-#
-LD		= "$(COMPDIR)"\bin\link
-#
-LINKFLAGS	= /nologo /subsystem:windows /dll /machine:I386 /libpath:"$(COMPDIR)\lib"  /libpath:"$(COMPDIRSDK)"\lib /libpath:"$(COMPDIR)\ATLMFC\lib" 
-ISCDBCDLL       = $(TARGETDIR)\IscDbc.dll
-ODBCJDBCDLL     = $(TARGETDIR)\OdbcFb32.dll
-ODBCJDBCSDLL    = $(TARGETDIR)\OdbcJdbcSetup.dll
-#
-!ifdef DEBUG
-DEBUGFLAGS	= /MTd /Gm /Zi /Od /D "_DEBUG" /D "DEBUG" /D "LOGGING" /FR"$(BUILDDIR)\\" 
-LINKFLAGS	= $(LINKFLAGS) /incremental:no /debug
-RSCFLAGS	= /l 0x409 /fo"$*.res" /I "$(COMPDIR)"\Include /I "$(COMPDIR)"\MFC\Include /d "DEBUG" /d "_DEBUG" /D "WIN32" /D "_WIN32" /D "_WINDOWS"
-!else
-DEBUGFLAGS	= /MT /W3 /D "NDEBUG"
-LINKFLAGS	= $(LINKFLAGS) /incremental:no
-RSCFLAGS	= /l 0x409 /fo"$*.res" /I "$(COMPDIR)"\Include /I "$(COMPDIRSDK)"\Include /I "$(COMPDIR)"\MFC\Include /d "NDEBUG" /D "WIN32" /D "_WIN32" /D "_WINDOWS"
-!endif
-#
-ISCDBCLIB	= $(ISCDBCDLL:.dll=.lib)
-ODBCJDBCLIB	= $(ODBCJDBCDLL:.dll=.lib)
-ODBCJDBCSLIB	= $(ODBCJDBCSDLL:.dll=.lib)
-ISCDBCDIR	= $(ISCDBCDIR:/=\)
-ODBCJDBCDIR	= $(ODBCJDBCDIR:/=\)
-ODBCJDBCSDIR	= $(ODBCJDBCSETUPDIR:/=\)
-ISCDBCOBJ	= $(ISCDBCSRC:.cpp=.obj)
-ODBCJDBCOBJ	= $(ODBCJDBCSRC:.cpp=.obj)
-ODBCJDBCSOBJ	= $(ODBCJDBCSETUPSRC:.cpp=.obj)
-#
-!ifdef DEBUG
-OBJS_ISCDBC 	= $(BUILDDIR)\$(ISCDBCOBJ:  = Debug\Obj^\)
-OBJS_ODBCJDBC 	= $(BUILDDIR)\$(ODBCJDBCOBJ:  = Debug\Obj^\)
-OBJS_ODBCJDBCS	= $(BUILDDIR)\$(ODBCJDBCSOBJ:  = Debug\Obj^\)
-!else
-OBJS_ISCDBC 	= $(BUILDDIR)\$(ISCDBCOBJ:  = Release\Obj^\)
-OBJS_ODBCJDBC 	= $(BUILDDIR)\$(ODBCJDBCOBJ:  = Release\Obj^\)
-OBJS_ODBCJDBCS	= $(BUILDDIR)\$(ODBCJDBCSOBJ:  = Release\Obj^\)
-!endif
-#
-{$(ISCDBCDIR)}.cpp{$(BUILDDIR)}.obj ::
-	@call $(CL) $(COMPFLAGS) $(DEBUGFLAGS) -c $<
-#
-{$(ODBCJDBCDIR)}.cpp{$(BUILDDIR)}.obj ::
-	@call $(CL) $(COMPFLAGS) $(COMPEXTFLAGS) $(DEBUGFLAGS) -c $<
-#
-{$(ODBCJDBCSDIR)}.cpp{$(BUILDDIR)}.obj ::
-	@call $(CL) /D "_USRDLL" /D "_WINDLL" $(COMPFLAGS) $(DEBUGFLAGS) -c $<
-#
-$(BUILDDIR)\IscDbc.res : $(ISCDBCDIR)\IscDbc.rc
-	@call $(RSC) $(RSCFLAGS) $(ISCDBCDIR)\IscDbc.rc
-#
-$(BUILDDIR)\OdbcJdbc.res : $(ODBCJDBCDIR)\OdbcJdbc.rc
-	@call $(RSC) $(RSCFLAGS) $(ODBCJDBCDIR)\OdbcJdbc.rc
-#
-$(BUILDDIR)\OdbcJdbcSetup.res : $(ODBCJDBCSDIR)\OdbcJdbcSetup.rc
-	@call $(RSC) $(RSCFLAGS) $(ODBCJDBCSDIR)\OdbcJdbcSetup.rc
-#
-ODBCJDBCDEFFILE	= $(ODBCJDBCDIR)\OdbcJdbc.def
-#
-all :	createdirs $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSDLL)
-#
-# Silently creates the target and build directories
-createdirs :
-	@-if not exist "$(TARGETDIR)/$(NULL)" mkdir $(TARGETDIR) > nul
-	@-if not exist "$(BUILDDIR)/$(NULL)" mkdir $(BUILDDIR) > nul
-#
-# Silently cleanup and deletes the target and build directories
-clean :
-	@if exist $(BUILDDIR) rmdir /S /Q $(TARGETDIR)
-#
-IscDbc : $(ISCDBCDLL)
-OdbcJdbc : $(ODBCJDBCDLL)
-OdbcJdbcSetup : $(ODBCJDBCSDLL)
-#
-# Build the library from the object modules
-#
-$(ISCDBCDLL) : $(OBJS_ISCDBC) $(BUILDDIR)\IscDbc.res
-#	@call $(LD) wsock32.lib $(LINKFLAGS) $(**) /pdb:"$(BUILDDIR)\IscDbc.pdb" /out:"$(ISCDBCDLL)" /implib:"$(ISCDBCLIB)" /EXPORT:createConnection /EXPORT:createServices
-#
-$(ODBCJDBCDLL) : $(OBJS_ISCDBC) $(OBJS_ODBCJDBC) $(OBJS_ODBCJDBCS) $(BUILDDIR)\OdbcJdbc.res
-	@call $(LD) version.lib gdi32.lib shell32.lib advapi32.lib wsock32.lib user32.lib comdlg32.lib comctl32.lib odbccp32.lib $(LINKFLAGS) $(**) /pdb:"$(BUILDDIR)\OdbcJdbc.pdb" /def:"$(ODBCJDBCDEFFILE)" /out:"$(ODBCJDBCDLL)" /implib:"$(ODBCJDBCLIB)" /EXPORT:ConfigDSN /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:ConfigDriver,PRIVATE
-#
-$(ODBCJDBCSDLL) : $(OBJS_ODBCJDBCS) $(BUILDDIR)\OdbcJdbcSetup.res
-#	@call $(LD) version.lib gdi32.lib shell32.lib advapi32.lib user32.lib comdlg32.lib comctl32.lib odbccp32.lib $(LINKFLAGS) /libpath:"$(COMPDIR)"\MFC\lib $(BUILDDIR)\JString.obj $(**) /pdb:"$(BUILDDIR)\OdbcJdbc.pdb" /out:"$(ODBCJDBCSDLL)" /implib:"$(ODBCJDBCSLIB)" /EXPORT:ConfigDSN /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:ConfigDriver,PRIVATE
-#
-# End
-#
diff --git a/Builds/MsVc80.win/OdbcFb.sln b/Builds/MsVc80.win/OdbcFb.sln
deleted file mode 100644
index e210e2ef..00000000
--- a/Builds/MsVc80.win/OdbcFb.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Firebird OdbcFb", "OdbcFb.vcproj", "{C6127398-654D-4196-B8C1-5BB32D75D7FD}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|Win32.Build.0 = Debug|Win32
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|x64.ActiveCfg = Debug|x64
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|x64.Build.0 = Debug|x64
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|Win32.ActiveCfg = Release|Win32
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|Win32.Build.0 = Release|Win32
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|x64.ActiveCfg = Release|x64
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/Builds/MsVc80.win/OdbcFb.vcproj b/Builds/MsVc80.win/OdbcFb.vcproj
deleted file mode 100644
index db754642..00000000
--- a/Builds/MsVc80.win/OdbcFb.vcproj
+++ /dev/null
@@ -1,1198 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="OdbcFb"
-	ProjectGUID="{C6127398-654D-4196-B8C1-5BB32D75D7FD}"
-	RootNamespace="Firebird OdbcFb"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/OdbcFb.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../IscDbc;C:\Program Files\Firebird\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG;LOGGING"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ObjectFile="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ProgramDataBaseFileName="$(PlatformName)/$(ConfigurationName)/Obj/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE"
-				AdditionalDependencies="version.lib wsock32.lib comctl32.lib"
-				OutputFile="$(PlatformName)/$(ConfigurationName)/OdbcFb.dll"
-				AdditionalLibraryDirectories="debug"
-				ModuleDefinitionFile="..\..\OdbcJdbc.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)/$(ConfigurationName)/$(TargetName).pdb"
-				SubSystem="2"
-				ImportLibrary=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug/OdbcFb.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../IscDbc;C:\Program Files\Firebird\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG;LOGGING"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=" "
-				AssemblerListingLocation="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ObjectFile="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ProgramDataBaseFileName="$(PlatformName)/$(ConfigurationName)/Obj/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE"
-				AdditionalDependencies="version.lib wsock32.lib comctl32.lib"
-				OutputFile="$(PlatformName)/$(ConfigurationName)/OdbcFb.dll"
-				AdditionalLibraryDirectories="debug"
-				ModuleDefinitionFile="..\..\OdbcJdbc.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)/$(ConfigurationName)/$(TargetName).pdb"
-				SubSystem="2"
-				ImportLibrary=""
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/OdbcFb.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../IscDbc;C:\Program Files\Firebird\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ObjectFile="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ProgramDataBaseFileName="$(PlatformName)/$(ConfigurationName)/Obj/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE"
-				AdditionalDependencies="version.lib wsock32.lib comctl32.lib"
-				OutputFile="$(PlatformName)/$(ConfigurationName)/OdbcFb.dll"
-				ModuleDefinitionFile="..\..\OdbcJdbc.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)/$(ConfigurationName)/$(TargetName).pdb"
-				SubSystem="2"
-				ImportLibrary=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Release/OdbcFb.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../IscDbc;C:\Program Files\Firebird\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=" "
-				AssemblerListingLocation="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ObjectFile="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ProgramDataBaseFileName="$(PlatformName)/$(ConfigurationName)/Obj/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE"
-				AdditionalDependencies="version.lib wsock32.lib comctl32.lib"
-				OutputFile="$(PlatformName)/$(ConfigurationName)/OdbcFb.dll"
-				ModuleDefinitionFile="..\..\OdbcJdbc.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)/$(ConfigurationName)/$(TargetName).pdb"
-				SubSystem="2"
-				ImportLibrary=""
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="IscDbc"
-			>
-			<Filter
-				Name="Source Files IscDbc"
-				>
-				<File
-					RelativePath="..\..\IscDbc\Attachment.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\BinaryBlob.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Blob.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\DateTime.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\EnvShare.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\extodbc.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscArray.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscBlob.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscCallableStatement.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnKeyInfo.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnPrivilegesResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnsResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscConnection.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscCrossReferenceResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscDatabaseMetaData.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscIndexInfoResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscMetaDataResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscOdbcStatement.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscPreparedStatement.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscPrimaryKeysResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscProcedureColumnsResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscProceduresResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscResultSetMetaData.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscSpecialColumnsResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscSqlType.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscStatement.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscStatementMetaData.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscTablePrivilegesResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscTablesResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscUserEvents.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\JString.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\LinkedList.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\LoadFbClientDll.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Lock.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\MultibyteConvert.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Mutex.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Parameter.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ParameterEvent.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Parameters.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ParametersEvents.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ServiceManager.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Sqlda.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SQLError.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SqlTime.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Stream.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SupportFunctions.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\TimeStamp.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\TypesResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Value.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Values.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files IscDbc"
-				>
-				<File
-					RelativePath="..\..\IscDbc\Attachment.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\BinaryBlob.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\BinToHexStr.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Blob.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Connection.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\DateTime.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\EnvShare.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscArray.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscBlob.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscCallableStatement.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnKeyInfo.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnPrivilegesResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnsResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscConnection.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscCrossReferenceResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscDatabaseMetaData.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscDbc.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscIndexInfoResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscMetaDataResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscOdbcStatement.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscPreparedStatement.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscPrimaryKeysResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscProcedureColumnsResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscProceduresResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscResultSetMetaData.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscSpecialColumnsResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscSqlType.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscStatement.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscStatementMetaData.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscTablePrivilegesResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscTablesResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscUserEvents.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\JavaType.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\JString.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\LinkedList.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\LoadFbClientDll.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Lock.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Mlist.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\MultibyteConvert.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Mutex.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Parameter.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ParameterEvent.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Parameters.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ParametersEvents.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Properties.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ServiceManager.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Sqlda.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SQLError.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SQLException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SqlTime.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Stream.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SupportFunctions.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\TimeStamp.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Types.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\TypesResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Value.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="OdbcJdbc"
-			>
-			<Filter
-				Name="Header Files Odbc"
-				Filter="h;hpp;hxx;hm;inl"
-				>
-				<File
-					RelativePath="..\..\ConnectDialog.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\DescRecord.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\InfoItems.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcConnection.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcConvert.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcDateTime.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcDesc.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcEnv.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcError.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbc.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcObject.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcStatement.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Headers\OdbcUserEvents.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\ResourceManagerSink.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\SafeEnvThread.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\SetupAttributes.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\TemplateConvert.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\TransactionResourceAsync.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Source Files Odbc"
-				Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-				>
-				<File
-					RelativePath="..\..\ConnectDialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\DescRecord.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Main.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\MainUnicode.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\MbsAndWcs.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcConnection.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcConvert.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcDateTime.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcDesc.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcEnv.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcError.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbc.def"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcObject.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcStatement.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\ResourceManagerSink.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\SafeEnvThread.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\TransactionResourceAsync.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Resource Files Odbc"
-				Filter=".rc"
-				>
-				<File
-					RelativePath="..\..\ODbcJdbc.rc"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCResourceCompilerTool"
-							AdditionalIncludeDirectories="..\..;$(NoInherit)"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCResourceCompilerTool"
-							AdditionalIncludeDirectories="..\..;$(NoInherit)"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCResourceCompilerTool"
-							AdditionalIncludeDirectories="..\..;$(NoInherit)"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCResourceCompilerTool"
-							AdditionalIncludeDirectories="..\..;$(NoInherit)"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="OdbcJdbcSetup"
-			>
-			<Filter
-				Name="Source Files Setup"
-				>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\CommonUtil.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\DsnDialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\OdbcJdbcSetup.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceClient.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabBackup.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabChild.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabCtrl.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabRepair.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabRestore.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabStatistics.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabUsers.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\Setup.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UserDialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabChild.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabMemberShips.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabRoles.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabUsers.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files Setup"
-				>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\CommonUtil.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\DsnDialog.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\OdbcJdbcSetup.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\resource.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceClient.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabBackup.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabChild.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabCtrl.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabRepair.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabRestore.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabStatistics.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabUsers.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\Setup.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UserDialog.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabChild.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabMemberShips.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabRoles.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabUsers.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/Builds/MsVc80.win/build.bat b/Builds/MsVc80.win/build.bat
deleted file mode 100644
index 9592a99f..00000000
--- a/Builds/MsVc80.win/build.bat
+++ /dev/null
@@ -1,44 +0,0 @@
-::
-:: This file is intended to do automated release builds.
-:: Automated debug builds will require you to do some hacking
-::
-:: The only meaningful option this file understands is CLEAN
-:: If you pass that it will do a rebuild of the driver.
-::
-:: After checking whether the binaries need to be (re)built
-:: it will package up the driver.
-::
-:: If the host environment is 64-bit it will build and package
-:: the 32-bit driver too.
-::
-:: WARNING: Only minimal error checking is done. The build/packaging
-:: process might not abort on error - be sure to check the logs and
-:: screen output afterwards.
-::
-
-@echo off
-goto :MAIN & goto :EOF
-
-:MAIN
-::===========
-
-if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
-	@set PLATFORM=x64
-) else (
-	if "%PROCESSOR_ARCHITEW6432%" == "AMD64" (
-		@set PLATFORM=x64
-	) else (
-		@set PLATFORM=win32
-	)
-)
-
-if "%PLATFORM%" == "x64" (
-	call build_platform.bat x86 %1
-	call build_platform.bat AMD64 %1
-) else (
-	call build_platform.bat x86 %1
-)
-
-@title Build complete
-goto :EOF
-::=======
\ No newline at end of file
diff --git a/Builds/MsVc80.win/build_platform.bat b/Builds/MsVc80.win/build_platform.bat
deleted file mode 100644
index 73958724..00000000
--- a/Builds/MsVc80.win/build_platform.bat
+++ /dev/null
@@ -1,26 +0,0 @@
-
-:BUILD
-::========
-@call setenvvar.bat %1 %2
-@title %BUILDTYPE%  %1%
-@echo   %BUILDTYPE% %1%
-@set > build_%1%.log
-if defined USE_NMAKE (
-@echo using NMAKE
-@nmake /i /f %~dp0\makefile.%vs_ver% %1 all >> build_%1%.log 2>&1
-) else (
-@devenv %~dp0\OdbcFb.sln /%BUILDTYPE% "%BUILDCONFIG%|%FB_TARGET_PLATFORM%" /OUT build_%1%.log 2>&1
-)
-echo.
-)
-
-
-:: Now make the packages
-pushd ..\..\Install\Win32
-@echo Now making packages
-call MakePackage.bat
-popd
-
-
-goto :EOF
-
diff --git a/Builds/MsVc80.win/makefile.msvc8 b/Builds/MsVc80.win/makefile.msvc8
deleted file mode 100644
index 4047dc7c..00000000
--- a/Builds/MsVc80.win/makefile.msvc8
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-.PHONY: all createdirs OdbcFb
-#
-#DEBUG = 1
-#
-#
-CL		= cl.exe
-RSC		= RC.Exe
-LD		= link.exe
-MT		= mt.exe
-
-!include ../makefile.win_environ
-!include ../makefile.sources
-#
-!ifdef DEBUG
-TARGETDIR	= $(FB_TARGET_PLATFORM)\Debug
-!else
-TARGETDIR	= $(FB_TARGET_PLATFORM)\Release
-!endif
-#
-BUILDDIR 	= $(TARGETDIR)\obj
-#
-COMPFLAGS	= /W3 /EHsc \
-		  /I "$(FBINCDIR)" /I $(ISCDBCDIR) /I $(ODBCJDBCDIR) \
-		  /D "WIN32" /D "_WIN32" /D "_WINDOWS" /D "_WINDLL" \
-		  /D "ISOLATION_AWARE_ENABLED" \
-		  /Fp"$(BUILDDIR)\OdbcFb.pch" /Fo"$(BUILDDIR)\\" \
-		  /Fd"$(BUILDDIR)\\" /FD /Gd /GF /Gy /c
-#/nologo
-
-
-#
-LINKFLAGS	= /SUBSYSTEM:WINDOWS /DLL
-#/NOLOGO /machine:$(FB_COMPILER_TYPE) /libpath:"$(COMPDIR)\lib\$(FB_COMPILER_TYPE)"
-ODBCJDBCDLL     = $(TARGETDIR)\OdbcFb.dll
-#
-!ifdef DEBUG
-DEBUGFLAGS	= /MTd /Gm /ZI /Od /D "_DEBUG" /D "DEBUG" /D "LOGGING" /FR"$(BUILDDIR)\\"
-LINKFLAGS	= $(LINKFLAGS) /incremental:yes /debug /pdbtype:sept
-RSCFLAGS	= /l 0x409 /fo"$*.res" /d "DEBUG" /d "_DEBUG" /d "WIN32" /d "_WIN32" /d "_WINDOWS"
-!ifdef "$(FB_TARGET_PLATFORM)" == "x64"
-DEBUGFLAGS	= $(DEBUGFLAGS) /Wp64
-!endif
-!else
-DEBUGFLAGS	= /MT /O2 /D "NDEBUG" /Ob1 /D _CRT_SECURE_NO_DEPRECATE
-LINKFLAGS	= $(LINKFLAGS) /incremental:no
-RSCFLAGS	= /l 0x409 /fo"$*.res" /d "NDEBUG" /d "WIN32" /d "_WIN32" /d "_WINDOWS"
-!endif
-#
-######## Don't change anything from here until 'all' ##################
-#
-ODBCJDBCLIB	= $(ODBCJDBCDLL:.dll=.lib)
-ISCDBCDIR	= $(ISCDBCDIR:/=\)
-ODBCJDBCDIR	= $(ODBCJDBCDIR:/=\)
-ODBCJDBCSDIR	= $(ODBCJDBCSETUPDIR:/=\)
-ISCDBCOBJ	= $(ISCDBCSRC:.cpp=.obj)
-ODBCJDBCOBJ	= $(ODBCJDBCSRC:.cpp=.obj)
-ODBCJDBCSOBJ	= $(ODBCJDBCSETUPSRC:.cpp=.obj)
-#
-!ifdef DEBUG
-!if "$(FB_TARGET_PLATFORM)" == "Win32"
-OBJS_ISCDBC 	= $(BUILDDIR)\$(ISCDBCOBJ:  = Win32\Debug\Obj^\)
-OBJS_ODBCJDBC 	= $(BUILDDIR)\$(ODBCJDBCOBJ:  = Win32\Debug\Obj^\)
-OBJS_ODBCJDBCS	= $(BUILDDIR)\$(ODBCJDBCSOBJ:  = Win32\Debug\Obj^\)
-!else
-OBJS_ISCDBC 	= $(BUILDDIR)\$(ISCDBCOBJ:  = x64\Debug\Obj^\)
-OBJS_ODBCJDBC 	= $(BUILDDIR)\$(ODBCJDBCOBJ:  = x64\Debug\Obj^\)
-OBJS_ODBCJDBCS	= $(BUILDDIR)\$(ODBCJDBCSOBJ:  = x64\Debug\Obj^\)
-!endif
-!else
-!if "$(FB_TARGET_PLATFORM)" == "Win32"
-OBJS_ISCDBC 	= $(BUILDDIR)\$(ISCDBCOBJ:  = Win32\Release\Obj^\)
-OBJS_ODBCJDBC 	= $(BUILDDIR)\$(ODBCJDBCOBJ:  = Win32\Release\Obj^\)
-OBJS_ODBCJDBCS	= $(BUILDDIR)\$(ODBCJDBCSOBJ:  = Win32\Release\Obj^\)
-!else
-OBJS_ISCDBC 	= $(BUILDDIR)\$(ISCDBCOBJ:  = x64\Release\Obj^\)
-OBJS_ODBCJDBC 	= $(BUILDDIR)\$(ODBCJDBCOBJ:  = x64\Release\Obj^\)
-OBJS_ODBCJDBCS	= $(BUILDDIR)\$(ODBCJDBCSOBJ:  = x64\Release\Obj^\)
-!endif
-!endif
-#
-{$(ISCDBCDIR)}.cpp{$(BUILDDIR)}.obj ::
-	$(CL) $(COMPFLAGS) $(DEBUGFLAGS) -c $<
-#
-{$(ODBCJDBCDIR)}.cpp{$(BUILDDIR)}.obj ::
-	$(CL) $(COMPFLAGS) $(DEBUGFLAGS) -c $<
-#
-{$(ODBCJDBCSDIR)}.cpp{$(BUILDDIR)}.obj ::
-	$(CL) $(COMPFLAGS) $(DEBUGFLAGS) -c $<
-#
-$(BUILDDIR)\OdbcFb.res : $(ODBCJDBCDIR)\OdbcJdbc.rc
-	$(RSC) $(RSCFLAGS) $(ODBCJDBCDIR)\OdbcJdbc.rc
-#
-ODBCJDBCDEFFILE	= $(ODBCJDBCDIR)\OdbcJdbc.def
-#
-all :	createdirs $(ODBCJDBCDLL)
-#
-# Silently creates the target and build directories
-createdirs :
-	@-if not exist "$(TARGETDIR)/$(NULL)" mkdir $(TARGETDIR) > nul
-	@-if not exist "$(BUILDDIR)/$(NULL)" mkdir $(BUILDDIR) > nul
-#
-# Cleanup - deletes the target and build directories
-clean :
-	@echo Cleaning build
-	@if exist $(BUILDDIR) rm -fr $(TARGETDIR)
-#
-OdbcFb : $(ODBCJDBCDLL)
-#
-# Build the library from the object modules
-#
-$(ODBCJDBCDLL) : $(OBJS_ISCDBC) $(OBJS_ODBCJDBC) $(BUILDDIR)\OdbcFb.res $(OBJS_ODBCJDBCS)
-	@echo Linking
-	$(LD) $(LINKFLAGS) $(**) /DEF:"$(ODBCJDBCDEFFILE)" /MANIFEST /MANIFESTFILE:"$(TARGETDIR)\OdbcFb.dll.intermediate.manifest" /DEBUG /PDB:"$(TARGETDIR)\OdbcFb.pdb" /OUT:"$(ODBCJDBCDLL)" version.lib wsock32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE
-	$(MT) /outputresource:"$(TARGETDIR)\OdbcFb.dll;#2" /manifest $(TARGETDIR)\OdbcFb.dll.intermediate.manifest
-#
-####### Add new targets below here
-#
-#
-# End
-#
diff --git a/Builds/MsVc80.win/setenvvar.bat b/Builds/MsVc80.win/setenvvar.bat
deleted file mode 100644
index 61dce722..00000000
--- a/Builds/MsVc80.win/setenvvar.bat
+++ /dev/null
@@ -1,115 +0,0 @@
-:: This program takes a single param - the
-::
-::
-
-@echo off
-
-::Check if on-line help is required
-@for /F "usebackq tokens=1,2 delims==-/ " %%i in ('%*') do @(
-@if /I "%%i"=="h" (goto :HELP & goto :EOF)
-@if /I "%%i"=="?" (goto :HELP & goto :EOF)
-@if /I "%%i"=="HELP" (goto :HELP & goto :EOF)
-)
-
-@echo Setting environment for %2...
-
-::=====================
-:SET_FB_TARGET_PLATFORM
-
-@if not defined FIREBIRD (
-  set FIREBIRD=C:\Program Files\Firebird\Firebird_2_1
-)
-
-:: can be x86 or x64
-@set FB_COMPILER_TYPE=%1
-
-@if /I "%FB_COMPILER_TYPE%"=="AMD64" (
-  @set FB_TARGET_PLATFORM=x64
-) else (
-  @set FB_TARGET_PLATFORM=Win32
-)
-
-::=========================
-:SET_BUILDTYPE
-if /I "%2" == "CLEAN" (
-  set BUILDTYPE=REBUILD
-) else (
-  set BUILDTYPE=BUILD
-)
-
-::=========================
-:SET_CONFIG
-set BUILDCONFIG=release
-
-
-::===============================
-:: Search for and set up the compiler environment
-::
-:SETUP_COMPILER
-@echo Guessing which compiler to use...
-if DEFINED VS80COMNTOOLS (
-	@"%VS80COMNTOOLS%\..\IDE\devenv" /? >nul 2>nul
-	@if not errorlevel 9009 (
-		call "%VS80COMNTOOLS%\..\..\VC\vcvarsall.bat" %FB_COMPILER_TYPE%
-	)
-)
-@echo.
-
-
-::=================
-:SET_MSVC_VER
-@for /f "delims=." %%a in ('@devenv /?') do (
-  @for /f "tokens=6" %%b in ("%%a") do (
-	(set MSVC_VERSION=%%b) & (set VS_VER=msvc%%b) & (goto :END)
-  )
-)
-@if not defined MSVC_VERSION goto :ERROR
-
-
-goto :END
-
-
-::===========
-:HELP
-@echo.
-@echo    %0 - Usage:
-@echo    This script takes the following parameters:
-@echo      PLATFORM - pass 'x86' or 'AMD64' (without quotes)
-@echo.
-:: set errorlevel
-@exit /B 1
-
-::===========
-:ERROR
-@echo.
-@echo    ERROR:
-@echo    A working version of Visual Studio cannot be found
-@echo    on your current path.
-@echo.
-@echo    You need MS Visual Studio 8 to build Firebird
-@echo    from these batch files.
-@echo.
-@echo    A properly installed version of Visual Studio will set
-@echo    the environment variable %%VS80COMNTOOLS%%. We use that
-@echo    variable to run the appropriate batch file to set up
-@echo    the build environment.
-@echo.
-:: set errorlevel
-@exit /B 1
-
-:END
-@echo.
-@echo   Building with these environment variables...
-@echo.
-@echo     vs_ver=%VS_VER%
-if defined VS_VER_EXPRESS (
-@echo     vs_ver_express=%VS_VER_EXPRESS%
-)
-@echo     platform=%FB_TARGET_PLATFORM%
-@echo     compiler=%FB_COMPILER_TYPE%
-@echo     msvc_version=%MSVC_VERSION%
-@echo     firebird=%FIREBIRD%
-@echo     Build type=%BUILDTYPE%
-@echo     Build config=%BUILDCONFIG%
-@echo.
-@exit /B 0
diff --git a/Builds/MsVc90.win/OdbcFb.sln b/Builds/MsVc90.win/OdbcFb.sln
deleted file mode 100644
index 1f835d9c..00000000
--- a/Builds/MsVc90.win/OdbcFb.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdbcFb", "OdbcFb.vcproj", "{C6127398-654D-4196-B8C1-5BB32D75D7FD}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|Win32.Build.0 = Debug|Win32
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|x64.ActiveCfg = Debug|x64
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Debug|x64.Build.0 = Debug|x64
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|Win32.ActiveCfg = Release|Win32
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|Win32.Build.0 = Release|Win32
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|x64.ActiveCfg = Release|x64
-		{C6127398-654D-4196-B8C1-5BB32D75D7FD}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/Builds/MsVc90.win/OdbcFb.vcproj b/Builds/MsVc90.win/OdbcFb.vcproj
deleted file mode 100644
index 8ef84d17..00000000
--- a/Builds/MsVc90.win/OdbcFb.vcproj
+++ /dev/null
@@ -1,1195 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="OdbcFb"
-	ProjectGUID="{C6127398-654D-4196-B8C1-5BB32D75D7FD}"
-	RootNamespace="Firebird OdbcFb"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/OdbcFb.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../IscDbc;C:\Program Files\Firebird\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG;LOGGING;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ObjectFile="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ProgramDataBaseFileName="$(PlatformName)/$(ConfigurationName)/Obj/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE"
-				AdditionalDependencies="version.lib wsock32.lib comctl32.lib"
-				OutputFile="$(PlatformName)/$(ConfigurationName)/OdbcFb.dll"
-				AdditionalLibraryDirectories="debug"
-				ModuleDefinitionFile="..\..\OdbcJdbc.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)/$(ConfigurationName)/$(TargetName).pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug/OdbcFb.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../IscDbc;C:\Program Files\Firebird\include\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG;LOGGING;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=" "
-				AssemblerListingLocation="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ObjectFile="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ProgramDataBaseFileName="$(PlatformName)/$(ConfigurationName)/Obj/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE"
-				AdditionalDependencies="version.lib wsock32.lib comctl32.lib"
-				OutputFile="$(PlatformName)/$(ConfigurationName)/OdbcFb.dll"
-				AdditionalLibraryDirectories="debug"
-				ModuleDefinitionFile="..\..\OdbcJdbc.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)/$(ConfigurationName)/$(TargetName).pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=""
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/OdbcFb.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../IscDbc;C:\Program Files\Firebird\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ObjectFile="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ProgramDataBaseFileName="$(PlatformName)/$(ConfigurationName)/Obj/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE"
-				AdditionalDependencies="version.lib wsock32.lib comctl32.lib"
-				OutputFile="$(PlatformName)/$(ConfigurationName)/OdbcFb.dll"
-				ModuleDefinitionFile="..\..\OdbcJdbc.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)/$(ConfigurationName)/$(TargetName).pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)/$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)/$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Release/OdbcFb.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../IscDbc;C:\Program Files\Firebird\include\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=" "
-				AssemblerListingLocation="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ObjectFile="$(PlatformName)/$(ConfigurationName)/Obj/"
-				ProgramDataBaseFileName="$(PlatformName)/$(ConfigurationName)/Obj/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE"
-				AdditionalDependencies="version.lib wsock32.lib comctl32.lib"
-				OutputFile="$(PlatformName)/$(ConfigurationName)/OdbcFb.dll"
-				ModuleDefinitionFile="..\..\OdbcJdbc.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(PlatformName)/$(ConfigurationName)/$(TargetName).pdb"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=""
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="IscDbc"
-			>
-			<Filter
-				Name="Source Files IscDbc"
-				>
-				<File
-					RelativePath="..\..\IscDbc\Attachment.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\BinaryBlob.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Blob.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\DateTime.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\EnvShare.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\extodbc.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscArray.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscBlob.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscCallableStatement.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnKeyInfo.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnPrivilegesResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnsResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscConnection.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscCrossReferenceResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscDatabaseMetaData.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscIndexInfoResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscMetaDataResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscOdbcStatement.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscPreparedStatement.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscPrimaryKeysResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscProcedureColumnsResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscProceduresResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscResultSetMetaData.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscSpecialColumnsResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscSqlType.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscStatement.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscStatementMetaData.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscTablePrivilegesResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscTablesResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscUserEvents.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\JString.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\LinkedList.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\LoadFbClientDll.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Lock.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\MultibyteConvert.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Mutex.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Parameter.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ParameterEvent.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Parameters.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ParametersEvents.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ServiceManager.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Sqlda.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SQLError.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SqlTime.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Stream.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SupportFunctions.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\TimeStamp.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\TypesResultSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Value.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Values.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files IscDbc"
-				>
-				<File
-					RelativePath="..\..\IscDbc\Attachment.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\BinaryBlob.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\BinToHexStr.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Blob.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Connection.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\DateTime.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\EnvShare.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscArray.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscBlob.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscCallableStatement.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnKeyInfo.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnPrivilegesResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscColumnsResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscConnection.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscCrossReferenceResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscDatabaseMetaData.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscDbc.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscIndexInfoResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscMetaDataResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscOdbcStatement.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscPreparedStatement.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscPrimaryKeysResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscProcedureColumnsResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscProceduresResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscResultSetMetaData.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscSpecialColumnsResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscSqlType.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscStatement.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscStatementMetaData.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscTablePrivilegesResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscTablesResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\IscUserEvents.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\JavaType.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\JString.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\LinkedList.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\LoadFbClientDll.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Lock.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Mlist.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\MultibyteConvert.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Mutex.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Parameter.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ParameterEvent.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Parameters.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ParametersEvents.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Properties.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\ServiceManager.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Sqlda.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SQLError.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SQLException.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SqlTime.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Stream.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\SupportFunctions.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\TimeStamp.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Types.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\TypesResultSet.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\IscDbc\Value.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="OdbcJdbc"
-			>
-			<Filter
-				Name="Header Files Odbc"
-				Filter="h;hpp;hxx;hm;inl"
-				>
-				<File
-					RelativePath="..\..\ConnectDialog.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\DescRecord.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\InfoItems.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcConnection.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcConvert.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcDateTime.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcDesc.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcEnv.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcError.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbc.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcObject.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcStatement.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Headers\OdbcUserEvents.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\ResourceManagerSink.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\SafeEnvThread.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\SetupAttributes.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\TemplateConvert.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\TransactionResourceAsync.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Source Files Odbc"
-				Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-				>
-				<File
-					RelativePath="..\..\ConnectDialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\DescRecord.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Main.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\MainUnicode.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\MbsAndWcs.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcConnection.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcConvert.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcDateTime.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcDesc.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcEnv.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcError.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbc.def"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcObject.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcStatement.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\ResourceManagerSink.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\SafeEnvThread.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\TransactionResourceAsync.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Resource Files Odbc"
-				Filter=".rc"
-				>
-				<File
-					RelativePath="..\..\ODbcJdbc.rc"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCResourceCompilerTool"
-							AdditionalIncludeDirectories="..\..;$(NoInherit)"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCResourceCompilerTool"
-							AdditionalIncludeDirectories="..\..;$(NoInherit)"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCResourceCompilerTool"
-							AdditionalIncludeDirectories="..\..;$(NoInherit)"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCResourceCompilerTool"
-							AdditionalIncludeDirectories="..\..;$(NoInherit)"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="OdbcJdbcSetup"
-			>
-			<Filter
-				Name="Source Files Setup"
-				>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\CommonUtil.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\DsnDialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\OdbcJdbcSetup.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceClient.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabBackup.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabChild.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabCtrl.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabRepair.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabRestore.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabStatistics.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabUsers.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\Setup.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UserDialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabChild.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabMemberShips.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabRoles.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabUsers.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files Setup"
-				>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\CommonUtil.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\DsnDialog.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\OdbcJdbcSetup.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\resource.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceClient.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabBackup.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabChild.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabCtrl.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabRepair.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabRestore.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabStatistics.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\ServiceTabUsers.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\Setup.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UserDialog.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabChild.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabMemberShips.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabRoles.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\OdbcJdbcSetup\UsersTabUsers.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/Builds/MsVc90.win/build.bat b/Builds/MsVc90.win/build.bat
deleted file mode 100644
index 03b9eb82..00000000
--- a/Builds/MsVc90.win/build.bat
+++ /dev/null
@@ -1,30 +0,0 @@
-::
-:: This file is intended to do automated release builds.
-:: Automated debug builds will require you to do some hacking
-::
-:: The only meaningful option this file understands is CLEAN
-:: If you pass that it will do a rebuild of the driver.
-::
-:: After checking whether the binaries need to be (re)built
-:: it will package up the driver.
-::
-:: If the host environment is 64-bit it will build and package
-:: the 32-bit driver too.
-::
-:: WARNING: Only minimal error checking is done. The build/packaging
-:: process might not abort on error - be sure to check the logs and
-:: screen output afterwards.
-::
-
-@echo off
-goto :MAIN & goto :EOF
-
-:MAIN
-::===========
-
-call build_platform.bat x86 %1
-call build_platform.bat AMD64 %1
-
-@title Build complete
-goto :EOF
-::=======
\ No newline at end of file
diff --git a/Builds/MsVc90.win/build_platform.bat b/Builds/MsVc90.win/build_platform.bat
deleted file mode 100644
index 184057e2..00000000
--- a/Builds/MsVc90.win/build_platform.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-
-:BUILD
-::========
-@call setenvvar.bat %1 %2
-@title %BUILDTYPE%  %1%
-@echo   %BUILDTYPE% %1%
-@set > build_%1%.log
-
-@devenv %~dp0\OdbcFb.sln /%BUILDTYPE% "%BUILDCONFIG%|%FB_TARGET_PLATFORM%" /OUT build_%1%.log 2>&1
-
-:: Now make the packages
-pushd ..\..\Install\Win32
-@echo Now making packages
-call MakePackage.bat
-popd
-
-
-goto :EOF
-
diff --git a/Builds/MsVc90.win/setenvvar.bat b/Builds/MsVc90.win/setenvvar.bat
deleted file mode 100644
index f36294a3..00000000
--- a/Builds/MsVc90.win/setenvvar.bat
+++ /dev/null
@@ -1,115 +0,0 @@
-:: This program takes a single param - the
-::
-::
-
-@echo off
-
-::Check if on-line help is required
-@for /F "usebackq tokens=1,2 delims==-/ " %%i in ('%*') do @(
-@if /I "%%i"=="h" (goto :HELP & goto :EOF)
-@if /I "%%i"=="?" (goto :HELP & goto :EOF)
-@if /I "%%i"=="HELP" (goto :HELP & goto :EOF)
-)
-
-@echo Setting environment for %2...
-
-::=====================
-:SET_FB_TARGET_PLATFORM
-
-@if not defined FIREBIRD (
-  set FIREBIRD=C:\Program Files\Firebird\Firebird_2_5
-)
-
-:: can be x86 or x64
-@set FB_COMPILER_TYPE=%1
-
-@if /I "%FB_COMPILER_TYPE%"=="AMD64" (
-  @set FB_TARGET_PLATFORM=x64
-) else (
-  @set FB_TARGET_PLATFORM=Win32
-)
-
-::=========================
-:SET_BUILDTYPE
-if /I "%2" == "CLEAN" (
-  set BUILDTYPE=REBUILD
-) else (
-  set BUILDTYPE=BUILD
-)
-
-::=========================
-:SET_CONFIG
-set BUILDCONFIG=release
-
-
-::===============================
-:: Search for and set up the compiler environment
-::
-:SETUP_COMPILER
-@echo Guessing which compiler to use...
-if DEFINED VS90COMNTOOLS (
-	@"%VS90COMNTOOLS%\..\IDE\devenv" /? >nul 2>nul
-	@if not errorlevel 9009 (
-		call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" %FB_COMPILER_TYPE%
-	)
-)
-@echo.
-
-
-::=================
-:SET_MSVC_VER
-@for /f "delims=." %%a in ('@devenv /?') do (
-  @for /f "tokens=6" %%b in ("%%a") do (
-	(set MSVC_VERSION=%%b) & (set VS_VER=msvc%%b) & (goto :END)
-  )
-)
-@if not defined MSVC_VERSION goto :ERROR
-
-
-goto :END
-
-
-::===========
-:HELP
-@echo.
-@echo    %0 - Usage:
-@echo    This script takes the following parameters:
-@echo      PLATFORM - pass 'x86' or 'AMD64' (without quotes)
-@echo.
-:: set errorlevel
-@exit /B 1
-
-::===========
-:ERROR
-@echo.
-@echo    ERROR:
-@echo    A working version of Visual Studio cannot be found
-@echo    on your current path.
-@echo.
-@echo    You need MS Visual Studio 9 to build Firebird
-@echo    from these batch files.
-@echo.
-@echo    A properly installed version of Visual Studio will set
-@echo    the environment variable %%VS90COMNTOOLS%%. We use that
-@echo    variable to run the appropriate batch file to set up
-@echo    the build environment.
-@echo.
-:: set errorlevel
-@exit /B 1
-
-:END
-@echo.
-@echo   Building with these environment variables...
-@echo.
-@echo     vs_ver=%VS_VER%
-if defined VS_VER_EXPRESS (
-@echo     vs_ver_express=%VS_VER_EXPRESS%
-)
-@echo     platform=%FB_TARGET_PLATFORM%
-@echo     compiler=%FB_COMPILER_TYPE%
-@echo     msvc_version=%MSVC_VERSION%
-@echo     firebird=%FIREBIRD%
-@echo     Build type=%BUILDTYPE%
-@echo     Build config=%BUILDCONFIG%
-@echo.
-@exit /B 0
diff --git a/Builds/VAC.aix/makefile.aix b/Builds/VAC.aix/makefile.aix
deleted file mode 100644
index 38fd8e37..00000000
--- a/Builds/VAC.aix/makefile.aix
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# To build set the following environment variables
-# ODBCMANAGER (either iODBC or unixODBC)
-# ODBCMANAGERDIR (set to installation folder of required ODBC driver, as per above)
-#
-
-#
-#DEBUG=1
-#
-.PHONY: all createdirs IscDbc OdbcJdbc OdbcJdbcSetup clean postbuild
-#
-
-CC = xlC_r -D_PTHREADS
-
-#
-# Start build
-#
-include ../makefile.sources
-include ../makefile.environ
-#
-#
-INCLUDEDIR      = -I$(FBINCDIR)                   -I$(ODBCMANAGERDIR)/include
-EXTLIBDIR       = -L$(FBLIBDIR)                   -L$(ODBCMANAGERDIR)/lib
-
-ifeq (iODBC,$(ODBCMANAGER))
-LIBODBCINST    = -liodbcinst
-else
-LIBODBCINST    = -lodbcinst
-endif
-
-#
-ifdef DEBUG
-TARGETDIR	= Debug
-else
-TARGETDIR	= Release
-endif
-#
-BUILDDIR 	= $(TARGETDIR)/obj
-#
-LIST_ISCDBCSRC 		= $(addprefix $(ISCDBCDIR)/, $(ISCDBCSRC))
-LIST_ISCDBCOBJ 		= $(addprefix $(BUILDDIR)/, $(ISCDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSRC	= $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSRC))
-LIST_ODBCJDBCOBJ	= $(addprefix $(BUILDDIR)/, $(ODBCJDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSETUPSRC	= $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
-LIST_ODBCJDBCSETUPOBJ	= $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
-#
-COMPFLAGS	= -q64 -pic -D_REENTRANT -D_PTHREADS -DEXTERNAL -qsuppress=1540-1401 -qstaticinline -qro -qroconst $(INCLUDEDIR)
-#
-EXTLIBS		= $(EXTLIBDIR) -lcrypt -ldl -lpthread
-LINKFLAGS	= -G
-#
-ISCDBCDLL       = $(TARGETDIR)/IscDbc.so
-ODBCJDBCDLL     = $(TARGETDIR)/libOdbcFb.so
-ODBCJDBCSETUPDLL= $(TARGETDIR)/OdbcJdbcS.so
-ISCDBCEXP	 	= $(ISCDBCDIR)/IscDbc.exp
-ODBCJDBCEXP		= $(ODBCJDBCDIR)/OdbcJdbc.exp
-ODBCJDBCSEXP		= $(ODBCJDBCSETUPDIR)/OdbcJdbcSetup.exp
-
-ISCDBCDEFFILE	= $(ISCDBCDIR)/IscDbc.def
-ODBCJDBCDEFFILE	= $(ODBCJDBCDIR)/OdbcJdbc.def
-ODBCJDBCSDEFFILE= $(ODBCJDBCSETUPDIR)/OdbcJdbcSetup.def
-#
-ifdef DEBUG
-DEBUGFLAGS	= -g -qnoopt -D_DEBUG -DDEBUG -DLOGGING -fexceptions 
-else
-DEBUGFLAGS	= -02 -DNDEBUG
-endif
-#
-$(BUILDDIR)/%.o: $(ISCDBCDIR)/%.cpp
-	$(CC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-$(BUILDDIR)/%.o: $(ODBCJDBCDIR)/%.cpp
-	$(CC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-ISCDBCLIB       = $(ISCDBCDLL:.so=.a)
-ODBCJDBCLIB     = $(ODBCJDBCDLL:.so=.a)
-ODBCJDBCSETUPLIB= $(ODBCJDBCSETUPDLL:.so=.a)
-#
-all :	createdirs $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-#
-# Silently creates the target and build directories
-createdirs :
-	@-mkdir $(TARGETDIR)
-	@-mkdir $(BUILDDIR)
-#
-# Silently cleanup and deletes the target and build directories
-clean :
-	@-rm -fr $(TARGETDIR)
-#
-IscDbc : $(ISCDBCDLL)
-OdbcJdbc : $(ODBCJDBCDLL)
-OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
-#
-# Build the library from the object modules
-#
-$(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
-#	ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
-#	$(CC) $(LINKFLAGS) -bE:$(ISCDBCEXP) $(LIST_ISCDBCOBJ) $(EXTLIBS) -o $(ISCDBCDLL)
-#
-$(ODBCJDBCDLL) : $(ISCDBCDLL) $(ODBCJDBCSETUPDLL) $(LIST_ODBCJDBCOBJ)
-      ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
-      ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-      ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
-      $(CC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) $(LIBODBCINST) -o $(ODBCJDBCDLL)
-#
-$(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
-#	ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
-#	$(CC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
-#
-postbuild : $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-	@-strip -s $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-	@-tar -cf OdbcJdbc_Snapshot.tar $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-	@-gzip -9 -S .gz OdbcJdbc_Snapshot.tar
-#
-# End
-#
diff --git a/Builds/aCC.HP/makefile.HP b/Builds/aCC.HP/makefile.HP
deleted file mode 100644
index c1128755..00000000
--- a/Builds/aCC.HP/makefile.HP
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# To build set the following environment variables
-# ODBCMANAGER (either iODBC or unixODBC)
-# ODBCMANAGERDIR (set to installation folder of required ODBC driver, as per above)
-#
-
-#
-#DEBUG=1
-#
-.PHONY: all createdirs IscDbc OdbcJdbc OdbcJdbcSetup clean postbuild
-#
-CC            = aCC
-#
-# Start build
-#
-include ../makefile.sources
-include ../makefile.environ
-#
-INCLUDEDIR      = -I$(FBINCDIR)                   -I$(ODBCMANAGERDIR)/include
-EXTLIBDIR       = -L$(FBLIBDIR)                   -L$(ODBCMANAGERDIR)/lib
-
-ifeq (iODBC,$(ODBCMANAGER))
-LIBODBCINST    = -liodbcinst
-else
-LIBODBCINST    = -lodbcinst
-endif
-
-#
-ifdef DEBUG
-TARGETDIR     = Debug
-else
-TARGETDIR     = Release
-endif
-#
-BUILDDIR      = $(TARGETDIR)/obj
-#
-LIST_ISCDBCSRC                = $(addprefix $(ISCDBCDIR)/, $(ISCDBCSRC))
-LIST_ISCDBCOBJ                = $(addprefix $(BUILDDIR)/, $(ISCDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSRC      = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSRC))
-LIST_ODBCJDBCOBJ      = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSETUPSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
-LIST_ODBCJDBCSETUPOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
-#
-
-COMPFLAGS     = +Z +DD64 -mt -D_REENTRANT -DEXTERNAL  $(INCLUDEDIR)
-LINKFLAGS     =  -mt -b -L/usr/lib/hpux64
-#
-EXTLIBS               = $(EXTLIBDIR) -ldl -lCsup -lpthread
-#
-ISCDBCDLL       = $(TARGETDIR)/IscDbc.so
-ODBCJDBCDLL     = $(TARGETDIR)/libOdbcFb.so
-ODBCJDBCSETUPDLL= $(TARGETDIR)/OdbcJdbcS.so
-ISCDBCDEFFILE = $(ISCDBCDIR)/IscDbc.def
-ODBCJDBCDEFFILE       = $(ODBCJDBCDIR)/OdbcJdbc.def
-ODBCJDBCSDEFFILE= $(ODBCJDBCSETUPDIR)/OdbcJdbcSetup.def
-#
-ifdef DEBUG
-DEBUGFLAGS    = -g0 +noobjdebug  +d -D_DEBUG -DDEBUG -DLOGGING -fexceptions
-else
-DEBUGFLAGS    = -DNDEBUG
-endif
-#
-$(BUILDDIR)/%.o: $(ISCDBCDIR)/%.cpp
-      $(CC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-$(BUILDDIR)/%.o: $(ODBCJDBCDIR)/%.cpp
-      $(CC) $(COMPFLAGS) $(DEBUGFLAGS) -c $(firstword $<) -o $@
-#
-ISCDBCLIB       = $(ISCDBCDLL:.so=.a)
-ODBCJDBCLIB     = $(ODBCJDBCDLL:.so=.a)
-ODBCJDBCSETUPLIB= $(ODBCJDBCSETUPDLL:.so=.a)
-#
-all : createdirs $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-#
-# Silently creates the target and build directories
-createdirs :
-      @-mkdir $(TARGETDIR)
-      @-mkdir $(BUILDDIR)
-#
-# Silently cleanup and deletes the target and build directories
-clean :
-      @-rm -fr $(TARGETDIR)
-#
-IscDbc : $(ISCDBCDLL)
-OdbcJdbc : $(ODBCJDBCDLL)
-OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
-#
-# Build the library from the object modules
-#
-$(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
-#     ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
-#     $(CC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) -o $(ISCDBCDLL)
-#
-#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
-#     ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-#     $(CC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) $(LIBODBCINST) -o $(ODBCJDBCDLL)
-#
-$(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
-#     ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
-#     $(CC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
-#
-$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ)
-      ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
-      ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-      ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
-      $(CC) $(LINKFLAGS)  $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) $(LIBODBCINST) -o $(ODBCJDBCDLL)
-#
-postbuild : $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-      @-strip -s $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-      @-tar -cf OdbcJdbc_Snapshot.tar $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
-      @-gzip -9 -S .gz OdbcJdbc_Snapshot.tar
-#
-# End
-#
\ No newline at end of file
diff --git a/Builds/delDependMT.bat b/Builds/delDependMT.bat
deleted file mode 100644
index bc09a610..00000000
--- a/Builds/delDependMT.bat
+++ /dev/null
@@ -1 +0,0 @@
-@rm Release/obj/Main.o* Release/obj/MainUn*.o* Release/obj/SafeEn*.o* Release/obj/OdbcCo*.o*
diff --git a/Builds/makefile.environ b/Builds/makefile.environ
deleted file mode 100644
index 0648b192..00000000
--- a/Builds/makefile.environ
+++ /dev/null
@@ -1,64 +0,0 @@
-# Define ARCH in the calling makefile if you want to target a different architecture
-ifndef ARCH
-ARCH=$(shell uname -m)
-endif
-ifndef ODBCMANAGERDIR
-$(warning ARCH is $(ARCH))
-
-ifeq ($(ARCH),x86_64)
-	UNIXODBCDIR = $(shell if [ -d /usr/lib64/unixODBC ]; then echo /usr/lib64/unixODBC; else echo /usr/lib64; fi)
-else
-	UNIXODBCDIR = $(shell if [ -d /usr/lib/unixODBC ]; then echo /usr/lib/unixODBC; else echo /usr/lib; fi)
-endif
-else
-    UNIXODBCDIR = $(ODBCMANAGERDIR)
-endif
-
-ifndef ODBCMANAGER
-#	ODBCMANAGER = $(shell if [ -f $(UNIXODBCDIR)/libodbc.so ]; then echo unixODBC; else echo iODBC; fi)
-	ODBCMANAGER = $(shell if [ -f $(UNIXODBCDIR)/libiodbc.so ]; then echo iODBC; else echo unixODBC; fi)
-endif
-$(warning ODBCMANAGER is $(ODBCMANAGER) in $(UNIXODBCDIR))
-
-ifdef FIREBIRD
-FBINCDIR	= $(FIREBIRD)/include
-FBLIBDIR	= $(FIREBIRD)/lib
-else
-ifdef INTERBASE
-FBINCDIR	= $(INTERBASE)/include
-FBLIBDIR	= $(INTERBASE)/lib
-else
-FBINCDIR	= $(shell if [ -d /opt/firebird/include ]; then echo /opt/firebird/include; else echo nul; fi)
-FBLIBDIR	= $(shell if [ -d /opt/firebird/lib ]; then echo /opt/firebird/lib; else echo nul; fi)
-endif
-endif
-
-ifeq (nul,$(FBINCDIR))
-FBINCDIR	= $(shell if [ -f /usr/include/ibase.h ]; then echo /usr/include; else echo nul; fi)
-endif
-ifeq (nul,$(FBLIBDIR))
-ifeq ($(ARCH),x86_64)
-FBLIBDIR	= $(shell if [ -f /usr/lib64/libfbclient.so ]; then echo /usr/lib64; else echo nul; fi)
-else
-FBLIBDIR        = $(shell if [ -f /usr/lib/libfbclient.so ]; then echo /usr/lib; else echo nul; fi)
-endif
-endif
-
-ifeq (nul,$(FBINCDIR))
-$(error FBINCDIR is undefined)
-else
-$(warning FBINCDIR is $(FBINCDIR))
-endif
-
-ifeq (nul,$(FBLIBDIR))
-$(error FBLIBDIR is undefined)
-else
-$(warning FBLIBDIR is $(FBLIBDIR))
-endif
-
-#
-ISCDBCDIR 		= ../../IscDbc
-ODBCJDBCDIR 		= ../..
-ODBCJDBCSETUPDIR 	= ../../OdbcJdbcSetup
-#
-
diff --git a/Builds/makefile.sources b/Builds/makefile.sources
deleted file mode 100644
index 53772fa9..00000000
--- a/Builds/makefile.sources
+++ /dev/null
@@ -1,92 +0,0 @@
-ISCDBCSRC = \
-	Attachment.cpp \
-	BinaryBlob.cpp \
-	Blob.cpp \
-	DateTime.cpp \
-	EnvShare.cpp \
-	extodbc.cpp \
-	IscArray.cpp \
-	IscBlob.cpp \
-	IscCallableStatement.cpp \
-	IscColumnKeyInfo.cpp \
-	IscColumnPrivilegesResultSet.cpp \
-	IscColumnsResultSet.cpp \
-	IscConnection.cpp \
-	IscCrossReferenceResultSet.cpp \
-	IscDatabaseMetaData.cpp \
-	IscIndexInfoResultSet.cpp \
-	IscMetaDataResultSet.cpp \
-	IscOdbcStatement.cpp \
-	IscPreparedStatement.cpp \
-	IscPrimaryKeysResultSet.cpp \
-	IscProcedureColumnsResultSet.cpp \
-	IscProceduresResultSet.cpp \
-	IscResultSet.cpp \
-	IscResultSetMetaData.cpp \
-	IscSpecialColumnsResultSet.cpp \
-	IscSqlType.cpp \
-	IscStatement.cpp \
-	IscStatementMetaData.cpp \
-	IscTablePrivilegesResultSet.cpp \
-	IscTablesResultSet.cpp \
-	IscUserEvents.cpp \
-	JString.cpp \
-	LinkedList.cpp \
-	LoadFbClientDll.cpp \
-	Lock.cpp \
-	MultibyteConvert.cpp \
-	Mutex.cpp \
-	Parameter.cpp \
-	ParameterEvent.cpp \
-	Parameters.cpp \
-	ParametersEvents.cpp \
-	ServiceManager.cpp \
-	Sqlda.cpp \
-	SQLError.cpp \
-	SqlTime.cpp \
-	Stream.cpp \
-	SupportFunctions.cpp \
-	TimeStamp.cpp \
-	TypesResultSet.cpp \
-	Value.cpp \
-	Values.cpp
-
-ODBCJDBCSRC = \
-	ConnectDialog.cpp \
-	DescRecord.cpp \
-	Main.cpp \
-	MainUnicode.cpp \
-	MbsAndWcs.cpp \
-	OdbcConnection.cpp \
-	OdbcConvert.cpp \
-	OdbcDateTime.cpp \
-	OdbcDesc.cpp \
-	OdbcEnv.cpp \
-	OdbcError.cpp \
-	OdbcObject.cpp \
-	OdbcStatement.cpp \
-	ResourceManagerSink.cpp \
-	SafeEnvThread.cpp \
-	TransactionResourceAsync.cpp
-
-ODBCJDBCSETUPSRC_LINUX = \
-	OdbcInstGetProp.cpp
-
-ODBCJDBCSETUPSRC = \
-	CommonUtil.cpp \
-	DsnDialog.cpp \
-	OdbcJdbcSetup.cpp \
-	ServiceClient.cpp \
-	ServiceTabBackup.cpp \
-	ServiceTabChild.cpp \
-	ServiceTabCtrl.cpp \
-	ServiceTabRepair.cpp \
-	ServiceTabRestore.cpp \
-	ServiceTabStatistics.cpp \
-	ServiceTabUsers.cpp \
-	Setup.cpp \
-	UserDialog.cpp \
-	UsersTabChild.cpp \
-	UsersTabMemberShips.cpp \
-	UsersTabRoles.cpp \
-	UsersTabUsers.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 00000000..a678cb4b
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,254 @@
+cmake_minimum_required(VERSION 3.15)
+
+project(firebird-odbc-driver LANGUAGES CXX C)
+
+# ---------------------------------------------------------------------------
+# Default build type (single-config generators only, e.g. Unix Makefiles/Ninja)
+# ---------------------------------------------------------------------------
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
+    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release RelWithDebInfo MinSizeRel)
+endif()
+message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
+
+# Extract version from git tags
+include(cmake/GetVersionFromGit.cmake)
+
+# Set project version from git
+set(PROJECT_VERSION "${ODBC_VERSION_MAJOR}.${ODBC_VERSION_MINOR}.${ODBC_VERSION_PATCH}.${ODBC_VERSION_TWEAK}")
+set(PROJECT_VERSION_MAJOR ${ODBC_VERSION_MAJOR})
+set(PROJECT_VERSION_MINOR ${ODBC_VERSION_MINOR})
+set(PROJECT_VERSION_PATCH ${ODBC_VERSION_PATCH})
+set(PROJECT_VERSION_TWEAK ${ODBC_VERSION_TWEAK})
+
+# Generate Version.h from template
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Version.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/generated/Version.h
+    @ONLY
+)
+
+# Set C++ standard
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+# Set C standard
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+
+# Options
+option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+option(BUILD_TESTING "Build tests" ON)
+
+# ---------------------------------------------------------------------------
+# CPU architecture detection (from PR #248)
+# ---------------------------------------------------------------------------
+set(FBODBC_ARCH ${CMAKE_HOST_SYSTEM_PROCESSOR})
+
+if(FBODBC_ARCH STREQUAL "x86" OR FBODBC_ARCH STREQUAL "i686")
+    add_definitions(-DFBODBC_ARCH_X86)
+    message(STATUS "Architecture: ${FBODBC_ARCH} (x86)")
+elseif(FBODBC_ARCH STREQUAL "x86_64" OR FBODBC_ARCH STREQUAL "AMD64")
+    add_definitions(-DFBODBC_ARCH_X86_64)
+    message(STATUS "Architecture: ${FBODBC_ARCH} (x86_64)")
+elseif(FBODBC_ARCH STREQUAL "aarch64" OR FBODBC_ARCH STREQUAL "arm64" OR FBODBC_ARCH STREQUAL "ARM64")
+    add_definitions(-DFBODBC_ARCH_ARM64)
+    message(STATUS "Architecture: ${FBODBC_ARCH} (ARM64)")
+else()
+    add_definitions(-DFBODBC_ARCH_GENERIC)
+    message(WARNING "Architecture <${FBODBC_ARCH}> conditionally supported")
+endif()
+
+# ---------------------------------------------------------------------------
+# Platform-specific compiler settings
+# ---------------------------------------------------------------------------
+if(WIN32)
+    add_definitions(-DWIN32 -D_WINDOWS -D_USRDLL)
+    if(MSVC)
+        add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+        # Match the VS 2022 project: static CRT (/MT for Release, /MTd for Debug)
+        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+        # Suppress same warnings as the .vcxproj (C4996, C5033)
+        add_compile_options(/wd4996 /wd5033)
+    endif()
+else()
+    # Linux/Unix
+    add_definitions(-DUNIX -D_REENTRANT -D_PTHREADS -DEXTERNAL)
+    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+    # Compiler optimization flags (from PR #248 / old makefile.linux)
+    add_compile_options(
+        "$<$<CONFIG:Debug>:-O0;-g3;-D_DEBUG;-DDEBUG;-DLOGGING;-fexceptions>"
+        "$<$<CONFIG:Release>:-O3;-DNDEBUG;-ftree-loop-vectorize>"
+        "$<$<CONFIG:RelWithDebInfo>:-O2;-g;-DNDEBUG>"
+        "$<$<CONFIG:MinSizeRel>:-Os;-DNDEBUG>"
+    )
+
+    # SSE4.1 for x86/x86_64 (from PR #248)
+    if(FBODBC_ARCH STREQUAL "x86" OR FBODBC_ARCH STREQUAL "i686"
+       OR FBODBC_ARCH STREQUAL "x86_64" OR FBODBC_ARCH STREQUAL "AMD64")
+        add_compile_options(-msse4.1)
+    endif()
+endif()
+
+# ---------------------------------------------------------------------------
+# Find required packages
+# ---------------------------------------------------------------------------
+if(WIN32)
+    # On Windows, ODBC is part of the system SDK
+    set(ODBC_FOUND TRUE)
+else()
+    # On Unix-like systems, find ODBC (unixODBC)
+    find_package(ODBC REQUIRED)
+    add_definitions(-DunixODBC)
+endif()
+
+# Fetch Firebird public headers from GitHub (replaces vendored FBClient.Headers)
+include(cmake/FetchFirebirdHeaders.cmake)
+
+# Include directories
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/IscDbc
+    ${CMAKE_CURRENT_BINARY_DIR}/generated
+    ${FIREBIRD_INCLUDE_DIR}
+)
+
+# ---------------------------------------------------------------------------
+# IscDbc — Firebird database connectivity (object library)
+# ---------------------------------------------------------------------------
+add_subdirectory(IscDbc)
+
+# ---------------------------------------------------------------------------
+# Windows resource file for version info
+# ---------------------------------------------------------------------------
+if(WIN32)
+    set(ODBCJDBC_RC OdbcJdbc.rc)
+endif()
+
+# ---------------------------------------------------------------------------
+# Main ODBC driver library sources (from makefile.sources ODBCJDBCSRC)
+# ---------------------------------------------------------------------------
+set(ODBCJDBC_SOURCES
+    ConnectDialog.cpp
+    DescRecord.cpp
+    Main.cpp
+    MainUnicode.cpp
+    MbsAndWcs.cpp
+    OdbcConnection.cpp
+    OdbcConvert.cpp
+    OdbcDateTime.cpp
+    OdbcDesc.cpp
+    OdbcEnv.cpp
+    OdbcError.cpp
+    OdbcObject.cpp
+    OdbcStatement.cpp
+    SafeEnvThread.cpp
+)
+
+# Windows-only sources (ATL-based DTC support, wrapped in #ifdef _WINDOWS)
+if(WIN32)
+    list(APPEND ODBCJDBC_SOURCES
+        ResourceManagerSink.cpp
+        TransactionResourceAsync.cpp
+    )
+endif()
+
+# ---------------------------------------------------------------------------
+# OdbcJdbcSetup sources — platform-specific (from makefile.sources)
+# ---------------------------------------------------------------------------
+if(WIN32)
+    # Windows: full GUI setup (ODBCJDBCSETUPSRC)
+    set(ODBCJDBCSETUP_SOURCES
+        OdbcJdbcSetup/CommonUtil.cpp
+        OdbcJdbcSetup/DsnDialog.cpp
+        OdbcJdbcSetup/OdbcJdbcSetup.cpp
+        OdbcJdbcSetup/ServiceClient.cpp
+        OdbcJdbcSetup/ServiceTabBackup.cpp
+        OdbcJdbcSetup/ServiceTabChild.cpp
+        OdbcJdbcSetup/ServiceTabCtrl.cpp
+        OdbcJdbcSetup/ServiceTabRepair.cpp
+        OdbcJdbcSetup/ServiceTabRestore.cpp
+        OdbcJdbcSetup/ServiceTabStatistics.cpp
+        OdbcJdbcSetup/ServiceTabUsers.cpp
+        OdbcJdbcSetup/Setup.cpp
+        OdbcJdbcSetup/UserDialog.cpp
+        OdbcJdbcSetup/UsersTabChild.cpp
+        OdbcJdbcSetup/UsersTabMemberShips.cpp
+        OdbcJdbcSetup/UsersTabRoles.cpp
+        OdbcJdbcSetup/UsersTabUsers.cpp
+    )
+else()
+    # Linux: only OdbcInstGetProp (ODBCJDBCSETUPSRC_LINUX)
+    set(ODBCJDBCSETUP_SOURCES
+        OdbcInstGetProp.cpp
+    )
+endif()
+
+# ---------------------------------------------------------------------------
+# Create the main ODBC driver library
+# ---------------------------------------------------------------------------
+add_library(OdbcFb
+    ${ODBCJDBC_SOURCES}
+    ${ODBCJDBCSETUP_SOURCES}
+    ${ODBCJDBC_RC}
+    $<TARGET_OBJECTS:IscDbc>
+)
+
+# Set library output name
+if(WIN32)
+    set_target_properties(OdbcFb PROPERTIES OUTPUT_NAME "FirebirdODBC")
+else()
+    set_target_properties(OdbcFb PROPERTIES OUTPUT_NAME "OdbcFb")
+endif()
+
+# ---------------------------------------------------------------------------
+# Linking
+# ---------------------------------------------------------------------------
+if(WIN32)
+    # Match the .vcxproj AdditionalDependencies
+    target_link_libraries(OdbcFb PRIVATE
+        odbccp32
+        version
+        wsock32
+        comctl32
+        legacy_stdio_definitions
+        legacy_stdio_wide_specifiers
+    )
+
+    # .def file for exports + disable duplicate manifest + extra exports
+    set_target_properties(OdbcFb PROPERTIES
+        LINK_FLAGS "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/OdbcJdbc.def /MANIFEST:NO /EXPORT:ConfigDSN /EXPORT:ConfigDriver,PRIVATE /EXPORT:DllRegisterServer,PRIVATE /EXPORT:DllUnregisterServer,PRIVATE /EXPORT:DllInstall,PRIVATE"
+    )
+else()
+    target_link_libraries(OdbcFb PRIVATE
+        ODBC::ODBC
+        odbcinst
+        dl
+        pthread
+    )
+endif()
+
+# Debug-specific definitions (matching .vcxproj: DEBUG;LOGGING for Debug configs)
+target_compile_definitions(OdbcFb PRIVATE
+    $<$<CONFIG:Debug>:DEBUG>
+    $<$<CONFIG:Debug>:LOGGING>
+)
+
+# ---------------------------------------------------------------------------
+# Testing
+# ---------------------------------------------------------------------------
+if(BUILD_TESTING)
+    enable_testing()
+    add_subdirectory(tests)
+endif()
+
+# ---------------------------------------------------------------------------
+# Installation
+# ---------------------------------------------------------------------------
+install(TARGETS OdbcFb
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+)
diff --git a/CMakePresets.json b/CMakePresets.json
new file mode 100644
index 00000000..fa3fc630
--- /dev/null
+++ b/CMakePresets.json
@@ -0,0 +1,56 @@
+{
+    "version": 3,
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 15,
+        "patch": 0
+    },
+    "configurePresets": [
+        {
+            "name": "default",
+            "displayName": "Default (build/)",
+            "description": "Default preset — uses 'build/' as the binary directory so that all tools (command-line, Visual Studio, CLion, VS Code) share the same layout.",
+            "binaryDir": "${sourceDir}/build",
+            "cacheVariables": {
+                "CMAKE_INSTALL_PREFIX": "${sourceDir}/install"
+            }
+        },
+        {
+            "name": "release",
+            "displayName": "Release",
+            "inherits": "default",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        },
+        {
+            "name": "debug",
+            "displayName": "Debug",
+            "inherits": "default",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            }
+        }
+    ],
+    "buildPresets": [
+        {
+            "name": "release",
+            "configurePreset": "default",
+            "configuration": "Release"
+        },
+        {
+            "name": "debug",
+            "configurePreset": "default",
+            "configuration": "Debug"
+        }
+    ],
+    "testPresets": [
+        {
+            "name": "default",
+            "configurePreset": "default",
+            "output": {
+                "outputOnFailure": true
+            }
+        }
+    ]
+}
diff --git a/FBClient.Headers/firebird/FirebirdInterface.idl b/FBClient.Headers/firebird/FirebirdInterface.idl
deleted file mode 100644
index eabac62a..00000000
--- a/FBClient.Headers/firebird/FirebirdInterface.idl
+++ /dev/null
@@ -1,1800 +0,0 @@
-/*
- *	PROGRAM:		Firebird interface.
- *	MODULE:			firebird/Interface.idl
- *	DESCRIPTION:	Collection of interfaces used by FB to talk with outer world.
- *
- *  The contents of this file are subject to the Initial
- *  Developer's Public License Version 1.0 (the "License");
- *  you may not use this file except in compliance with the
- *  License. You may obtain a copy of the License at
- *  http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
- *
- *  Software distributed under the License is distributed AS IS,
- *  WITHOUT WARRANTY OF ANY KIND, either express or implied.
- *  See the License for the specific language governing rights
- *  and limitations under the License.
- *
- *  The Original Code was created by Alex Peshkov
- *  for the Firebird Open Source RDBMS project.
- *
- *  Copyright (c) 2010 Alex Peshkov <peshkoff at mail.ru>
- *  and all contributors signed below.
- *
- *  All Rights Reserved.
- *  Contributor(s): ______________________________________.
- *
- *
- */
-
-typedef ISC_DATE;
-typedef ISC_QUAD;
-typedef ISC_TIME;
-typedef ISC_TIMESTAMP;
-typedef ISC_TIME_TZ;
-typedef ISC_TIMESTAMP_TZ;
-typedef ISC_TIME_TZ_EX;
-typedef ISC_TIMESTAMP_TZ_EX;
-typedef FB_DEC16;
-typedef FB_DEC34;
-typedef FB_I128;
-
-boolean FB_UsedInYValve;
-
-// Versioned interface - base for all FB interfaces
-interface Versioned
-{
-}
-
-// Reference counted interface - base for refCounted FB interfaces
-interface ReferenceCounted : Versioned
-{
-	void addRef();
-	int release();
-}
-
-// Disposable interface - base for disposable FB interfaces
-interface Disposable : Versioned
-{
-	void dispose();
-}
-
-// Interface to work with status vector
-[exception]
-interface Status : Disposable
-{
-	// flags in value returned by getState()
-	const uint STATE_WARNINGS	= 0x01;
-	const uint STATE_ERRORS 	= 0x02;
-
-	// completion codes - not used in Status, but I must have them somewhere
-	const int RESULT_ERROR = -1;
-	const int RESULT_OK = 0;
-	const int RESULT_NO_DATA = 1;
-	const int RESULT_SEGMENT = 2;
-
-	void init();
-	uint getState() const;
-
-	void setErrors2(uint length, const intptr* value);
-	void setWarnings2(uint length, const intptr* value);
-	void setErrors(const intptr* value);
-	void setWarnings(const intptr* value);
-
-	[onError stubError]
-	const intptr* getErrors() const;
-	[onError stubError]
-	const intptr* getWarnings() const;
-
-	Status clone() const;
-}
-
-// Master interface is used to access almost all other interfaces.
-interface Master : Versioned
-{
-	Status getStatus();
-	Provider getDispatcher();
-	PluginManager getPluginManager();
-	TimerControl getTimerControl();
-	Dtc getDtc();
-	Attachment registerAttachment(Provider provider, Attachment attachment);
-	Transaction registerTransaction(Attachment attachment, Transaction transaction);
-
-	MetadataBuilder getMetadataBuilder(Status status, uint fieldCount);
-	int serverMode(int mode);
-	Util getUtilInterface();
-	ConfigManager getConfigManager();
-	boolean getProcessExiting();
-}
-
-
-/*
- * Firebird plugins are accessed using methods of PluginLoader interface.
- * For each plugin_module tag found, it constructs a Plugin object, reads the corresponding
- * plugin_config tag and inserts all config information in the object.
- *
- * When requested, the engine gets the attribute value of plugin_module/filename, load it as a
- * dynamic (shared) library and calls the exported function firebirdPlugin (FB_PLUGIN_ENTRY_POINT
- * definition, PluginEntrypoint prototype) passing the Plugin object as parameter.
- *
- * The plugin library may save the plugin object and call they methods later. The object and all
- * pointers returned by it are valid until the plugin is unloaded (done through OS unload of the
- * dynamic library) when Firebird is shutting down.
- *
- * Inside the plugin entry point (firebirdPlugin), the plugin may register extra functionality that
- * may be obtained by Firebird when required. Currently only External Engines may be registered
- * through Plugin::setExternalEngineFactory.
- *
- * Example plugin configuration file:
- *
- * <external_engine UDR>
- *     plugin_module UDR_engine
- * </external_engine>
- *
- * <plugin_module UDR_engine>
- *     filename $(this)/udr_engine
- *     plugin_config UDR_config
- * </plugin_module>
- *
- * <plugin_config UDR_config>
- *     path $(this)/udr
- * </plugin_config>
- *
- * Note that the external_engine tag is ignored at this stage. Only plugin_module and plugin_config
- * are read. The dynamic library extension may be ommitted, and $(this) expands to the directory of
- * the .conf file.
- *
- * Plugins may access Firebird API through the fbclient library.
- */
-
-// IPluginBase interface - base for master plugin interfaces (factories are registered for them)
-interface PluginBase : ReferenceCounted
-{
-	// Additional (compared with Interface) functions getOwner() and setOwner()
-	// are needed to release() owner of the plugin. This is done in releasePlugin()
-	// function in PluginManager. Such method is needed to make sure that owner is released
-	// after plugin itself, and therefore module is unloaded after release of last plugin from it.
-	// Releasing owner from release() of plugin will unload module and after returning control
-	// to missing code segfault is unavoidable.
-	void setOwner(ReferenceCounted r);
-	ReferenceCounted getOwner();
-}
-
-// PluginSet - low level tool to access plugins according to parameter from firebird.conf
-interface PluginSet : ReferenceCounted
-{
-	const string getName() const;
-	const string getModuleName() const;
-	PluginBase getPlugin(Status status);
-	void next(Status status);
-	void set(Status status, const string s);
-}
-
-// Entry in configuration file
-interface ConfigEntry : ReferenceCounted
-{
-	const string getName();
-	const string getValue();
-	int64 getIntValue();
-	boolean getBoolValue();
-	Config getSubConfig(Status status);
-}
-
-// Generic form of access to configuration file - find specific entry in it
-interface Config : ReferenceCounted
-{
-	ConfigEntry find(Status status, const string name);
-	ConfigEntry findValue(Status status, const string name, const string value);
-	ConfigEntry findPos(Status status, const string name, uint pos);
-}
-
-// Used to access config values from firebird.conf (may be DB specific)
-interface FirebirdConf : ReferenceCounted
-{
-	// Get integer key by it's name
-	// Value ~0 means name is invalid
-	// Keys are stable: one can use once obtained key in other instances of this interface
-	// provided they have same minor version (upper 16 bits match with getVersion())
-	uint getKey(const string name);
-	// Use to access integer values
-	int64 asInteger(uint key);
-	// Use to access string values
-	const string asString(uint key);
-	// Use to access boolean values
-	boolean asBoolean(uint key);
-version:		// 3.0 => 4.0
-	// Use to access version of configuration manager serving this interface
-	// Format: major byte, minor byte, buildno 2-byte
-	uint getVersion(Status status);
-}
-
-// This interface is passed to plugin's factory as it's single parameter
-// and contains methods to access specific plugin's configuration data
-interface PluginConfig : ReferenceCounted
-{
-	const string getConfigFileName();
-	Config getDefaultConfig(Status status);
-	FirebirdConf getFirebirdConf(Status status);
-	void setReleaseDelay(Status status, uint64 microSeconds);
-}
-
-// Required to creat instances of given plugin
-interface PluginFactory : Versioned
-{
-	PluginBase createPlugin(Status status, PluginConfig factoryParameter);
-}
-
-// Required to let plugins manager invoke module's cleanup routine before unloading it.
-// For some OS/compiler this may be done in dtor of global variable in module itself.
-// Others (Windows/VC) fail to create some very useful resources (threads) when module is unloading.
-interface PluginModule : Versioned
-{
-	void doClean();
-
-version:		// 3.0.3 => 3.0.4
-	// Used to release resources allocated per-thread
-	void threadDetach();
-}
-
-// Interface to deal with plugins here and there, returned by master interface
-interface PluginManager : Versioned
-{
-	// Plugin types
-	const uint TYPE_PROVIDER = 1;
-	const uint TYPE_FIRST_NON_LIB = 2;
-	const uint TYPE_AUTH_SERVER = 3;
-	const uint TYPE_AUTH_CLIENT = 4;
-	const uint TYPE_AUTH_USER_MANAGEMENT = 5;
-	const uint TYPE_EXTERNAL_ENGINE = 6;
-	const uint TYPE_TRACE = 7;
-	const uint TYPE_WIRE_CRYPT = 8;
-	const uint TYPE_DB_CRYPT = 9;
-	const uint TYPE_KEY_HOLDER = 10;
-	const uint TYPE_REPLICATOR = 11;
-	const uint TYPE_PROFILER = 12;
-	const uint TYPE_COUNT = 13;	// keep in sync
-	//// TYPE_COUNT is not count. And these constants starts from 1, different than DIR_* ones.
-
-	// Main function called by plugin modules in firebird_plugin()
-	void registerPluginFactory(uint pluginType, const string defaultName, PluginFactory factory);
-	// Sets cleanup for plugin module
-	// Pay attention - this should be called at plugin-register time!
-	// Only at this moment manager knows, which module sets his cleanup
-	void registerModule(PluginModule cleanup);
-	// Remove registered module before cleanup routine.
-	// This method must be called by module which detects that it's unloaded,
-	// but not notified prior to it by PluginManager via PluginModule.
-	void unregisterModule(PluginModule cleanup);
-	// Main function called to access plugins registered in plugins manager
-	// Has front-end in GetPlugins.h - template GetPlugins
-	// In namesList parameter comma or space separated list of names of configured plugins is passed
-	// in case when plugin's version is less than desired
-	// If caller already has an interface for firebird.conf, it may be passed here
-	// If parameter is missing, plugins will get access to default (non database specific) config
-	PluginSet getPlugins(Status status, uint pluginType,
-						const string namesList, FirebirdConf firebirdConf);
-	// Get generic config interface for given file
-	Config getConfig(Status status, const string filename);
-	// Plugins must be released using this function - use of plugin's release()
-	// will cause resources leak
-	void releasePlugin(PluginBase plugin);
-}
-
-
-// Helper interface to pass wire crypt key from authentication to crypt plugin
-interface CryptKey : Versioned
-{
-	// In 2 following methods NULL type means auth plugin's name is used as key type
-	void setSymmetric(Status status, const string type, uint keyLength, const void* key);
-	void setAsymmetric(Status status, const string type, uint encryptKeyLength,
-		const void* encryptKey, uint decryptKeyLength, const void* decryptKey);
-
-	const void* getEncryptKey(uint* length);
-	const void* getDecryptKey(uint* length);
-}
-
-
-// Generic access to all config interfaces
-interface ConfigManager : Versioned
-{
-	// Codes for ConfigManager::getDirectory()
-	const uint DIR_BIN = 0;
-	const uint DIR_SBIN = 1;
-	const uint DIR_CONF = 2;
-	const uint DIR_LIB = 3;
-	const uint DIR_INC = 4;
-	const uint DIR_DOC = 5;
-	const uint DIR_UDF = 6;
-	const uint DIR_SAMPLE = 7;
-	const uint DIR_SAMPLEDB = 8;
-	const uint DIR_HELP = 9;
-	const uint DIR_INTL = 10;
-	const uint DIR_MISC = 11;
-	const uint DIR_SECDB = 12;
-	const uint DIR_MSG = 13;
-	const uint DIR_LOG = 14;
-	const uint DIR_GUARD = 15;
-	const uint DIR_PLUGINS = 16;
-	const uint DIR_TZDATA = 17;
-	const uint DIR_COUNT = 18;	// keep in sync
-
-	const string getDirectory(uint code);
-	FirebirdConf getFirebirdConf();
-	FirebirdConf getDatabaseConf(const string dbName);
-	Config getPluginConfig(const string configuredPlugin);
-	const string getInstallDirectory();
-	const string getRootDirectory();
-
-version:		// 3.0 => 4.0
-	const string getDefaultSecurityDb();
-}
-
-
-// Provider interface - how we talk to databases
-// This interfaces are implemented by yvalve code and by each of providers.
-
-interface EventCallback : ReferenceCounted
-{
-	// eventCallbackFunction is missing error status cause it's always called from places
-	// where an ability to report an error to the user is missing
-	void eventCallbackFunction(uint length, const uchar* events);
-}
-
-interface Blob : ReferenceCounted
-{
-	void getInfo(Status status,
-						 uint itemsLength, const uchar* items,
-						 uint bufferLength, uchar* buffer);
-
-	[notImplemented(Status::RESULT_ERROR)]
-	int getSegment(Status status, uint bufferLength, void* buffer, uint* segmentLength);
-
-	void putSegment(Status status, uint length,
-									const void* buffer);
-	void deprecatedCancel(Status status);
-	void deprecatedClose(Status status);
-	int seek(Status status, int mode, int offset);			// returns position
-
-version:	// 3.0.7 => 3.0.8, 4.0.0 => 4.0.1
-	[notImplementedAction if ::FB_UsedInYValve then defaultAction else call deprecatedCancel(status) endif]
-	void cancel(Status status);
-	[notImplementedAction if ::FB_UsedInYValve then defaultAction else call deprecatedClose(status) endif]
-	void close(Status status);
-}
-
-interface Transaction : ReferenceCounted
-{
-	void getInfo(Status status,
-						 uint itemsLength, const uchar* items,
-						 uint bufferLength, uchar* buffer);
-	void prepare(Status status,
-						 uint msgLength, const uchar* message);
-	void deprecatedCommit(Status status);
-	void commitRetaining(Status status);
-	void deprecatedRollback(Status status);
-	void rollbackRetaining(Status status);
-	void deprecatedDisconnect(Status status);
-	Transaction join(Status status, Transaction transaction);
-	Transaction validate(Status status, Attachment attachment);
-	Transaction enterDtc(Status status);
-
-version:	// 3.0.7 => 3.0.8, 4.0.0 => 4.0.1
-	[notImplementedAction if ::FB_UsedInYValve then defaultAction else call deprecatedCommit(status) endif]
-	void commit(Status status);
-	[notImplementedAction if ::FB_UsedInYValve then defaultAction else call deprecatedRollback(status) endif]
-	void rollback(Status status);
-	[notImplementedAction if ::FB_UsedInYValve then defaultAction else call deprecatedDisconnect(status) endif]
-	void disconnect(Status status);
-}
-
-interface MessageMetadata : ReferenceCounted
-{
-	uint getCount(Status status);
-	const string getField(Status status, uint index);
-	const string getRelation(Status status, uint index);
-	const string getOwner(Status status, uint index);
-	const string getAlias(Status status, uint index);
-	uint getType(Status status, uint index);
-	boolean isNullable(Status status, uint index);
-	int getSubType(Status status, uint index);
-	uint getLength(Status status, uint index);
-	int getScale(Status status, uint index);
-	uint getCharSet(Status status, uint index);
-	uint getOffset(Status status, uint index);
-	uint getNullOffset(Status status, uint index);
-
-	MetadataBuilder getBuilder(Status status);
-	uint getMessageLength(Status status);
-
-version:	// 3.0 => 4.0
-	uint getAlignment(Status status);
-	uint getAlignedLength(Status status);
-}
-
-interface MetadataBuilder : ReferenceCounted
-{
-	void setType(Status status, uint index, uint type);
-	void setSubType(Status status, uint index, int subType);
-	void setLength(Status status, uint index, uint length);
-	void setCharSet(Status status, uint index, uint charSet);
-	void setScale(Status status, uint index, int scale);
-
-	void truncate(Status status, uint count);
-	void moveNameToIndex(Status status, const string name, uint index);
-	void remove(Status status, uint index);
-	uint addField(Status status);
-
-	MessageMetadata getMetadata(Status status);
-
-version:	// 3.0 => 4.0
-	void setField(Status status, uint index, const string field);
-	void setRelation(Status status, uint index, const string relation);
-	void setOwner(Status status, uint index, const string owner);
-	void setAlias(Status status, uint index, const string alias);
-}
-
-interface ResultSet : ReferenceCounted
-{
-	// Info items
-	const uchar INF_RECORD_COUNT = 10;		// Number of records in the result set
-
-	[notImplemented(Status::RESULT_ERROR)] int fetchNext(Status status, void* message);
-	[notImplemented(Status::RESULT_ERROR)] int fetchPrior(Status status, void* message);
-	[notImplemented(Status::RESULT_ERROR)] int fetchFirst(Status status, void* message);
-	[notImplemented(Status::RESULT_ERROR)] int fetchLast(Status status, void* message);
-	[notImplemented(Status::RESULT_ERROR)] int fetchAbsolute(Status status, int position, void* message);
-	[notImplemented(Status::RESULT_ERROR)] int fetchRelative(Status status, int offset, void* message);
-	boolean isEof(Status status);
-	boolean isBof(Status status);
-	MessageMetadata getMetadata(Status status);
-	void deprecatedClose(Status status);
-
-	// This item is for ISC API emulation only
-	// It may be gone in future versions
-	// Please do not use it!
-	void setDelayedOutputFormat(Status status, MessageMetadata format);
-
-version:	// 3.0.7 => 3.0.8, 4.0.0 => 4.0.1
-	[notImplementedAction if ::FB_UsedInYValve then defaultAction else call deprecatedClose(status) endif]
-	void close(Status status);
-
-version:	// 4.0.1 => 5.0
-	void getInfo(Status status,
-				 uint itemsLength, const uchar* items,
-				 uint bufferLength, uchar* buffer);
-}
-
-interface Statement : ReferenceCounted
-{
-	// Prepare flags.
-	const uint PREPARE_PREFETCH_NONE 				= 0x00;
-	const uint PREPARE_PREFETCH_TYPE 				= 0x01;
-	const uint PREPARE_PREFETCH_INPUT_PARAMETERS 	= 0x02;
-	const uint PREPARE_PREFETCH_OUTPUT_PARAMETERS	= 0x04;
-	const uint PREPARE_PREFETCH_LEGACY_PLAN			= 0x08;
-	const uint PREPARE_PREFETCH_DETAILED_PLAN		= 0x10;
-	const uint PREPARE_PREFETCH_AFFECTED_RECORDS	= 0x20;	// not used yet
-	const uint PREPARE_PREFETCH_FLAGS				= 0x40;
-	const uint PREPARE_PREFETCH_METADATA =
-		PREPARE_PREFETCH_TYPE | PREPARE_PREFETCH_FLAGS |
-		PREPARE_PREFETCH_INPUT_PARAMETERS | PREPARE_PREFETCH_OUTPUT_PARAMETERS;
-	const uint PREPARE_PREFETCH_ALL =
-		PREPARE_PREFETCH_METADATA | PREPARE_PREFETCH_LEGACY_PLAN | PREPARE_PREFETCH_DETAILED_PLAN |
-		PREPARE_PREFETCH_AFFECTED_RECORDS;
-
-	// Statement flags.
-	const uint FLAG_HAS_CURSOR	 					= 0x01;
-	const uint FLAG_REPEAT_EXECUTE				 	= 0x02;
-
-	// Cursor flags.
-	const uint CURSOR_TYPE_SCROLLABLE 				= 0x01;
-
-	void getInfo(Status status,
-								 uint itemsLength, const uchar* items,
-								 uint bufferLength, uchar* buffer);
-	uint getType(Status status);
-	const string getPlan(Status status, boolean detailed);
-	uint64 getAffectedRecords(Status status);
-	MessageMetadata getInputMetadata(Status status);
-	MessageMetadata getOutputMetadata(Status status);
-	Transaction execute(Status status, Transaction transaction,
-		MessageMetadata inMetadata, void* inBuffer, MessageMetadata outMetadata, void* outBuffer);
-	ResultSet openCursor(Status status, Transaction transaction,
-		MessageMetadata inMetadata, void* inBuffer, MessageMetadata outMetadata, uint flags);
-	void setCursorName(Status status, const string name);
-	void deprecatedFree(Status status);
-	uint getFlags(Status status);
-
-version:	// 3.0 => 4.0
-	// Statement execution timeout, milliseconds
-	uint getTimeout(Status status);
-	void setTimeout(Status status, uint timeOut);
-
-	// Batch API
-	Batch createBatch(Status status, MessageMetadata inMetadata, uint parLength, const uchar* par);
-
-	/*
-	Pipe createPipe(Status status, Transaction transaction, MessageMetadata inMetadata,
-		void* inBuffer, MessageMetadata outMetadata, uint parLength, const uchar* par);
-	*/
-
-version:	// 3.0.7 => 3.0.8, 4.0.0 => 4.0.1
-	[notImplementedAction if ::FB_UsedInYValve then defaultAction else call deprecatedFree(status) endif]
-	void free(Status status);
-}
-
-interface Batch : ReferenceCounted
-{
-	const uchar VERSION1 = 1;				// Tag for parameters block
-	const uchar CURRENT_VERSION = VERSION1;
-
-	// Tags for parameters
-	const uchar TAG_MULTIERROR = 1;			// Can have >1 buffers with errors
-	const uchar TAG_RECORD_COUNTS = 2;		// Per-record modified records accountung
-	const uchar TAG_BUFFER_BYTES_SIZE = 3;	// Maximum possible buffer size
-	const uchar TAG_BLOB_POLICY = 4;		// What policy is used to store blobs
-	const uchar TAG_DETAILED_ERRORS = 5;	// How many vectors with detailed error info are stored
-
-	// Info items
-	const uchar INF_BUFFER_BYTES_SIZE = 10;	// Maximum possible buffer size
-	const uchar INF_DATA_BYTES_SIZE = 11;	// Already added messages size
-	const uchar INF_BLOBS_BYTES_SIZE = 12;	// Already added blobs size
-	const uchar INF_BLOB_ALIGNMENT = 13;	// Duplicate getBlobAlignment
-	const uchar INF_BLOB_HEADER = 14;		// Blob header size
-
-	// How should batch work with blobs
-	const uchar BLOB_NONE = 0;				// Blobs can't be used
-	const uchar BLOB_ID_ENGINE = 1;			// Blobs are added one by one, IDs are generated by firebird
-	const uchar BLOB_ID_USER = 2;			// Blobs are added one by one, IDs are generated by user
-	const uchar BLOB_STREAM = 3;			// Blobs are added in a stream, IDs are generated by user
-
-	// Blob stream
-	const uint BLOB_SEGHDR_ALIGN = 2;		// Alignment of segment header in the blob stream
-
-	void add(Status status, uint count, const void* inBuffer);
-	void addBlob(Status status, uint length, const void* inBuffer, ISC_QUAD* blobId, uint parLength, const uchar* par);
-	void appendBlobData(Status status, uint length, const void* inBuffer);
-	void addBlobStream(Status status, uint length, const void* inBuffer);
-	void registerBlob(Status status, const ISC_QUAD* existingBlob, ISC_QUAD* blobId);
-	BatchCompletionState execute(Status status, Transaction transaction);
-	void cancel(Status status);
-	uint getBlobAlignment(Status status);
-	MessageMetadata getMetadata(Status status);
-	void setDefaultBpb(Status status, uint parLength, const uchar* par);
-	void deprecatedClose(Status status);
-
-version:	// 4.0.0 => 4.0.1
-	[notImplementedAction if ::FB_UsedInYValve then defaultAction else call deprecatedClose(status) endif]
-	void close(Status status);
-	void getInfo(Status status,
-				 uint itemsLength, const uchar* items,
-				 uint bufferLength, uchar* buffer);
-}
-
-interface BatchCompletionState : Disposable
-{
-	const int EXECUTE_FAILED = -1;				// Error happened when processing record
-	const int SUCCESS_NO_INFO = -2;				// Record update info was not collected
-	const uint NO_MORE_ERRORS = 0xFFFFFFFF;		// Special value returned by findError()
-
-	uint getSize(Status status);
-	int getState(Status status, uint pos);
-	uint findError(Status status, uint pos);
-	void getStatus(Status status, Status to, uint pos);
-}
-
-/*
-interface Pipe : ReferenceCounted
-{
-	uint add(Status status, uint count, void* inBuffer);
-	uint fetch(Status status, uint count, void* outBuffer);
-	void close(Status status);
-}
-*/
-/*
-interface ReplicationBatch : Versioned
-{
-	void process(Status status, ReplicationSession replicator);
-	const string getDatabaseID();
-	uint64 getTransactionID();
-	ISC_TIMESTAMP getTimestamp();
-}
-*/
-interface Replicator : ReferenceCounted
-{
-/*
-	void process(Status status, ReplicationBatch batch);
-*/
-	void process(Status status, uint length, const uchar* data);
-	void deprecatedClose(Status status);
-
-version:	// 4.0.0 => 4.0.1
-	[notImplementedAction if ::FB_UsedInYValve then defaultAction else call deprecatedClose(status) endif]
-	void close(Status status);
-}
-
-interface Request : ReferenceCounted
-{
-	void receive(Status status, int level, uint msgType,
-						 uint length, void* message);
-	void send(Status status, int level, uint msgType,
-					  uint length, const void* message);
-	void getInfo(Status status, int level,
-						 uint itemsLength, const uchar* items,
-						 uint bufferLength, uchar* buffer);
-	void start(Status status, Transaction tra, int level);
-	void startAndSend(Status status, Transaction tra, int level, uint msgType,
-							  uint length, const void* message);
-	void unwind(Status status, int level);
-	void deprecatedFree(Status status);
-
-version:	// 3.0.7 => 3.0.8, 4.0.0 => 4.0.1
-	[notImplementedAction if ::FB_UsedInYValve then defaultAction else call deprecatedFree(status) endif]
-	void free(Status status);
-}
-
-interface Events : ReferenceCounted
-{
-	void deprecatedCancel(Status status);
-
-version:	// 3.0.7 => 3.0.8, 4.0.0 => 4.0.1
-	[notImplementedAction if ::FB_UsedInYValve then defaultAction else call deprecatedCancel(status) endif]
-	void cancel(Status status);
-}
-
-interface Attachment : ReferenceCounted
-{
-	void getInfo(Status status,
-						 uint itemsLength, const uchar* items,
-						 uint bufferLength, uchar* buffer);
-	Transaction startTransaction(Status status,
-		uint tpbLength, const uchar* tpb);
-	Transaction reconnectTransaction(Status status,
-		uint length, const uchar* id);
-	Request compileRequest(Status status,
-		uint blrLength, const uchar* blr);
-	void transactRequest(Status status, Transaction transaction,
-								 uint blrLength, const uchar* blr,
-								 uint inMsgLength, const uchar* inMsg,
-								 uint outMsgLength, uchar* outMsg);
-	Blob createBlob(Status status, Transaction transaction, ISC_QUAD* id,
-							 uint bpbLength, const uchar* bpb);
-	Blob openBlob(Status status, Transaction transaction, ISC_QUAD* id,
-						   uint bpbLength, const uchar* bpb);
-	int getSlice(Status status, Transaction transaction, ISC_QUAD* id,
-						 uint sdlLength, const uchar* sdl,
-						 uint paramLength, const uchar* param,
-						 int sliceLength, uchar* slice);
-	void putSlice(Status status, Transaction transaction, ISC_QUAD* id,
-						  uint sdlLength, const uchar* sdl,
-						  uint paramLength, const uchar* param,
-						  int sliceLength, uchar* slice);
-	void executeDyn(Status status, Transaction transaction, uint length,
-		const uchar* dyn);
-	Statement prepare(Status status, Transaction tra,
-		uint stmtLength, const string sqlStmt, uint dialect, uint flags);
-	Transaction execute(Status status, Transaction transaction,
-		uint stmtLength, const string sqlStmt, uint dialect,
-		MessageMetadata inMetadata, void* inBuffer, MessageMetadata outMetadata, void* outBuffer);
-	ResultSet openCursor(Status status, Transaction transaction,
-		uint stmtLength, const string sqlStmt, uint dialect,
-		MessageMetadata inMetadata, void* inBuffer, MessageMetadata outMetadata,
-		const string cursorName, uint cursorFlags);
-	Events queEvents(Status status, EventCallback callback,
-						   uint length, const uchar* events);
-	void cancelOperation(Status status, int option);
-	void ping(Status status);
-	void deprecatedDetach(Status status);
-	void deprecatedDropDatabase(Status status);
-
-version:	// 3.0 => 4.0
-	// Idle attachment timeout, seconds
-	uint getIdleTimeout(Status status);
-	void setIdleTimeout(Status status, uint timeOut);
-
-	// Statement execution timeout, milliseconds
-	uint getStatementTimeout(Status status);
-	void setStatementTimeout(Status status, uint timeOut);
-
-	// Batch API
-	Batch createBatch(Status status, Transaction transaction, uint stmtLength, const string sqlStmt,
-		uint dialect, MessageMetadata inMetadata, uint parLength, const uchar* par);
-
-	/*
-	Pipe createPipe(Status status, uint stmtLength, const string sqlStmt, uint dialect,
-		Transaction transaction, MessageMetadata inMetadata, void* inBuffer,
-		MessageMetadata outMetadata, uint parLength, const uchar* par);
-	*/
-
-	Replicator createReplicator(Status status);
-
-version:	// 3.0.7 => 3.0.8, 4.0.0 => 4.0.1
-	[notImplementedAction if ::FB_UsedInYValve then defaultAction else call deprecatedDetach(status) endif]
-	void detach(Status status);
-	[notImplementedAction if ::FB_UsedInYValve then defaultAction else call deprecatedDropDatabase(status) endif]
-	void dropDatabase(Status status);
-}
-
-interface Service : ReferenceCounted
-{
-	void deprecatedDetach(Status status);
-	void query(Status status,
-					   uint sendLength, const uchar* sendItems,
-					   uint receiveLength, const uchar* receiveItems,
-					   uint bufferLength, uchar* buffer);
-	void start(Status status,
-					   uint spbLength, const uchar* spb);
-
-version:	// 3.0.7 => 3.0.8, 4.0.0 => 4.0.1
-	[notImplementedAction if ::FB_UsedInYValve then defaultAction else call deprecatedDetach(status) endif]
-	void detach(Status status);
-
-version:	// 3.0.9 => 3.0.10, 4.0.1 => 4.0.2
-	void cancel(Status status);
-}
-
-interface Provider : PluginBase
-{
-	Attachment attachDatabase(Status status, const string fileName,
-		uint dpbLength, const uchar* dpb);
-	Attachment createDatabase(Status status, const string fileName,
-		uint dpbLength, const uchar* dpb);
-	Service attachServiceManager(Status status, const string service,
-		 uint spbLength, const uchar* spb);
-	void shutdown(Status status, uint timeout, const int reason);
-	void setDbCryptCallback(Status status, CryptKeyCallback cryptCallback);
-}
-
-// Helper to start transaction over >1 attachments (former TEB)
-interface DtcStart : Disposable
-{
-	void addAttachment(Status status, Attachment att);
-	void addWithTpb(Status status, Attachment att, uint length, const uchar* tpb);
-	Transaction start(Status status);	// successfull call disposes interfaces
-}
-
-// Distributed transactions coordinator
-interface Dtc : Versioned
-{
-	Transaction join(Status status, Transaction one, Transaction two);
-	DtcStart startBuilder(Status status);
-}
-
-
-// Interfaces, used by authentication plugins
-
-interface Auth : PluginBase
-{
-	const int AUTH_FAILED = -1;
-	const int AUTH_SUCCESS = 0;
-	const int AUTH_MORE_DATA = 1;
-	const int AUTH_CONTINUE = 2;
-}
-
-interface Writer : Versioned
-{
-	void reset();
-	void add(Status status, const string name);
-	void setType(Status status, const string value);
-	void setDb(Status status, const string value);
-}
-
-// Representation of auth-related data, passed to/from server auth plugin
-interface ServerBlock : Versioned
-{
-	const string getLogin();
-	const uchar* getData(uint* length);
-	void putData(Status status, uint length, const void* data);
-	CryptKey newKey(Status status);
-}
-
-// Representation of auth-related data, passed to/from client auth plugin
-interface ClientBlock : ReferenceCounted
-{
-	const string getLogin();
-	const string getPassword();
-	const uchar* getData(uint* length);
-	void putData(Status status, uint length, const void* data);
-	CryptKey newKey(Status status);
-version:	// 3.0 => 4.0
-	AuthBlock getAuthBlock(Status status);
-}
-
-// server part of authentication plugin
-interface Server : Auth
-{
-	[notImplemented(Auth::AUTH_FAILED)]
-	int authenticate(Status status, ServerBlock sBlock, Writer writerInterface);
-
-version:		// 3.0.1 => 4.0
-	void setDbCryptCallback(Status status, CryptKeyCallback cryptCallback);
-}
-
-// .. and corresponding client
-interface Client : Auth
-{
-	[notImplemented(Auth::AUTH_FAILED)]
-	int authenticate(Status status, ClientBlock cBlock);
-}
-
-interface UserField : Versioned
-{
-	int entered();
-	int specified();
-	void setEntered(Status status, int newValue);
-}
-
-interface CharUserField : UserField
-{
-	const string get();
-	void set(Status status, const string newValue);
-}
-
-interface IntUserField : UserField
-{
-	int get();
-	void set(Status status, int newValue);
-}
-
-interface User : Versioned
-{
-	uint operation();
-
-	CharUserField userName();
-	CharUserField password();
-
-	CharUserField firstName();
-	CharUserField lastName();
-	CharUserField middleName();
-
-	CharUserField comment();
-	CharUserField attributes();
-	IntUserField active();
-
-	IntUserField admin();
-
-	void clear(Status status);
-
-	// code of operation()
-	const uint OP_USER_ADD = 1;
-	const uint OP_USER_MODIFY = 2;
-	const uint OP_USER_DELETE = 3;
-	const uint OP_USER_DISPLAY = 4;
-	const uint OP_USER_SET_MAP = 5;
-	const uint OP_USER_DROP_MAP = 6;
-}
-
-interface ListUsers : Versioned
-{
-	void list(Status status, User user);
-}
-
-interface LogonInfo : Versioned
-{
-	const string name();
-	const string role();
-	const string networkProtocol();
-	const string remoteAddress();
-	const uchar* authBlock(uint* length);
-
-version:
-	Attachment attachment(Status status);
-	Transaction transaction(Status status);
-}
-
-interface Management : PluginBase
-{
-	void start(Status status, LogonInfo logonInfo);
-	int execute(Status status, User user, ListUsers callback);
-	void commit(Status status);
-	void rollback(Status status);
-}
-
-interface AuthBlock : Versioned
-{
-	const string getType();
-	const string getName();
-	const string getPlugin();
-	const string getSecurityDb();
-	const string getOriginalPlugin();
-	boolean next(Status status);
-	boolean first(Status status);
-}
-
-
-// Encryption
-
-// Part 1. Network crypt.
-
-// Plugins of this type are used to crypt data, sent over the wire
-// Plugin must support encrypt and decrypt operations.
-// Interface of plugin is the same for both client and server,
-// and it may have different or same implementations for client and server.
-interface WireCryptPlugin : PluginBase
-{
-	// getKnownTypes() function must return list of acceptable keys' types
-	// special type 'builtin' means that crypt plugin knows itself where to get the key from
-	const string getKnownTypes(Status status);
-	void setKey(Status status, CryptKey key);
-	void encrypt(Status status, uint length, const void* from, void* to);
-	void decrypt(Status status, uint length, const void* from, void* to);
-
-version:
-	const uchar* getSpecificData(Status status, const string keyType, uint* length);
-	void setSpecificData(Status status, const string keyType, uint length, const uchar* data);
-}
-
-
-// Part 2. Database crypt.
-
-// This interface is used to transfer some data (related to crypt keys)
-// between different components of firebird.
-interface CryptKeyCallback : Versioned
-{
-	// First two parameters can be used by calling side to identify
-	// itself for callback object.
-	// Buffer must be big enough to hold a key.
-	// It may be NULL, in this case just a key size will be returned
-	// (not recommended because callback may cause network roundtrip).
-	// Returning value is a real size of the key.
-	// Returning of zero means error, but there is no way to provide
-	// any further details.
-	uint callback(uint dataLength, const void* data,
-		uint bufferLength, void* buffer);
-}
-
-
-// Key holder accepts key(s) from attachment at database attach time
-// (or gets them it some other arbitrary way)
-// and sends it to database crypt plugin on request.
-interface KeyHolderPlugin : PluginBase
-{
-	// keyCallback() signals that a new attachment will need a key.
-	// Key holder can call callback to send upstairs a request for
-	// some additional information (if needed). For example, RSA key
-	// holder can send request to end user application for passphrase.
-	// Return value is 1 if key is ready.
-	int keyCallback(Status status, CryptKeyCallback callback);
-	// Crypt plugin calls keyHandle() when it needs a key with a given name, stored in key holder.
-	// Key is not returned directly - instead of it callback interface is returned.
-	// Missing key with given name is not an error condition for keyHandle().
-	// It should just return NULL in this case
-	CryptKeyCallback keyHandle(Status status, const string keyName);
-
-version:		// 3.0.1 => 4.0
-	// With returning true here KeyHolder attachment can use only keys, provided by this KeyHolder.
-	// Use of keys, got by database crypt plugin from other attachments, is prohibited.
-	boolean useOnlyOwnKeys(Status status);
-	// Communication in a chain of key holders - get callback interface for chaining holders
-	CryptKeyCallback chainHandle(Status status);
-}
-
-
-// Information calls available for crypt plugin
-interface DbCryptInfo : ReferenceCounted
-{
-	const string getDatabaseFullPath(Status status);
-}
-
-
-interface DbCryptPlugin : PluginBase
-{
-	// When database crypt plugin is loaded, setKey() is called to provide information
-	// about key holders, available for a given database and key name for database.
-	// It's supposed that crypt plugin will invoke keyHandle() function from them
-	// to access callback interface for getting actual crypt key.
-	// If crypt plugin fails to find appropriate key in sources, it should raise error.
-	void setKey(Status status, uint length, KeyHolderPlugin* sources, const string keyName);
-	void encrypt(Status status, uint length, const void* from, void* to);
-	void decrypt(Status status, uint length, const void* from, void* to);
-
-version:		// 3.0.1 => 4.0
-	// Crypto manager may pass some additional info to plugin
-	void setInfo(Status status, DbCryptInfo info);
-}
-
-
-
-// External procedures, functions & triggers
-
-
-// Connection to current database in external engine.
-// Context passed to ExternalEngine has SYSDBA privileges.
-// Context passed to ExternalFunction, ExternalProcedure and ExternalTrigger
-// has user privileges.
-// There is one IExternalContext per attachment. The privileges and character
-// set properties are changed during the calls.
-interface ExternalContext : Versioned
-{
-	// Gets the Master associated with this context.
-	Master getMaster();
-
-	// Gets the ExternalEngine associated with this context.
-	ExternalEngine getEngine(Status status);
-
-	// Gets the Attachment associated with this context.
-	Attachment getAttachment(Status status);
-
-	// Obtained transaction is valid only before control is returned to the engine
-	// or in ExternalResultSet::fetch calls of correspondent ExternalProcedure::open.
-	Transaction getTransaction(Status status);
-
-	const string getUserName();
-	const string getDatabaseName();
-
-	// Get user attachment character set.
-	const string getClientCharSet();
-
-	// Misc info associated with a context. The pointers are never accessed or freed by Firebird.
-
-	// Obtains an unique (across all contexts) code to associate plugin and/or user information.
-	int obtainInfoCode();
-	// Gets a value associated with this code or FB_NULL if no value was set.
-	void* getInfo(int code);
-	// Sets a value associated with this code and returns the last value.
-	void* setInfo(int code, void* value);
-}
-
-
-// To return set of rows in selectable procedures.
-interface ExternalResultSet : Disposable
-{
-	boolean fetch(Status status);
-}
-
-
-
-interface ExternalFunction : Disposable
-{
-	// This method is called just before execute and informs the engine our requested character
-	// set for data exchange inside that method.
-	// During this call, the context uses the character set obtained from ExternalEngine::getCharSet.
-	void getCharSet(Status status, ExternalContext context,
-		string name, uint nameSize);
-
-	void execute(Status status, ExternalContext context,
-		void* inMsg, void* outMsg);
-}
-
-
-
-interface ExternalProcedure : Disposable
-{
-	// This method is called just before open and informs the engine our requested character
-	// set for data exchange inside that method and ExternalResultSet::fetch.
-	// During this call, the context uses the character set obtained from ExternalEngine::getCharSet.
-	void getCharSet(Status status, ExternalContext context,
-		string name, uint nameSize);
-
-	// Returns a ExternalResultSet for selectable procedures.
-	// Returning NULL results in a result set of one record.
-	// Procedures without output parameters should return NULL.
-	ExternalResultSet open(Status status, ExternalContext context,
-		void* inMsg, void* outMsg);
-}
-
-
-
-interface ExternalTrigger : Disposable
-{
-	// types
-	const uint TYPE_BEFORE = 1;
-	const uint TYPE_AFTER = 2;
-	const uint TYPE_DATABASE = 3;
-
-	// actions
-	const uint ACTION_INSERT = 1;
-	const uint ACTION_UPDATE = 2;
-	const uint ACTION_DELETE = 3;
-	const uint ACTION_CONNECT = 4;
-	const uint ACTION_DISCONNECT = 5;
-	const uint ACTION_TRANS_START = 6;
-	const uint ACTION_TRANS_COMMIT = 7;
-	const uint ACTION_TRANS_ROLLBACK = 8;
-	const uint ACTION_DDL = 9;
-
-	// This method is called just before execute and informs the engine our requested character
-	// set for data exchange inside that method.
-	// During this call, the context uses the character set obtained from ExternalEngine::getCharSet.
-	void getCharSet(Status status, ExternalContext context,
-		string name, uint nameSize);
-
-	void execute(Status status, ExternalContext context,
-		uint action, void* oldMsg, void* newMsg);
-}
-
-
-
-interface RoutineMetadata : Versioned
-{
-	const string getPackage(Status status) const;
-	const string getName(Status status) const;
-	const string getEntryPoint(Status status) const;
-	const string getBody(Status status) const;
-	MessageMetadata getInputMetadata(Status status) const;
-	MessageMetadata getOutputMetadata(Status status) const;
-	MessageMetadata getTriggerMetadata(Status status) const;
-	const string getTriggerTable(Status status) const;
-	uint getTriggerType(Status status) const;
-}
-
-
-// In SuperServer, shared by all attachments to one database and disposed when last (non-external)
-// user attachment to the database is closed.
-interface ExternalEngine : PluginBase
-{
-	// This method is called once (per ExternalEngine instance) before any following methods.
-	// The requested character set for data exchange inside methods of this interface should
-	// be copied to charSet parameter.
-	// During this call, the context uses the UTF-8 character set.
-	void open(Status status, ExternalContext context,
-		string charSet, uint charSetSize);
-
-	// Attachment is being opened.
-	void openAttachment(Status status, ExternalContext context);
-
-	// Attachment is being closed.
-	void closeAttachment(Status status, ExternalContext context);
-
-	// Called when engine wants to load object in the cache. Objects are disposed when
-	// going out of the cache.
-	ExternalFunction makeFunction(Status status, ExternalContext context,
-		RoutineMetadata metadata,
-		MetadataBuilder inBuilder, MetadataBuilder outBuilder);
-	ExternalProcedure makeProcedure(Status status, ExternalContext context,
-		RoutineMetadata metadata,
-		MetadataBuilder inBuilder, MetadataBuilder outBuilder);
-	ExternalTrigger makeTrigger(Status status, ExternalContext context,
-		RoutineMetadata metadata, MetadataBuilder fieldsBuilder);
-}
-
-
-// Identifies particular timer.
-// Callback handler is invoked when timer fires.
-interface Timer : ReferenceCounted
-{
-	void handler();
-}
-
-// Interface to set timer for particular time
-interface TimerControl : Versioned
-{
-	// Set timer
-	void start(Status status, Timer timer, uint64 microSeconds);
-	// Stop timer
-	void stop(Status status, Timer timer);
-}
-
-
-// Misc calls
-
-interface VersionCallback : Versioned
-{
-	void callback(Status status, const string text);
-}
-
-interface Util : Versioned
-{
-	void getFbVersion(Status status, Attachment att, VersionCallback callback);
-	void loadBlob(Status status, ISC_QUAD* blobId,
-		Attachment att, Transaction tra, const string file, boolean txt);
-	void dumpBlob(Status status, ISC_QUAD* blobId,
-		Attachment att, Transaction tra, const string file, boolean txt);
-	void getPerfCounters(Status status, Attachment att,
-		const string countersSet, int64* counters);
-	Attachment executeCreateDatabase(Status status,
-		uint stmtLength, const string creatDBstatement, uint dialect,
-		boolean* stmtIsCreateDb);
-	void decodeDate(ISC_DATE date, uint* year, uint* month, uint* day);
-	void decodeTime(ISC_TIME time, uint* hours, uint* minutes, uint* seconds, uint* fractions);
-	ISC_DATE encodeDate(uint year, uint month, uint day);
-	ISC_TIME encodeTime(uint hours, uint minutes, uint seconds, uint fractions);
-	uint formatStatus(string buffer, uint bufferSize, Status status);
-	uint getClientVersion();	// Returns major * 256 + minor
-	XpbBuilder getXpbBuilder(Status status, uint kind, const uchar* buf, uint len);
-	uint setOffsets(Status status, MessageMetadata metadata, OffsetsCallback callback);
-
-version:	// 3.0 => 4.0 Alpha1
-	DecFloat16 getDecFloat16(Status status);
-	DecFloat34 getDecFloat34(Status status);
-	void decodeTimeTz(Status status, const ISC_TIME_TZ* timeTz, uint* hours, uint* minutes, uint* seconds,
-		uint* fractions, uint timeZoneBufferLength, string timeZoneBuffer);
-	void decodeTimeStampTz(Status status, const ISC_TIMESTAMP_TZ* timeStampTz, uint* year, uint* month, uint* day,
-		uint* hours, uint* minutes, uint* seconds, uint* fractions, uint timeZoneBufferLength, string timeZoneBuffer);
-	void encodeTimeTz(Status status, ISC_TIME_TZ* timeTz, uint hours, uint minutes, uint seconds,
-		uint fractions, const string timeZone);
-	void encodeTimeStampTz(Status status, ISC_TIMESTAMP_TZ* timeStampTz, uint year, uint month, uint day,
-		uint hours, uint minutes, uint seconds, uint fractions, const string timeZone);
-
-version:	// 4.0 Beta1 => 4.0 Beta2
-	Int128 getInt128(Status status);
-	void decodeTimeTzEx(Status status, const ISC_TIME_TZ_EX* timeTz, uint* hours, uint* minutes, uint* seconds,
-		uint* fractions, uint timeZoneBufferLength, string timeZoneBuffer);
-	void decodeTimeStampTzEx(Status status, const ISC_TIMESTAMP_TZ_EX* timeStampTz, uint* year, uint* month, uint* day,
-		uint* hours, uint* minutes, uint* seconds, uint* fractions, uint timeZoneBufferLength, string timeZoneBuffer);
-}
-
-interface OffsetsCallback : Versioned
-{
-	void setOffset(Status status, uint index, uint offset, uint nullOffset);
-}
-
-interface XpbBuilder : Disposable
-{
-	const uint DPB = 1;
-	const uint SPB_ATTACH = 2;
-	const uint SPB_START = 3;
-	const uint TPB = 4;
-	const uint BATCH = 5;
-	const uint BPB = 6;
-	const uint SPB_SEND = 7;
-	const uint SPB_RECEIVE = 8;
-	const uint SPB_RESPONSE = 9;
-	const uint INFO_SEND = 10;
-	const uint INFO_RESPONSE = 11;
-
-	// removing data
-	void clear(Status status);
-	void removeCurrent(Status status);
-
-	// adding data
-	void insertInt(Status status, uchar tag, int value);
-	void insertBigInt(Status status, uchar tag, int64 value);
-	void insertBytes(Status status, uchar tag, const void* bytes, uint length);
-	void insertString(Status status, uchar tag, const string str);
-	void insertTag(Status status, uchar tag);
-
-	// navigation
-	boolean isEof(Status status);
-	void moveNext(Status status);
-	void rewind(Status status);
-	boolean findFirst(Status status, uchar tag);
-	boolean findNext(Status status);
-
-	// Methods which work with current selection
-	uchar getTag(Status status);
-	uint getLength(Status status);
-	int getInt(Status status);
-	int64 getBigInt(Status status);
-	const string getString(Status status);
-	const uchar* getBytes(Status status);
-
-	// Methods which work with resulting buffer
-	uint getBufferLength(Status status);
-	const uchar* getBuffer(Status status);
-}
-
-// Database trace objects
-
-struct PerformanceInfo;
-struct dsc;
-
-interface TraceConnection : Versioned
-{
-	const uint KIND_DATABASE = 1;
-	const uint KIND_SERVICE = 2;
-
-	uint getKind();
-
-	int getProcessID();
-	const string getUserName();
-	const string getRoleName();
-	const string getCharSet();
-	const string getRemoteProtocol();
-	const string getRemoteAddress();
-	int getRemoteProcessID();
-	const string getRemoteProcessName();
-}
-
-interface TraceDatabaseConnection : TraceConnection
-{
-	int64 getConnectionID();
-	const string getDatabaseName();
-}
-
-interface TraceTransaction : Versioned
-{
-	const uint ISOLATION_CONSISTENCY = 1;
-	const uint ISOLATION_CONCURRENCY = 2;
-	const uint ISOLATION_READ_COMMITTED_RECVER = 3;
-	const uint ISOLATION_READ_COMMITTED_NORECVER = 4;
-	const uint ISOLATION_READ_COMMITTED_READ_CONSISTENCY = 5;
-
-	int64 getTransactionID();
-	boolean getReadOnly();
-	int getWait();
-	uint getIsolation();
-	PerformanceInfo* getPerf();
-
-version: // 3.0.4 -> 3.0.5
-	int64 getInitialID();
-	int64 getPreviousID();
-}
-
-interface TraceParams : Versioned
-{
-	uint getCount();
-	const dsc* getParam(uint idx);
-
-version:
-	const string getTextUTF8(Status status, uint idx);
-}
-
-interface TraceStatement : Versioned
-{
-	int64 getStmtID();
-	PerformanceInfo* getPerf();
-}
-
-interface TraceSQLStatement : TraceStatement
-{
-	const string getText();
-	const string getPlan();
-	TraceParams getInputs();
-	const string getTextUTF8();
-	const string getExplainedPlan();
-}
-
-interface TraceBLRStatement : TraceStatement
-{
-	const uchar* getData();
-	uint getDataLength();
-	const string getText();
-}
-
-interface TraceDYNRequest : Versioned
-{
-	const uchar* getData();
-	uint getDataLength();
-	const string getText();
-}
-
-interface TraceContextVariable : Versioned
-{
-	const string getNameSpace();
-	const string getVarName();
-	const string getVarValue();
-}
-
-interface TraceProcedure : Versioned
-{
-	const string getProcName();
-	TraceParams getInputs();
-	PerformanceInfo* getPerf();
-
-version: // 4.0 -> 5.0
-	int64 getStmtID();
-	const string getPlan();
-	const string getExplainedPlan();
-}
-
-interface TraceFunction : Versioned
-{
-	const string getFuncName();
-	TraceParams getInputs();
-	TraceParams getResult();
-	PerformanceInfo* getPerf();
-
-version: // 4.0 -> 5.0
-	int64 getStmtID();
-	const string getPlan();
-	const string getExplainedPlan();
-}
-
-interface TraceTrigger : Versioned
-{
-	//// TODO: TYPE or WHICH? ExternalTrigger has similar constants.
-	const uint TYPE_ALL = 0;
-	const uint TYPE_BEFORE = 1;
-	const uint TYPE_AFTER = 2;
-	//// TODO: What about database triggers?
-
-	//// TODO: Action constants?
-
-	const string getTriggerName();
-	const string getRelationName();
-	int getAction();
-	int getWhich();
-	PerformanceInfo* getPerf();
-
-version: // 4.0 -> 5.0
-	int64 getStmtID();
-	const string getPlan();
-	const string getExplainedPlan();
-}
-
-interface TraceServiceConnection : TraceConnection
-{
-	void* getServiceID();
-	const string getServiceMgr();
-	const string getServiceName();
-}
-
-interface TraceStatusVector : Versioned
-{
-	boolean hasError();
-	boolean hasWarning();
-	Status getStatus();
-	const string getText();
-}
-
-interface TraceSweepInfo : Versioned
-{
-	int64 getOIT();
-	int64 getOST();
-	int64 getOAT();
-	int64 getNext();
-	PerformanceInfo* getPerf();
-}
-
-interface TraceLogWriter : ReferenceCounted
-{
-	uint write(const void* buf, uint size);
-version: // 3.0.4 -> 3.0.5
-	uint write_s(Status status, const void* buf, uint size);
-}
-
-interface TraceInitInfo : Versioned
-{
-	const string getConfigText();
-	int getTraceSessionID();
-	const string getTraceSessionName();
-	const string getFirebirdRootDirectory();
-	const string getDatabaseName();
-	TraceDatabaseConnection getConnection();
-	TraceLogWriter getLogWriter();
-}
-
-// API of trace plugin. Used to deliver notifications for each database
-interface TracePlugin : ReferenceCounted
-{
-	const uint RESULT_SUCCESS = 0;
-	const uint RESULT_FAILED = 1;
-	const uint RESULT_UNAUTHORIZED = 2;
-
-	// Function to return error string for hook failure
-	const string trace_get_error();
-
-	// Events supported:
-
-	// Create/close attachment
-
-	[notImplemented(true)]
-	boolean trace_attach(TraceDatabaseConnection connection, boolean create_db, uint att_result);
-
-	[notImplemented(true)]
-	boolean trace_detach(TraceDatabaseConnection connection, boolean drop_db);
-
-	// Start/end transaction
-
-	[notImplemented(true)]
-	boolean trace_transaction_start(TraceDatabaseConnection connection, TraceTransaction transaction,
-			uint tpb_length, const uchar* tpb, uint tra_result);
-
-	[notImplemented(true)]
-	boolean trace_transaction_end(TraceDatabaseConnection connection, TraceTransaction transaction,
-			boolean commit, boolean retain_context, uint tra_result);
-
-	// Stored procedures and triggers execution
-
-	[notImplemented(true)]
-	boolean trace_proc_execute (TraceDatabaseConnection connection, TraceTransaction transaction, TraceProcedure procedure,
-			boolean started, uint proc_result);
-
-	[notImplemented(true)]
-	boolean trace_trigger_execute(TraceDatabaseConnection connection, TraceTransaction transaction, TraceTrigger trigger,
-			boolean started, uint trig_result);
-
-	// Assignment to context variables
-
-	[notImplemented(true)]
-	boolean trace_set_context(TraceDatabaseConnection connection, TraceTransaction transaction, TraceContextVariable variable);
-
-	// DSQL statement lifecycle
-
-	[notImplemented(true)]
-	boolean trace_dsql_prepare(TraceDatabaseConnection connection, TraceTransaction transaction,
-			TraceSQLStatement statement, int64 time_millis, uint req_result);
-
-	[notImplemented(true)]
-	boolean trace_dsql_free(TraceDatabaseConnection connection, TraceSQLStatement statement, uint option);
-
-	[notImplemented(true)]
-	boolean trace_dsql_execute(TraceDatabaseConnection connection, TraceTransaction transaction, TraceSQLStatement statement,
-			boolean started, uint req_result);
-
-	// BLR requests
-
-	[notImplemented(true)]
-	boolean trace_blr_compile(TraceDatabaseConnection connection, TraceTransaction transaction,
-			TraceBLRStatement statement, int64 time_millis, uint req_result);
-
-	[notImplemented(true)]
-	boolean trace_blr_execute(TraceDatabaseConnection connection, TraceTransaction transaction,
-			TraceBLRStatement statement, uint req_result);
-
-	// DYN requests
-
-	[notImplemented(true)]
-	boolean trace_dyn_execute(TraceDatabaseConnection connection, TraceTransaction transaction,
-			TraceDYNRequest request, int64 time_millis, uint req_result);
-
-	// Using the services
-
-	[notImplemented(true)]
-	boolean trace_service_attach(TraceServiceConnection service, uint att_result);
-
-	[notImplemented(true)]
-	boolean trace_service_start(TraceServiceConnection service, uint switches_length, const string switches,
-			uint start_result);
-
-	[notImplemented(true)]
-	boolean trace_service_query(TraceServiceConnection service, uint send_item_length,
-			const uchar* send_items, uint recv_item_length,
-			const uchar* recv_items, uint query_result);
-
-	[notImplemented(true)]
-	boolean trace_service_detach(TraceServiceConnection service, uint detach_result);
-
-	// Errors happened
-
-	[notImplemented(true)]
-	boolean trace_event_error(TraceConnection connection, TraceStatusVector status, const string function);
-
-	// Sweep activity
-
-	const uint SWEEP_STATE_STARTED = 1;
-	const uint SWEEP_STATE_FINISHED = 2;
-	const uint SWEEP_STATE_FAILED = 3;
-	const uint SWEEP_STATE_PROGRESS = 4;
-
-	[notImplemented(true)]
-	boolean trace_event_sweep(TraceDatabaseConnection connection, TraceSweepInfo sweep,
-			uint sweep_state);
-
-	// Stored functions execution
-
-	[notImplemented(true)]
-	boolean trace_func_execute(TraceDatabaseConnection connection, TraceTransaction transaction,
-		TraceFunction function,	boolean started, uint func_result);
-
-version:	// 4.0.1 -> 4.0.2
-	boolean trace_dsql_restart(TraceDatabaseConnection connection, TraceTransaction transaction,
-		TraceSQLStatement statement, uint number);
-
-version:	// 4.0 -> 5.0
-
-	// Compilation of stored procedures, functions, triggers
-
-	boolean trace_proc_compile(TraceDatabaseConnection connection, TraceProcedure procedure,
-		int64 time_millis, uint proc_result);
-
-	boolean trace_func_compile(TraceDatabaseConnection connection, TraceFunction function,
-		int64 time_millis, uint func_result);
-
-	boolean trace_trigger_compile(TraceDatabaseConnection connection, TraceTrigger trigger,
-		int64 time_millis, uint trig_result);
-}
-
-// Trace plugin second level factory (this is what is known to PluginManager as "trace plugin")
-interface TraceFactory : PluginBase
-{
-	// Known notifications
-	const uint TRACE_EVENT_ATTACH = 0;
-	const uint TRACE_EVENT_DETACH = 1;
-	const uint TRACE_EVENT_TRANSACTION_START = 2;
-	const uint TRACE_EVENT_TRANSACTION_END = 3;
-	const uint TRACE_EVENT_SET_CONTEXT = 4;
-	const uint TRACE_EVENT_PROC_EXECUTE = 5;
-	const uint TRACE_EVENT_TRIGGER_EXECUTE = 6;
-	const uint TRACE_EVENT_DSQL_PREPARE = 7;
-	const uint TRACE_EVENT_DSQL_FREE = 8;
-	const uint TRACE_EVENT_DSQL_EXECUTE = 9;
-	const uint TRACE_EVENT_BLR_COMPILE = 10;
-	const uint TRACE_EVENT_BLR_EXECUTE = 11;
-	const uint TRACE_EVENT_DYN_EXECUTE = 12;
-	const uint TRACE_EVENT_SERVICE_ATTACH = 13;
-	const uint TRACE_EVENT_SERVICE_START = 14;
-	const uint TRACE_EVENT_SERVICE_QUERY = 15;
-	const uint TRACE_EVENT_SERVICE_DETACH = 16;
-	const uint TRACE_EVENT_ERROR = 17;
-	const uint TRACE_EVENT_SWEEP = 18;
-	const uint TRACE_EVENT_FUNC_EXECUTE = 19;
-	const uint TRACE_EVENT_PROC_COMPILE = 20;
-	const uint TRACE_EVENT_FUNC_COMPILE = 21;
-	const uint TRACE_EVENT_TRIGGER_COMPILE = 22;
-	const uint TRACE_EVENT_MAX = 23;	// keep it last
-
-	// What notifications does plugin need
-	uint64 trace_needs();
-
-	// Create plugin
-	TracePlugin trace_create(Status status, TraceInitInfo init_info);
-}
-
-// UDR Factory interfaces. They should be singletons instances created by user's modules and
-// registered. When UDR engine is going to load a routine, it calls newItem.
-
-interface UdrFunctionFactory : Disposable
-{
-	void setup(Status status, ExternalContext context, RoutineMetadata metadata,
-		MetadataBuilder inBuilder, MetadataBuilder outBuilder);
-	ExternalFunction newItem(Status status, ExternalContext context, RoutineMetadata metadata);
-}
-
-interface UdrProcedureFactory : Disposable
-{
-	void setup(Status status, ExternalContext context, RoutineMetadata metadata,
-		MetadataBuilder inBuilder, MetadataBuilder outBuilder);
-	ExternalProcedure newItem(Status status, ExternalContext context, RoutineMetadata metadata);
-}
-
-interface UdrTriggerFactory : Disposable
-{
-	void setup(Status status, ExternalContext context, RoutineMetadata metadata,
-		MetadataBuilder fieldsBuilder);
-	ExternalTrigger newItem(Status status, ExternalContext context, RoutineMetadata metadata);
-}
-
-interface UdrPlugin : Versioned
-{
-	Master getMaster();
-
-	void registerFunction(Status status, const string name, UdrFunctionFactory factory);
-	void registerProcedure(Status status, const string name, UdrProcedureFactory factory);
-	void registerTrigger(Status status, const string name, UdrTriggerFactory factory);
-}
-
-interface DecFloat16 : Versioned
-{
-	const uint BCD_SIZE = 16;
-	const uint STRING_SIZE = 24;	// includes terminating \0
-	void toBcd(const FB_DEC16* from, int* sign, uchar* bcd, int* exp);
-	void toString(Status status, const FB_DEC16* from, uint bufferLength, string buffer);
-	void fromBcd(int sign, const uchar* bcd, int exp, FB_DEC16* to);
-	void fromString(Status status, const string from, FB_DEC16* to);
-}
-
-interface DecFloat34 : Versioned
-{
-	const uint BCD_SIZE = 34;
-	const uint STRING_SIZE = 43;	// includes terminating \0
-	void toBcd(const FB_DEC34* from, int* sign, uchar* bcd, int* exp);
-	void toString(Status status, const FB_DEC34* from, uint bufferLength, string buffer);
-	void fromBcd(int sign, const uchar* bcd, int exp, FB_DEC34* to);
-	void fromString(Status status, const string from, FB_DEC34* to);
-}
-
-interface Int128 : Versioned
-{
-	// - 170141183460469231731687303715884105728 e - 128 \0
-	// 1 + 39 +							1 + 1 + 3 + 1 = 46
-	const uint STRING_SIZE = 46;	// includes terminating \0
-	void toString(Status status, const FB_I128* from, int scale, uint bufferLength, string buffer);
-	void fromString(Status status, int scale, const string from, FB_I128* to);
-}
-
-// Replication interfaces
-
-interface ReplicatedField : Versioned
-{
-	// Return field name (or nullptr on error)
-	const string getName();
-	// Return field type (or zero if the field does not exist)
-	uint getType();
-	// Return field subtype, if applicable
-	int getSubType();
-	// Return field scale (behavior is undefined for non-numeric fields)
-	int getScale();
-	// Return maximum length of the field data in bytes
-	uint getLength();
-	// Return character set without collation part for text or CLOB fields
-	uint getCharSet();
-	// Return pointer to data (or nullptr for NULL values)
-	const void* getData();
-}
-
-interface ReplicatedRecord : Versioned
-{
-	// Return count of fields
-	uint getCount();
-	// Return ReplicatedField with given index (or nullptr if index is invalid).
-	// Returned reference is valid until next call of getField() or end of the record life.
-	ReplicatedField getField(uint index);
-
-	// Return size of raw data
-	uint getRawLength();
-	// Dirty method to return record buffer in internal format
-	const uchar* getRawData();
-}
-
-interface ReplicatedTransaction : Disposable
-{
-	// Last chance to return an error and make commit to be aborted.
-	// The transaction still can be rolled back on error happened after this call.
-	void prepare(Status status);
-	// An error returned from these methods may be logged but do not abort process.
-	void commit(Status status);
-	void rollback(Status status);
-
-	void startSavepoint(Status status);
-	void releaseSavepoint(Status status);
-	void rollbackSavepoint(Status status);
-
-	// ReplicatedRecords parameters point to local objects, do not ever store the pointer.
-	void insertRecord(Status status, const string name,
-					  ReplicatedRecord record);
-	void updateRecord(Status status, const string name,
-					  ReplicatedRecord orgRecord,
-					  ReplicatedRecord newRecord);
-	void deleteRecord(Status status, const string name,
-					  ReplicatedRecord record);
-
-	void executeSql(Status status, const string sql);
-	void executeSqlIntl(Status status, uint charset, const string sql);
-}
-
-interface ReplicatedSession : PluginBase
-{
-	// Parameter don't need to be released if not used.
-	boolean init(Status status, Attachment attachment);
-
-	ReplicatedTransaction startTransaction(Status status, Transaction transaction, int64 number);
-	void cleanupTransaction(Status status, int64 number);
-	void setSequence(Status status, const string name, int64 value);
-}
-
-// Profiler interfaces
-
-interface ProfilerPlugin : PluginBase
-{
-	void init(Status status, Attachment attachment, uint64 ticksFrequency);
-
-	ProfilerSession startSession(Status status, const string description,
-		const string options, ISC_TIMESTAMP_TZ timestamp);
-
-	void flush(Status status);
-}
-
-interface ProfilerSession : Disposable
-{
-	const uint FLAG_BEFORE_EVENTS = 0x1;
-	const uint FLAG_AFTER_EVENTS = 0x2;
-
-	int64 getId();
-	uint getFlags();
-
-	// When closing an attachment, the engine is free to dispose the ProfilerPlugin without call this method in advance.
-	void cancel(Status status);
-
-	void finish(Status status, ISC_TIMESTAMP_TZ timestamp);
-
-	void defineStatement(Status status, int64 statementId, int64 parentStatementId,
-		const string type, const string packageName, const string routineName, const string sqlText);
-
-	void defineCursor(int64 statementId, uint cursorId, const string name, uint line, uint column);
-
-	void defineRecordSource(int64 statementId, uint cursorId, uint recSourceId,
-		uint level, const string accessPath, uint parentRecSourceId);
-
-	void onRequestStart(Status status, int64 statementId, int64 requestId,
-		int64 callerStatementId, int64 callerRequestId, ISC_TIMESTAMP_TZ timestamp);
-
-	void onRequestFinish(Status status, int64 statementId, int64 requestId,
-		ISC_TIMESTAMP_TZ timestamp, ProfilerStats stats);
-
-	void beforePsqlLineColumn(int64 statementId, int64 requestId, uint line, uint column);
-	void afterPsqlLineColumn(int64 statementId, int64 requestId, uint line, uint column, ProfilerStats stats);
-
-	void beforeRecordSourceOpen(int64 statementId, int64 requestId, uint cursorId, uint recSourceId);
-	void afterRecordSourceOpen(int64 statementId, int64 requestId, uint cursorId, uint recSourceId,
-		ProfilerStats stats);
-
-	void beforeRecordSourceGetRecord(int64 statementId, int64 requestId, uint cursorId, uint recSourceId);
-	void afterRecordSourceGetRecord(int64 statementId, int64 requestId, uint cursorId, uint recSourceId,
-		ProfilerStats stats);
-}
-
-interface ProfilerStats : Versioned
-{
-	uint64 getElapsedTicks();
-}
diff --git a/FBClient.Headers/firebird/IdlFbInterfaces.h b/FBClient.Headers/firebird/IdlFbInterfaces.h
deleted file mode 100644
index e52e2a13..00000000
--- a/FBClient.Headers/firebird/IdlFbInterfaces.h
+++ /dev/null
@@ -1,21053 +0,0 @@
-// This file was autogenerated by cloop - Cross Language Object Oriented Programming
-
-#ifndef IDL_FB_INTERFACES_H
-#define IDL_FB_INTERFACES_H
-
-#ifndef CLOOP_CARG
-#define CLOOP_CARG
-#endif
-
-#ifndef CLOOP_NOEXCEPT
-#if __cplusplus >= 201103L
-#define CLOOP_NOEXCEPT noexcept
-#else
-#define CLOOP_NOEXCEPT throw()
-#endif
-#endif
-
-
-#ifndef CLOOP_CONSTEXPR
-#if __cplusplus >= 201103L
-#define CLOOP_CONSTEXPR constexpr
-#else
-#define CLOOP_CONSTEXPR const
-#endif
-#endif
-
-
-namespace Firebird
-{
-	class DoNotInherit
-	{
-	};
-
-	template <typename T>
-	class Inherit : public T
-	{
-	public:
-		Inherit(DoNotInherit = DoNotInherit())
-			: T(DoNotInherit())
-		{
-		}
-	};
-
-	// Forward interfaces declarations
-
-	class IVersioned;
-	class IReferenceCounted;
-	class IDisposable;
-	class IStatus;
-	class IMaster;
-	class IPluginBase;
-	class IPluginSet;
-	class IConfigEntry;
-	class IConfig;
-	class IFirebirdConf;
-	class IPluginConfig;
-	class IPluginFactory;
-	class IPluginModule;
-	class IPluginManager;
-	class ICryptKey;
-	class IConfigManager;
-	class IEventCallback;
-	class IBlob;
-	class ITransaction;
-	class IMessageMetadata;
-	class IMetadataBuilder;
-	class IResultSet;
-	class IStatement;
-	class IBatch;
-	class IBatchCompletionState;
-	class IReplicator;
-	class IRequest;
-	class IEvents;
-	class IAttachment;
-	class IService;
-	class IProvider;
-	class IDtcStart;
-	class IDtc;
-	class IAuth;
-	class IWriter;
-	class IServerBlock;
-	class IClientBlock;
-	class IServer;
-	class IClient;
-	class IUserField;
-	class ICharUserField;
-	class IIntUserField;
-	class IUser;
-	class IListUsers;
-	class ILogonInfo;
-	class IManagement;
-	class IAuthBlock;
-	class IWireCryptPlugin;
-	class ICryptKeyCallback;
-	class IKeyHolderPlugin;
-	class IDbCryptInfo;
-	class IDbCryptPlugin;
-	class IExternalContext;
-	class IExternalResultSet;
-	class IExternalFunction;
-	class IExternalProcedure;
-	class IExternalTrigger;
-	class IRoutineMetadata;
-	class IExternalEngine;
-	class ITimer;
-	class ITimerControl;
-	class IVersionCallback;
-	class IUtil;
-	class IOffsetsCallback;
-	class IXpbBuilder;
-	class ITraceConnection;
-	class ITraceDatabaseConnection;
-	class ITraceTransaction;
-	class ITraceParams;
-	class ITraceStatement;
-	class ITraceSQLStatement;
-	class ITraceBLRStatement;
-	class ITraceDYNRequest;
-	class ITraceContextVariable;
-	class ITraceProcedure;
-	class ITraceFunction;
-	class ITraceTrigger;
-	class ITraceServiceConnection;
-	class ITraceStatusVector;
-	class ITraceSweepInfo;
-	class ITraceLogWriter;
-	class ITraceInitInfo;
-	class ITracePlugin;
-	class ITraceFactory;
-	class IUdrFunctionFactory;
-	class IUdrProcedureFactory;
-	class IUdrTriggerFactory;
-	class IUdrPlugin;
-	class IDecFloat16;
-	class IDecFloat34;
-	class IInt128;
-	class IReplicatedField;
-	class IReplicatedRecord;
-	class IReplicatedTransaction;
-	class IReplicatedSession;
-	class IProfilerPlugin;
-	class IProfilerSession;
-	class IProfilerStats;
-
-	// Interfaces declarations
-
-#define FIREBIRD_IVERSIONED_VERSION 1u
-
-	class IVersioned
-	{
-	public:
-		struct VTable
-		{
-			void* cloopDummy[1];
-			uintptr_t version;
-		};
-
-		void* cloopDummy[1];
-		VTable* cloopVTable;
-
-	protected:
-		IVersioned(DoNotInherit)
-		{
-		}
-
-		~IVersioned()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IVERSIONED_VERSION;
-	};
-
-#define FIREBIRD_IREFERENCE_COUNTED_VERSION 2u
-
-	class IReferenceCounted : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			void (CLOOP_CARG *addRef)(IReferenceCounted* self) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *release)(IReferenceCounted* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IReferenceCounted(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IReferenceCounted()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IREFERENCE_COUNTED_VERSION;
-
-		void addRef()
-		{
-			static_cast<VTable*>(this->cloopVTable)->addRef(this);
-		}
-
-		int release()
-		{
-			int ret = static_cast<VTable*>(this->cloopVTable)->release(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IDISPOSABLE_VERSION 2u
-
-	class IDisposable : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			void (CLOOP_CARG *dispose)(IDisposable* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IDisposable(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IDisposable()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IDISPOSABLE_VERSION;
-
-		void dispose()
-		{
-			static_cast<VTable*>(this->cloopVTable)->dispose(this);
-		}
-	};
-
-#define FIREBIRD_ISTATUS_VERSION 3u
-
-	class IStatus : public IDisposable
-	{
-	public:
-		struct VTable : public IDisposable::VTable
-		{
-			void (CLOOP_CARG *init)(IStatus* self) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getState)(const IStatus* self) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setErrors2)(IStatus* self, unsigned length, const intptr_t* value) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setWarnings2)(IStatus* self, unsigned length, const intptr_t* value) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setErrors)(IStatus* self, const intptr_t* value) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setWarnings)(IStatus* self, const intptr_t* value) CLOOP_NOEXCEPT;
-			const intptr_t* (CLOOP_CARG *getErrors)(const IStatus* self) CLOOP_NOEXCEPT;
-			const intptr_t* (CLOOP_CARG *getWarnings)(const IStatus* self) CLOOP_NOEXCEPT;
-			IStatus* (CLOOP_CARG *clone)(const IStatus* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IStatus(DoNotInherit)
-			: IDisposable(DoNotInherit())
-		{
-		}
-
-		~IStatus()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ISTATUS_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned STATE_WARNINGS = 0x1;
-		static CLOOP_CONSTEXPR unsigned STATE_ERRORS = 0x2;
-		static CLOOP_CONSTEXPR int RESULT_ERROR = -1;
-		static CLOOP_CONSTEXPR int RESULT_OK = 0;
-		static CLOOP_CONSTEXPR int RESULT_NO_DATA = 1;
-		static CLOOP_CONSTEXPR int RESULT_SEGMENT = 2;
-
-		void init()
-		{
-			static_cast<VTable*>(this->cloopVTable)->init(this);
-		}
-
-		unsigned getState() const
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getState(this);
-			return ret;
-		}
-
-		void setErrors2(unsigned length, const intptr_t* value)
-		{
-			static_cast<VTable*>(this->cloopVTable)->setErrors2(this, length, value);
-		}
-
-		void setWarnings2(unsigned length, const intptr_t* value)
-		{
-			static_cast<VTable*>(this->cloopVTable)->setWarnings2(this, length, value);
-		}
-
-		void setErrors(const intptr_t* value)
-		{
-			static_cast<VTable*>(this->cloopVTable)->setErrors(this, value);
-		}
-
-		void setWarnings(const intptr_t* value)
-		{
-			static_cast<VTable*>(this->cloopVTable)->setWarnings(this, value);
-		}
-
-		const intptr_t* getErrors() const
-		{
-			const intptr_t* ret = static_cast<VTable*>(this->cloopVTable)->getErrors(this);
-			return ret;
-		}
-
-		const intptr_t* getWarnings() const
-		{
-			const intptr_t* ret = static_cast<VTable*>(this->cloopVTable)->getWarnings(this);
-			return ret;
-		}
-
-		IStatus* clone() const
-		{
-			IStatus* ret = static_cast<VTable*>(this->cloopVTable)->clone(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IMASTER_VERSION 2u
-
-	class IMaster : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			IStatus* (CLOOP_CARG *getStatus)(IMaster* self) CLOOP_NOEXCEPT;
-			IProvider* (CLOOP_CARG *getDispatcher)(IMaster* self) CLOOP_NOEXCEPT;
-			IPluginManager* (CLOOP_CARG *getPluginManager)(IMaster* self) CLOOP_NOEXCEPT;
-			ITimerControl* (CLOOP_CARG *getTimerControl)(IMaster* self) CLOOP_NOEXCEPT;
-			IDtc* (CLOOP_CARG *getDtc)(IMaster* self) CLOOP_NOEXCEPT;
-			IAttachment* (CLOOP_CARG *registerAttachment)(IMaster* self, IProvider* provider, IAttachment* attachment) CLOOP_NOEXCEPT;
-			ITransaction* (CLOOP_CARG *registerTransaction)(IMaster* self, IAttachment* attachment, ITransaction* transaction) CLOOP_NOEXCEPT;
-			IMetadataBuilder* (CLOOP_CARG *getMetadataBuilder)(IMaster* self, IStatus* status, unsigned fieldCount) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *serverMode)(IMaster* self, int mode) CLOOP_NOEXCEPT;
-			IUtil* (CLOOP_CARG *getUtilInterface)(IMaster* self) CLOOP_NOEXCEPT;
-			IConfigManager* (CLOOP_CARG *getConfigManager)(IMaster* self) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *getProcessExiting)(IMaster* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IMaster(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IMaster()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IMASTER_VERSION;
-
-		IStatus* getStatus()
-		{
-			IStatus* ret = static_cast<VTable*>(this->cloopVTable)->getStatus(this);
-			return ret;
-		}
-
-		IProvider* getDispatcher()
-		{
-			IProvider* ret = static_cast<VTable*>(this->cloopVTable)->getDispatcher(this);
-			return ret;
-		}
-
-		IPluginManager* getPluginManager()
-		{
-			IPluginManager* ret = static_cast<VTable*>(this->cloopVTable)->getPluginManager(this);
-			return ret;
-		}
-
-		ITimerControl* getTimerControl()
-		{
-			ITimerControl* ret = static_cast<VTable*>(this->cloopVTable)->getTimerControl(this);
-			return ret;
-		}
-
-		IDtc* getDtc()
-		{
-			IDtc* ret = static_cast<VTable*>(this->cloopVTable)->getDtc(this);
-			return ret;
-		}
-
-		IAttachment* registerAttachment(IProvider* provider, IAttachment* attachment)
-		{
-			IAttachment* ret = static_cast<VTable*>(this->cloopVTable)->registerAttachment(this, provider, attachment);
-			return ret;
-		}
-
-		ITransaction* registerTransaction(IAttachment* attachment, ITransaction* transaction)
-		{
-			ITransaction* ret = static_cast<VTable*>(this->cloopVTable)->registerTransaction(this, attachment, transaction);
-			return ret;
-		}
-
-		template <typename StatusType> IMetadataBuilder* getMetadataBuilder(StatusType* status, unsigned fieldCount)
-		{
-			StatusType::clearException(status);
-			IMetadataBuilder* ret = static_cast<VTable*>(this->cloopVTable)->getMetadataBuilder(this, status, fieldCount);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		int serverMode(int mode)
-		{
-			int ret = static_cast<VTable*>(this->cloopVTable)->serverMode(this, mode);
-			return ret;
-		}
-
-		IUtil* getUtilInterface()
-		{
-			IUtil* ret = static_cast<VTable*>(this->cloopVTable)->getUtilInterface(this);
-			return ret;
-		}
-
-		IConfigManager* getConfigManager()
-		{
-			IConfigManager* ret = static_cast<VTable*>(this->cloopVTable)->getConfigManager(this);
-			return ret;
-		}
-
-		FB_BOOLEAN getProcessExiting()
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->getProcessExiting(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IPLUGIN_BASE_VERSION 3u
-
-	class IPluginBase : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			void (CLOOP_CARG *setOwner)(IPluginBase* self, IReferenceCounted* r) CLOOP_NOEXCEPT;
-			IReferenceCounted* (CLOOP_CARG *getOwner)(IPluginBase* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IPluginBase(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IPluginBase()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IPLUGIN_BASE_VERSION;
-
-		void setOwner(IReferenceCounted* r)
-		{
-			static_cast<VTable*>(this->cloopVTable)->setOwner(this, r);
-		}
-
-		IReferenceCounted* getOwner()
-		{
-			IReferenceCounted* ret = static_cast<VTable*>(this->cloopVTable)->getOwner(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IPLUGIN_SET_VERSION 3u
-
-	class IPluginSet : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			const char* (CLOOP_CARG *getName)(const IPluginSet* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getModuleName)(const IPluginSet* self) CLOOP_NOEXCEPT;
-			IPluginBase* (CLOOP_CARG *getPlugin)(IPluginSet* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *next)(IPluginSet* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *set)(IPluginSet* self, IStatus* status, const char* s) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IPluginSet(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IPluginSet()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IPLUGIN_SET_VERSION;
-
-		const char* getName() const
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getName(this);
-			return ret;
-		}
-
-		const char* getModuleName() const
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getModuleName(this);
-			return ret;
-		}
-
-		template <typename StatusType> IPluginBase* getPlugin(StatusType* status)
-		{
-			StatusType::clearException(status);
-			IPluginBase* ret = static_cast<VTable*>(this->cloopVTable)->getPlugin(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void next(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->next(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void set(StatusType* status, const char* s)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->set(this, status, s);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_ICONFIG_ENTRY_VERSION 3u
-
-	class IConfigEntry : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			const char* (CLOOP_CARG *getName)(IConfigEntry* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getValue)(IConfigEntry* self) CLOOP_NOEXCEPT;
-			ISC_INT64 (CLOOP_CARG *getIntValue)(IConfigEntry* self) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *getBoolValue)(IConfigEntry* self) CLOOP_NOEXCEPT;
-			IConfig* (CLOOP_CARG *getSubConfig)(IConfigEntry* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IConfigEntry(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IConfigEntry()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ICONFIG_ENTRY_VERSION;
-
-		const char* getName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getName(this);
-			return ret;
-		}
-
-		const char* getValue()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getValue(this);
-			return ret;
-		}
-
-		ISC_INT64 getIntValue()
-		{
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getIntValue(this);
-			return ret;
-		}
-
-		FB_BOOLEAN getBoolValue()
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->getBoolValue(this);
-			return ret;
-		}
-
-		template <typename StatusType> IConfig* getSubConfig(StatusType* status)
-		{
-			StatusType::clearException(status);
-			IConfig* ret = static_cast<VTable*>(this->cloopVTable)->getSubConfig(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ICONFIG_VERSION 3u
-
-	class IConfig : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			IConfigEntry* (CLOOP_CARG *find)(IConfig* self, IStatus* status, const char* name) CLOOP_NOEXCEPT;
-			IConfigEntry* (CLOOP_CARG *findValue)(IConfig* self, IStatus* status, const char* name, const char* value) CLOOP_NOEXCEPT;
-			IConfigEntry* (CLOOP_CARG *findPos)(IConfig* self, IStatus* status, const char* name, unsigned pos) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IConfig(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IConfig()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ICONFIG_VERSION;
-
-		template <typename StatusType> IConfigEntry* find(StatusType* status, const char* name)
-		{
-			StatusType::clearException(status);
-			IConfigEntry* ret = static_cast<VTable*>(this->cloopVTable)->find(this, status, name);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IConfigEntry* findValue(StatusType* status, const char* name, const char* value)
-		{
-			StatusType::clearException(status);
-			IConfigEntry* ret = static_cast<VTable*>(this->cloopVTable)->findValue(this, status, name, value);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IConfigEntry* findPos(StatusType* status, const char* name, unsigned pos)
-		{
-			StatusType::clearException(status);
-			IConfigEntry* ret = static_cast<VTable*>(this->cloopVTable)->findPos(this, status, name, pos);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IFIREBIRD_CONF_VERSION 4u
-
-	class IFirebirdConf : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			unsigned (CLOOP_CARG *getKey)(IFirebirdConf* self, const char* name) CLOOP_NOEXCEPT;
-			ISC_INT64 (CLOOP_CARG *asInteger)(IFirebirdConf* self, unsigned key) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *asString)(IFirebirdConf* self, unsigned key) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *asBoolean)(IFirebirdConf* self, unsigned key) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getVersion)(IFirebirdConf* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IFirebirdConf(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IFirebirdConf()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IFIREBIRD_CONF_VERSION;
-
-		unsigned getKey(const char* name)
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getKey(this, name);
-			return ret;
-		}
-
-		ISC_INT64 asInteger(unsigned key)
-		{
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->asInteger(this, key);
-			return ret;
-		}
-
-		const char* asString(unsigned key)
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->asString(this, key);
-			return ret;
-		}
-
-		FB_BOOLEAN asBoolean(unsigned key)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->asBoolean(this, key);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned getVersion(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IFirebirdConf", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getVersion(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IPLUGIN_CONFIG_VERSION 3u
-
-	class IPluginConfig : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			const char* (CLOOP_CARG *getConfigFileName)(IPluginConfig* self) CLOOP_NOEXCEPT;
-			IConfig* (CLOOP_CARG *getDefaultConfig)(IPluginConfig* self, IStatus* status) CLOOP_NOEXCEPT;
-			IFirebirdConf* (CLOOP_CARG *getFirebirdConf)(IPluginConfig* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setReleaseDelay)(IPluginConfig* self, IStatus* status, ISC_UINT64 microSeconds) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IPluginConfig(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IPluginConfig()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IPLUGIN_CONFIG_VERSION;
-
-		const char* getConfigFileName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getConfigFileName(this);
-			return ret;
-		}
-
-		template <typename StatusType> IConfig* getDefaultConfig(StatusType* status)
-		{
-			StatusType::clearException(status);
-			IConfig* ret = static_cast<VTable*>(this->cloopVTable)->getDefaultConfig(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IFirebirdConf* getFirebirdConf(StatusType* status)
-		{
-			StatusType::clearException(status);
-			IFirebirdConf* ret = static_cast<VTable*>(this->cloopVTable)->getFirebirdConf(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void setReleaseDelay(StatusType* status, ISC_UINT64 microSeconds)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setReleaseDelay(this, status, microSeconds);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IPLUGIN_FACTORY_VERSION 2u
-
-	class IPluginFactory : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			IPluginBase* (CLOOP_CARG *createPlugin)(IPluginFactory* self, IStatus* status, IPluginConfig* factoryParameter) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IPluginFactory(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IPluginFactory()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IPLUGIN_FACTORY_VERSION;
-
-		template <typename StatusType> IPluginBase* createPlugin(StatusType* status, IPluginConfig* factoryParameter)
-		{
-			StatusType::clearException(status);
-			IPluginBase* ret = static_cast<VTable*>(this->cloopVTable)->createPlugin(this, status, factoryParameter);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IPLUGIN_MODULE_VERSION 3u
-
-	class IPluginModule : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			void (CLOOP_CARG *doClean)(IPluginModule* self) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *threadDetach)(IPluginModule* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IPluginModule(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IPluginModule()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IPLUGIN_MODULE_VERSION;
-
-		void doClean()
-		{
-			static_cast<VTable*>(this->cloopVTable)->doClean(this);
-		}
-
-		void threadDetach()
-		{
-			if (cloopVTable->version < 3)
-			{
-				return;
-			}
-			static_cast<VTable*>(this->cloopVTable)->threadDetach(this);
-		}
-	};
-
-#define FIREBIRD_IPLUGIN_MANAGER_VERSION 2u
-
-	class IPluginManager : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			void (CLOOP_CARG *registerPluginFactory)(IPluginManager* self, unsigned pluginType, const char* defaultName, IPluginFactory* factory) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *registerModule)(IPluginManager* self, IPluginModule* cleanup) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *unregisterModule)(IPluginManager* self, IPluginModule* cleanup) CLOOP_NOEXCEPT;
-			IPluginSet* (CLOOP_CARG *getPlugins)(IPluginManager* self, IStatus* status, unsigned pluginType, const char* namesList, IFirebirdConf* firebirdConf) CLOOP_NOEXCEPT;
-			IConfig* (CLOOP_CARG *getConfig)(IPluginManager* self, IStatus* status, const char* filename) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *releasePlugin)(IPluginManager* self, IPluginBase* plugin) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IPluginManager(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IPluginManager()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IPLUGIN_MANAGER_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned TYPE_PROVIDER = 1;
-		static CLOOP_CONSTEXPR unsigned TYPE_FIRST_NON_LIB = 2;
-		static CLOOP_CONSTEXPR unsigned TYPE_AUTH_SERVER = 3;
-		static CLOOP_CONSTEXPR unsigned TYPE_AUTH_CLIENT = 4;
-		static CLOOP_CONSTEXPR unsigned TYPE_AUTH_USER_MANAGEMENT = 5;
-		static CLOOP_CONSTEXPR unsigned TYPE_EXTERNAL_ENGINE = 6;
-		static CLOOP_CONSTEXPR unsigned TYPE_TRACE = 7;
-		static CLOOP_CONSTEXPR unsigned TYPE_WIRE_CRYPT = 8;
-		static CLOOP_CONSTEXPR unsigned TYPE_DB_CRYPT = 9;
-		static CLOOP_CONSTEXPR unsigned TYPE_KEY_HOLDER = 10;
-		static CLOOP_CONSTEXPR unsigned TYPE_REPLICATOR = 11;
-		static CLOOP_CONSTEXPR unsigned TYPE_PROFILER = 12;
-		static CLOOP_CONSTEXPR unsigned TYPE_COUNT = 13;
-
-		void registerPluginFactory(unsigned pluginType, const char* defaultName, IPluginFactory* factory)
-		{
-			static_cast<VTable*>(this->cloopVTable)->registerPluginFactory(this, pluginType, defaultName, factory);
-		}
-
-		void registerModule(IPluginModule* cleanup)
-		{
-			static_cast<VTable*>(this->cloopVTable)->registerModule(this, cleanup);
-		}
-
-		void unregisterModule(IPluginModule* cleanup)
-		{
-			static_cast<VTable*>(this->cloopVTable)->unregisterModule(this, cleanup);
-		}
-
-		template <typename StatusType> IPluginSet* getPlugins(StatusType* status, unsigned pluginType, const char* namesList, IFirebirdConf* firebirdConf)
-		{
-			StatusType::clearException(status);
-			IPluginSet* ret = static_cast<VTable*>(this->cloopVTable)->getPlugins(this, status, pluginType, namesList, firebirdConf);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IConfig* getConfig(StatusType* status, const char* filename)
-		{
-			StatusType::clearException(status);
-			IConfig* ret = static_cast<VTable*>(this->cloopVTable)->getConfig(this, status, filename);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		void releasePlugin(IPluginBase* plugin)
-		{
-			static_cast<VTable*>(this->cloopVTable)->releasePlugin(this, plugin);
-		}
-	};
-
-#define FIREBIRD_ICRYPT_KEY_VERSION 2u
-
-	class ICryptKey : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			void (CLOOP_CARG *setSymmetric)(ICryptKey* self, IStatus* status, const char* type, unsigned keyLength, const void* key) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setAsymmetric)(ICryptKey* self, IStatus* status, const char* type, unsigned encryptKeyLength, const void* encryptKey, unsigned decryptKeyLength, const void* decryptKey) CLOOP_NOEXCEPT;
-			const void* (CLOOP_CARG *getEncryptKey)(ICryptKey* self, unsigned* length) CLOOP_NOEXCEPT;
-			const void* (CLOOP_CARG *getDecryptKey)(ICryptKey* self, unsigned* length) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ICryptKey(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ICryptKey()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ICRYPT_KEY_VERSION;
-
-		template <typename StatusType> void setSymmetric(StatusType* status, const char* type, unsigned keyLength, const void* key)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setSymmetric(this, status, type, keyLength, key);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void setAsymmetric(StatusType* status, const char* type, unsigned encryptKeyLength, const void* encryptKey, unsigned decryptKeyLength, const void* decryptKey)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setAsymmetric(this, status, type, encryptKeyLength, encryptKey, decryptKeyLength, decryptKey);
-			StatusType::checkException(status);
-		}
-
-		const void* getEncryptKey(unsigned* length)
-		{
-			const void* ret = static_cast<VTable*>(this->cloopVTable)->getEncryptKey(this, length);
-			return ret;
-		}
-
-		const void* getDecryptKey(unsigned* length)
-		{
-			const void* ret = static_cast<VTable*>(this->cloopVTable)->getDecryptKey(this, length);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ICONFIG_MANAGER_VERSION 3u
-
-	class IConfigManager : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			const char* (CLOOP_CARG *getDirectory)(IConfigManager* self, unsigned code) CLOOP_NOEXCEPT;
-			IFirebirdConf* (CLOOP_CARG *getFirebirdConf)(IConfigManager* self) CLOOP_NOEXCEPT;
-			IFirebirdConf* (CLOOP_CARG *getDatabaseConf)(IConfigManager* self, const char* dbName) CLOOP_NOEXCEPT;
-			IConfig* (CLOOP_CARG *getPluginConfig)(IConfigManager* self, const char* configuredPlugin) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getInstallDirectory)(IConfigManager* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getRootDirectory)(IConfigManager* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getDefaultSecurityDb)(IConfigManager* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IConfigManager(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IConfigManager()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ICONFIG_MANAGER_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned DIR_BIN = 0;
-		static CLOOP_CONSTEXPR unsigned DIR_SBIN = 1;
-		static CLOOP_CONSTEXPR unsigned DIR_CONF = 2;
-		static CLOOP_CONSTEXPR unsigned DIR_LIB = 3;
-		static CLOOP_CONSTEXPR unsigned DIR_INC = 4;
-		static CLOOP_CONSTEXPR unsigned DIR_DOC = 5;
-		static CLOOP_CONSTEXPR unsigned DIR_UDF = 6;
-		static CLOOP_CONSTEXPR unsigned DIR_SAMPLE = 7;
-		static CLOOP_CONSTEXPR unsigned DIR_SAMPLEDB = 8;
-		static CLOOP_CONSTEXPR unsigned DIR_HELP = 9;
-		static CLOOP_CONSTEXPR unsigned DIR_INTL = 10;
-		static CLOOP_CONSTEXPR unsigned DIR_MISC = 11;
-		static CLOOP_CONSTEXPR unsigned DIR_SECDB = 12;
-		static CLOOP_CONSTEXPR unsigned DIR_MSG = 13;
-		static CLOOP_CONSTEXPR unsigned DIR_LOG = 14;
-		static CLOOP_CONSTEXPR unsigned DIR_GUARD = 15;
-		static CLOOP_CONSTEXPR unsigned DIR_PLUGINS = 16;
-		static CLOOP_CONSTEXPR unsigned DIR_TZDATA = 17;
-		static CLOOP_CONSTEXPR unsigned DIR_COUNT = 18;
-
-		const char* getDirectory(unsigned code)
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getDirectory(this, code);
-			return ret;
-		}
-
-		IFirebirdConf* getFirebirdConf()
-		{
-			IFirebirdConf* ret = static_cast<VTable*>(this->cloopVTable)->getFirebirdConf(this);
-			return ret;
-		}
-
-		IFirebirdConf* getDatabaseConf(const char* dbName)
-		{
-			IFirebirdConf* ret = static_cast<VTable*>(this->cloopVTable)->getDatabaseConf(this, dbName);
-			return ret;
-		}
-
-		IConfig* getPluginConfig(const char* configuredPlugin)
-		{
-			IConfig* ret = static_cast<VTable*>(this->cloopVTable)->getPluginConfig(this, configuredPlugin);
-			return ret;
-		}
-
-		const char* getInstallDirectory()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getInstallDirectory(this);
-			return ret;
-		}
-
-		const char* getRootDirectory()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getRootDirectory(this);
-			return ret;
-		}
-
-		const char* getDefaultSecurityDb()
-		{
-			if (cloopVTable->version < 3)
-			{
-				return 0;
-			}
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getDefaultSecurityDb(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IEVENT_CALLBACK_VERSION 3u
-
-	class IEventCallback : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			void (CLOOP_CARG *eventCallbackFunction)(IEventCallback* self, unsigned length, const unsigned char* events) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IEventCallback(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IEventCallback()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IEVENT_CALLBACK_VERSION;
-
-		void eventCallbackFunction(unsigned length, const unsigned char* events)
-		{
-			static_cast<VTable*>(this->cloopVTable)->eventCallbackFunction(this, length, events);
-		}
-	};
-
-#define FIREBIRD_IBLOB_VERSION 4u
-
-	class IBlob : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			void (CLOOP_CARG *getInfo)(IBlob* self, IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *getSegment)(IBlob* self, IStatus* status, unsigned bufferLength, void* buffer, unsigned* segmentLength) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *putSegment)(IBlob* self, IStatus* status, unsigned length, const void* buffer) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *deprecatedCancel)(IBlob* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *deprecatedClose)(IBlob* self, IStatus* status) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *seek)(IBlob* self, IStatus* status, int mode, int offset) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *cancel)(IBlob* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *close)(IBlob* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IBlob(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IBlob()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IBLOB_VERSION;
-
-		template <typename StatusType> void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->getInfo(this, status, itemsLength, items, bufferLength, buffer);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> int getSegment(StatusType* status, unsigned bufferLength, void* buffer, unsigned* segmentLength)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->getSegment(this, status, bufferLength, buffer, segmentLength);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void putSegment(StatusType* status, unsigned length, const void* buffer)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->putSegment(this, status, length, buffer);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void deprecatedCancel(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deprecatedCancel(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void deprecatedClose(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deprecatedClose(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> int seek(StatusType* status, int mode, int offset)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->seek(this, status, mode, offset);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void cancel(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				if (FB_UsedInYValve) {
-					StatusType::setVersionError(status, "IBlob", cloopVTable->version, 4);
-					StatusType::checkException(status);
-				}
-				else {
-					deprecatedCancel(status);
-				}
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->cancel(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void close(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				if (FB_UsedInYValve) {
-					StatusType::setVersionError(status, "IBlob", cloopVTable->version, 4);
-					StatusType::checkException(status);
-				}
-				else {
-					deprecatedClose(status);
-				}
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->close(this, status);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_ITRANSACTION_VERSION 4u
-
-	class ITransaction : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			void (CLOOP_CARG *getInfo)(ITransaction* self, IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *prepare)(ITransaction* self, IStatus* status, unsigned msgLength, const unsigned char* message) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *deprecatedCommit)(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *commitRetaining)(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *deprecatedRollback)(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *rollbackRetaining)(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *deprecatedDisconnect)(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-			ITransaction* (CLOOP_CARG *join)(ITransaction* self, IStatus* status, ITransaction* transaction) CLOOP_NOEXCEPT;
-			ITransaction* (CLOOP_CARG *validate)(ITransaction* self, IStatus* status, IAttachment* attachment) CLOOP_NOEXCEPT;
-			ITransaction* (CLOOP_CARG *enterDtc)(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *commit)(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *rollback)(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *disconnect)(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITransaction(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~ITransaction()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRANSACTION_VERSION;
-
-		template <typename StatusType> void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->getInfo(this, status, itemsLength, items, bufferLength, buffer);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void prepare(StatusType* status, unsigned msgLength, const unsigned char* message)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->prepare(this, status, msgLength, message);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void deprecatedCommit(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deprecatedCommit(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void commitRetaining(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->commitRetaining(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void deprecatedRollback(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deprecatedRollback(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void rollbackRetaining(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->rollbackRetaining(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void deprecatedDisconnect(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deprecatedDisconnect(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> ITransaction* join(StatusType* status, ITransaction* transaction)
-		{
-			StatusType::clearException(status);
-			ITransaction* ret = static_cast<VTable*>(this->cloopVTable)->join(this, status, transaction);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> ITransaction* validate(StatusType* status, IAttachment* attachment)
-		{
-			StatusType::clearException(status);
-			ITransaction* ret = static_cast<VTable*>(this->cloopVTable)->validate(this, status, attachment);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> ITransaction* enterDtc(StatusType* status)
-		{
-			StatusType::clearException(status);
-			ITransaction* ret = static_cast<VTable*>(this->cloopVTable)->enterDtc(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void commit(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				if (FB_UsedInYValve) {
-					StatusType::setVersionError(status, "ITransaction", cloopVTable->version, 4);
-					StatusType::checkException(status);
-				}
-				else {
-					deprecatedCommit(status);
-				}
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->commit(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void rollback(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				if (FB_UsedInYValve) {
-					StatusType::setVersionError(status, "ITransaction", cloopVTable->version, 4);
-					StatusType::checkException(status);
-				}
-				else {
-					deprecatedRollback(status);
-				}
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->rollback(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void disconnect(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				if (FB_UsedInYValve) {
-					StatusType::setVersionError(status, "ITransaction", cloopVTable->version, 4);
-					StatusType::checkException(status);
-				}
-				else {
-					deprecatedDisconnect(status);
-				}
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->disconnect(this, status);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IMESSAGE_METADATA_VERSION 4u
-
-	class IMessageMetadata : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			unsigned (CLOOP_CARG *getCount)(IMessageMetadata* self, IStatus* status) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getField)(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getRelation)(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getOwner)(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getAlias)(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getType)(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *isNullable)(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *getSubType)(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getLength)(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *getScale)(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getCharSet)(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getOffset)(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getNullOffset)(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT;
-			IMetadataBuilder* (CLOOP_CARG *getBuilder)(IMessageMetadata* self, IStatus* status) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getMessageLength)(IMessageMetadata* self, IStatus* status) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getAlignment)(IMessageMetadata* self, IStatus* status) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getAlignedLength)(IMessageMetadata* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IMessageMetadata(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IMessageMetadata()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IMESSAGE_METADATA_VERSION;
-
-		template <typename StatusType> unsigned getCount(StatusType* status)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getCount(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> const char* getField(StatusType* status, unsigned index)
-		{
-			StatusType::clearException(status);
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getField(this, status, index);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> const char* getRelation(StatusType* status, unsigned index)
-		{
-			StatusType::clearException(status);
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getRelation(this, status, index);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> const char* getOwner(StatusType* status, unsigned index)
-		{
-			StatusType::clearException(status);
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getOwner(this, status, index);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> const char* getAlias(StatusType* status, unsigned index)
-		{
-			StatusType::clearException(status);
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getAlias(this, status, index);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned getType(StatusType* status, unsigned index)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getType(this, status, index);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> FB_BOOLEAN isNullable(StatusType* status, unsigned index)
-		{
-			StatusType::clearException(status);
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->isNullable(this, status, index);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> int getSubType(StatusType* status, unsigned index)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->getSubType(this, status, index);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned getLength(StatusType* status, unsigned index)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getLength(this, status, index);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> int getScale(StatusType* status, unsigned index)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->getScale(this, status, index);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned getCharSet(StatusType* status, unsigned index)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getCharSet(this, status, index);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned getOffset(StatusType* status, unsigned index)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getOffset(this, status, index);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned getNullOffset(StatusType* status, unsigned index)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getNullOffset(this, status, index);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IMetadataBuilder* getBuilder(StatusType* status)
-		{
-			StatusType::clearException(status);
-			IMetadataBuilder* ret = static_cast<VTable*>(this->cloopVTable)->getBuilder(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned getMessageLength(StatusType* status)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getMessageLength(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned getAlignment(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IMessageMetadata", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getAlignment(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned getAlignedLength(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IMessageMetadata", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getAlignedLength(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IMETADATA_BUILDER_VERSION 4u
-
-	class IMetadataBuilder : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			void (CLOOP_CARG *setType)(IMetadataBuilder* self, IStatus* status, unsigned index, unsigned type) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setSubType)(IMetadataBuilder* self, IStatus* status, unsigned index, int subType) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setLength)(IMetadataBuilder* self, IStatus* status, unsigned index, unsigned length) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setCharSet)(IMetadataBuilder* self, IStatus* status, unsigned index, unsigned charSet) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setScale)(IMetadataBuilder* self, IStatus* status, unsigned index, int scale) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *truncate)(IMetadataBuilder* self, IStatus* status, unsigned count) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *moveNameToIndex)(IMetadataBuilder* self, IStatus* status, const char* name, unsigned index) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *remove)(IMetadataBuilder* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *addField)(IMetadataBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			IMessageMetadata* (CLOOP_CARG *getMetadata)(IMetadataBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setField)(IMetadataBuilder* self, IStatus* status, unsigned index, const char* field) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setRelation)(IMetadataBuilder* self, IStatus* status, unsigned index, const char* relation) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setOwner)(IMetadataBuilder* self, IStatus* status, unsigned index, const char* owner) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setAlias)(IMetadataBuilder* self, IStatus* status, unsigned index, const char* alias) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IMetadataBuilder(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IMetadataBuilder()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IMETADATA_BUILDER_VERSION;
-
-		template <typename StatusType> void setType(StatusType* status, unsigned index, unsigned type)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setType(this, status, index, type);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void setSubType(StatusType* status, unsigned index, int subType)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setSubType(this, status, index, subType);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void setLength(StatusType* status, unsigned index, unsigned length)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setLength(this, status, index, length);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void setCharSet(StatusType* status, unsigned index, unsigned charSet)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setCharSet(this, status, index, charSet);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void setScale(StatusType* status, unsigned index, int scale)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setScale(this, status, index, scale);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void truncate(StatusType* status, unsigned count)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->truncate(this, status, count);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void moveNameToIndex(StatusType* status, const char* name, unsigned index)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->moveNameToIndex(this, status, name, index);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void remove(StatusType* status, unsigned index)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->remove(this, status, index);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> unsigned addField(StatusType* status)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->addField(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IMessageMetadata* getMetadata(StatusType* status)
-		{
-			StatusType::clearException(status);
-			IMessageMetadata* ret = static_cast<VTable*>(this->cloopVTable)->getMetadata(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void setField(StatusType* status, unsigned index, const char* field)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IMetadataBuilder", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setField(this, status, index, field);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void setRelation(StatusType* status, unsigned index, const char* relation)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IMetadataBuilder", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setRelation(this, status, index, relation);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void setOwner(StatusType* status, unsigned index, const char* owner)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IMetadataBuilder", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setOwner(this, status, index, owner);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void setAlias(StatusType* status, unsigned index, const char* alias)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IMetadataBuilder", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setAlias(this, status, index, alias);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IRESULT_SET_VERSION 5u
-
-	class IResultSet : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			int (CLOOP_CARG *fetchNext)(IResultSet* self, IStatus* status, void* message) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *fetchPrior)(IResultSet* self, IStatus* status, void* message) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *fetchFirst)(IResultSet* self, IStatus* status, void* message) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *fetchLast)(IResultSet* self, IStatus* status, void* message) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *fetchAbsolute)(IResultSet* self, IStatus* status, int position, void* message) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *fetchRelative)(IResultSet* self, IStatus* status, int offset, void* message) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *isEof)(IResultSet* self, IStatus* status) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *isBof)(IResultSet* self, IStatus* status) CLOOP_NOEXCEPT;
-			IMessageMetadata* (CLOOP_CARG *getMetadata)(IResultSet* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *deprecatedClose)(IResultSet* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setDelayedOutputFormat)(IResultSet* self, IStatus* status, IMessageMetadata* format) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *close)(IResultSet* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *getInfo)(IResultSet* self, IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IResultSet(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IResultSet()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IRESULT_SET_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned char INF_RECORD_COUNT = 10;
-
-		template <typename StatusType> int fetchNext(StatusType* status, void* message)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->fetchNext(this, status, message);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> int fetchPrior(StatusType* status, void* message)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->fetchPrior(this, status, message);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> int fetchFirst(StatusType* status, void* message)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->fetchFirst(this, status, message);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> int fetchLast(StatusType* status, void* message)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->fetchLast(this, status, message);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> int fetchAbsolute(StatusType* status, int position, void* message)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->fetchAbsolute(this, status, position, message);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> int fetchRelative(StatusType* status, int offset, void* message)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->fetchRelative(this, status, offset, message);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> FB_BOOLEAN isEof(StatusType* status)
-		{
-			StatusType::clearException(status);
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->isEof(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> FB_BOOLEAN isBof(StatusType* status)
-		{
-			StatusType::clearException(status);
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->isBof(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IMessageMetadata* getMetadata(StatusType* status)
-		{
-			StatusType::clearException(status);
-			IMessageMetadata* ret = static_cast<VTable*>(this->cloopVTable)->getMetadata(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void deprecatedClose(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deprecatedClose(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void setDelayedOutputFormat(StatusType* status, IMessageMetadata* format)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setDelayedOutputFormat(this, status, format);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void close(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				if (FB_UsedInYValve) {
-					StatusType::setVersionError(status, "IResultSet", cloopVTable->version, 4);
-					StatusType::checkException(status);
-				}
-				else {
-					deprecatedClose(status);
-				}
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->close(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer)
-		{
-			if (cloopVTable->version < 5)
-			{
-				StatusType::setVersionError(status, "IResultSet", cloopVTable->version, 5);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->getInfo(this, status, itemsLength, items, bufferLength, buffer);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_ISTATEMENT_VERSION 5u
-
-	class IStatement : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			void (CLOOP_CARG *getInfo)(IStatement* self, IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getType)(IStatement* self, IStatus* status) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getPlan)(IStatement* self, IStatus* status, FB_BOOLEAN detailed) CLOOP_NOEXCEPT;
-			ISC_UINT64 (CLOOP_CARG *getAffectedRecords)(IStatement* self, IStatus* status) CLOOP_NOEXCEPT;
-			IMessageMetadata* (CLOOP_CARG *getInputMetadata)(IStatement* self, IStatus* status) CLOOP_NOEXCEPT;
-			IMessageMetadata* (CLOOP_CARG *getOutputMetadata)(IStatement* self, IStatus* status) CLOOP_NOEXCEPT;
-			ITransaction* (CLOOP_CARG *execute)(IStatement* self, IStatus* status, ITransaction* transaction, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, void* outBuffer) CLOOP_NOEXCEPT;
-			IResultSet* (CLOOP_CARG *openCursor)(IStatement* self, IStatus* status, ITransaction* transaction, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, unsigned flags) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setCursorName)(IStatement* self, IStatus* status, const char* name) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *deprecatedFree)(IStatement* self, IStatus* status) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getFlags)(IStatement* self, IStatus* status) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getTimeout)(IStatement* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setTimeout)(IStatement* self, IStatus* status, unsigned timeOut) CLOOP_NOEXCEPT;
-			IBatch* (CLOOP_CARG *createBatch)(IStatement* self, IStatus* status, IMessageMetadata* inMetadata, unsigned parLength, const unsigned char* par) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *free)(IStatement* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IStatement(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IStatement()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ISTATEMENT_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned PREPARE_PREFETCH_NONE = 0x0;
-		static CLOOP_CONSTEXPR unsigned PREPARE_PREFETCH_TYPE = 0x1;
-		static CLOOP_CONSTEXPR unsigned PREPARE_PREFETCH_INPUT_PARAMETERS = 0x2;
-		static CLOOP_CONSTEXPR unsigned PREPARE_PREFETCH_OUTPUT_PARAMETERS = 0x4;
-		static CLOOP_CONSTEXPR unsigned PREPARE_PREFETCH_LEGACY_PLAN = 0x8;
-		static CLOOP_CONSTEXPR unsigned PREPARE_PREFETCH_DETAILED_PLAN = 0x10;
-		static CLOOP_CONSTEXPR unsigned PREPARE_PREFETCH_AFFECTED_RECORDS = 0x20;
-		static CLOOP_CONSTEXPR unsigned PREPARE_PREFETCH_FLAGS = 0x40;
-		static CLOOP_CONSTEXPR unsigned PREPARE_PREFETCH_METADATA = IStatement::PREPARE_PREFETCH_TYPE | IStatement::PREPARE_PREFETCH_FLAGS | IStatement::PREPARE_PREFETCH_INPUT_PARAMETERS | IStatement::PREPARE_PREFETCH_OUTPUT_PARAMETERS;
-		static CLOOP_CONSTEXPR unsigned PREPARE_PREFETCH_ALL = IStatement::PREPARE_PREFETCH_METADATA | IStatement::PREPARE_PREFETCH_LEGACY_PLAN | IStatement::PREPARE_PREFETCH_DETAILED_PLAN | IStatement::PREPARE_PREFETCH_AFFECTED_RECORDS;
-		static CLOOP_CONSTEXPR unsigned FLAG_HAS_CURSOR = 0x1;
-		static CLOOP_CONSTEXPR unsigned FLAG_REPEAT_EXECUTE = 0x2;
-		static CLOOP_CONSTEXPR unsigned CURSOR_TYPE_SCROLLABLE = 0x1;
-
-		template <typename StatusType> void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->getInfo(this, status, itemsLength, items, bufferLength, buffer);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> unsigned getType(StatusType* status)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getType(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> const char* getPlan(StatusType* status, FB_BOOLEAN detailed)
-		{
-			StatusType::clearException(status);
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getPlan(this, status, detailed);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> ISC_UINT64 getAffectedRecords(StatusType* status)
-		{
-			StatusType::clearException(status);
-			ISC_UINT64 ret = static_cast<VTable*>(this->cloopVTable)->getAffectedRecords(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IMessageMetadata* getInputMetadata(StatusType* status)
-		{
-			StatusType::clearException(status);
-			IMessageMetadata* ret = static_cast<VTable*>(this->cloopVTable)->getInputMetadata(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IMessageMetadata* getOutputMetadata(StatusType* status)
-		{
-			StatusType::clearException(status);
-			IMessageMetadata* ret = static_cast<VTable*>(this->cloopVTable)->getOutputMetadata(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> ITransaction* execute(StatusType* status, ITransaction* transaction, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, void* outBuffer)
-		{
-			StatusType::clearException(status);
-			ITransaction* ret = static_cast<VTable*>(this->cloopVTable)->execute(this, status, transaction, inMetadata, inBuffer, outMetadata, outBuffer);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IResultSet* openCursor(StatusType* status, ITransaction* transaction, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, unsigned flags)
-		{
-			StatusType::clearException(status);
-			IResultSet* ret = static_cast<VTable*>(this->cloopVTable)->openCursor(this, status, transaction, inMetadata, inBuffer, outMetadata, flags);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void setCursorName(StatusType* status, const char* name)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setCursorName(this, status, name);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void deprecatedFree(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deprecatedFree(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> unsigned getFlags(StatusType* status)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getFlags(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned getTimeout(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IStatement", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getTimeout(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void setTimeout(StatusType* status, unsigned timeOut)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IStatement", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setTimeout(this, status, timeOut);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> IBatch* createBatch(StatusType* status, IMessageMetadata* inMetadata, unsigned parLength, const unsigned char* par)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IStatement", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			IBatch* ret = static_cast<VTable*>(this->cloopVTable)->createBatch(this, status, inMetadata, parLength, par);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void free(StatusType* status)
-		{
-			if (cloopVTable->version < 5)
-			{
-				if (FB_UsedInYValve) {
-					StatusType::setVersionError(status, "IStatement", cloopVTable->version, 5);
-					StatusType::checkException(status);
-				}
-				else {
-					deprecatedFree(status);
-				}
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->free(this, status);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IBATCH_VERSION 4u
-
-	class IBatch : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			void (CLOOP_CARG *add)(IBatch* self, IStatus* status, unsigned count, const void* inBuffer) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *addBlob)(IBatch* self, IStatus* status, unsigned length, const void* inBuffer, ISC_QUAD* blobId, unsigned parLength, const unsigned char* par) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *appendBlobData)(IBatch* self, IStatus* status, unsigned length, const void* inBuffer) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *addBlobStream)(IBatch* self, IStatus* status, unsigned length, const void* inBuffer) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *registerBlob)(IBatch* self, IStatus* status, const ISC_QUAD* existingBlob, ISC_QUAD* blobId) CLOOP_NOEXCEPT;
-			IBatchCompletionState* (CLOOP_CARG *execute)(IBatch* self, IStatus* status, ITransaction* transaction) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *cancel)(IBatch* self, IStatus* status) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getBlobAlignment)(IBatch* self, IStatus* status) CLOOP_NOEXCEPT;
-			IMessageMetadata* (CLOOP_CARG *getMetadata)(IBatch* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setDefaultBpb)(IBatch* self, IStatus* status, unsigned parLength, const unsigned char* par) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *deprecatedClose)(IBatch* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *close)(IBatch* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *getInfo)(IBatch* self, IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IBatch(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IBatch()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IBATCH_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned char VERSION1 = 1;
-		static CLOOP_CONSTEXPR unsigned char CURRENT_VERSION = IBatch::VERSION1;
-		static CLOOP_CONSTEXPR unsigned char TAG_MULTIERROR = 1;
-		static CLOOP_CONSTEXPR unsigned char TAG_RECORD_COUNTS = 2;
-		static CLOOP_CONSTEXPR unsigned char TAG_BUFFER_BYTES_SIZE = 3;
-		static CLOOP_CONSTEXPR unsigned char TAG_BLOB_POLICY = 4;
-		static CLOOP_CONSTEXPR unsigned char TAG_DETAILED_ERRORS = 5;
-		static CLOOP_CONSTEXPR unsigned char INF_BUFFER_BYTES_SIZE = 10;
-		static CLOOP_CONSTEXPR unsigned char INF_DATA_BYTES_SIZE = 11;
-		static CLOOP_CONSTEXPR unsigned char INF_BLOBS_BYTES_SIZE = 12;
-		static CLOOP_CONSTEXPR unsigned char INF_BLOB_ALIGNMENT = 13;
-		static CLOOP_CONSTEXPR unsigned char INF_BLOB_HEADER = 14;
-		static CLOOP_CONSTEXPR unsigned char BLOB_NONE = 0;
-		static CLOOP_CONSTEXPR unsigned char BLOB_ID_ENGINE = 1;
-		static CLOOP_CONSTEXPR unsigned char BLOB_ID_USER = 2;
-		static CLOOP_CONSTEXPR unsigned char BLOB_STREAM = 3;
-		static CLOOP_CONSTEXPR unsigned BLOB_SEGHDR_ALIGN = 2;
-
-		template <typename StatusType> void add(StatusType* status, unsigned count, const void* inBuffer)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->add(this, status, count, inBuffer);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void addBlob(StatusType* status, unsigned length, const void* inBuffer, ISC_QUAD* blobId, unsigned parLength, const unsigned char* par)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->addBlob(this, status, length, inBuffer, blobId, parLength, par);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void appendBlobData(StatusType* status, unsigned length, const void* inBuffer)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->appendBlobData(this, status, length, inBuffer);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void addBlobStream(StatusType* status, unsigned length, const void* inBuffer)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->addBlobStream(this, status, length, inBuffer);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void registerBlob(StatusType* status, const ISC_QUAD* existingBlob, ISC_QUAD* blobId)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->registerBlob(this, status, existingBlob, blobId);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> IBatchCompletionState* execute(StatusType* status, ITransaction* transaction)
-		{
-			StatusType::clearException(status);
-			IBatchCompletionState* ret = static_cast<VTable*>(this->cloopVTable)->execute(this, status, transaction);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void cancel(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->cancel(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> unsigned getBlobAlignment(StatusType* status)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getBlobAlignment(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IMessageMetadata* getMetadata(StatusType* status)
-		{
-			StatusType::clearException(status);
-			IMessageMetadata* ret = static_cast<VTable*>(this->cloopVTable)->getMetadata(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void setDefaultBpb(StatusType* status, unsigned parLength, const unsigned char* par)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setDefaultBpb(this, status, parLength, par);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void deprecatedClose(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deprecatedClose(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void close(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				if (FB_UsedInYValve) {
-					StatusType::setVersionError(status, "IBatch", cloopVTable->version, 4);
-					StatusType::checkException(status);
-				}
-				else {
-					deprecatedClose(status);
-				}
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->close(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IBatch", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->getInfo(this, status, itemsLength, items, bufferLength, buffer);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IBATCH_COMPLETION_STATE_VERSION 3u
-
-	class IBatchCompletionState : public IDisposable
-	{
-	public:
-		struct VTable : public IDisposable::VTable
-		{
-			unsigned (CLOOP_CARG *getSize)(IBatchCompletionState* self, IStatus* status) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *getState)(IBatchCompletionState* self, IStatus* status, unsigned pos) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *findError)(IBatchCompletionState* self, IStatus* status, unsigned pos) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *getStatus)(IBatchCompletionState* self, IStatus* status, IStatus* to, unsigned pos) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IBatchCompletionState(DoNotInherit)
-			: IDisposable(DoNotInherit())
-		{
-		}
-
-		~IBatchCompletionState()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IBATCH_COMPLETION_STATE_VERSION;
-
-		static CLOOP_CONSTEXPR int EXECUTE_FAILED = -1;
-		static CLOOP_CONSTEXPR int SUCCESS_NO_INFO = -2;
-		static CLOOP_CONSTEXPR unsigned NO_MORE_ERRORS = 0xffffffff;
-
-		template <typename StatusType> unsigned getSize(StatusType* status)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getSize(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> int getState(StatusType* status, unsigned pos)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->getState(this, status, pos);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned findError(StatusType* status, unsigned pos)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->findError(this, status, pos);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void getStatus(StatusType* status, IStatus* to, unsigned pos)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->getStatus(this, status, to, pos);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IREPLICATOR_VERSION 4u
-
-	class IReplicator : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			void (CLOOP_CARG *process)(IReplicator* self, IStatus* status, unsigned length, const unsigned char* data) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *deprecatedClose)(IReplicator* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *close)(IReplicator* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IReplicator(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IReplicator()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IREPLICATOR_VERSION;
-
-		template <typename StatusType> void process(StatusType* status, unsigned length, const unsigned char* data)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->process(this, status, length, data);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void deprecatedClose(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deprecatedClose(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void close(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				if (FB_UsedInYValve) {
-					StatusType::setVersionError(status, "IReplicator", cloopVTable->version, 4);
-					StatusType::checkException(status);
-				}
-				else {
-					deprecatedClose(status);
-				}
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->close(this, status);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IREQUEST_VERSION 4u
-
-	class IRequest : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			void (CLOOP_CARG *receive)(IRequest* self, IStatus* status, int level, unsigned msgType, unsigned length, void* message) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *send)(IRequest* self, IStatus* status, int level, unsigned msgType, unsigned length, const void* message) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *getInfo)(IRequest* self, IStatus* status, int level, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *start)(IRequest* self, IStatus* status, ITransaction* tra, int level) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *startAndSend)(IRequest* self, IStatus* status, ITransaction* tra, int level, unsigned msgType, unsigned length, const void* message) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *unwind)(IRequest* self, IStatus* status, int level) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *deprecatedFree)(IRequest* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *free)(IRequest* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IRequest(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IRequest()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IREQUEST_VERSION;
-
-		template <typename StatusType> void receive(StatusType* status, int level, unsigned msgType, unsigned length, void* message)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->receive(this, status, level, msgType, length, message);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void send(StatusType* status, int level, unsigned msgType, unsigned length, const void* message)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->send(this, status, level, msgType, length, message);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void getInfo(StatusType* status, int level, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->getInfo(this, status, level, itemsLength, items, bufferLength, buffer);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void start(StatusType* status, ITransaction* tra, int level)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->start(this, status, tra, level);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void startAndSend(StatusType* status, ITransaction* tra, int level, unsigned msgType, unsigned length, const void* message)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->startAndSend(this, status, tra, level, msgType, length, message);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void unwind(StatusType* status, int level)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->unwind(this, status, level);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void deprecatedFree(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deprecatedFree(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void free(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				if (FB_UsedInYValve) {
-					StatusType::setVersionError(status, "IRequest", cloopVTable->version, 4);
-					StatusType::checkException(status);
-				}
-				else {
-					deprecatedFree(status);
-				}
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->free(this, status);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IEVENTS_VERSION 4u
-
-	class IEvents : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			void (CLOOP_CARG *deprecatedCancel)(IEvents* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *cancel)(IEvents* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IEvents(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IEvents()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IEVENTS_VERSION;
-
-		template <typename StatusType> void deprecatedCancel(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deprecatedCancel(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void cancel(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				if (FB_UsedInYValve) {
-					StatusType::setVersionError(status, "IEvents", cloopVTable->version, 4);
-					StatusType::checkException(status);
-				}
-				else {
-					deprecatedCancel(status);
-				}
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->cancel(this, status);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IATTACHMENT_VERSION 5u
-
-	class IAttachment : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			void (CLOOP_CARG *getInfo)(IAttachment* self, IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT;
-			ITransaction* (CLOOP_CARG *startTransaction)(IAttachment* self, IStatus* status, unsigned tpbLength, const unsigned char* tpb) CLOOP_NOEXCEPT;
-			ITransaction* (CLOOP_CARG *reconnectTransaction)(IAttachment* self, IStatus* status, unsigned length, const unsigned char* id) CLOOP_NOEXCEPT;
-			IRequest* (CLOOP_CARG *compileRequest)(IAttachment* self, IStatus* status, unsigned blrLength, const unsigned char* blr) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *transactRequest)(IAttachment* self, IStatus* status, ITransaction* transaction, unsigned blrLength, const unsigned char* blr, unsigned inMsgLength, const unsigned char* inMsg, unsigned outMsgLength, unsigned char* outMsg) CLOOP_NOEXCEPT;
-			IBlob* (CLOOP_CARG *createBlob)(IAttachment* self, IStatus* status, ITransaction* transaction, ISC_QUAD* id, unsigned bpbLength, const unsigned char* bpb) CLOOP_NOEXCEPT;
-			IBlob* (CLOOP_CARG *openBlob)(IAttachment* self, IStatus* status, ITransaction* transaction, ISC_QUAD* id, unsigned bpbLength, const unsigned char* bpb) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *getSlice)(IAttachment* self, IStatus* status, ITransaction* transaction, ISC_QUAD* id, unsigned sdlLength, const unsigned char* sdl, unsigned paramLength, const unsigned char* param, int sliceLength, unsigned char* slice) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *putSlice)(IAttachment* self, IStatus* status, ITransaction* transaction, ISC_QUAD* id, unsigned sdlLength, const unsigned char* sdl, unsigned paramLength, const unsigned char* param, int sliceLength, unsigned char* slice) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *executeDyn)(IAttachment* self, IStatus* status, ITransaction* transaction, unsigned length, const unsigned char* dyn) CLOOP_NOEXCEPT;
-			IStatement* (CLOOP_CARG *prepare)(IAttachment* self, IStatus* status, ITransaction* tra, unsigned stmtLength, const char* sqlStmt, unsigned dialect, unsigned flags) CLOOP_NOEXCEPT;
-			ITransaction* (CLOOP_CARG *execute)(IAttachment* self, IStatus* status, ITransaction* transaction, unsigned stmtLength, const char* sqlStmt, unsigned dialect, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, void* outBuffer) CLOOP_NOEXCEPT;
-			IResultSet* (CLOOP_CARG *openCursor)(IAttachment* self, IStatus* status, ITransaction* transaction, unsigned stmtLength, const char* sqlStmt, unsigned dialect, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, const char* cursorName, unsigned cursorFlags) CLOOP_NOEXCEPT;
-			IEvents* (CLOOP_CARG *queEvents)(IAttachment* self, IStatus* status, IEventCallback* callback, unsigned length, const unsigned char* events) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *cancelOperation)(IAttachment* self, IStatus* status, int option) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *ping)(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *deprecatedDetach)(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *deprecatedDropDatabase)(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getIdleTimeout)(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setIdleTimeout)(IAttachment* self, IStatus* status, unsigned timeOut) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getStatementTimeout)(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setStatementTimeout)(IAttachment* self, IStatus* status, unsigned timeOut) CLOOP_NOEXCEPT;
-			IBatch* (CLOOP_CARG *createBatch)(IAttachment* self, IStatus* status, ITransaction* transaction, unsigned stmtLength, const char* sqlStmt, unsigned dialect, IMessageMetadata* inMetadata, unsigned parLength, const unsigned char* par) CLOOP_NOEXCEPT;
-			IReplicator* (CLOOP_CARG *createReplicator)(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *detach)(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *dropDatabase)(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IAttachment(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IAttachment()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IATTACHMENT_VERSION;
-
-		template <typename StatusType> void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->getInfo(this, status, itemsLength, items, bufferLength, buffer);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> ITransaction* startTransaction(StatusType* status, unsigned tpbLength, const unsigned char* tpb)
-		{
-			StatusType::clearException(status);
-			ITransaction* ret = static_cast<VTable*>(this->cloopVTable)->startTransaction(this, status, tpbLength, tpb);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> ITransaction* reconnectTransaction(StatusType* status, unsigned length, const unsigned char* id)
-		{
-			StatusType::clearException(status);
-			ITransaction* ret = static_cast<VTable*>(this->cloopVTable)->reconnectTransaction(this, status, length, id);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IRequest* compileRequest(StatusType* status, unsigned blrLength, const unsigned char* blr)
-		{
-			StatusType::clearException(status);
-			IRequest* ret = static_cast<VTable*>(this->cloopVTable)->compileRequest(this, status, blrLength, blr);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void transactRequest(StatusType* status, ITransaction* transaction, unsigned blrLength, const unsigned char* blr, unsigned inMsgLength, const unsigned char* inMsg, unsigned outMsgLength, unsigned char* outMsg)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->transactRequest(this, status, transaction, blrLength, blr, inMsgLength, inMsg, outMsgLength, outMsg);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> IBlob* createBlob(StatusType* status, ITransaction* transaction, ISC_QUAD* id, unsigned bpbLength, const unsigned char* bpb)
-		{
-			StatusType::clearException(status);
-			IBlob* ret = static_cast<VTable*>(this->cloopVTable)->createBlob(this, status, transaction, id, bpbLength, bpb);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IBlob* openBlob(StatusType* status, ITransaction* transaction, ISC_QUAD* id, unsigned bpbLength, const unsigned char* bpb)
-		{
-			StatusType::clearException(status);
-			IBlob* ret = static_cast<VTable*>(this->cloopVTable)->openBlob(this, status, transaction, id, bpbLength, bpb);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> int getSlice(StatusType* status, ITransaction* transaction, ISC_QUAD* id, unsigned sdlLength, const unsigned char* sdl, unsigned paramLength, const unsigned char* param, int sliceLength, unsigned char* slice)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->getSlice(this, status, transaction, id, sdlLength, sdl, paramLength, param, sliceLength, slice);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void putSlice(StatusType* status, ITransaction* transaction, ISC_QUAD* id, unsigned sdlLength, const unsigned char* sdl, unsigned paramLength, const unsigned char* param, int sliceLength, unsigned char* slice)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->putSlice(this, status, transaction, id, sdlLength, sdl, paramLength, param, sliceLength, slice);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void executeDyn(StatusType* status, ITransaction* transaction, unsigned length, const unsigned char* dyn)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->executeDyn(this, status, transaction, length, dyn);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> IStatement* prepare(StatusType* status, ITransaction* tra, unsigned stmtLength, const char* sqlStmt, unsigned dialect, unsigned flags)
-		{
-			StatusType::clearException(status);
-			IStatement* ret = static_cast<VTable*>(this->cloopVTable)->prepare(this, status, tra, stmtLength, sqlStmt, dialect, flags);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> ITransaction* execute(StatusType* status, ITransaction* transaction, unsigned stmtLength, const char* sqlStmt, unsigned dialect, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, void* outBuffer)
-		{
-			StatusType::clearException(status);
-			ITransaction* ret = static_cast<VTable*>(this->cloopVTable)->execute(this, status, transaction, stmtLength, sqlStmt, dialect, inMetadata, inBuffer, outMetadata, outBuffer);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IResultSet* openCursor(StatusType* status, ITransaction* transaction, unsigned stmtLength, const char* sqlStmt, unsigned dialect, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, const char* cursorName, unsigned cursorFlags)
-		{
-			StatusType::clearException(status);
-			IResultSet* ret = static_cast<VTable*>(this->cloopVTable)->openCursor(this, status, transaction, stmtLength, sqlStmt, dialect, inMetadata, inBuffer, outMetadata, cursorName, cursorFlags);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IEvents* queEvents(StatusType* status, IEventCallback* callback, unsigned length, const unsigned char* events)
-		{
-			StatusType::clearException(status);
-			IEvents* ret = static_cast<VTable*>(this->cloopVTable)->queEvents(this, status, callback, length, events);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void cancelOperation(StatusType* status, int option)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->cancelOperation(this, status, option);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void ping(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->ping(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void deprecatedDetach(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deprecatedDetach(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void deprecatedDropDatabase(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deprecatedDropDatabase(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> unsigned getIdleTimeout(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IAttachment", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getIdleTimeout(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void setIdleTimeout(StatusType* status, unsigned timeOut)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IAttachment", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setIdleTimeout(this, status, timeOut);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> unsigned getStatementTimeout(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IAttachment", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getStatementTimeout(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void setStatementTimeout(StatusType* status, unsigned timeOut)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IAttachment", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setStatementTimeout(this, status, timeOut);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> IBatch* createBatch(StatusType* status, ITransaction* transaction, unsigned stmtLength, const char* sqlStmt, unsigned dialect, IMessageMetadata* inMetadata, unsigned parLength, const unsigned char* par)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IAttachment", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			IBatch* ret = static_cast<VTable*>(this->cloopVTable)->createBatch(this, status, transaction, stmtLength, sqlStmt, dialect, inMetadata, parLength, par);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IReplicator* createReplicator(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IAttachment", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			IReplicator* ret = static_cast<VTable*>(this->cloopVTable)->createReplicator(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void detach(StatusType* status)
-		{
-			if (cloopVTable->version < 5)
-			{
-				if (FB_UsedInYValve) {
-					StatusType::setVersionError(status, "IAttachment", cloopVTable->version, 5);
-					StatusType::checkException(status);
-				}
-				else {
-					deprecatedDetach(status);
-				}
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->detach(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void dropDatabase(StatusType* status)
-		{
-			if (cloopVTable->version < 5)
-			{
-				if (FB_UsedInYValve) {
-					StatusType::setVersionError(status, "IAttachment", cloopVTable->version, 5);
-					StatusType::checkException(status);
-				}
-				else {
-					deprecatedDropDatabase(status);
-				}
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->dropDatabase(this, status);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_ISERVICE_VERSION 5u
-
-	class IService : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			void (CLOOP_CARG *deprecatedDetach)(IService* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *query)(IService* self, IStatus* status, unsigned sendLength, const unsigned char* sendItems, unsigned receiveLength, const unsigned char* receiveItems, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *start)(IService* self, IStatus* status, unsigned spbLength, const unsigned char* spb) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *detach)(IService* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *cancel)(IService* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IService(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IService()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ISERVICE_VERSION;
-
-		template <typename StatusType> void deprecatedDetach(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deprecatedDetach(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void query(StatusType* status, unsigned sendLength, const unsigned char* sendItems, unsigned receiveLength, const unsigned char* receiveItems, unsigned bufferLength, unsigned char* buffer)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->query(this, status, sendLength, sendItems, receiveLength, receiveItems, bufferLength, buffer);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void start(StatusType* status, unsigned spbLength, const unsigned char* spb)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->start(this, status, spbLength, spb);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void detach(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				if (FB_UsedInYValve) {
-					StatusType::setVersionError(status, "IService", cloopVTable->version, 4);
-					StatusType::checkException(status);
-				}
-				else {
-					deprecatedDetach(status);
-				}
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->detach(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void cancel(StatusType* status)
-		{
-			if (cloopVTable->version < 5)
-			{
-				StatusType::setVersionError(status, "IService", cloopVTable->version, 5);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->cancel(this, status);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IPROVIDER_VERSION 4u
-
-	class IProvider : public IPluginBase
-	{
-	public:
-		struct VTable : public IPluginBase::VTable
-		{
-			IAttachment* (CLOOP_CARG *attachDatabase)(IProvider* self, IStatus* status, const char* fileName, unsigned dpbLength, const unsigned char* dpb) CLOOP_NOEXCEPT;
-			IAttachment* (CLOOP_CARG *createDatabase)(IProvider* self, IStatus* status, const char* fileName, unsigned dpbLength, const unsigned char* dpb) CLOOP_NOEXCEPT;
-			IService* (CLOOP_CARG *attachServiceManager)(IProvider* self, IStatus* status, const char* service, unsigned spbLength, const unsigned char* spb) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *shutdown)(IProvider* self, IStatus* status, unsigned timeout, const int reason) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setDbCryptCallback)(IProvider* self, IStatus* status, ICryptKeyCallback* cryptCallback) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IProvider(DoNotInherit)
-			: IPluginBase(DoNotInherit())
-		{
-		}
-
-		~IProvider()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IPROVIDER_VERSION;
-
-		template <typename StatusType> IAttachment* attachDatabase(StatusType* status, const char* fileName, unsigned dpbLength, const unsigned char* dpb)
-		{
-			StatusType::clearException(status);
-			IAttachment* ret = static_cast<VTable*>(this->cloopVTable)->attachDatabase(this, status, fileName, dpbLength, dpb);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IAttachment* createDatabase(StatusType* status, const char* fileName, unsigned dpbLength, const unsigned char* dpb)
-		{
-			StatusType::clearException(status);
-			IAttachment* ret = static_cast<VTable*>(this->cloopVTable)->createDatabase(this, status, fileName, dpbLength, dpb);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IService* attachServiceManager(StatusType* status, const char* service, unsigned spbLength, const unsigned char* spb)
-		{
-			StatusType::clearException(status);
-			IService* ret = static_cast<VTable*>(this->cloopVTable)->attachServiceManager(this, status, service, spbLength, spb);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void shutdown(StatusType* status, unsigned timeout, const int reason)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->shutdown(this, status, timeout, reason);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void setDbCryptCallback(StatusType* status, ICryptKeyCallback* cryptCallback)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setDbCryptCallback(this, status, cryptCallback);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IDTC_START_VERSION 3u
-
-	class IDtcStart : public IDisposable
-	{
-	public:
-		struct VTable : public IDisposable::VTable
-		{
-			void (CLOOP_CARG *addAttachment)(IDtcStart* self, IStatus* status, IAttachment* att) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *addWithTpb)(IDtcStart* self, IStatus* status, IAttachment* att, unsigned length, const unsigned char* tpb) CLOOP_NOEXCEPT;
-			ITransaction* (CLOOP_CARG *start)(IDtcStart* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IDtcStart(DoNotInherit)
-			: IDisposable(DoNotInherit())
-		{
-		}
-
-		~IDtcStart()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IDTC_START_VERSION;
-
-		template <typename StatusType> void addAttachment(StatusType* status, IAttachment* att)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->addAttachment(this, status, att);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void addWithTpb(StatusType* status, IAttachment* att, unsigned length, const unsigned char* tpb)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->addWithTpb(this, status, att, length, tpb);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> ITransaction* start(StatusType* status)
-		{
-			StatusType::clearException(status);
-			ITransaction* ret = static_cast<VTable*>(this->cloopVTable)->start(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IDTC_VERSION 2u
-
-	class IDtc : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			ITransaction* (CLOOP_CARG *join)(IDtc* self, IStatus* status, ITransaction* one, ITransaction* two) CLOOP_NOEXCEPT;
-			IDtcStart* (CLOOP_CARG *startBuilder)(IDtc* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IDtc(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IDtc()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IDTC_VERSION;
-
-		template <typename StatusType> ITransaction* join(StatusType* status, ITransaction* one, ITransaction* two)
-		{
-			StatusType::clearException(status);
-			ITransaction* ret = static_cast<VTable*>(this->cloopVTable)->join(this, status, one, two);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IDtcStart* startBuilder(StatusType* status)
-		{
-			StatusType::clearException(status);
-			IDtcStart* ret = static_cast<VTable*>(this->cloopVTable)->startBuilder(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IAUTH_VERSION 4u
-
-	class IAuth : public IPluginBase
-	{
-	public:
-		struct VTable : public IPluginBase::VTable
-		{
-		};
-
-	protected:
-		IAuth(DoNotInherit)
-			: IPluginBase(DoNotInherit())
-		{
-		}
-
-		~IAuth()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IAUTH_VERSION;
-
-		static CLOOP_CONSTEXPR int AUTH_FAILED = -1;
-		static CLOOP_CONSTEXPR int AUTH_SUCCESS = 0;
-		static CLOOP_CONSTEXPR int AUTH_MORE_DATA = 1;
-		static CLOOP_CONSTEXPR int AUTH_CONTINUE = 2;
-	};
-
-#define FIREBIRD_IWRITER_VERSION 2u
-
-	class IWriter : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			void (CLOOP_CARG *reset)(IWriter* self) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *add)(IWriter* self, IStatus* status, const char* name) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setType)(IWriter* self, IStatus* status, const char* value) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setDb)(IWriter* self, IStatus* status, const char* value) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IWriter(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IWriter()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IWRITER_VERSION;
-
-		void reset()
-		{
-			static_cast<VTable*>(this->cloopVTable)->reset(this);
-		}
-
-		template <typename StatusType> void add(StatusType* status, const char* name)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->add(this, status, name);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void setType(StatusType* status, const char* value)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setType(this, status, value);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void setDb(StatusType* status, const char* value)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setDb(this, status, value);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_ISERVER_BLOCK_VERSION 2u
-
-	class IServerBlock : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			const char* (CLOOP_CARG *getLogin)(IServerBlock* self) CLOOP_NOEXCEPT;
-			const unsigned char* (CLOOP_CARG *getData)(IServerBlock* self, unsigned* length) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *putData)(IServerBlock* self, IStatus* status, unsigned length, const void* data) CLOOP_NOEXCEPT;
-			ICryptKey* (CLOOP_CARG *newKey)(IServerBlock* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IServerBlock(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IServerBlock()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ISERVER_BLOCK_VERSION;
-
-		const char* getLogin()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getLogin(this);
-			return ret;
-		}
-
-		const unsigned char* getData(unsigned* length)
-		{
-			const unsigned char* ret = static_cast<VTable*>(this->cloopVTable)->getData(this, length);
-			return ret;
-		}
-
-		template <typename StatusType> void putData(StatusType* status, unsigned length, const void* data)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->putData(this, status, length, data);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> ICryptKey* newKey(StatusType* status)
-		{
-			StatusType::clearException(status);
-			ICryptKey* ret = static_cast<VTable*>(this->cloopVTable)->newKey(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ICLIENT_BLOCK_VERSION 4u
-
-	class IClientBlock : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			const char* (CLOOP_CARG *getLogin)(IClientBlock* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getPassword)(IClientBlock* self) CLOOP_NOEXCEPT;
-			const unsigned char* (CLOOP_CARG *getData)(IClientBlock* self, unsigned* length) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *putData)(IClientBlock* self, IStatus* status, unsigned length, const void* data) CLOOP_NOEXCEPT;
-			ICryptKey* (CLOOP_CARG *newKey)(IClientBlock* self, IStatus* status) CLOOP_NOEXCEPT;
-			IAuthBlock* (CLOOP_CARG *getAuthBlock)(IClientBlock* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IClientBlock(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IClientBlock()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ICLIENT_BLOCK_VERSION;
-
-		const char* getLogin()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getLogin(this);
-			return ret;
-		}
-
-		const char* getPassword()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getPassword(this);
-			return ret;
-		}
-
-		const unsigned char* getData(unsigned* length)
-		{
-			const unsigned char* ret = static_cast<VTable*>(this->cloopVTable)->getData(this, length);
-			return ret;
-		}
-
-		template <typename StatusType> void putData(StatusType* status, unsigned length, const void* data)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->putData(this, status, length, data);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> ICryptKey* newKey(StatusType* status)
-		{
-			StatusType::clearException(status);
-			ICryptKey* ret = static_cast<VTable*>(this->cloopVTable)->newKey(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IAuthBlock* getAuthBlock(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IClientBlock", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			IAuthBlock* ret = static_cast<VTable*>(this->cloopVTable)->getAuthBlock(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ISERVER_VERSION 6u
-
-	class IServer : public IAuth
-	{
-	public:
-		struct VTable : public IAuth::VTable
-		{
-			int (CLOOP_CARG *authenticate)(IServer* self, IStatus* status, IServerBlock* sBlock, IWriter* writerInterface) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setDbCryptCallback)(IServer* self, IStatus* status, ICryptKeyCallback* cryptCallback) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IServer(DoNotInherit)
-			: IAuth(DoNotInherit())
-		{
-		}
-
-		~IServer()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ISERVER_VERSION;
-
-		template <typename StatusType> int authenticate(StatusType* status, IServerBlock* sBlock, IWriter* writerInterface)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->authenticate(this, status, sBlock, writerInterface);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void setDbCryptCallback(StatusType* status, ICryptKeyCallback* cryptCallback)
-		{
-			if (cloopVTable->version < 6)
-			{
-				StatusType::setVersionError(status, "IServer", cloopVTable->version, 6);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setDbCryptCallback(this, status, cryptCallback);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_ICLIENT_VERSION 5u
-
-	class IClient : public IAuth
-	{
-	public:
-		struct VTable : public IAuth::VTable
-		{
-			int (CLOOP_CARG *authenticate)(IClient* self, IStatus* status, IClientBlock* cBlock) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IClient(DoNotInherit)
-			: IAuth(DoNotInherit())
-		{
-		}
-
-		~IClient()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ICLIENT_VERSION;
-
-		template <typename StatusType> int authenticate(StatusType* status, IClientBlock* cBlock)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->authenticate(this, status, cBlock);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IUSER_FIELD_VERSION 2u
-
-	class IUserField : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			int (CLOOP_CARG *entered)(IUserField* self) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *specified)(IUserField* self) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setEntered)(IUserField* self, IStatus* status, int newValue) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IUserField(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IUserField()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IUSER_FIELD_VERSION;
-
-		int entered()
-		{
-			int ret = static_cast<VTable*>(this->cloopVTable)->entered(this);
-			return ret;
-		}
-
-		int specified()
-		{
-			int ret = static_cast<VTable*>(this->cloopVTable)->specified(this);
-			return ret;
-		}
-
-		template <typename StatusType> void setEntered(StatusType* status, int newValue)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setEntered(this, status, newValue);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_ICHAR_USER_FIELD_VERSION 3u
-
-	class ICharUserField : public IUserField
-	{
-	public:
-		struct VTable : public IUserField::VTable
-		{
-			const char* (CLOOP_CARG *get)(ICharUserField* self) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *set)(ICharUserField* self, IStatus* status, const char* newValue) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ICharUserField(DoNotInherit)
-			: IUserField(DoNotInherit())
-		{
-		}
-
-		~ICharUserField()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ICHAR_USER_FIELD_VERSION;
-
-		const char* get()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->get(this);
-			return ret;
-		}
-
-		template <typename StatusType> void set(StatusType* status, const char* newValue)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->set(this, status, newValue);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IINT_USER_FIELD_VERSION 3u
-
-	class IIntUserField : public IUserField
-	{
-	public:
-		struct VTable : public IUserField::VTable
-		{
-			int (CLOOP_CARG *get)(IIntUserField* self) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *set)(IIntUserField* self, IStatus* status, int newValue) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IIntUserField(DoNotInherit)
-			: IUserField(DoNotInherit())
-		{
-		}
-
-		~IIntUserField()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IINT_USER_FIELD_VERSION;
-
-		int get()
-		{
-			int ret = static_cast<VTable*>(this->cloopVTable)->get(this);
-			return ret;
-		}
-
-		template <typename StatusType> void set(StatusType* status, int newValue)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->set(this, status, newValue);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IUSER_VERSION 2u
-
-	class IUser : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			unsigned (CLOOP_CARG *operation)(IUser* self) CLOOP_NOEXCEPT;
-			ICharUserField* (CLOOP_CARG *userName)(IUser* self) CLOOP_NOEXCEPT;
-			ICharUserField* (CLOOP_CARG *password)(IUser* self) CLOOP_NOEXCEPT;
-			ICharUserField* (CLOOP_CARG *firstName)(IUser* self) CLOOP_NOEXCEPT;
-			ICharUserField* (CLOOP_CARG *lastName)(IUser* self) CLOOP_NOEXCEPT;
-			ICharUserField* (CLOOP_CARG *middleName)(IUser* self) CLOOP_NOEXCEPT;
-			ICharUserField* (CLOOP_CARG *comment)(IUser* self) CLOOP_NOEXCEPT;
-			ICharUserField* (CLOOP_CARG *attributes)(IUser* self) CLOOP_NOEXCEPT;
-			IIntUserField* (CLOOP_CARG *active)(IUser* self) CLOOP_NOEXCEPT;
-			IIntUserField* (CLOOP_CARG *admin)(IUser* self) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *clear)(IUser* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IUser(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IUser()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IUSER_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned OP_USER_ADD = 1;
-		static CLOOP_CONSTEXPR unsigned OP_USER_MODIFY = 2;
-		static CLOOP_CONSTEXPR unsigned OP_USER_DELETE = 3;
-		static CLOOP_CONSTEXPR unsigned OP_USER_DISPLAY = 4;
-		static CLOOP_CONSTEXPR unsigned OP_USER_SET_MAP = 5;
-		static CLOOP_CONSTEXPR unsigned OP_USER_DROP_MAP = 6;
-
-		unsigned operation()
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->operation(this);
-			return ret;
-		}
-
-		ICharUserField* userName()
-		{
-			ICharUserField* ret = static_cast<VTable*>(this->cloopVTable)->userName(this);
-			return ret;
-		}
-
-		ICharUserField* password()
-		{
-			ICharUserField* ret = static_cast<VTable*>(this->cloopVTable)->password(this);
-			return ret;
-		}
-
-		ICharUserField* firstName()
-		{
-			ICharUserField* ret = static_cast<VTable*>(this->cloopVTable)->firstName(this);
-			return ret;
-		}
-
-		ICharUserField* lastName()
-		{
-			ICharUserField* ret = static_cast<VTable*>(this->cloopVTable)->lastName(this);
-			return ret;
-		}
-
-		ICharUserField* middleName()
-		{
-			ICharUserField* ret = static_cast<VTable*>(this->cloopVTable)->middleName(this);
-			return ret;
-		}
-
-		ICharUserField* comment()
-		{
-			ICharUserField* ret = static_cast<VTable*>(this->cloopVTable)->comment(this);
-			return ret;
-		}
-
-		ICharUserField* attributes()
-		{
-			ICharUserField* ret = static_cast<VTable*>(this->cloopVTable)->attributes(this);
-			return ret;
-		}
-
-		IIntUserField* active()
-		{
-			IIntUserField* ret = static_cast<VTable*>(this->cloopVTable)->active(this);
-			return ret;
-		}
-
-		IIntUserField* admin()
-		{
-			IIntUserField* ret = static_cast<VTable*>(this->cloopVTable)->admin(this);
-			return ret;
-		}
-
-		template <typename StatusType> void clear(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->clear(this, status);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_ILIST_USERS_VERSION 2u
-
-	class IListUsers : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			void (CLOOP_CARG *list)(IListUsers* self, IStatus* status, IUser* user) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IListUsers(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IListUsers()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ILIST_USERS_VERSION;
-
-		template <typename StatusType> void list(StatusType* status, IUser* user)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->list(this, status, user);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_ILOGON_INFO_VERSION 3u
-
-	class ILogonInfo : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			const char* (CLOOP_CARG *name)(ILogonInfo* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *role)(ILogonInfo* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *networkProtocol)(ILogonInfo* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *remoteAddress)(ILogonInfo* self) CLOOP_NOEXCEPT;
-			const unsigned char* (CLOOP_CARG *authBlock)(ILogonInfo* self, unsigned* length) CLOOP_NOEXCEPT;
-			IAttachment* (CLOOP_CARG *attachment)(ILogonInfo* self, IStatus* status) CLOOP_NOEXCEPT;
-			ITransaction* (CLOOP_CARG *transaction)(ILogonInfo* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ILogonInfo(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ILogonInfo()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ILOGON_INFO_VERSION;
-
-		const char* name()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->name(this);
-			return ret;
-		}
-
-		const char* role()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->role(this);
-			return ret;
-		}
-
-		const char* networkProtocol()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->networkProtocol(this);
-			return ret;
-		}
-
-		const char* remoteAddress()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->remoteAddress(this);
-			return ret;
-		}
-
-		const unsigned char* authBlock(unsigned* length)
-		{
-			const unsigned char* ret = static_cast<VTable*>(this->cloopVTable)->authBlock(this, length);
-			return ret;
-		}
-
-		template <typename StatusType> IAttachment* attachment(StatusType* status)
-		{
-			if (cloopVTable->version < 3)
-			{
-				StatusType::setVersionError(status, "ILogonInfo", cloopVTable->version, 3);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			IAttachment* ret = static_cast<VTable*>(this->cloopVTable)->attachment(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> ITransaction* transaction(StatusType* status)
-		{
-			if (cloopVTable->version < 3)
-			{
-				StatusType::setVersionError(status, "ILogonInfo", cloopVTable->version, 3);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			ITransaction* ret = static_cast<VTable*>(this->cloopVTable)->transaction(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IMANAGEMENT_VERSION 4u
-
-	class IManagement : public IPluginBase
-	{
-	public:
-		struct VTable : public IPluginBase::VTable
-		{
-			void (CLOOP_CARG *start)(IManagement* self, IStatus* status, ILogonInfo* logonInfo) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *execute)(IManagement* self, IStatus* status, IUser* user, IListUsers* callback) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *commit)(IManagement* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *rollback)(IManagement* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IManagement(DoNotInherit)
-			: IPluginBase(DoNotInherit())
-		{
-		}
-
-		~IManagement()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IMANAGEMENT_VERSION;
-
-		template <typename StatusType> void start(StatusType* status, ILogonInfo* logonInfo)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->start(this, status, logonInfo);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> int execute(StatusType* status, IUser* user, IListUsers* callback)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->execute(this, status, user, callback);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void commit(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->commit(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void rollback(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->rollback(this, status);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IAUTH_BLOCK_VERSION 2u
-
-	class IAuthBlock : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			const char* (CLOOP_CARG *getType)(IAuthBlock* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getName)(IAuthBlock* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getPlugin)(IAuthBlock* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getSecurityDb)(IAuthBlock* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getOriginalPlugin)(IAuthBlock* self) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *next)(IAuthBlock* self, IStatus* status) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *first)(IAuthBlock* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IAuthBlock(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IAuthBlock()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IAUTH_BLOCK_VERSION;
-
-		const char* getType()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getType(this);
-			return ret;
-		}
-
-		const char* getName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getName(this);
-			return ret;
-		}
-
-		const char* getPlugin()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getPlugin(this);
-			return ret;
-		}
-
-		const char* getSecurityDb()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getSecurityDb(this);
-			return ret;
-		}
-
-		const char* getOriginalPlugin()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getOriginalPlugin(this);
-			return ret;
-		}
-
-		template <typename StatusType> FB_BOOLEAN next(StatusType* status)
-		{
-			StatusType::clearException(status);
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->next(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> FB_BOOLEAN first(StatusType* status)
-		{
-			StatusType::clearException(status);
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->first(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IWIRE_CRYPT_PLUGIN_VERSION 5u
-
-	class IWireCryptPlugin : public IPluginBase
-	{
-	public:
-		struct VTable : public IPluginBase::VTable
-		{
-			const char* (CLOOP_CARG *getKnownTypes)(IWireCryptPlugin* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setKey)(IWireCryptPlugin* self, IStatus* status, ICryptKey* key) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *encrypt)(IWireCryptPlugin* self, IStatus* status, unsigned length, const void* from, void* to) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *decrypt)(IWireCryptPlugin* self, IStatus* status, unsigned length, const void* from, void* to) CLOOP_NOEXCEPT;
-			const unsigned char* (CLOOP_CARG *getSpecificData)(IWireCryptPlugin* self, IStatus* status, const char* keyType, unsigned* length) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setSpecificData)(IWireCryptPlugin* self, IStatus* status, const char* keyType, unsigned length, const unsigned char* data) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IWireCryptPlugin(DoNotInherit)
-			: IPluginBase(DoNotInherit())
-		{
-		}
-
-		~IWireCryptPlugin()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IWIRE_CRYPT_PLUGIN_VERSION;
-
-		template <typename StatusType> const char* getKnownTypes(StatusType* status)
-		{
-			StatusType::clearException(status);
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getKnownTypes(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void setKey(StatusType* status, ICryptKey* key)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setKey(this, status, key);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void encrypt(StatusType* status, unsigned length, const void* from, void* to)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->encrypt(this, status, length, from, to);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void decrypt(StatusType* status, unsigned length, const void* from, void* to)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->decrypt(this, status, length, from, to);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> const unsigned char* getSpecificData(StatusType* status, const char* keyType, unsigned* length)
-		{
-			if (cloopVTable->version < 5)
-			{
-				StatusType::setVersionError(status, "IWireCryptPlugin", cloopVTable->version, 5);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			const unsigned char* ret = static_cast<VTable*>(this->cloopVTable)->getSpecificData(this, status, keyType, length);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void setSpecificData(StatusType* status, const char* keyType, unsigned length, const unsigned char* data)
-		{
-			if (cloopVTable->version < 5)
-			{
-				StatusType::setVersionError(status, "IWireCryptPlugin", cloopVTable->version, 5);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setSpecificData(this, status, keyType, length, data);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_ICRYPT_KEY_CALLBACK_VERSION 2u
-
-	class ICryptKeyCallback : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			unsigned (CLOOP_CARG *callback)(ICryptKeyCallback* self, unsigned dataLength, const void* data, unsigned bufferLength, void* buffer) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ICryptKeyCallback(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ICryptKeyCallback()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ICRYPT_KEY_CALLBACK_VERSION;
-
-		unsigned callback(unsigned dataLength, const void* data, unsigned bufferLength, void* buffer)
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->callback(this, dataLength, data, bufferLength, buffer);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IKEY_HOLDER_PLUGIN_VERSION 5u
-
-	class IKeyHolderPlugin : public IPluginBase
-	{
-	public:
-		struct VTable : public IPluginBase::VTable
-		{
-			int (CLOOP_CARG *keyCallback)(IKeyHolderPlugin* self, IStatus* status, ICryptKeyCallback* callback) CLOOP_NOEXCEPT;
-			ICryptKeyCallback* (CLOOP_CARG *keyHandle)(IKeyHolderPlugin* self, IStatus* status, const char* keyName) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *useOnlyOwnKeys)(IKeyHolderPlugin* self, IStatus* status) CLOOP_NOEXCEPT;
-			ICryptKeyCallback* (CLOOP_CARG *chainHandle)(IKeyHolderPlugin* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IKeyHolderPlugin(DoNotInherit)
-			: IPluginBase(DoNotInherit())
-		{
-		}
-
-		~IKeyHolderPlugin()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IKEY_HOLDER_PLUGIN_VERSION;
-
-		template <typename StatusType> int keyCallback(StatusType* status, ICryptKeyCallback* callback)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->keyCallback(this, status, callback);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> ICryptKeyCallback* keyHandle(StatusType* status, const char* keyName)
-		{
-			StatusType::clearException(status);
-			ICryptKeyCallback* ret = static_cast<VTable*>(this->cloopVTable)->keyHandle(this, status, keyName);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> FB_BOOLEAN useOnlyOwnKeys(StatusType* status)
-		{
-			if (cloopVTable->version < 5)
-			{
-				StatusType::setVersionError(status, "IKeyHolderPlugin", cloopVTable->version, 5);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->useOnlyOwnKeys(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> ICryptKeyCallback* chainHandle(StatusType* status)
-		{
-			if (cloopVTable->version < 5)
-			{
-				StatusType::setVersionError(status, "IKeyHolderPlugin", cloopVTable->version, 5);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			ICryptKeyCallback* ret = static_cast<VTable*>(this->cloopVTable)->chainHandle(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IDB_CRYPT_INFO_VERSION 3u
-
-	class IDbCryptInfo : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			const char* (CLOOP_CARG *getDatabaseFullPath)(IDbCryptInfo* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IDbCryptInfo(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~IDbCryptInfo()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IDB_CRYPT_INFO_VERSION;
-
-		template <typename StatusType> const char* getDatabaseFullPath(StatusType* status)
-		{
-			StatusType::clearException(status);
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getDatabaseFullPath(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IDB_CRYPT_PLUGIN_VERSION 5u
-
-	class IDbCryptPlugin : public IPluginBase
-	{
-	public:
-		struct VTable : public IPluginBase::VTable
-		{
-			void (CLOOP_CARG *setKey)(IDbCryptPlugin* self, IStatus* status, unsigned length, IKeyHolderPlugin** sources, const char* keyName) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *encrypt)(IDbCryptPlugin* self, IStatus* status, unsigned length, const void* from, void* to) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *decrypt)(IDbCryptPlugin* self, IStatus* status, unsigned length, const void* from, void* to) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setInfo)(IDbCryptPlugin* self, IStatus* status, IDbCryptInfo* info) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IDbCryptPlugin(DoNotInherit)
-			: IPluginBase(DoNotInherit())
-		{
-		}
-
-		~IDbCryptPlugin()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IDB_CRYPT_PLUGIN_VERSION;
-
-		template <typename StatusType> void setKey(StatusType* status, unsigned length, IKeyHolderPlugin** sources, const char* keyName)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setKey(this, status, length, sources, keyName);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void encrypt(StatusType* status, unsigned length, const void* from, void* to)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->encrypt(this, status, length, from, to);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void decrypt(StatusType* status, unsigned length, const void* from, void* to)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->decrypt(this, status, length, from, to);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void setInfo(StatusType* status, IDbCryptInfo* info)
-		{
-			if (cloopVTable->version < 5)
-			{
-				StatusType::setVersionError(status, "IDbCryptPlugin", cloopVTable->version, 5);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setInfo(this, status, info);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IEXTERNAL_CONTEXT_VERSION 2u
-
-	class IExternalContext : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			IMaster* (CLOOP_CARG *getMaster)(IExternalContext* self) CLOOP_NOEXCEPT;
-			IExternalEngine* (CLOOP_CARG *getEngine)(IExternalContext* self, IStatus* status) CLOOP_NOEXCEPT;
-			IAttachment* (CLOOP_CARG *getAttachment)(IExternalContext* self, IStatus* status) CLOOP_NOEXCEPT;
-			ITransaction* (CLOOP_CARG *getTransaction)(IExternalContext* self, IStatus* status) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getUserName)(IExternalContext* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getDatabaseName)(IExternalContext* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getClientCharSet)(IExternalContext* self) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *obtainInfoCode)(IExternalContext* self) CLOOP_NOEXCEPT;
-			void* (CLOOP_CARG *getInfo)(IExternalContext* self, int code) CLOOP_NOEXCEPT;
-			void* (CLOOP_CARG *setInfo)(IExternalContext* self, int code, void* value) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IExternalContext(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IExternalContext()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IEXTERNAL_CONTEXT_VERSION;
-
-		IMaster* getMaster()
-		{
-			IMaster* ret = static_cast<VTable*>(this->cloopVTable)->getMaster(this);
-			return ret;
-		}
-
-		template <typename StatusType> IExternalEngine* getEngine(StatusType* status)
-		{
-			StatusType::clearException(status);
-			IExternalEngine* ret = static_cast<VTable*>(this->cloopVTable)->getEngine(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IAttachment* getAttachment(StatusType* status)
-		{
-			StatusType::clearException(status);
-			IAttachment* ret = static_cast<VTable*>(this->cloopVTable)->getAttachment(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> ITransaction* getTransaction(StatusType* status)
-		{
-			StatusType::clearException(status);
-			ITransaction* ret = static_cast<VTable*>(this->cloopVTable)->getTransaction(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		const char* getUserName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getUserName(this);
-			return ret;
-		}
-
-		const char* getDatabaseName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getDatabaseName(this);
-			return ret;
-		}
-
-		const char* getClientCharSet()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getClientCharSet(this);
-			return ret;
-		}
-
-		int obtainInfoCode()
-		{
-			int ret = static_cast<VTable*>(this->cloopVTable)->obtainInfoCode(this);
-			return ret;
-		}
-
-		void* getInfo(int code)
-		{
-			void* ret = static_cast<VTable*>(this->cloopVTable)->getInfo(this, code);
-			return ret;
-		}
-
-		void* setInfo(int code, void* value)
-		{
-			void* ret = static_cast<VTable*>(this->cloopVTable)->setInfo(this, code, value);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IEXTERNAL_RESULT_SET_VERSION 3u
-
-	class IExternalResultSet : public IDisposable
-	{
-	public:
-		struct VTable : public IDisposable::VTable
-		{
-			FB_BOOLEAN (CLOOP_CARG *fetch)(IExternalResultSet* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IExternalResultSet(DoNotInherit)
-			: IDisposable(DoNotInherit())
-		{
-		}
-
-		~IExternalResultSet()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IEXTERNAL_RESULT_SET_VERSION;
-
-		template <typename StatusType> FB_BOOLEAN fetch(StatusType* status)
-		{
-			StatusType::clearException(status);
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->fetch(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IEXTERNAL_FUNCTION_VERSION 3u
-
-	class IExternalFunction : public IDisposable
-	{
-	public:
-		struct VTable : public IDisposable::VTable
-		{
-			void (CLOOP_CARG *getCharSet)(IExternalFunction* self, IStatus* status, IExternalContext* context, char* name, unsigned nameSize) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *execute)(IExternalFunction* self, IStatus* status, IExternalContext* context, void* inMsg, void* outMsg) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IExternalFunction(DoNotInherit)
-			: IDisposable(DoNotInherit())
-		{
-		}
-
-		~IExternalFunction()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IEXTERNAL_FUNCTION_VERSION;
-
-		template <typename StatusType> void getCharSet(StatusType* status, IExternalContext* context, char* name, unsigned nameSize)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->getCharSet(this, status, context, name, nameSize);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void execute(StatusType* status, IExternalContext* context, void* inMsg, void* outMsg)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->execute(this, status, context, inMsg, outMsg);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IEXTERNAL_PROCEDURE_VERSION 3u
-
-	class IExternalProcedure : public IDisposable
-	{
-	public:
-		struct VTable : public IDisposable::VTable
-		{
-			void (CLOOP_CARG *getCharSet)(IExternalProcedure* self, IStatus* status, IExternalContext* context, char* name, unsigned nameSize) CLOOP_NOEXCEPT;
-			IExternalResultSet* (CLOOP_CARG *open)(IExternalProcedure* self, IStatus* status, IExternalContext* context, void* inMsg, void* outMsg) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IExternalProcedure(DoNotInherit)
-			: IDisposable(DoNotInherit())
-		{
-		}
-
-		~IExternalProcedure()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IEXTERNAL_PROCEDURE_VERSION;
-
-		template <typename StatusType> void getCharSet(StatusType* status, IExternalContext* context, char* name, unsigned nameSize)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->getCharSet(this, status, context, name, nameSize);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> IExternalResultSet* open(StatusType* status, IExternalContext* context, void* inMsg, void* outMsg)
-		{
-			StatusType::clearException(status);
-			IExternalResultSet* ret = static_cast<VTable*>(this->cloopVTable)->open(this, status, context, inMsg, outMsg);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IEXTERNAL_TRIGGER_VERSION 3u
-
-	class IExternalTrigger : public IDisposable
-	{
-	public:
-		struct VTable : public IDisposable::VTable
-		{
-			void (CLOOP_CARG *getCharSet)(IExternalTrigger* self, IStatus* status, IExternalContext* context, char* name, unsigned nameSize) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *execute)(IExternalTrigger* self, IStatus* status, IExternalContext* context, unsigned action, void* oldMsg, void* newMsg) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IExternalTrigger(DoNotInherit)
-			: IDisposable(DoNotInherit())
-		{
-		}
-
-		~IExternalTrigger()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IEXTERNAL_TRIGGER_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned TYPE_BEFORE = 1;
-		static CLOOP_CONSTEXPR unsigned TYPE_AFTER = 2;
-		static CLOOP_CONSTEXPR unsigned TYPE_DATABASE = 3;
-		static CLOOP_CONSTEXPR unsigned ACTION_INSERT = 1;
-		static CLOOP_CONSTEXPR unsigned ACTION_UPDATE = 2;
-		static CLOOP_CONSTEXPR unsigned ACTION_DELETE = 3;
-		static CLOOP_CONSTEXPR unsigned ACTION_CONNECT = 4;
-		static CLOOP_CONSTEXPR unsigned ACTION_DISCONNECT = 5;
-		static CLOOP_CONSTEXPR unsigned ACTION_TRANS_START = 6;
-		static CLOOP_CONSTEXPR unsigned ACTION_TRANS_COMMIT = 7;
-		static CLOOP_CONSTEXPR unsigned ACTION_TRANS_ROLLBACK = 8;
-		static CLOOP_CONSTEXPR unsigned ACTION_DDL = 9;
-
-		template <typename StatusType> void getCharSet(StatusType* status, IExternalContext* context, char* name, unsigned nameSize)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->getCharSet(this, status, context, name, nameSize);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void execute(StatusType* status, IExternalContext* context, unsigned action, void* oldMsg, void* newMsg)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->execute(this, status, context, action, oldMsg, newMsg);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IROUTINE_METADATA_VERSION 2u
-
-	class IRoutineMetadata : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			const char* (CLOOP_CARG *getPackage)(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getName)(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getEntryPoint)(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getBody)(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT;
-			IMessageMetadata* (CLOOP_CARG *getInputMetadata)(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT;
-			IMessageMetadata* (CLOOP_CARG *getOutputMetadata)(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT;
-			IMessageMetadata* (CLOOP_CARG *getTriggerMetadata)(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getTriggerTable)(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getTriggerType)(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IRoutineMetadata(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IRoutineMetadata()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IROUTINE_METADATA_VERSION;
-
-		template <typename StatusType> const char* getPackage(StatusType* status) const
-		{
-			StatusType::clearException(status);
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getPackage(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> const char* getName(StatusType* status) const
-		{
-			StatusType::clearException(status);
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getName(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> const char* getEntryPoint(StatusType* status) const
-		{
-			StatusType::clearException(status);
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getEntryPoint(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> const char* getBody(StatusType* status) const
-		{
-			StatusType::clearException(status);
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getBody(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IMessageMetadata* getInputMetadata(StatusType* status) const
-		{
-			StatusType::clearException(status);
-			IMessageMetadata* ret = static_cast<VTable*>(this->cloopVTable)->getInputMetadata(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IMessageMetadata* getOutputMetadata(StatusType* status) const
-		{
-			StatusType::clearException(status);
-			IMessageMetadata* ret = static_cast<VTable*>(this->cloopVTable)->getOutputMetadata(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IMessageMetadata* getTriggerMetadata(StatusType* status) const
-		{
-			StatusType::clearException(status);
-			IMessageMetadata* ret = static_cast<VTable*>(this->cloopVTable)->getTriggerMetadata(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> const char* getTriggerTable(StatusType* status) const
-		{
-			StatusType::clearException(status);
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getTriggerTable(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned getTriggerType(StatusType* status) const
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getTriggerType(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IEXTERNAL_ENGINE_VERSION 4u
-
-	class IExternalEngine : public IPluginBase
-	{
-	public:
-		struct VTable : public IPluginBase::VTable
-		{
-			void (CLOOP_CARG *open)(IExternalEngine* self, IStatus* status, IExternalContext* context, char* charSet, unsigned charSetSize) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *openAttachment)(IExternalEngine* self, IStatus* status, IExternalContext* context) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *closeAttachment)(IExternalEngine* self, IStatus* status, IExternalContext* context) CLOOP_NOEXCEPT;
-			IExternalFunction* (CLOOP_CARG *makeFunction)(IExternalEngine* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder) CLOOP_NOEXCEPT;
-			IExternalProcedure* (CLOOP_CARG *makeProcedure)(IExternalEngine* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder) CLOOP_NOEXCEPT;
-			IExternalTrigger* (CLOOP_CARG *makeTrigger)(IExternalEngine* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* fieldsBuilder) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IExternalEngine(DoNotInherit)
-			: IPluginBase(DoNotInherit())
-		{
-		}
-
-		~IExternalEngine()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IEXTERNAL_ENGINE_VERSION;
-
-		template <typename StatusType> void open(StatusType* status, IExternalContext* context, char* charSet, unsigned charSetSize)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->open(this, status, context, charSet, charSetSize);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void openAttachment(StatusType* status, IExternalContext* context)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->openAttachment(this, status, context);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void closeAttachment(StatusType* status, IExternalContext* context)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->closeAttachment(this, status, context);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> IExternalFunction* makeFunction(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder)
-		{
-			StatusType::clearException(status);
-			IExternalFunction* ret = static_cast<VTable*>(this->cloopVTable)->makeFunction(this, status, context, metadata, inBuilder, outBuilder);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IExternalProcedure* makeProcedure(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder)
-		{
-			StatusType::clearException(status);
-			IExternalProcedure* ret = static_cast<VTable*>(this->cloopVTable)->makeProcedure(this, status, context, metadata, inBuilder, outBuilder);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IExternalTrigger* makeTrigger(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* fieldsBuilder)
-		{
-			StatusType::clearException(status);
-			IExternalTrigger* ret = static_cast<VTable*>(this->cloopVTable)->makeTrigger(this, status, context, metadata, fieldsBuilder);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITIMER_VERSION 3u
-
-	class ITimer : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			void (CLOOP_CARG *handler)(ITimer* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITimer(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~ITimer()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITIMER_VERSION;
-
-		void handler()
-		{
-			static_cast<VTable*>(this->cloopVTable)->handler(this);
-		}
-	};
-
-#define FIREBIRD_ITIMER_CONTROL_VERSION 2u
-
-	class ITimerControl : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			void (CLOOP_CARG *start)(ITimerControl* self, IStatus* status, ITimer* timer, ISC_UINT64 microSeconds) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *stop)(ITimerControl* self, IStatus* status, ITimer* timer) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITimerControl(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ITimerControl()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITIMER_CONTROL_VERSION;
-
-		template <typename StatusType> void start(StatusType* status, ITimer* timer, ISC_UINT64 microSeconds)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->start(this, status, timer, microSeconds);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void stop(StatusType* status, ITimer* timer)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->stop(this, status, timer);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IVERSION_CALLBACK_VERSION 2u
-
-	class IVersionCallback : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			void (CLOOP_CARG *callback)(IVersionCallback* self, IStatus* status, const char* text) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IVersionCallback(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IVersionCallback()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IVERSION_CALLBACK_VERSION;
-
-		template <typename StatusType> void callback(StatusType* status, const char* text)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->callback(this, status, text);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IUTIL_VERSION 4u
-
-	class IUtil : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			void (CLOOP_CARG *getFbVersion)(IUtil* self, IStatus* status, IAttachment* att, IVersionCallback* callback) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *loadBlob)(IUtil* self, IStatus* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *dumpBlob)(IUtil* self, IStatus* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *getPerfCounters)(IUtil* self, IStatus* status, IAttachment* att, const char* countersSet, ISC_INT64* counters) CLOOP_NOEXCEPT;
-			IAttachment* (CLOOP_CARG *executeCreateDatabase)(IUtil* self, IStatus* status, unsigned stmtLength, const char* creatDBstatement, unsigned dialect, FB_BOOLEAN* stmtIsCreateDb) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *decodeDate)(IUtil* self, ISC_DATE date, unsigned* year, unsigned* month, unsigned* day) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *decodeTime)(IUtil* self, ISC_TIME time, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions) CLOOP_NOEXCEPT;
-			ISC_DATE (CLOOP_CARG *encodeDate)(IUtil* self, unsigned year, unsigned month, unsigned day) CLOOP_NOEXCEPT;
-			ISC_TIME (CLOOP_CARG *encodeTime)(IUtil* self, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *formatStatus)(IUtil* self, char* buffer, unsigned bufferSize, IStatus* status) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getClientVersion)(IUtil* self) CLOOP_NOEXCEPT;
-			IXpbBuilder* (CLOOP_CARG *getXpbBuilder)(IUtil* self, IStatus* status, unsigned kind, const unsigned char* buf, unsigned len) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *setOffsets)(IUtil* self, IStatus* status, IMessageMetadata* metadata, IOffsetsCallback* callback) CLOOP_NOEXCEPT;
-			IDecFloat16* (CLOOP_CARG *getDecFloat16)(IUtil* self, IStatus* status) CLOOP_NOEXCEPT;
-			IDecFloat34* (CLOOP_CARG *getDecFloat34)(IUtil* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *decodeTimeTz)(IUtil* self, IStatus* status, const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *decodeTimeStampTz)(IUtil* self, IStatus* status, const ISC_TIMESTAMP_TZ* timeStampTz, unsigned* year, unsigned* month, unsigned* day, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *encodeTimeTz)(IUtil* self, IStatus* status, ISC_TIME_TZ* timeTz, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions, const char* timeZone) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *encodeTimeStampTz)(IUtil* self, IStatus* status, ISC_TIMESTAMP_TZ* timeStampTz, unsigned year, unsigned month, unsigned day, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions, const char* timeZone) CLOOP_NOEXCEPT;
-			IInt128* (CLOOP_CARG *getInt128)(IUtil* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *decodeTimeTzEx)(IUtil* self, IStatus* status, const ISC_TIME_TZ_EX* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *decodeTimeStampTzEx)(IUtil* self, IStatus* status, const ISC_TIMESTAMP_TZ_EX* timeStampTz, unsigned* year, unsigned* month, unsigned* day, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IUtil(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IUtil()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IUTIL_VERSION;
-
-		template <typename StatusType> void getFbVersion(StatusType* status, IAttachment* att, IVersionCallback* callback)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->getFbVersion(this, status, att, callback);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void loadBlob(StatusType* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->loadBlob(this, status, blobId, att, tra, file, txt);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void dumpBlob(StatusType* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->dumpBlob(this, status, blobId, att, tra, file, txt);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void getPerfCounters(StatusType* status, IAttachment* att, const char* countersSet, ISC_INT64* counters)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->getPerfCounters(this, status, att, countersSet, counters);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> IAttachment* executeCreateDatabase(StatusType* status, unsigned stmtLength, const char* creatDBstatement, unsigned dialect, FB_BOOLEAN* stmtIsCreateDb)
-		{
-			StatusType::clearException(status);
-			IAttachment* ret = static_cast<VTable*>(this->cloopVTable)->executeCreateDatabase(this, status, stmtLength, creatDBstatement, dialect, stmtIsCreateDb);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		void decodeDate(ISC_DATE date, unsigned* year, unsigned* month, unsigned* day)
-		{
-			static_cast<VTable*>(this->cloopVTable)->decodeDate(this, date, year, month, day);
-		}
-
-		void decodeTime(ISC_TIME time, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions)
-		{
-			static_cast<VTable*>(this->cloopVTable)->decodeTime(this, time, hours, minutes, seconds, fractions);
-		}
-
-		ISC_DATE encodeDate(unsigned year, unsigned month, unsigned day)
-		{
-			ISC_DATE ret = static_cast<VTable*>(this->cloopVTable)->encodeDate(this, year, month, day);
-			return ret;
-		}
-
-		ISC_TIME encodeTime(unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions)
-		{
-			ISC_TIME ret = static_cast<VTable*>(this->cloopVTable)->encodeTime(this, hours, minutes, seconds, fractions);
-			return ret;
-		}
-
-		unsigned formatStatus(char* buffer, unsigned bufferSize, IStatus* status)
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->formatStatus(this, buffer, bufferSize, status);
-			return ret;
-		}
-
-		unsigned getClientVersion()
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getClientVersion(this);
-			return ret;
-		}
-
-		template <typename StatusType> IXpbBuilder* getXpbBuilder(StatusType* status, unsigned kind, const unsigned char* buf, unsigned len)
-		{
-			StatusType::clearException(status);
-			IXpbBuilder* ret = static_cast<VTable*>(this->cloopVTable)->getXpbBuilder(this, status, kind, buf, len);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned setOffsets(StatusType* status, IMessageMetadata* metadata, IOffsetsCallback* callback)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->setOffsets(this, status, metadata, callback);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IDecFloat16* getDecFloat16(StatusType* status)
-		{
-			if (cloopVTable->version < 3)
-			{
-				StatusType::setVersionError(status, "IUtil", cloopVTable->version, 3);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			IDecFloat16* ret = static_cast<VTable*>(this->cloopVTable)->getDecFloat16(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IDecFloat34* getDecFloat34(StatusType* status)
-		{
-			if (cloopVTable->version < 3)
-			{
-				StatusType::setVersionError(status, "IUtil", cloopVTable->version, 3);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			IDecFloat34* ret = static_cast<VTable*>(this->cloopVTable)->getDecFloat34(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void decodeTimeTz(StatusType* status, const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer)
-		{
-			if (cloopVTable->version < 3)
-			{
-				StatusType::setVersionError(status, "IUtil", cloopVTable->version, 3);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->decodeTimeTz(this, status, timeTz, hours, minutes, seconds, fractions, timeZoneBufferLength, timeZoneBuffer);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void decodeTimeStampTz(StatusType* status, const ISC_TIMESTAMP_TZ* timeStampTz, unsigned* year, unsigned* month, unsigned* day, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer)
-		{
-			if (cloopVTable->version < 3)
-			{
-				StatusType::setVersionError(status, "IUtil", cloopVTable->version, 3);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->decodeTimeStampTz(this, status, timeStampTz, year, month, day, hours, minutes, seconds, fractions, timeZoneBufferLength, timeZoneBuffer);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void encodeTimeTz(StatusType* status, ISC_TIME_TZ* timeTz, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions, const char* timeZone)
-		{
-			if (cloopVTable->version < 3)
-			{
-				StatusType::setVersionError(status, "IUtil", cloopVTable->version, 3);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->encodeTimeTz(this, status, timeTz, hours, minutes, seconds, fractions, timeZone);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void encodeTimeStampTz(StatusType* status, ISC_TIMESTAMP_TZ* timeStampTz, unsigned year, unsigned month, unsigned day, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions, const char* timeZone)
-		{
-			if (cloopVTable->version < 3)
-			{
-				StatusType::setVersionError(status, "IUtil", cloopVTable->version, 3);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->encodeTimeStampTz(this, status, timeStampTz, year, month, day, hours, minutes, seconds, fractions, timeZone);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> IInt128* getInt128(StatusType* status)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IUtil", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			IInt128* ret = static_cast<VTable*>(this->cloopVTable)->getInt128(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void decodeTimeTzEx(StatusType* status, const ISC_TIME_TZ_EX* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IUtil", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->decodeTimeTzEx(this, status, timeTz, hours, minutes, seconds, fractions, timeZoneBufferLength, timeZoneBuffer);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void decodeTimeStampTzEx(StatusType* status, const ISC_TIMESTAMP_TZ_EX* timeStampTz, unsigned* year, unsigned* month, unsigned* day, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "IUtil", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return;
-			}
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->decodeTimeStampTzEx(this, status, timeStampTz, year, month, day, hours, minutes, seconds, fractions, timeZoneBufferLength, timeZoneBuffer);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IOFFSETS_CALLBACK_VERSION 2u
-
-	class IOffsetsCallback : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			void (CLOOP_CARG *setOffset)(IOffsetsCallback* self, IStatus* status, unsigned index, unsigned offset, unsigned nullOffset) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IOffsetsCallback(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IOffsetsCallback()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IOFFSETS_CALLBACK_VERSION;
-
-		template <typename StatusType> void setOffset(StatusType* status, unsigned index, unsigned offset, unsigned nullOffset)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setOffset(this, status, index, offset, nullOffset);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IXPB_BUILDER_VERSION 3u
-
-	class IXpbBuilder : public IDisposable
-	{
-	public:
-		struct VTable : public IDisposable::VTable
-		{
-			void (CLOOP_CARG *clear)(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *removeCurrent)(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *insertInt)(IXpbBuilder* self, IStatus* status, unsigned char tag, int value) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *insertBigInt)(IXpbBuilder* self, IStatus* status, unsigned char tag, ISC_INT64 value) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *insertBytes)(IXpbBuilder* self, IStatus* status, unsigned char tag, const void* bytes, unsigned length) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *insertString)(IXpbBuilder* self, IStatus* status, unsigned char tag, const char* str) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *insertTag)(IXpbBuilder* self, IStatus* status, unsigned char tag) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *isEof)(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *moveNext)(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *rewind)(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *findFirst)(IXpbBuilder* self, IStatus* status, unsigned char tag) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *findNext)(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			unsigned char (CLOOP_CARG *getTag)(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getLength)(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *getInt)(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			ISC_INT64 (CLOOP_CARG *getBigInt)(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getString)(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			const unsigned char* (CLOOP_CARG *getBytes)(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getBufferLength)(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-			const unsigned char* (CLOOP_CARG *getBuffer)(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IXpbBuilder(DoNotInherit)
-			: IDisposable(DoNotInherit())
-		{
-		}
-
-		~IXpbBuilder()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IXPB_BUILDER_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned DPB = 1;
-		static CLOOP_CONSTEXPR unsigned SPB_ATTACH = 2;
-		static CLOOP_CONSTEXPR unsigned SPB_START = 3;
-		static CLOOP_CONSTEXPR unsigned TPB = 4;
-		static CLOOP_CONSTEXPR unsigned BATCH = 5;
-		static CLOOP_CONSTEXPR unsigned BPB = 6;
-		static CLOOP_CONSTEXPR unsigned SPB_SEND = 7;
-		static CLOOP_CONSTEXPR unsigned SPB_RECEIVE = 8;
-		static CLOOP_CONSTEXPR unsigned SPB_RESPONSE = 9;
-		static CLOOP_CONSTEXPR unsigned INFO_SEND = 10;
-		static CLOOP_CONSTEXPR unsigned INFO_RESPONSE = 11;
-
-		template <typename StatusType> void clear(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->clear(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void removeCurrent(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->removeCurrent(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void insertInt(StatusType* status, unsigned char tag, int value)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->insertInt(this, status, tag, value);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void insertBigInt(StatusType* status, unsigned char tag, ISC_INT64 value)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->insertBigInt(this, status, tag, value);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void insertBytes(StatusType* status, unsigned char tag, const void* bytes, unsigned length)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->insertBytes(this, status, tag, bytes, length);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void insertString(StatusType* status, unsigned char tag, const char* str)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->insertString(this, status, tag, str);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void insertTag(StatusType* status, unsigned char tag)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->insertTag(this, status, tag);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> FB_BOOLEAN isEof(StatusType* status)
-		{
-			StatusType::clearException(status);
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->isEof(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void moveNext(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->moveNext(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void rewind(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->rewind(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> FB_BOOLEAN findFirst(StatusType* status, unsigned char tag)
-		{
-			StatusType::clearException(status);
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->findFirst(this, status, tag);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> FB_BOOLEAN findNext(StatusType* status)
-		{
-			StatusType::clearException(status);
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->findNext(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned char getTag(StatusType* status)
-		{
-			StatusType::clearException(status);
-			unsigned char ret = static_cast<VTable*>(this->cloopVTable)->getTag(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned getLength(StatusType* status)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getLength(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> int getInt(StatusType* status)
-		{
-			StatusType::clearException(status);
-			int ret = static_cast<VTable*>(this->cloopVTable)->getInt(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> ISC_INT64 getBigInt(StatusType* status)
-		{
-			StatusType::clearException(status);
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getBigInt(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> const char* getString(StatusType* status)
-		{
-			StatusType::clearException(status);
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getString(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> const unsigned char* getBytes(StatusType* status)
-		{
-			StatusType::clearException(status);
-			const unsigned char* ret = static_cast<VTable*>(this->cloopVTable)->getBytes(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned getBufferLength(StatusType* status)
-		{
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getBufferLength(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> const unsigned char* getBuffer(StatusType* status)
-		{
-			StatusType::clearException(status);
-			const unsigned char* ret = static_cast<VTable*>(this->cloopVTable)->getBuffer(this, status);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_CONNECTION_VERSION 2u
-
-	class ITraceConnection : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			unsigned (CLOOP_CARG *getKind)(ITraceConnection* self) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *getProcessID)(ITraceConnection* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getUserName)(ITraceConnection* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getRoleName)(ITraceConnection* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getCharSet)(ITraceConnection* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getRemoteProtocol)(ITraceConnection* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getRemoteAddress)(ITraceConnection* self) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *getRemoteProcessID)(ITraceConnection* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getRemoteProcessName)(ITraceConnection* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceConnection(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ITraceConnection()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_CONNECTION_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned KIND_DATABASE = 1;
-		static CLOOP_CONSTEXPR unsigned KIND_SERVICE = 2;
-
-		unsigned getKind()
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getKind(this);
-			return ret;
-		}
-
-		int getProcessID()
-		{
-			int ret = static_cast<VTable*>(this->cloopVTable)->getProcessID(this);
-			return ret;
-		}
-
-		const char* getUserName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getUserName(this);
-			return ret;
-		}
-
-		const char* getRoleName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getRoleName(this);
-			return ret;
-		}
-
-		const char* getCharSet()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getCharSet(this);
-			return ret;
-		}
-
-		const char* getRemoteProtocol()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getRemoteProtocol(this);
-			return ret;
-		}
-
-		const char* getRemoteAddress()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getRemoteAddress(this);
-			return ret;
-		}
-
-		int getRemoteProcessID()
-		{
-			int ret = static_cast<VTable*>(this->cloopVTable)->getRemoteProcessID(this);
-			return ret;
-		}
-
-		const char* getRemoteProcessName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getRemoteProcessName(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_DATABASE_CONNECTION_VERSION 3u
-
-	class ITraceDatabaseConnection : public ITraceConnection
-	{
-	public:
-		struct VTable : public ITraceConnection::VTable
-		{
-			ISC_INT64 (CLOOP_CARG *getConnectionID)(ITraceDatabaseConnection* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getDatabaseName)(ITraceDatabaseConnection* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceDatabaseConnection(DoNotInherit)
-			: ITraceConnection(DoNotInherit())
-		{
-		}
-
-		~ITraceDatabaseConnection()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_DATABASE_CONNECTION_VERSION;
-
-		ISC_INT64 getConnectionID()
-		{
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getConnectionID(this);
-			return ret;
-		}
-
-		const char* getDatabaseName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getDatabaseName(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_TRANSACTION_VERSION 3u
-
-	class ITraceTransaction : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			ISC_INT64 (CLOOP_CARG *getTransactionID)(ITraceTransaction* self) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *getReadOnly)(ITraceTransaction* self) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *getWait)(ITraceTransaction* self) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getIsolation)(ITraceTransaction* self) CLOOP_NOEXCEPT;
-			PerformanceInfo* (CLOOP_CARG *getPerf)(ITraceTransaction* self) CLOOP_NOEXCEPT;
-			ISC_INT64 (CLOOP_CARG *getInitialID)(ITraceTransaction* self) CLOOP_NOEXCEPT;
-			ISC_INT64 (CLOOP_CARG *getPreviousID)(ITraceTransaction* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceTransaction(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ITraceTransaction()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_TRANSACTION_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned ISOLATION_CONSISTENCY = 1;
-		static CLOOP_CONSTEXPR unsigned ISOLATION_CONCURRENCY = 2;
-		static CLOOP_CONSTEXPR unsigned ISOLATION_READ_COMMITTED_RECVER = 3;
-		static CLOOP_CONSTEXPR unsigned ISOLATION_READ_COMMITTED_NORECVER = 4;
-		static CLOOP_CONSTEXPR unsigned ISOLATION_READ_COMMITTED_READ_CONSISTENCY = 5;
-
-		ISC_INT64 getTransactionID()
-		{
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getTransactionID(this);
-			return ret;
-		}
-
-		FB_BOOLEAN getReadOnly()
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->getReadOnly(this);
-			return ret;
-		}
-
-		int getWait()
-		{
-			int ret = static_cast<VTable*>(this->cloopVTable)->getWait(this);
-			return ret;
-		}
-
-		unsigned getIsolation()
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getIsolation(this);
-			return ret;
-		}
-
-		PerformanceInfo* getPerf()
-		{
-			PerformanceInfo* ret = static_cast<VTable*>(this->cloopVTable)->getPerf(this);
-			return ret;
-		}
-
-		ISC_INT64 getInitialID()
-		{
-			if (cloopVTable->version < 3)
-			{
-				return 0;
-			}
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getInitialID(this);
-			return ret;
-		}
-
-		ISC_INT64 getPreviousID()
-		{
-			if (cloopVTable->version < 3)
-			{
-				return 0;
-			}
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getPreviousID(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_PARAMS_VERSION 3u
-
-	class ITraceParams : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			unsigned (CLOOP_CARG *getCount)(ITraceParams* self) CLOOP_NOEXCEPT;
-			const dsc* (CLOOP_CARG *getParam)(ITraceParams* self, unsigned idx) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getTextUTF8)(ITraceParams* self, IStatus* status, unsigned idx) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceParams(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ITraceParams()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_PARAMS_VERSION;
-
-		unsigned getCount()
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getCount(this);
-			return ret;
-		}
-
-		const dsc* getParam(unsigned idx)
-		{
-			const dsc* ret = static_cast<VTable*>(this->cloopVTable)->getParam(this, idx);
-			return ret;
-		}
-
-		template <typename StatusType> const char* getTextUTF8(StatusType* status, unsigned idx)
-		{
-			if (cloopVTable->version < 3)
-			{
-				StatusType::setVersionError(status, "ITraceParams", cloopVTable->version, 3);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getTextUTF8(this, status, idx);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_STATEMENT_VERSION 2u
-
-	class ITraceStatement : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			ISC_INT64 (CLOOP_CARG *getStmtID)(ITraceStatement* self) CLOOP_NOEXCEPT;
-			PerformanceInfo* (CLOOP_CARG *getPerf)(ITraceStatement* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceStatement(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ITraceStatement()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_STATEMENT_VERSION;
-
-		ISC_INT64 getStmtID()
-		{
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getStmtID(this);
-			return ret;
-		}
-
-		PerformanceInfo* getPerf()
-		{
-			PerformanceInfo* ret = static_cast<VTable*>(this->cloopVTable)->getPerf(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_SQLSTATEMENT_VERSION 3u
-
-	class ITraceSQLStatement : public ITraceStatement
-	{
-	public:
-		struct VTable : public ITraceStatement::VTable
-		{
-			const char* (CLOOP_CARG *getText)(ITraceSQLStatement* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getPlan)(ITraceSQLStatement* self) CLOOP_NOEXCEPT;
-			ITraceParams* (CLOOP_CARG *getInputs)(ITraceSQLStatement* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getTextUTF8)(ITraceSQLStatement* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getExplainedPlan)(ITraceSQLStatement* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceSQLStatement(DoNotInherit)
-			: ITraceStatement(DoNotInherit())
-		{
-		}
-
-		~ITraceSQLStatement()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_SQLSTATEMENT_VERSION;
-
-		const char* getText()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getText(this);
-			return ret;
-		}
-
-		const char* getPlan()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getPlan(this);
-			return ret;
-		}
-
-		ITraceParams* getInputs()
-		{
-			ITraceParams* ret = static_cast<VTable*>(this->cloopVTable)->getInputs(this);
-			return ret;
-		}
-
-		const char* getTextUTF8()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getTextUTF8(this);
-			return ret;
-		}
-
-		const char* getExplainedPlan()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getExplainedPlan(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_BLRSTATEMENT_VERSION 3u
-
-	class ITraceBLRStatement : public ITraceStatement
-	{
-	public:
-		struct VTable : public ITraceStatement::VTable
-		{
-			const unsigned char* (CLOOP_CARG *getData)(ITraceBLRStatement* self) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getDataLength)(ITraceBLRStatement* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getText)(ITraceBLRStatement* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceBLRStatement(DoNotInherit)
-			: ITraceStatement(DoNotInherit())
-		{
-		}
-
-		~ITraceBLRStatement()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_BLRSTATEMENT_VERSION;
-
-		const unsigned char* getData()
-		{
-			const unsigned char* ret = static_cast<VTable*>(this->cloopVTable)->getData(this);
-			return ret;
-		}
-
-		unsigned getDataLength()
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getDataLength(this);
-			return ret;
-		}
-
-		const char* getText()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getText(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_DYNREQUEST_VERSION 2u
-
-	class ITraceDYNRequest : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			const unsigned char* (CLOOP_CARG *getData)(ITraceDYNRequest* self) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getDataLength)(ITraceDYNRequest* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getText)(ITraceDYNRequest* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceDYNRequest(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ITraceDYNRequest()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_DYNREQUEST_VERSION;
-
-		const unsigned char* getData()
-		{
-			const unsigned char* ret = static_cast<VTable*>(this->cloopVTable)->getData(this);
-			return ret;
-		}
-
-		unsigned getDataLength()
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getDataLength(this);
-			return ret;
-		}
-
-		const char* getText()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getText(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_CONTEXT_VARIABLE_VERSION 2u
-
-	class ITraceContextVariable : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			const char* (CLOOP_CARG *getNameSpace)(ITraceContextVariable* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getVarName)(ITraceContextVariable* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getVarValue)(ITraceContextVariable* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceContextVariable(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ITraceContextVariable()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_CONTEXT_VARIABLE_VERSION;
-
-		const char* getNameSpace()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getNameSpace(this);
-			return ret;
-		}
-
-		const char* getVarName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getVarName(this);
-			return ret;
-		}
-
-		const char* getVarValue()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getVarValue(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_PROCEDURE_VERSION 3u
-
-	class ITraceProcedure : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			const char* (CLOOP_CARG *getProcName)(ITraceProcedure* self) CLOOP_NOEXCEPT;
-			ITraceParams* (CLOOP_CARG *getInputs)(ITraceProcedure* self) CLOOP_NOEXCEPT;
-			PerformanceInfo* (CLOOP_CARG *getPerf)(ITraceProcedure* self) CLOOP_NOEXCEPT;
-			ISC_INT64 (CLOOP_CARG *getStmtID)(ITraceProcedure* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getPlan)(ITraceProcedure* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getExplainedPlan)(ITraceProcedure* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceProcedure(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ITraceProcedure()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_PROCEDURE_VERSION;
-
-		const char* getProcName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getProcName(this);
-			return ret;
-		}
-
-		ITraceParams* getInputs()
-		{
-			ITraceParams* ret = static_cast<VTable*>(this->cloopVTable)->getInputs(this);
-			return ret;
-		}
-
-		PerformanceInfo* getPerf()
-		{
-			PerformanceInfo* ret = static_cast<VTable*>(this->cloopVTable)->getPerf(this);
-			return ret;
-		}
-
-		ISC_INT64 getStmtID()
-		{
-			if (cloopVTable->version < 3)
-			{
-				return 0;
-			}
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getStmtID(this);
-			return ret;
-		}
-
-		const char* getPlan()
-		{
-			if (cloopVTable->version < 3)
-			{
-				return 0;
-			}
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getPlan(this);
-			return ret;
-		}
-
-		const char* getExplainedPlan()
-		{
-			if (cloopVTable->version < 3)
-			{
-				return 0;
-			}
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getExplainedPlan(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_FUNCTION_VERSION 3u
-
-	class ITraceFunction : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			const char* (CLOOP_CARG *getFuncName)(ITraceFunction* self) CLOOP_NOEXCEPT;
-			ITraceParams* (CLOOP_CARG *getInputs)(ITraceFunction* self) CLOOP_NOEXCEPT;
-			ITraceParams* (CLOOP_CARG *getResult)(ITraceFunction* self) CLOOP_NOEXCEPT;
-			PerformanceInfo* (CLOOP_CARG *getPerf)(ITraceFunction* self) CLOOP_NOEXCEPT;
-			ISC_INT64 (CLOOP_CARG *getStmtID)(ITraceFunction* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getPlan)(ITraceFunction* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getExplainedPlan)(ITraceFunction* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceFunction(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ITraceFunction()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_FUNCTION_VERSION;
-
-		const char* getFuncName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getFuncName(this);
-			return ret;
-		}
-
-		ITraceParams* getInputs()
-		{
-			ITraceParams* ret = static_cast<VTable*>(this->cloopVTable)->getInputs(this);
-			return ret;
-		}
-
-		ITraceParams* getResult()
-		{
-			ITraceParams* ret = static_cast<VTable*>(this->cloopVTable)->getResult(this);
-			return ret;
-		}
-
-		PerformanceInfo* getPerf()
-		{
-			PerformanceInfo* ret = static_cast<VTable*>(this->cloopVTable)->getPerf(this);
-			return ret;
-		}
-
-		ISC_INT64 getStmtID()
-		{
-			if (cloopVTable->version < 3)
-			{
-				return 0;
-			}
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getStmtID(this);
-			return ret;
-		}
-
-		const char* getPlan()
-		{
-			if (cloopVTable->version < 3)
-			{
-				return 0;
-			}
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getPlan(this);
-			return ret;
-		}
-
-		const char* getExplainedPlan()
-		{
-			if (cloopVTable->version < 3)
-			{
-				return 0;
-			}
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getExplainedPlan(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_TRIGGER_VERSION 3u
-
-	class ITraceTrigger : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			const char* (CLOOP_CARG *getTriggerName)(ITraceTrigger* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getRelationName)(ITraceTrigger* self) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *getAction)(ITraceTrigger* self) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *getWhich)(ITraceTrigger* self) CLOOP_NOEXCEPT;
-			PerformanceInfo* (CLOOP_CARG *getPerf)(ITraceTrigger* self) CLOOP_NOEXCEPT;
-			ISC_INT64 (CLOOP_CARG *getStmtID)(ITraceTrigger* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getPlan)(ITraceTrigger* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getExplainedPlan)(ITraceTrigger* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceTrigger(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ITraceTrigger()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_TRIGGER_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned TYPE_ALL = 0;
-		static CLOOP_CONSTEXPR unsigned TYPE_BEFORE = 1;
-		static CLOOP_CONSTEXPR unsigned TYPE_AFTER = 2;
-
-		const char* getTriggerName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getTriggerName(this);
-			return ret;
-		}
-
-		const char* getRelationName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getRelationName(this);
-			return ret;
-		}
-
-		int getAction()
-		{
-			int ret = static_cast<VTable*>(this->cloopVTable)->getAction(this);
-			return ret;
-		}
-
-		int getWhich()
-		{
-			int ret = static_cast<VTable*>(this->cloopVTable)->getWhich(this);
-			return ret;
-		}
-
-		PerformanceInfo* getPerf()
-		{
-			PerformanceInfo* ret = static_cast<VTable*>(this->cloopVTable)->getPerf(this);
-			return ret;
-		}
-
-		ISC_INT64 getStmtID()
-		{
-			if (cloopVTable->version < 3)
-			{
-				return 0;
-			}
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getStmtID(this);
-			return ret;
-		}
-
-		const char* getPlan()
-		{
-			if (cloopVTable->version < 3)
-			{
-				return 0;
-			}
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getPlan(this);
-			return ret;
-		}
-
-		const char* getExplainedPlan()
-		{
-			if (cloopVTable->version < 3)
-			{
-				return 0;
-			}
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getExplainedPlan(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_SERVICE_CONNECTION_VERSION 3u
-
-	class ITraceServiceConnection : public ITraceConnection
-	{
-	public:
-		struct VTable : public ITraceConnection::VTable
-		{
-			void* (CLOOP_CARG *getServiceID)(ITraceServiceConnection* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getServiceMgr)(ITraceServiceConnection* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getServiceName)(ITraceServiceConnection* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceServiceConnection(DoNotInherit)
-			: ITraceConnection(DoNotInherit())
-		{
-		}
-
-		~ITraceServiceConnection()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_SERVICE_CONNECTION_VERSION;
-
-		void* getServiceID()
-		{
-			void* ret = static_cast<VTable*>(this->cloopVTable)->getServiceID(this);
-			return ret;
-		}
-
-		const char* getServiceMgr()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getServiceMgr(this);
-			return ret;
-		}
-
-		const char* getServiceName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getServiceName(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_STATUS_VECTOR_VERSION 2u
-
-	class ITraceStatusVector : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			FB_BOOLEAN (CLOOP_CARG *hasError)(ITraceStatusVector* self) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *hasWarning)(ITraceStatusVector* self) CLOOP_NOEXCEPT;
-			IStatus* (CLOOP_CARG *getStatus)(ITraceStatusVector* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getText)(ITraceStatusVector* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceStatusVector(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ITraceStatusVector()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_STATUS_VECTOR_VERSION;
-
-		FB_BOOLEAN hasError()
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->hasError(this);
-			return ret;
-		}
-
-		FB_BOOLEAN hasWarning()
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->hasWarning(this);
-			return ret;
-		}
-
-		IStatus* getStatus()
-		{
-			IStatus* ret = static_cast<VTable*>(this->cloopVTable)->getStatus(this);
-			return ret;
-		}
-
-		const char* getText()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getText(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_SWEEP_INFO_VERSION 2u
-
-	class ITraceSweepInfo : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			ISC_INT64 (CLOOP_CARG *getOIT)(ITraceSweepInfo* self) CLOOP_NOEXCEPT;
-			ISC_INT64 (CLOOP_CARG *getOST)(ITraceSweepInfo* self) CLOOP_NOEXCEPT;
-			ISC_INT64 (CLOOP_CARG *getOAT)(ITraceSweepInfo* self) CLOOP_NOEXCEPT;
-			ISC_INT64 (CLOOP_CARG *getNext)(ITraceSweepInfo* self) CLOOP_NOEXCEPT;
-			PerformanceInfo* (CLOOP_CARG *getPerf)(ITraceSweepInfo* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceSweepInfo(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ITraceSweepInfo()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_SWEEP_INFO_VERSION;
-
-		ISC_INT64 getOIT()
-		{
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getOIT(this);
-			return ret;
-		}
-
-		ISC_INT64 getOST()
-		{
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getOST(this);
-			return ret;
-		}
-
-		ISC_INT64 getOAT()
-		{
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getOAT(this);
-			return ret;
-		}
-
-		ISC_INT64 getNext()
-		{
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getNext(this);
-			return ret;
-		}
-
-		PerformanceInfo* getPerf()
-		{
-			PerformanceInfo* ret = static_cast<VTable*>(this->cloopVTable)->getPerf(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_LOG_WRITER_VERSION 4u
-
-	class ITraceLogWriter : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			unsigned (CLOOP_CARG *write)(ITraceLogWriter* self, const void* buf, unsigned size) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *write_s)(ITraceLogWriter* self, IStatus* status, const void* buf, unsigned size) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceLogWriter(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~ITraceLogWriter()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_LOG_WRITER_VERSION;
-
-		unsigned write(const void* buf, unsigned size)
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->write(this, buf, size);
-			return ret;
-		}
-
-		template <typename StatusType> unsigned write_s(StatusType* status, const void* buf, unsigned size)
-		{
-			if (cloopVTable->version < 4)
-			{
-				StatusType::setVersionError(status, "ITraceLogWriter", cloopVTable->version, 4);
-				StatusType::checkException(status);
-				return 0;
-			}
-			StatusType::clearException(status);
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->write_s(this, status, buf, size);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_INIT_INFO_VERSION 2u
-
-	class ITraceInitInfo : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			const char* (CLOOP_CARG *getConfigText)(ITraceInitInfo* self) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *getTraceSessionID)(ITraceInitInfo* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getTraceSessionName)(ITraceInitInfo* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getFirebirdRootDirectory)(ITraceInitInfo* self) CLOOP_NOEXCEPT;
-			const char* (CLOOP_CARG *getDatabaseName)(ITraceInitInfo* self) CLOOP_NOEXCEPT;
-			ITraceDatabaseConnection* (CLOOP_CARG *getConnection)(ITraceInitInfo* self) CLOOP_NOEXCEPT;
-			ITraceLogWriter* (CLOOP_CARG *getLogWriter)(ITraceInitInfo* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceInitInfo(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~ITraceInitInfo()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_INIT_INFO_VERSION;
-
-		const char* getConfigText()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getConfigText(this);
-			return ret;
-		}
-
-		int getTraceSessionID()
-		{
-			int ret = static_cast<VTable*>(this->cloopVTable)->getTraceSessionID(this);
-			return ret;
-		}
-
-		const char* getTraceSessionName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getTraceSessionName(this);
-			return ret;
-		}
-
-		const char* getFirebirdRootDirectory()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getFirebirdRootDirectory(this);
-			return ret;
-		}
-
-		const char* getDatabaseName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getDatabaseName(this);
-			return ret;
-		}
-
-		ITraceDatabaseConnection* getConnection()
-		{
-			ITraceDatabaseConnection* ret = static_cast<VTable*>(this->cloopVTable)->getConnection(this);
-			return ret;
-		}
-
-		ITraceLogWriter* getLogWriter()
-		{
-			ITraceLogWriter* ret = static_cast<VTable*>(this->cloopVTable)->getLogWriter(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_PLUGIN_VERSION 5u
-
-	class ITracePlugin : public IReferenceCounted
-	{
-	public:
-		struct VTable : public IReferenceCounted::VTable
-		{
-			const char* (CLOOP_CARG *trace_get_error)(ITracePlugin* self) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_attach)(ITracePlugin* self, ITraceDatabaseConnection* connection, FB_BOOLEAN create_db, unsigned att_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_detach)(ITracePlugin* self, ITraceDatabaseConnection* connection, FB_BOOLEAN drop_db) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_transaction_start)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, unsigned tpb_length, const unsigned char* tpb, unsigned tra_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_transaction_end)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, FB_BOOLEAN commit, FB_BOOLEAN retain_context, unsigned tra_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_proc_execute)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceProcedure* procedure, FB_BOOLEAN started, unsigned proc_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_trigger_execute)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceTrigger* trigger, FB_BOOLEAN started, unsigned trig_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_set_context)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceContextVariable* variable) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_dsql_prepare)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceSQLStatement* statement, ISC_INT64 time_millis, unsigned req_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_dsql_free)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceSQLStatement* statement, unsigned option) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_dsql_execute)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceSQLStatement* statement, FB_BOOLEAN started, unsigned req_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_blr_compile)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceBLRStatement* statement, ISC_INT64 time_millis, unsigned req_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_blr_execute)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceBLRStatement* statement, unsigned req_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_dyn_execute)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceDYNRequest* request, ISC_INT64 time_millis, unsigned req_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_service_attach)(ITracePlugin* self, ITraceServiceConnection* service, unsigned att_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_service_start)(ITracePlugin* self, ITraceServiceConnection* service, unsigned switches_length, const char* switches, unsigned start_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_service_query)(ITracePlugin* self, ITraceServiceConnection* service, unsigned send_item_length, const unsigned char* send_items, unsigned recv_item_length, const unsigned char* recv_items, unsigned query_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_service_detach)(ITracePlugin* self, ITraceServiceConnection* service, unsigned detach_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_event_error)(ITracePlugin* self, ITraceConnection* connection, ITraceStatusVector* status, const char* function) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_event_sweep)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceSweepInfo* sweep, unsigned sweep_state) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_func_execute)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceFunction* function, FB_BOOLEAN started, unsigned func_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_dsql_restart)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceSQLStatement* statement, unsigned number) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_proc_compile)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceProcedure* procedure, ISC_INT64 time_millis, unsigned proc_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_func_compile)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceFunction* function, ISC_INT64 time_millis, unsigned func_result) CLOOP_NOEXCEPT;
-			FB_BOOLEAN (CLOOP_CARG *trace_trigger_compile)(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTrigger* trigger, ISC_INT64 time_millis, unsigned trig_result) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITracePlugin(DoNotInherit)
-			: IReferenceCounted(DoNotInherit())
-		{
-		}
-
-		~ITracePlugin()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_PLUGIN_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned RESULT_SUCCESS = 0;
-		static CLOOP_CONSTEXPR unsigned RESULT_FAILED = 1;
-		static CLOOP_CONSTEXPR unsigned RESULT_UNAUTHORIZED = 2;
-		static CLOOP_CONSTEXPR unsigned SWEEP_STATE_STARTED = 1;
-		static CLOOP_CONSTEXPR unsigned SWEEP_STATE_FINISHED = 2;
-		static CLOOP_CONSTEXPR unsigned SWEEP_STATE_FAILED = 3;
-		static CLOOP_CONSTEXPR unsigned SWEEP_STATE_PROGRESS = 4;
-
-		const char* trace_get_error()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->trace_get_error(this);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_attach(ITraceDatabaseConnection* connection, FB_BOOLEAN create_db, unsigned att_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_attach(this, connection, create_db, att_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_detach(ITraceDatabaseConnection* connection, FB_BOOLEAN drop_db)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_detach(this, connection, drop_db);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_transaction_start(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, unsigned tpb_length, const unsigned char* tpb, unsigned tra_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_transaction_start(this, connection, transaction, tpb_length, tpb, tra_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_transaction_end(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, FB_BOOLEAN commit, FB_BOOLEAN retain_context, unsigned tra_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_transaction_end(this, connection, transaction, commit, retain_context, tra_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_proc_execute(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceProcedure* procedure, FB_BOOLEAN started, unsigned proc_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_proc_execute(this, connection, transaction, procedure, started, proc_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_trigger_execute(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceTrigger* trigger, FB_BOOLEAN started, unsigned trig_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_trigger_execute(this, connection, transaction, trigger, started, trig_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_set_context(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceContextVariable* variable)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_set_context(this, connection, transaction, variable);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_dsql_prepare(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceSQLStatement* statement, ISC_INT64 time_millis, unsigned req_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_dsql_prepare(this, connection, transaction, statement, time_millis, req_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_dsql_free(ITraceDatabaseConnection* connection, ITraceSQLStatement* statement, unsigned option)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_dsql_free(this, connection, statement, option);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_dsql_execute(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceSQLStatement* statement, FB_BOOLEAN started, unsigned req_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_dsql_execute(this, connection, transaction, statement, started, req_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_blr_compile(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceBLRStatement* statement, ISC_INT64 time_millis, unsigned req_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_blr_compile(this, connection, transaction, statement, time_millis, req_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_blr_execute(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceBLRStatement* statement, unsigned req_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_blr_execute(this, connection, transaction, statement, req_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_dyn_execute(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceDYNRequest* request, ISC_INT64 time_millis, unsigned req_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_dyn_execute(this, connection, transaction, request, time_millis, req_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_service_attach(ITraceServiceConnection* service, unsigned att_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_service_attach(this, service, att_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_service_start(ITraceServiceConnection* service, unsigned switches_length, const char* switches, unsigned start_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_service_start(this, service, switches_length, switches, start_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_service_query(ITraceServiceConnection* service, unsigned send_item_length, const unsigned char* send_items, unsigned recv_item_length, const unsigned char* recv_items, unsigned query_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_service_query(this, service, send_item_length, send_items, recv_item_length, recv_items, query_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_service_detach(ITraceServiceConnection* service, unsigned detach_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_service_detach(this, service, detach_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_event_error(ITraceConnection* connection, ITraceStatusVector* status, const char* function)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_event_error(this, connection, status, function);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_event_sweep(ITraceDatabaseConnection* connection, ITraceSweepInfo* sweep, unsigned sweep_state)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_event_sweep(this, connection, sweep, sweep_state);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_func_execute(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceFunction* function, FB_BOOLEAN started, unsigned func_result)
-		{
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_func_execute(this, connection, transaction, function, started, func_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_dsql_restart(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceSQLStatement* statement, unsigned number)
-		{
-			if (cloopVTable->version < 4)
-			{
-				return 0;
-			}
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_dsql_restart(this, connection, transaction, statement, number);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_proc_compile(ITraceDatabaseConnection* connection, ITraceProcedure* procedure, ISC_INT64 time_millis, unsigned proc_result)
-		{
-			if (cloopVTable->version < 5)
-			{
-				return 0;
-			}
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_proc_compile(this, connection, procedure, time_millis, proc_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_func_compile(ITraceDatabaseConnection* connection, ITraceFunction* function, ISC_INT64 time_millis, unsigned func_result)
-		{
-			if (cloopVTable->version < 5)
-			{
-				return 0;
-			}
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_func_compile(this, connection, function, time_millis, func_result);
-			return ret;
-		}
-
-		FB_BOOLEAN trace_trigger_compile(ITraceDatabaseConnection* connection, ITraceTrigger* trigger, ISC_INT64 time_millis, unsigned trig_result)
-		{
-			if (cloopVTable->version < 5)
-			{
-				return 0;
-			}
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->trace_trigger_compile(this, connection, trigger, time_millis, trig_result);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_ITRACE_FACTORY_VERSION 4u
-
-	class ITraceFactory : public IPluginBase
-	{
-	public:
-		struct VTable : public IPluginBase::VTable
-		{
-			ISC_UINT64 (CLOOP_CARG *trace_needs)(ITraceFactory* self) CLOOP_NOEXCEPT;
-			ITracePlugin* (CLOOP_CARG *trace_create)(ITraceFactory* self, IStatus* status, ITraceInitInfo* init_info) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		ITraceFactory(DoNotInherit)
-			: IPluginBase(DoNotInherit())
-		{
-		}
-
-		~ITraceFactory()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_ITRACE_FACTORY_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_ATTACH = 0;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_DETACH = 1;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_TRANSACTION_START = 2;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_TRANSACTION_END = 3;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_SET_CONTEXT = 4;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_PROC_EXECUTE = 5;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_TRIGGER_EXECUTE = 6;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_DSQL_PREPARE = 7;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_DSQL_FREE = 8;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_DSQL_EXECUTE = 9;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_BLR_COMPILE = 10;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_BLR_EXECUTE = 11;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_DYN_EXECUTE = 12;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_SERVICE_ATTACH = 13;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_SERVICE_START = 14;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_SERVICE_QUERY = 15;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_SERVICE_DETACH = 16;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_ERROR = 17;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_SWEEP = 18;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_FUNC_EXECUTE = 19;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_PROC_COMPILE = 20;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_FUNC_COMPILE = 21;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_TRIGGER_COMPILE = 22;
-		static CLOOP_CONSTEXPR unsigned TRACE_EVENT_MAX = 23;
-
-		ISC_UINT64 trace_needs()
-		{
-			ISC_UINT64 ret = static_cast<VTable*>(this->cloopVTable)->trace_needs(this);
-			return ret;
-		}
-
-		template <typename StatusType> ITracePlugin* trace_create(StatusType* status, ITraceInitInfo* init_info)
-		{
-			StatusType::clearException(status);
-			ITracePlugin* ret = static_cast<VTable*>(this->cloopVTable)->trace_create(this, status, init_info);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IUDR_FUNCTION_FACTORY_VERSION 3u
-
-	class IUdrFunctionFactory : public IDisposable
-	{
-	public:
-		struct VTable : public IDisposable::VTable
-		{
-			void (CLOOP_CARG *setup)(IUdrFunctionFactory* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder) CLOOP_NOEXCEPT;
-			IExternalFunction* (CLOOP_CARG *newItem)(IUdrFunctionFactory* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IUdrFunctionFactory(DoNotInherit)
-			: IDisposable(DoNotInherit())
-		{
-		}
-
-		~IUdrFunctionFactory()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IUDR_FUNCTION_FACTORY_VERSION;
-
-		template <typename StatusType> void setup(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setup(this, status, context, metadata, inBuilder, outBuilder);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> IExternalFunction* newItem(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata)
-		{
-			StatusType::clearException(status);
-			IExternalFunction* ret = static_cast<VTable*>(this->cloopVTable)->newItem(this, status, context, metadata);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IUDR_PROCEDURE_FACTORY_VERSION 3u
-
-	class IUdrProcedureFactory : public IDisposable
-	{
-	public:
-		struct VTable : public IDisposable::VTable
-		{
-			void (CLOOP_CARG *setup)(IUdrProcedureFactory* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder) CLOOP_NOEXCEPT;
-			IExternalProcedure* (CLOOP_CARG *newItem)(IUdrProcedureFactory* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IUdrProcedureFactory(DoNotInherit)
-			: IDisposable(DoNotInherit())
-		{
-		}
-
-		~IUdrProcedureFactory()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IUDR_PROCEDURE_FACTORY_VERSION;
-
-		template <typename StatusType> void setup(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setup(this, status, context, metadata, inBuilder, outBuilder);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> IExternalProcedure* newItem(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata)
-		{
-			StatusType::clearException(status);
-			IExternalProcedure* ret = static_cast<VTable*>(this->cloopVTable)->newItem(this, status, context, metadata);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IUDR_TRIGGER_FACTORY_VERSION 3u
-
-	class IUdrTriggerFactory : public IDisposable
-	{
-	public:
-		struct VTable : public IDisposable::VTable
-		{
-			void (CLOOP_CARG *setup)(IUdrTriggerFactory* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* fieldsBuilder) CLOOP_NOEXCEPT;
-			IExternalTrigger* (CLOOP_CARG *newItem)(IUdrTriggerFactory* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IUdrTriggerFactory(DoNotInherit)
-			: IDisposable(DoNotInherit())
-		{
-		}
-
-		~IUdrTriggerFactory()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IUDR_TRIGGER_FACTORY_VERSION;
-
-		template <typename StatusType> void setup(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* fieldsBuilder)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setup(this, status, context, metadata, fieldsBuilder);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> IExternalTrigger* newItem(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata)
-		{
-			StatusType::clearException(status);
-			IExternalTrigger* ret = static_cast<VTable*>(this->cloopVTable)->newItem(this, status, context, metadata);
-			StatusType::checkException(status);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IUDR_PLUGIN_VERSION 2u
-
-	class IUdrPlugin : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			IMaster* (CLOOP_CARG *getMaster)(IUdrPlugin* self) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *registerFunction)(IUdrPlugin* self, IStatus* status, const char* name, IUdrFunctionFactory* factory) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *registerProcedure)(IUdrPlugin* self, IStatus* status, const char* name, IUdrProcedureFactory* factory) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *registerTrigger)(IUdrPlugin* self, IStatus* status, const char* name, IUdrTriggerFactory* factory) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IUdrPlugin(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IUdrPlugin()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IUDR_PLUGIN_VERSION;
-
-		IMaster* getMaster()
-		{
-			IMaster* ret = static_cast<VTable*>(this->cloopVTable)->getMaster(this);
-			return ret;
-		}
-
-		template <typename StatusType> void registerFunction(StatusType* status, const char* name, IUdrFunctionFactory* factory)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->registerFunction(this, status, name, factory);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void registerProcedure(StatusType* status, const char* name, IUdrProcedureFactory* factory)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->registerProcedure(this, status, name, factory);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void registerTrigger(StatusType* status, const char* name, IUdrTriggerFactory* factory)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->registerTrigger(this, status, name, factory);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IDEC_FLOAT16_VERSION 2u
-
-	class IDecFloat16 : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			void (CLOOP_CARG *toBcd)(IDecFloat16* self, const FB_DEC16* from, int* sign, unsigned char* bcd, int* exp) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *toString)(IDecFloat16* self, IStatus* status, const FB_DEC16* from, unsigned bufferLength, char* buffer) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *fromBcd)(IDecFloat16* self, int sign, const unsigned char* bcd, int exp, FB_DEC16* to) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *fromString)(IDecFloat16* self, IStatus* status, const char* from, FB_DEC16* to) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IDecFloat16(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IDecFloat16()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IDEC_FLOAT16_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned BCD_SIZE = 16;
-		static CLOOP_CONSTEXPR unsigned STRING_SIZE = 24;
-
-		void toBcd(const FB_DEC16* from, int* sign, unsigned char* bcd, int* exp)
-		{
-			static_cast<VTable*>(this->cloopVTable)->toBcd(this, from, sign, bcd, exp);
-		}
-
-		template <typename StatusType> void toString(StatusType* status, const FB_DEC16* from, unsigned bufferLength, char* buffer)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->toString(this, status, from, bufferLength, buffer);
-			StatusType::checkException(status);
-		}
-
-		void fromBcd(int sign, const unsigned char* bcd, int exp, FB_DEC16* to)
-		{
-			static_cast<VTable*>(this->cloopVTable)->fromBcd(this, sign, bcd, exp, to);
-		}
-
-		template <typename StatusType> void fromString(StatusType* status, const char* from, FB_DEC16* to)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->fromString(this, status, from, to);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IDEC_FLOAT34_VERSION 2u
-
-	class IDecFloat34 : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			void (CLOOP_CARG *toBcd)(IDecFloat34* self, const FB_DEC34* from, int* sign, unsigned char* bcd, int* exp) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *toString)(IDecFloat34* self, IStatus* status, const FB_DEC34* from, unsigned bufferLength, char* buffer) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *fromBcd)(IDecFloat34* self, int sign, const unsigned char* bcd, int exp, FB_DEC34* to) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *fromString)(IDecFloat34* self, IStatus* status, const char* from, FB_DEC34* to) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IDecFloat34(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IDecFloat34()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IDEC_FLOAT34_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned BCD_SIZE = 34;
-		static CLOOP_CONSTEXPR unsigned STRING_SIZE = 43;
-
-		void toBcd(const FB_DEC34* from, int* sign, unsigned char* bcd, int* exp)
-		{
-			static_cast<VTable*>(this->cloopVTable)->toBcd(this, from, sign, bcd, exp);
-		}
-
-		template <typename StatusType> void toString(StatusType* status, const FB_DEC34* from, unsigned bufferLength, char* buffer)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->toString(this, status, from, bufferLength, buffer);
-			StatusType::checkException(status);
-		}
-
-		void fromBcd(int sign, const unsigned char* bcd, int exp, FB_DEC34* to)
-		{
-			static_cast<VTable*>(this->cloopVTable)->fromBcd(this, sign, bcd, exp, to);
-		}
-
-		template <typename StatusType> void fromString(StatusType* status, const char* from, FB_DEC34* to)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->fromString(this, status, from, to);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IINT128_VERSION 2u
-
-	class IInt128 : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			void (CLOOP_CARG *toString)(IInt128* self, IStatus* status, const FB_I128* from, int scale, unsigned bufferLength, char* buffer) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *fromString)(IInt128* self, IStatus* status, int scale, const char* from, FB_I128* to) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IInt128(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IInt128()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IINT128_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned STRING_SIZE = 46;
-
-		template <typename StatusType> void toString(StatusType* status, const FB_I128* from, int scale, unsigned bufferLength, char* buffer)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->toString(this, status, from, scale, bufferLength, buffer);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void fromString(StatusType* status, int scale, const char* from, FB_I128* to)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->fromString(this, status, scale, from, to);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IREPLICATED_FIELD_VERSION 2u
-
-	class IReplicatedField : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			const char* (CLOOP_CARG *getName)(IReplicatedField* self) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getType)(IReplicatedField* self) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *getSubType)(IReplicatedField* self) CLOOP_NOEXCEPT;
-			int (CLOOP_CARG *getScale)(IReplicatedField* self) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getLength)(IReplicatedField* self) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getCharSet)(IReplicatedField* self) CLOOP_NOEXCEPT;
-			const void* (CLOOP_CARG *getData)(IReplicatedField* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IReplicatedField(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IReplicatedField()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IREPLICATED_FIELD_VERSION;
-
-		const char* getName()
-		{
-			const char* ret = static_cast<VTable*>(this->cloopVTable)->getName(this);
-			return ret;
-		}
-
-		unsigned getType()
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getType(this);
-			return ret;
-		}
-
-		int getSubType()
-		{
-			int ret = static_cast<VTable*>(this->cloopVTable)->getSubType(this);
-			return ret;
-		}
-
-		int getScale()
-		{
-			int ret = static_cast<VTable*>(this->cloopVTable)->getScale(this);
-			return ret;
-		}
-
-		unsigned getLength()
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getLength(this);
-			return ret;
-		}
-
-		unsigned getCharSet()
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getCharSet(this);
-			return ret;
-		}
-
-		const void* getData()
-		{
-			const void* ret = static_cast<VTable*>(this->cloopVTable)->getData(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IREPLICATED_RECORD_VERSION 2u
-
-	class IReplicatedRecord : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			unsigned (CLOOP_CARG *getCount)(IReplicatedRecord* self) CLOOP_NOEXCEPT;
-			IReplicatedField* (CLOOP_CARG *getField)(IReplicatedRecord* self, unsigned index) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getRawLength)(IReplicatedRecord* self) CLOOP_NOEXCEPT;
-			const unsigned char* (CLOOP_CARG *getRawData)(IReplicatedRecord* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IReplicatedRecord(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IReplicatedRecord()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IREPLICATED_RECORD_VERSION;
-
-		unsigned getCount()
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getCount(this);
-			return ret;
-		}
-
-		IReplicatedField* getField(unsigned index)
-		{
-			IReplicatedField* ret = static_cast<VTable*>(this->cloopVTable)->getField(this, index);
-			return ret;
-		}
-
-		unsigned getRawLength()
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getRawLength(this);
-			return ret;
-		}
-
-		const unsigned char* getRawData()
-		{
-			const unsigned char* ret = static_cast<VTable*>(this->cloopVTable)->getRawData(this);
-			return ret;
-		}
-	};
-
-#define FIREBIRD_IREPLICATED_TRANSACTION_VERSION 3u
-
-	class IReplicatedTransaction : public IDisposable
-	{
-	public:
-		struct VTable : public IDisposable::VTable
-		{
-			void (CLOOP_CARG *prepare)(IReplicatedTransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *commit)(IReplicatedTransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *rollback)(IReplicatedTransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *startSavepoint)(IReplicatedTransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *releaseSavepoint)(IReplicatedTransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *rollbackSavepoint)(IReplicatedTransaction* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *insertRecord)(IReplicatedTransaction* self, IStatus* status, const char* name, IReplicatedRecord* record) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *updateRecord)(IReplicatedTransaction* self, IStatus* status, const char* name, IReplicatedRecord* orgRecord, IReplicatedRecord* newRecord) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *deleteRecord)(IReplicatedTransaction* self, IStatus* status, const char* name, IReplicatedRecord* record) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *executeSql)(IReplicatedTransaction* self, IStatus* status, const char* sql) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *executeSqlIntl)(IReplicatedTransaction* self, IStatus* status, unsigned charset, const char* sql) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IReplicatedTransaction(DoNotInherit)
-			: IDisposable(DoNotInherit())
-		{
-		}
-
-		~IReplicatedTransaction()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IREPLICATED_TRANSACTION_VERSION;
-
-		template <typename StatusType> void prepare(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->prepare(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void commit(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->commit(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void rollback(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->rollback(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void startSavepoint(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->startSavepoint(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void releaseSavepoint(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->releaseSavepoint(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void rollbackSavepoint(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->rollbackSavepoint(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void insertRecord(StatusType* status, const char* name, IReplicatedRecord* record)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->insertRecord(this, status, name, record);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void updateRecord(StatusType* status, const char* name, IReplicatedRecord* orgRecord, IReplicatedRecord* newRecord)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->updateRecord(this, status, name, orgRecord, newRecord);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void deleteRecord(StatusType* status, const char* name, IReplicatedRecord* record)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->deleteRecord(this, status, name, record);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void executeSql(StatusType* status, const char* sql)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->executeSql(this, status, sql);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void executeSqlIntl(StatusType* status, unsigned charset, const char* sql)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->executeSqlIntl(this, status, charset, sql);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IREPLICATED_SESSION_VERSION 4u
-
-	class IReplicatedSession : public IPluginBase
-	{
-	public:
-		struct VTable : public IPluginBase::VTable
-		{
-			FB_BOOLEAN (CLOOP_CARG *init)(IReplicatedSession* self, IStatus* status, IAttachment* attachment) CLOOP_NOEXCEPT;
-			IReplicatedTransaction* (CLOOP_CARG *startTransaction)(IReplicatedSession* self, IStatus* status, ITransaction* transaction, ISC_INT64 number) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *cleanupTransaction)(IReplicatedSession* self, IStatus* status, ISC_INT64 number) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *setSequence)(IReplicatedSession* self, IStatus* status, const char* name, ISC_INT64 value) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IReplicatedSession(DoNotInherit)
-			: IPluginBase(DoNotInherit())
-		{
-		}
-
-		~IReplicatedSession()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IREPLICATED_SESSION_VERSION;
-
-		template <typename StatusType> FB_BOOLEAN init(StatusType* status, IAttachment* attachment)
-		{
-			StatusType::clearException(status);
-			FB_BOOLEAN ret = static_cast<VTable*>(this->cloopVTable)->init(this, status, attachment);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> IReplicatedTransaction* startTransaction(StatusType* status, ITransaction* transaction, ISC_INT64 number)
-		{
-			StatusType::clearException(status);
-			IReplicatedTransaction* ret = static_cast<VTable*>(this->cloopVTable)->startTransaction(this, status, transaction, number);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void cleanupTransaction(StatusType* status, ISC_INT64 number)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->cleanupTransaction(this, status, number);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void setSequence(StatusType* status, const char* name, ISC_INT64 value)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->setSequence(this, status, name, value);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IPROFILER_PLUGIN_VERSION 4u
-
-	class IProfilerPlugin : public IPluginBase
-	{
-	public:
-		struct VTable : public IPluginBase::VTable
-		{
-			void (CLOOP_CARG *init)(IProfilerPlugin* self, IStatus* status, IAttachment* attachment, ISC_UINT64 ticksFrequency) CLOOP_NOEXCEPT;
-			IProfilerSession* (CLOOP_CARG *startSession)(IProfilerPlugin* self, IStatus* status, const char* description, const char* options, ISC_TIMESTAMP_TZ timestamp) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *flush)(IProfilerPlugin* self, IStatus* status) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IProfilerPlugin(DoNotInherit)
-			: IPluginBase(DoNotInherit())
-		{
-		}
-
-		~IProfilerPlugin()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IPROFILER_PLUGIN_VERSION;
-
-		template <typename StatusType> void init(StatusType* status, IAttachment* attachment, ISC_UINT64 ticksFrequency)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->init(this, status, attachment, ticksFrequency);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> IProfilerSession* startSession(StatusType* status, const char* description, const char* options, ISC_TIMESTAMP_TZ timestamp)
-		{
-			StatusType::clearException(status);
-			IProfilerSession* ret = static_cast<VTable*>(this->cloopVTable)->startSession(this, status, description, options, timestamp);
-			StatusType::checkException(status);
-			return ret;
-		}
-
-		template <typename StatusType> void flush(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->flush(this, status);
-			StatusType::checkException(status);
-		}
-	};
-
-#define FIREBIRD_IPROFILER_SESSION_VERSION 3u
-
-	class IProfilerSession : public IDisposable
-	{
-	public:
-		struct VTable : public IDisposable::VTable
-		{
-			ISC_INT64 (CLOOP_CARG *getId)(IProfilerSession* self) CLOOP_NOEXCEPT;
-			unsigned (CLOOP_CARG *getFlags)(IProfilerSession* self) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *cancel)(IProfilerSession* self, IStatus* status) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *finish)(IProfilerSession* self, IStatus* status, ISC_TIMESTAMP_TZ timestamp) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *defineStatement)(IProfilerSession* self, IStatus* status, ISC_INT64 statementId, ISC_INT64 parentStatementId, const char* type, const char* packageName, const char* routineName, const char* sqlText) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *defineCursor)(IProfilerSession* self, ISC_INT64 statementId, unsigned cursorId, const char* name, unsigned line, unsigned column) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *defineRecordSource)(IProfilerSession* self, ISC_INT64 statementId, unsigned cursorId, unsigned recSourceId, unsigned level, const char* accessPath, unsigned parentRecSourceId) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *onRequestStart)(IProfilerSession* self, IStatus* status, ISC_INT64 statementId, ISC_INT64 requestId, ISC_INT64 callerStatementId, ISC_INT64 callerRequestId, ISC_TIMESTAMP_TZ timestamp) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *onRequestFinish)(IProfilerSession* self, IStatus* status, ISC_INT64 statementId, ISC_INT64 requestId, ISC_TIMESTAMP_TZ timestamp, IProfilerStats* stats) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *beforePsqlLineColumn)(IProfilerSession* self, ISC_INT64 statementId, ISC_INT64 requestId, unsigned line, unsigned column) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *afterPsqlLineColumn)(IProfilerSession* self, ISC_INT64 statementId, ISC_INT64 requestId, unsigned line, unsigned column, IProfilerStats* stats) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *beforeRecordSourceOpen)(IProfilerSession* self, ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *afterRecordSourceOpen)(IProfilerSession* self, ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId, IProfilerStats* stats) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *beforeRecordSourceGetRecord)(IProfilerSession* self, ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId) CLOOP_NOEXCEPT;
-			void (CLOOP_CARG *afterRecordSourceGetRecord)(IProfilerSession* self, ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId, IProfilerStats* stats) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IProfilerSession(DoNotInherit)
-			: IDisposable(DoNotInherit())
-		{
-		}
-
-		~IProfilerSession()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IPROFILER_SESSION_VERSION;
-
-		static CLOOP_CONSTEXPR unsigned FLAG_BEFORE_EVENTS = 0x1;
-		static CLOOP_CONSTEXPR unsigned FLAG_AFTER_EVENTS = 0x2;
-
-		ISC_INT64 getId()
-		{
-			ISC_INT64 ret = static_cast<VTable*>(this->cloopVTable)->getId(this);
-			return ret;
-		}
-
-		unsigned getFlags()
-		{
-			unsigned ret = static_cast<VTable*>(this->cloopVTable)->getFlags(this);
-			return ret;
-		}
-
-		template <typename StatusType> void cancel(StatusType* status)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->cancel(this, status);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void finish(StatusType* status, ISC_TIMESTAMP_TZ timestamp)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->finish(this, status, timestamp);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void defineStatement(StatusType* status, ISC_INT64 statementId, ISC_INT64 parentStatementId, const char* type, const char* packageName, const char* routineName, const char* sqlText)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->defineStatement(this, status, statementId, parentStatementId, type, packageName, routineName, sqlText);
-			StatusType::checkException(status);
-		}
-
-		void defineCursor(ISC_INT64 statementId, unsigned cursorId, const char* name, unsigned line, unsigned column)
-		{
-			static_cast<VTable*>(this->cloopVTable)->defineCursor(this, statementId, cursorId, name, line, column);
-		}
-
-		void defineRecordSource(ISC_INT64 statementId, unsigned cursorId, unsigned recSourceId, unsigned level, const char* accessPath, unsigned parentRecSourceId)
-		{
-			static_cast<VTable*>(this->cloopVTable)->defineRecordSource(this, statementId, cursorId, recSourceId, level, accessPath, parentRecSourceId);
-		}
-
-		template <typename StatusType> void onRequestStart(StatusType* status, ISC_INT64 statementId, ISC_INT64 requestId, ISC_INT64 callerStatementId, ISC_INT64 callerRequestId, ISC_TIMESTAMP_TZ timestamp)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->onRequestStart(this, status, statementId, requestId, callerStatementId, callerRequestId, timestamp);
-			StatusType::checkException(status);
-		}
-
-		template <typename StatusType> void onRequestFinish(StatusType* status, ISC_INT64 statementId, ISC_INT64 requestId, ISC_TIMESTAMP_TZ timestamp, IProfilerStats* stats)
-		{
-			StatusType::clearException(status);
-			static_cast<VTable*>(this->cloopVTable)->onRequestFinish(this, status, statementId, requestId, timestamp, stats);
-			StatusType::checkException(status);
-		}
-
-		void beforePsqlLineColumn(ISC_INT64 statementId, ISC_INT64 requestId, unsigned line, unsigned column)
-		{
-			static_cast<VTable*>(this->cloopVTable)->beforePsqlLineColumn(this, statementId, requestId, line, column);
-		}
-
-		void afterPsqlLineColumn(ISC_INT64 statementId, ISC_INT64 requestId, unsigned line, unsigned column, IProfilerStats* stats)
-		{
-			static_cast<VTable*>(this->cloopVTable)->afterPsqlLineColumn(this, statementId, requestId, line, column, stats);
-		}
-
-		void beforeRecordSourceOpen(ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId)
-		{
-			static_cast<VTable*>(this->cloopVTable)->beforeRecordSourceOpen(this, statementId, requestId, cursorId, recSourceId);
-		}
-
-		void afterRecordSourceOpen(ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId, IProfilerStats* stats)
-		{
-			static_cast<VTable*>(this->cloopVTable)->afterRecordSourceOpen(this, statementId, requestId, cursorId, recSourceId, stats);
-		}
-
-		void beforeRecordSourceGetRecord(ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId)
-		{
-			static_cast<VTable*>(this->cloopVTable)->beforeRecordSourceGetRecord(this, statementId, requestId, cursorId, recSourceId);
-		}
-
-		void afterRecordSourceGetRecord(ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId, IProfilerStats* stats)
-		{
-			static_cast<VTable*>(this->cloopVTable)->afterRecordSourceGetRecord(this, statementId, requestId, cursorId, recSourceId, stats);
-		}
-	};
-
-#define FIREBIRD_IPROFILER_STATS_VERSION 2u
-
-	class IProfilerStats : public IVersioned
-	{
-	public:
-		struct VTable : public IVersioned::VTable
-		{
-			ISC_UINT64 (CLOOP_CARG *getElapsedTicks)(IProfilerStats* self) CLOOP_NOEXCEPT;
-		};
-
-	protected:
-		IProfilerStats(DoNotInherit)
-			: IVersioned(DoNotInherit())
-		{
-		}
-
-		~IProfilerStats()
-		{
-		}
-
-	public:
-		static CLOOP_CONSTEXPR unsigned VERSION = FIREBIRD_IPROFILER_STATS_VERSION;
-
-		ISC_UINT64 getElapsedTicks()
-		{
-			ISC_UINT64 ret = static_cast<VTable*>(this->cloopVTable)->getElapsedTicks(this);
-			return ret;
-		}
-	};
-
-	// Interfaces implementations
-
-	template <typename Name, typename StatusType, typename Base>
-	class IVersionedBaseImpl : public Base
-	{
-	public:
-		typedef IVersioned Declaration;
-
-		IVersionedBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = Inherit<IVersioned> >
-	class IVersionedImpl : public IVersionedBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IVersionedImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IVersionedImpl()
-		{
-		}
-
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IReferenceCountedBaseImpl : public Base
-	{
-	public:
-		typedef IReferenceCounted Declaration;
-
-		IReferenceCountedBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IReferenceCounted> > >
-	class IReferenceCountedImpl : public IReferenceCountedBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IReferenceCountedImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IReferenceCountedImpl()
-		{
-		}
-
-		virtual void addRef() = 0;
-		virtual int release() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IDisposableBaseImpl : public Base
-	{
-	public:
-		typedef IDisposable Declaration;
-
-		IDisposableBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->dispose = &Name::cloopdisposeDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopdisposeDispatcher(IDisposable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::dispose();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IDisposable> > >
-	class IDisposableImpl : public IDisposableBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IDisposableImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IDisposableImpl()
-		{
-		}
-
-		virtual void dispose() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IStatusBaseImpl : public Base
-	{
-	public:
-		typedef IStatus Declaration;
-
-		IStatusBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->dispose = &Name::cloopdisposeDispatcher;
-					this->init = &Name::cloopinitDispatcher;
-					this->getState = &Name::cloopgetStateDispatcher;
-					this->setErrors2 = &Name::cloopsetErrors2Dispatcher;
-					this->setWarnings2 = &Name::cloopsetWarnings2Dispatcher;
-					this->setErrors = &Name::cloopsetErrorsDispatcher;
-					this->setWarnings = &Name::cloopsetWarningsDispatcher;
-					this->getErrors = &Name::cloopgetErrorsDispatcher;
-					this->getWarnings = &Name::cloopgetWarningsDispatcher;
-					this->clone = &Name::cloopcloneDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopinitDispatcher(IStatus* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::init();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetStateDispatcher(const IStatus* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<const Name*>(self)->Name::getState();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetErrors2Dispatcher(IStatus* self, unsigned length, const intptr_t* value) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setErrors2(length, value);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetWarnings2Dispatcher(IStatus* self, unsigned length, const intptr_t* value) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setWarnings2(length, value);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetErrorsDispatcher(IStatus* self, const intptr_t* value) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setErrors(value);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetWarningsDispatcher(IStatus* self, const intptr_t* value) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setWarnings(value);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static const intptr_t* CLOOP_CARG cloopgetErrorsDispatcher(const IStatus* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<const Name*>(self)->Name::getErrors();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return stubError();
-			}
-		}
-
-		static const intptr_t* CLOOP_CARG cloopgetWarningsDispatcher(const IStatus* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<const Name*>(self)->Name::getWarnings();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return stubError();
-			}
-		}
-
-		static IStatus* CLOOP_CARG cloopcloneDispatcher(const IStatus* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<const Name*>(self)->Name::clone();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IStatus*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdisposeDispatcher(IDisposable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::dispose();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IDisposableImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IStatus> > > > >
-	class IStatusImpl : public IStatusBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IStatusImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IStatusImpl()
-		{
-		}
-
-		virtual void init() = 0;
-		virtual unsigned getState() const = 0;
-		virtual void setErrors2(unsigned length, const intptr_t* value) = 0;
-		virtual void setWarnings2(unsigned length, const intptr_t* value) = 0;
-		virtual void setErrors(const intptr_t* value) = 0;
-		virtual void setWarnings(const intptr_t* value) = 0;
-		virtual const intptr_t* getErrors() const = 0;
-		virtual const intptr_t* getWarnings() const = 0;
-		virtual IStatus* clone() const = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IMasterBaseImpl : public Base
-	{
-	public:
-		typedef IMaster Declaration;
-
-		IMasterBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getStatus = &Name::cloopgetStatusDispatcher;
-					this->getDispatcher = &Name::cloopgetDispatcherDispatcher;
-					this->getPluginManager = &Name::cloopgetPluginManagerDispatcher;
-					this->getTimerControl = &Name::cloopgetTimerControlDispatcher;
-					this->getDtc = &Name::cloopgetDtcDispatcher;
-					this->registerAttachment = &Name::cloopregisterAttachmentDispatcher;
-					this->registerTransaction = &Name::cloopregisterTransactionDispatcher;
-					this->getMetadataBuilder = &Name::cloopgetMetadataBuilderDispatcher;
-					this->serverMode = &Name::cloopserverModeDispatcher;
-					this->getUtilInterface = &Name::cloopgetUtilInterfaceDispatcher;
-					this->getConfigManager = &Name::cloopgetConfigManagerDispatcher;
-					this->getProcessExiting = &Name::cloopgetProcessExitingDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static IStatus* CLOOP_CARG cloopgetStatusDispatcher(IMaster* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getStatus();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IStatus*>(0);
-			}
-		}
-
-		static IProvider* CLOOP_CARG cloopgetDispatcherDispatcher(IMaster* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDispatcher();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IProvider*>(0);
-			}
-		}
-
-		static IPluginManager* CLOOP_CARG cloopgetPluginManagerDispatcher(IMaster* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPluginManager();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IPluginManager*>(0);
-			}
-		}
-
-		static ITimerControl* CLOOP_CARG cloopgetTimerControlDispatcher(IMaster* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getTimerControl();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ITimerControl*>(0);
-			}
-		}
-
-		static IDtc* CLOOP_CARG cloopgetDtcDispatcher(IMaster* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDtc();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IDtc*>(0);
-			}
-		}
-
-		static IAttachment* CLOOP_CARG cloopregisterAttachmentDispatcher(IMaster* self, IProvider* provider, IAttachment* attachment) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::registerAttachment(provider, attachment);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IAttachment*>(0);
-			}
-		}
-
-		static ITransaction* CLOOP_CARG cloopregisterTransactionDispatcher(IMaster* self, IAttachment* attachment, ITransaction* transaction) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::registerTransaction(attachment, transaction);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ITransaction*>(0);
-			}
-		}
-
-		static IMetadataBuilder* CLOOP_CARG cloopgetMetadataBuilderDispatcher(IMaster* self, IStatus* status, unsigned fieldCount) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getMetadataBuilder(&status2, fieldCount);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IMetadataBuilder*>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopserverModeDispatcher(IMaster* self, int mode) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::serverMode(mode);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static IUtil* CLOOP_CARG cloopgetUtilInterfaceDispatcher(IMaster* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getUtilInterface();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IUtil*>(0);
-			}
-		}
-
-		static IConfigManager* CLOOP_CARG cloopgetConfigManagerDispatcher(IMaster* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getConfigManager();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IConfigManager*>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopgetProcessExitingDispatcher(IMaster* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getProcessExiting();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IMaster> > >
-	class IMasterImpl : public IMasterBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IMasterImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IMasterImpl()
-		{
-		}
-
-		virtual IStatus* getStatus() = 0;
-		virtual IProvider* getDispatcher() = 0;
-		virtual IPluginManager* getPluginManager() = 0;
-		virtual ITimerControl* getTimerControl() = 0;
-		virtual IDtc* getDtc() = 0;
-		virtual IAttachment* registerAttachment(IProvider* provider, IAttachment* attachment) = 0;
-		virtual ITransaction* registerTransaction(IAttachment* attachment, ITransaction* transaction) = 0;
-		virtual IMetadataBuilder* getMetadataBuilder(StatusType* status, unsigned fieldCount) = 0;
-		virtual int serverMode(int mode) = 0;
-		virtual IUtil* getUtilInterface() = 0;
-		virtual IConfigManager* getConfigManager() = 0;
-		virtual FB_BOOLEAN getProcessExiting() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IPluginBaseBaseImpl : public Base
-	{
-	public:
-		typedef IPluginBase Declaration;
-
-		IPluginBaseBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->setOwner = &Name::cloopsetOwnerDispatcher;
-					this->getOwner = &Name::cloopgetOwnerDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopsetOwnerDispatcher(IPluginBase* self, IReferenceCounted* r) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setOwner(r);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static IReferenceCounted* CLOOP_CARG cloopgetOwnerDispatcher(IPluginBase* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOwner();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IReferenceCounted*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IPluginBase> > > > >
-	class IPluginBaseImpl : public IPluginBaseBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IPluginBaseImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IPluginBaseImpl()
-		{
-		}
-
-		virtual void setOwner(IReferenceCounted* r) = 0;
-		virtual IReferenceCounted* getOwner() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IPluginSetBaseImpl : public Base
-	{
-	public:
-		typedef IPluginSet Declaration;
-
-		IPluginSetBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->getName = &Name::cloopgetNameDispatcher;
-					this->getModuleName = &Name::cloopgetModuleNameDispatcher;
-					this->getPlugin = &Name::cloopgetPluginDispatcher;
-					this->next = &Name::cloopnextDispatcher;
-					this->set = &Name::cloopsetDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetNameDispatcher(const IPluginSet* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<const Name*>(self)->Name::getName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetModuleNameDispatcher(const IPluginSet* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<const Name*>(self)->Name::getModuleName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static IPluginBase* CLOOP_CARG cloopgetPluginDispatcher(IPluginSet* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPlugin(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IPluginBase*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopnextDispatcher(IPluginSet* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::next(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetDispatcher(IPluginSet* self, IStatus* status, const char* s) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::set(&status2, s);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IPluginSet> > > > >
-	class IPluginSetImpl : public IPluginSetBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IPluginSetImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IPluginSetImpl()
-		{
-		}
-
-		virtual const char* getName() const = 0;
-		virtual const char* getModuleName() const = 0;
-		virtual IPluginBase* getPlugin(StatusType* status) = 0;
-		virtual void next(StatusType* status) = 0;
-		virtual void set(StatusType* status, const char* s) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IConfigEntryBaseImpl : public Base
-	{
-	public:
-		typedef IConfigEntry Declaration;
-
-		IConfigEntryBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->getName = &Name::cloopgetNameDispatcher;
-					this->getValue = &Name::cloopgetValueDispatcher;
-					this->getIntValue = &Name::cloopgetIntValueDispatcher;
-					this->getBoolValue = &Name::cloopgetBoolValueDispatcher;
-					this->getSubConfig = &Name::cloopgetSubConfigDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetNameDispatcher(IConfigEntry* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetValueDispatcher(IConfigEntry* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getValue();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetIntValueDispatcher(IConfigEntry* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getIntValue();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopgetBoolValueDispatcher(IConfigEntry* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getBoolValue();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static IConfig* CLOOP_CARG cloopgetSubConfigDispatcher(IConfigEntry* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getSubConfig(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IConfig*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IConfigEntry> > > > >
-	class IConfigEntryImpl : public IConfigEntryBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IConfigEntryImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IConfigEntryImpl()
-		{
-		}
-
-		virtual const char* getName() = 0;
-		virtual const char* getValue() = 0;
-		virtual ISC_INT64 getIntValue() = 0;
-		virtual FB_BOOLEAN getBoolValue() = 0;
-		virtual IConfig* getSubConfig(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IConfigBaseImpl : public Base
-	{
-	public:
-		typedef IConfig Declaration;
-
-		IConfigBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->find = &Name::cloopfindDispatcher;
-					this->findValue = &Name::cloopfindValueDispatcher;
-					this->findPos = &Name::cloopfindPosDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static IConfigEntry* CLOOP_CARG cloopfindDispatcher(IConfig* self, IStatus* status, const char* name) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::find(&status2, name);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IConfigEntry*>(0);
-			}
-		}
-
-		static IConfigEntry* CLOOP_CARG cloopfindValueDispatcher(IConfig* self, IStatus* status, const char* name, const char* value) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::findValue(&status2, name, value);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IConfigEntry*>(0);
-			}
-		}
-
-		static IConfigEntry* CLOOP_CARG cloopfindPosDispatcher(IConfig* self, IStatus* status, const char* name, unsigned pos) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::findPos(&status2, name, pos);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IConfigEntry*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IConfig> > > > >
-	class IConfigImpl : public IConfigBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IConfigImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IConfigImpl()
-		{
-		}
-
-		virtual IConfigEntry* find(StatusType* status, const char* name) = 0;
-		virtual IConfigEntry* findValue(StatusType* status, const char* name, const char* value) = 0;
-		virtual IConfigEntry* findPos(StatusType* status, const char* name, unsigned pos) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IFirebirdConfBaseImpl : public Base
-	{
-	public:
-		typedef IFirebirdConf Declaration;
-
-		IFirebirdConfBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->getKey = &Name::cloopgetKeyDispatcher;
-					this->asInteger = &Name::cloopasIntegerDispatcher;
-					this->asString = &Name::cloopasStringDispatcher;
-					this->asBoolean = &Name::cloopasBooleanDispatcher;
-					this->getVersion = &Name::cloopgetVersionDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static unsigned CLOOP_CARG cloopgetKeyDispatcher(IFirebirdConf* self, const char* name) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getKey(name);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopasIntegerDispatcher(IFirebirdConf* self, unsigned key) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::asInteger(key);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopasStringDispatcher(IFirebirdConf* self, unsigned key) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::asString(key);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopasBooleanDispatcher(IFirebirdConf* self, unsigned key) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::asBoolean(key);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetVersionDispatcher(IFirebirdConf* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getVersion(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IFirebirdConf> > > > >
-	class IFirebirdConfImpl : public IFirebirdConfBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IFirebirdConfImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IFirebirdConfImpl()
-		{
-		}
-
-		virtual unsigned getKey(const char* name) = 0;
-		virtual ISC_INT64 asInteger(unsigned key) = 0;
-		virtual const char* asString(unsigned key) = 0;
-		virtual FB_BOOLEAN asBoolean(unsigned key) = 0;
-		virtual unsigned getVersion(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IPluginConfigBaseImpl : public Base
-	{
-	public:
-		typedef IPluginConfig Declaration;
-
-		IPluginConfigBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->getConfigFileName = &Name::cloopgetConfigFileNameDispatcher;
-					this->getDefaultConfig = &Name::cloopgetDefaultConfigDispatcher;
-					this->getFirebirdConf = &Name::cloopgetFirebirdConfDispatcher;
-					this->setReleaseDelay = &Name::cloopsetReleaseDelayDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetConfigFileNameDispatcher(IPluginConfig* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getConfigFileName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static IConfig* CLOOP_CARG cloopgetDefaultConfigDispatcher(IPluginConfig* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDefaultConfig(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IConfig*>(0);
-			}
-		}
-
-		static IFirebirdConf* CLOOP_CARG cloopgetFirebirdConfDispatcher(IPluginConfig* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getFirebirdConf(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IFirebirdConf*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetReleaseDelayDispatcher(IPluginConfig* self, IStatus* status, ISC_UINT64 microSeconds) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setReleaseDelay(&status2, microSeconds);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IPluginConfig> > > > >
-	class IPluginConfigImpl : public IPluginConfigBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IPluginConfigImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IPluginConfigImpl()
-		{
-		}
-
-		virtual const char* getConfigFileName() = 0;
-		virtual IConfig* getDefaultConfig(StatusType* status) = 0;
-		virtual IFirebirdConf* getFirebirdConf(StatusType* status) = 0;
-		virtual void setReleaseDelay(StatusType* status, ISC_UINT64 microSeconds) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IPluginFactoryBaseImpl : public Base
-	{
-	public:
-		typedef IPluginFactory Declaration;
-
-		IPluginFactoryBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->createPlugin = &Name::cloopcreatePluginDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static IPluginBase* CLOOP_CARG cloopcreatePluginDispatcher(IPluginFactory* self, IStatus* status, IPluginConfig* factoryParameter) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::createPlugin(&status2, factoryParameter);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IPluginBase*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IPluginFactory> > >
-	class IPluginFactoryImpl : public IPluginFactoryBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IPluginFactoryImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IPluginFactoryImpl()
-		{
-		}
-
-		virtual IPluginBase* createPlugin(StatusType* status, IPluginConfig* factoryParameter) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IPluginModuleBaseImpl : public Base
-	{
-	public:
-		typedef IPluginModule Declaration;
-
-		IPluginModuleBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->doClean = &Name::cloopdoCleanDispatcher;
-					this->threadDetach = &Name::cloopthreadDetachDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopdoCleanDispatcher(IPluginModule* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::doClean();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopthreadDetachDispatcher(IPluginModule* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::threadDetach();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IPluginModule> > >
-	class IPluginModuleImpl : public IPluginModuleBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IPluginModuleImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IPluginModuleImpl()
-		{
-		}
-
-		virtual void doClean() = 0;
-		virtual void threadDetach() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IPluginManagerBaseImpl : public Base
-	{
-	public:
-		typedef IPluginManager Declaration;
-
-		IPluginManagerBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->registerPluginFactory = &Name::cloopregisterPluginFactoryDispatcher;
-					this->registerModule = &Name::cloopregisterModuleDispatcher;
-					this->unregisterModule = &Name::cloopunregisterModuleDispatcher;
-					this->getPlugins = &Name::cloopgetPluginsDispatcher;
-					this->getConfig = &Name::cloopgetConfigDispatcher;
-					this->releasePlugin = &Name::cloopreleasePluginDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopregisterPluginFactoryDispatcher(IPluginManager* self, unsigned pluginType, const char* defaultName, IPluginFactory* factory) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::registerPluginFactory(pluginType, defaultName, factory);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopregisterModuleDispatcher(IPluginManager* self, IPluginModule* cleanup) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::registerModule(cleanup);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopunregisterModuleDispatcher(IPluginManager* self, IPluginModule* cleanup) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::unregisterModule(cleanup);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static IPluginSet* CLOOP_CARG cloopgetPluginsDispatcher(IPluginManager* self, IStatus* status, unsigned pluginType, const char* namesList, IFirebirdConf* firebirdConf) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPlugins(&status2, pluginType, namesList, firebirdConf);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IPluginSet*>(0);
-			}
-		}
-
-		static IConfig* CLOOP_CARG cloopgetConfigDispatcher(IPluginManager* self, IStatus* status, const char* filename) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getConfig(&status2, filename);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IConfig*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopreleasePluginDispatcher(IPluginManager* self, IPluginBase* plugin) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::releasePlugin(plugin);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IPluginManager> > >
-	class IPluginManagerImpl : public IPluginManagerBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IPluginManagerImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IPluginManagerImpl()
-		{
-		}
-
-		virtual void registerPluginFactory(unsigned pluginType, const char* defaultName, IPluginFactory* factory) = 0;
-		virtual void registerModule(IPluginModule* cleanup) = 0;
-		virtual void unregisterModule(IPluginModule* cleanup) = 0;
-		virtual IPluginSet* getPlugins(StatusType* status, unsigned pluginType, const char* namesList, IFirebirdConf* firebirdConf) = 0;
-		virtual IConfig* getConfig(StatusType* status, const char* filename) = 0;
-		virtual void releasePlugin(IPluginBase* plugin) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ICryptKeyBaseImpl : public Base
-	{
-	public:
-		typedef ICryptKey Declaration;
-
-		ICryptKeyBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->setSymmetric = &Name::cloopsetSymmetricDispatcher;
-					this->setAsymmetric = &Name::cloopsetAsymmetricDispatcher;
-					this->getEncryptKey = &Name::cloopgetEncryptKeyDispatcher;
-					this->getDecryptKey = &Name::cloopgetDecryptKeyDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopsetSymmetricDispatcher(ICryptKey* self, IStatus* status, const char* type, unsigned keyLength, const void* key) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setSymmetric(&status2, type, keyLength, key);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetAsymmetricDispatcher(ICryptKey* self, IStatus* status, const char* type, unsigned encryptKeyLength, const void* encryptKey, unsigned decryptKeyLength, const void* decryptKey) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setAsymmetric(&status2, type, encryptKeyLength, encryptKey, decryptKeyLength, decryptKey);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static const void* CLOOP_CARG cloopgetEncryptKeyDispatcher(ICryptKey* self, unsigned* length) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getEncryptKey(length);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const void*>(0);
-			}
-		}
-
-		static const void* CLOOP_CARG cloopgetDecryptKeyDispatcher(ICryptKey* self, unsigned* length) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDecryptKey(length);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const void*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ICryptKey> > >
-	class ICryptKeyImpl : public ICryptKeyBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ICryptKeyImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ICryptKeyImpl()
-		{
-		}
-
-		virtual void setSymmetric(StatusType* status, const char* type, unsigned keyLength, const void* key) = 0;
-		virtual void setAsymmetric(StatusType* status, const char* type, unsigned encryptKeyLength, const void* encryptKey, unsigned decryptKeyLength, const void* decryptKey) = 0;
-		virtual const void* getEncryptKey(unsigned* length) = 0;
-		virtual const void* getDecryptKey(unsigned* length) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IConfigManagerBaseImpl : public Base
-	{
-	public:
-		typedef IConfigManager Declaration;
-
-		IConfigManagerBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getDirectory = &Name::cloopgetDirectoryDispatcher;
-					this->getFirebirdConf = &Name::cloopgetFirebirdConfDispatcher;
-					this->getDatabaseConf = &Name::cloopgetDatabaseConfDispatcher;
-					this->getPluginConfig = &Name::cloopgetPluginConfigDispatcher;
-					this->getInstallDirectory = &Name::cloopgetInstallDirectoryDispatcher;
-					this->getRootDirectory = &Name::cloopgetRootDirectoryDispatcher;
-					this->getDefaultSecurityDb = &Name::cloopgetDefaultSecurityDbDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetDirectoryDispatcher(IConfigManager* self, unsigned code) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDirectory(code);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static IFirebirdConf* CLOOP_CARG cloopgetFirebirdConfDispatcher(IConfigManager* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getFirebirdConf();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IFirebirdConf*>(0);
-			}
-		}
-
-		static IFirebirdConf* CLOOP_CARG cloopgetDatabaseConfDispatcher(IConfigManager* self, const char* dbName) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDatabaseConf(dbName);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IFirebirdConf*>(0);
-			}
-		}
-
-		static IConfig* CLOOP_CARG cloopgetPluginConfigDispatcher(IConfigManager* self, const char* configuredPlugin) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPluginConfig(configuredPlugin);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IConfig*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetInstallDirectoryDispatcher(IConfigManager* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getInstallDirectory();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRootDirectoryDispatcher(IConfigManager* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRootDirectory();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetDefaultSecurityDbDispatcher(IConfigManager* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDefaultSecurityDb();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IConfigManager> > >
-	class IConfigManagerImpl : public IConfigManagerBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IConfigManagerImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IConfigManagerImpl()
-		{
-		}
-
-		virtual const char* getDirectory(unsigned code) = 0;
-		virtual IFirebirdConf* getFirebirdConf() = 0;
-		virtual IFirebirdConf* getDatabaseConf(const char* dbName) = 0;
-		virtual IConfig* getPluginConfig(const char* configuredPlugin) = 0;
-		virtual const char* getInstallDirectory() = 0;
-		virtual const char* getRootDirectory() = 0;
-		virtual const char* getDefaultSecurityDb() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IEventCallbackBaseImpl : public Base
-	{
-	public:
-		typedef IEventCallback Declaration;
-
-		IEventCallbackBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->eventCallbackFunction = &Name::cloopeventCallbackFunctionDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopeventCallbackFunctionDispatcher(IEventCallback* self, unsigned length, const unsigned char* events) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::eventCallbackFunction(length, events);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IEventCallback> > > > >
-	class IEventCallbackImpl : public IEventCallbackBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IEventCallbackImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IEventCallbackImpl()
-		{
-		}
-
-		virtual void eventCallbackFunction(unsigned length, const unsigned char* events) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IBlobBaseImpl : public Base
-	{
-	public:
-		typedef IBlob Declaration;
-
-		IBlobBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->getInfo = &Name::cloopgetInfoDispatcher;
-					this->getSegment = &Name::cloopgetSegmentDispatcher;
-					this->putSegment = &Name::cloopputSegmentDispatcher;
-					this->deprecatedCancel = &Name::cloopdeprecatedCancelDispatcher;
-					this->deprecatedClose = &Name::cloopdeprecatedCloseDispatcher;
-					this->seek = &Name::cloopseekDispatcher;
-					this->cancel = &Name::cloopcancelDispatcher;
-					this->close = &Name::cloopcloseDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopgetInfoDispatcher(IBlob* self, IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::getInfo(&status2, itemsLength, items, bufferLength, buffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetSegmentDispatcher(IBlob* self, IStatus* status, unsigned bufferLength, void* buffer, unsigned* segmentLength) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getSegment(&status2, bufferLength, buffer, segmentLength);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopputSegmentDispatcher(IBlob* self, IStatus* status, unsigned length, const void* buffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::putSegment(&status2, length, buffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdeprecatedCancelDispatcher(IBlob* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deprecatedCancel(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdeprecatedCloseDispatcher(IBlob* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deprecatedClose(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static int CLOOP_CARG cloopseekDispatcher(IBlob* self, IStatus* status, int mode, int offset) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::seek(&status2, mode, offset);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopcancelDispatcher(IBlob* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::cancel(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopcloseDispatcher(IBlob* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::close(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IBlob> > > > >
-	class IBlobImpl : public IBlobBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IBlobImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IBlobImpl()
-		{
-		}
-
-		virtual void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) = 0;
-		virtual int getSegment(StatusType* status, unsigned bufferLength, void* buffer, unsigned* segmentLength) = 0;
-		virtual void putSegment(StatusType* status, unsigned length, const void* buffer) = 0;
-		virtual void deprecatedCancel(StatusType* status) = 0;
-		virtual void deprecatedClose(StatusType* status) = 0;
-		virtual int seek(StatusType* status, int mode, int offset) = 0;
-		virtual void cancel(StatusType* status) = 0;
-		virtual void close(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITransactionBaseImpl : public Base
-	{
-	public:
-		typedef ITransaction Declaration;
-
-		ITransactionBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->getInfo = &Name::cloopgetInfoDispatcher;
-					this->prepare = &Name::cloopprepareDispatcher;
-					this->deprecatedCommit = &Name::cloopdeprecatedCommitDispatcher;
-					this->commitRetaining = &Name::cloopcommitRetainingDispatcher;
-					this->deprecatedRollback = &Name::cloopdeprecatedRollbackDispatcher;
-					this->rollbackRetaining = &Name::clooprollbackRetainingDispatcher;
-					this->deprecatedDisconnect = &Name::cloopdeprecatedDisconnectDispatcher;
-					this->join = &Name::cloopjoinDispatcher;
-					this->validate = &Name::cloopvalidateDispatcher;
-					this->enterDtc = &Name::cloopenterDtcDispatcher;
-					this->commit = &Name::cloopcommitDispatcher;
-					this->rollback = &Name::clooprollbackDispatcher;
-					this->disconnect = &Name::cloopdisconnectDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopgetInfoDispatcher(ITransaction* self, IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::getInfo(&status2, itemsLength, items, bufferLength, buffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopprepareDispatcher(ITransaction* self, IStatus* status, unsigned msgLength, const unsigned char* message) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::prepare(&status2, msgLength, message);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdeprecatedCommitDispatcher(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deprecatedCommit(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopcommitRetainingDispatcher(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::commitRetaining(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdeprecatedRollbackDispatcher(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deprecatedRollback(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG clooprollbackRetainingDispatcher(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::rollbackRetaining(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdeprecatedDisconnectDispatcher(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deprecatedDisconnect(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static ITransaction* CLOOP_CARG cloopjoinDispatcher(ITransaction* self, IStatus* status, ITransaction* transaction) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::join(&status2, transaction);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ITransaction*>(0);
-			}
-		}
-
-		static ITransaction* CLOOP_CARG cloopvalidateDispatcher(ITransaction* self, IStatus* status, IAttachment* attachment) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::validate(&status2, attachment);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ITransaction*>(0);
-			}
-		}
-
-		static ITransaction* CLOOP_CARG cloopenterDtcDispatcher(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::enterDtc(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ITransaction*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopcommitDispatcher(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::commit(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG clooprollbackDispatcher(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::rollback(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdisconnectDispatcher(ITransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::disconnect(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<ITransaction> > > > >
-	class ITransactionImpl : public ITransactionBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITransactionImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITransactionImpl()
-		{
-		}
-
-		virtual void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) = 0;
-		virtual void prepare(StatusType* status, unsigned msgLength, const unsigned char* message) = 0;
-		virtual void deprecatedCommit(StatusType* status) = 0;
-		virtual void commitRetaining(StatusType* status) = 0;
-		virtual void deprecatedRollback(StatusType* status) = 0;
-		virtual void rollbackRetaining(StatusType* status) = 0;
-		virtual void deprecatedDisconnect(StatusType* status) = 0;
-		virtual ITransaction* join(StatusType* status, ITransaction* transaction) = 0;
-		virtual ITransaction* validate(StatusType* status, IAttachment* attachment) = 0;
-		virtual ITransaction* enterDtc(StatusType* status) = 0;
-		virtual void commit(StatusType* status) = 0;
-		virtual void rollback(StatusType* status) = 0;
-		virtual void disconnect(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IMessageMetadataBaseImpl : public Base
-	{
-	public:
-		typedef IMessageMetadata Declaration;
-
-		IMessageMetadataBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->getCount = &Name::cloopgetCountDispatcher;
-					this->getField = &Name::cloopgetFieldDispatcher;
-					this->getRelation = &Name::cloopgetRelationDispatcher;
-					this->getOwner = &Name::cloopgetOwnerDispatcher;
-					this->getAlias = &Name::cloopgetAliasDispatcher;
-					this->getType = &Name::cloopgetTypeDispatcher;
-					this->isNullable = &Name::cloopisNullableDispatcher;
-					this->getSubType = &Name::cloopgetSubTypeDispatcher;
-					this->getLength = &Name::cloopgetLengthDispatcher;
-					this->getScale = &Name::cloopgetScaleDispatcher;
-					this->getCharSet = &Name::cloopgetCharSetDispatcher;
-					this->getOffset = &Name::cloopgetOffsetDispatcher;
-					this->getNullOffset = &Name::cloopgetNullOffsetDispatcher;
-					this->getBuilder = &Name::cloopgetBuilderDispatcher;
-					this->getMessageLength = &Name::cloopgetMessageLengthDispatcher;
-					this->getAlignment = &Name::cloopgetAlignmentDispatcher;
-					this->getAlignedLength = &Name::cloopgetAlignedLengthDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static unsigned CLOOP_CARG cloopgetCountDispatcher(IMessageMetadata* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getCount(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetFieldDispatcher(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getField(&status2, index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRelationDispatcher(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRelation(&status2, index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetOwnerDispatcher(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOwner(&status2, index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetAliasDispatcher(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getAlias(&status2, index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetTypeDispatcher(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getType(&status2, index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopisNullableDispatcher(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::isNullable(&status2, index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetSubTypeDispatcher(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getSubType(&status2, index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetLengthDispatcher(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getLength(&status2, index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetScaleDispatcher(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getScale(&status2, index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetCharSetDispatcher(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getCharSet(&status2, index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetOffsetDispatcher(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOffset(&status2, index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetNullOffsetDispatcher(IMessageMetadata* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getNullOffset(&status2, index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static IMetadataBuilder* CLOOP_CARG cloopgetBuilderDispatcher(IMessageMetadata* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getBuilder(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IMetadataBuilder*>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetMessageLengthDispatcher(IMessageMetadata* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getMessageLength(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetAlignmentDispatcher(IMessageMetadata* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getAlignment(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetAlignedLengthDispatcher(IMessageMetadata* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getAlignedLength(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IMessageMetadata> > > > >
-	class IMessageMetadataImpl : public IMessageMetadataBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IMessageMetadataImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IMessageMetadataImpl()
-		{
-		}
-
-		virtual unsigned getCount(StatusType* status) = 0;
-		virtual const char* getField(StatusType* status, unsigned index) = 0;
-		virtual const char* getRelation(StatusType* status, unsigned index) = 0;
-		virtual const char* getOwner(StatusType* status, unsigned index) = 0;
-		virtual const char* getAlias(StatusType* status, unsigned index) = 0;
-		virtual unsigned getType(StatusType* status, unsigned index) = 0;
-		virtual FB_BOOLEAN isNullable(StatusType* status, unsigned index) = 0;
-		virtual int getSubType(StatusType* status, unsigned index) = 0;
-		virtual unsigned getLength(StatusType* status, unsigned index) = 0;
-		virtual int getScale(StatusType* status, unsigned index) = 0;
-		virtual unsigned getCharSet(StatusType* status, unsigned index) = 0;
-		virtual unsigned getOffset(StatusType* status, unsigned index) = 0;
-		virtual unsigned getNullOffset(StatusType* status, unsigned index) = 0;
-		virtual IMetadataBuilder* getBuilder(StatusType* status) = 0;
-		virtual unsigned getMessageLength(StatusType* status) = 0;
-		virtual unsigned getAlignment(StatusType* status) = 0;
-		virtual unsigned getAlignedLength(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IMetadataBuilderBaseImpl : public Base
-	{
-	public:
-		typedef IMetadataBuilder Declaration;
-
-		IMetadataBuilderBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->setType = &Name::cloopsetTypeDispatcher;
-					this->setSubType = &Name::cloopsetSubTypeDispatcher;
-					this->setLength = &Name::cloopsetLengthDispatcher;
-					this->setCharSet = &Name::cloopsetCharSetDispatcher;
-					this->setScale = &Name::cloopsetScaleDispatcher;
-					this->truncate = &Name::clooptruncateDispatcher;
-					this->moveNameToIndex = &Name::cloopmoveNameToIndexDispatcher;
-					this->remove = &Name::cloopremoveDispatcher;
-					this->addField = &Name::cloopaddFieldDispatcher;
-					this->getMetadata = &Name::cloopgetMetadataDispatcher;
-					this->setField = &Name::cloopsetFieldDispatcher;
-					this->setRelation = &Name::cloopsetRelationDispatcher;
-					this->setOwner = &Name::cloopsetOwnerDispatcher;
-					this->setAlias = &Name::cloopsetAliasDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopsetTypeDispatcher(IMetadataBuilder* self, IStatus* status, unsigned index, unsigned type) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setType(&status2, index, type);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetSubTypeDispatcher(IMetadataBuilder* self, IStatus* status, unsigned index, int subType) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setSubType(&status2, index, subType);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetLengthDispatcher(IMetadataBuilder* self, IStatus* status, unsigned index, unsigned length) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setLength(&status2, index, length);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetCharSetDispatcher(IMetadataBuilder* self, IStatus* status, unsigned index, unsigned charSet) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setCharSet(&status2, index, charSet);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetScaleDispatcher(IMetadataBuilder* self, IStatus* status, unsigned index, int scale) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setScale(&status2, index, scale);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG clooptruncateDispatcher(IMetadataBuilder* self, IStatus* status, unsigned count) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::truncate(&status2, count);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopmoveNameToIndexDispatcher(IMetadataBuilder* self, IStatus* status, const char* name, unsigned index) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::moveNameToIndex(&status2, name, index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopremoveDispatcher(IMetadataBuilder* self, IStatus* status, unsigned index) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::remove(&status2, index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopaddFieldDispatcher(IMetadataBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::addField(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static IMessageMetadata* CLOOP_CARG cloopgetMetadataDispatcher(IMetadataBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getMetadata(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IMessageMetadata*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetFieldDispatcher(IMetadataBuilder* self, IStatus* status, unsigned index, const char* field) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setField(&status2, index, field);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetRelationDispatcher(IMetadataBuilder* self, IStatus* status, unsigned index, const char* relation) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setRelation(&status2, index, relation);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetOwnerDispatcher(IMetadataBuilder* self, IStatus* status, unsigned index, const char* owner) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setOwner(&status2, index, owner);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetAliasDispatcher(IMetadataBuilder* self, IStatus* status, unsigned index, const char* alias) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setAlias(&status2, index, alias);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IMetadataBuilder> > > > >
-	class IMetadataBuilderImpl : public IMetadataBuilderBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IMetadataBuilderImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IMetadataBuilderImpl()
-		{
-		}
-
-		virtual void setType(StatusType* status, unsigned index, unsigned type) = 0;
-		virtual void setSubType(StatusType* status, unsigned index, int subType) = 0;
-		virtual void setLength(StatusType* status, unsigned index, unsigned length) = 0;
-		virtual void setCharSet(StatusType* status, unsigned index, unsigned charSet) = 0;
-		virtual void setScale(StatusType* status, unsigned index, int scale) = 0;
-		virtual void truncate(StatusType* status, unsigned count) = 0;
-		virtual void moveNameToIndex(StatusType* status, const char* name, unsigned index) = 0;
-		virtual void remove(StatusType* status, unsigned index) = 0;
-		virtual unsigned addField(StatusType* status) = 0;
-		virtual IMessageMetadata* getMetadata(StatusType* status) = 0;
-		virtual void setField(StatusType* status, unsigned index, const char* field) = 0;
-		virtual void setRelation(StatusType* status, unsigned index, const char* relation) = 0;
-		virtual void setOwner(StatusType* status, unsigned index, const char* owner) = 0;
-		virtual void setAlias(StatusType* status, unsigned index, const char* alias) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IResultSetBaseImpl : public Base
-	{
-	public:
-		typedef IResultSet Declaration;
-
-		IResultSetBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->fetchNext = &Name::cloopfetchNextDispatcher;
-					this->fetchPrior = &Name::cloopfetchPriorDispatcher;
-					this->fetchFirst = &Name::cloopfetchFirstDispatcher;
-					this->fetchLast = &Name::cloopfetchLastDispatcher;
-					this->fetchAbsolute = &Name::cloopfetchAbsoluteDispatcher;
-					this->fetchRelative = &Name::cloopfetchRelativeDispatcher;
-					this->isEof = &Name::cloopisEofDispatcher;
-					this->isBof = &Name::cloopisBofDispatcher;
-					this->getMetadata = &Name::cloopgetMetadataDispatcher;
-					this->deprecatedClose = &Name::cloopdeprecatedCloseDispatcher;
-					this->setDelayedOutputFormat = &Name::cloopsetDelayedOutputFormatDispatcher;
-					this->close = &Name::cloopcloseDispatcher;
-					this->getInfo = &Name::cloopgetInfoDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static int CLOOP_CARG cloopfetchNextDispatcher(IResultSet* self, IStatus* status, void* message) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::fetchNext(&status2, message);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopfetchPriorDispatcher(IResultSet* self, IStatus* status, void* message) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::fetchPrior(&status2, message);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopfetchFirstDispatcher(IResultSet* self, IStatus* status, void* message) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::fetchFirst(&status2, message);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopfetchLastDispatcher(IResultSet* self, IStatus* status, void* message) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::fetchLast(&status2, message);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopfetchAbsoluteDispatcher(IResultSet* self, IStatus* status, int position, void* message) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::fetchAbsolute(&status2, position, message);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopfetchRelativeDispatcher(IResultSet* self, IStatus* status, int offset, void* message) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::fetchRelative(&status2, offset, message);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopisEofDispatcher(IResultSet* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::isEof(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopisBofDispatcher(IResultSet* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::isBof(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static IMessageMetadata* CLOOP_CARG cloopgetMetadataDispatcher(IResultSet* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getMetadata(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IMessageMetadata*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdeprecatedCloseDispatcher(IResultSet* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deprecatedClose(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetDelayedOutputFormatDispatcher(IResultSet* self, IStatus* status, IMessageMetadata* format) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setDelayedOutputFormat(&status2, format);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopcloseDispatcher(IResultSet* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::close(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopgetInfoDispatcher(IResultSet* self, IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::getInfo(&status2, itemsLength, items, bufferLength, buffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IResultSet> > > > >
-	class IResultSetImpl : public IResultSetBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IResultSetImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IResultSetImpl()
-		{
-		}
-
-		virtual int fetchNext(StatusType* status, void* message) = 0;
-		virtual int fetchPrior(StatusType* status, void* message) = 0;
-		virtual int fetchFirst(StatusType* status, void* message) = 0;
-		virtual int fetchLast(StatusType* status, void* message) = 0;
-		virtual int fetchAbsolute(StatusType* status, int position, void* message) = 0;
-		virtual int fetchRelative(StatusType* status, int offset, void* message) = 0;
-		virtual FB_BOOLEAN isEof(StatusType* status) = 0;
-		virtual FB_BOOLEAN isBof(StatusType* status) = 0;
-		virtual IMessageMetadata* getMetadata(StatusType* status) = 0;
-		virtual void deprecatedClose(StatusType* status) = 0;
-		virtual void setDelayedOutputFormat(StatusType* status, IMessageMetadata* format) = 0;
-		virtual void close(StatusType* status) = 0;
-		virtual void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IStatementBaseImpl : public Base
-	{
-	public:
-		typedef IStatement Declaration;
-
-		IStatementBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->getInfo = &Name::cloopgetInfoDispatcher;
-					this->getType = &Name::cloopgetTypeDispatcher;
-					this->getPlan = &Name::cloopgetPlanDispatcher;
-					this->getAffectedRecords = &Name::cloopgetAffectedRecordsDispatcher;
-					this->getInputMetadata = &Name::cloopgetInputMetadataDispatcher;
-					this->getOutputMetadata = &Name::cloopgetOutputMetadataDispatcher;
-					this->execute = &Name::cloopexecuteDispatcher;
-					this->openCursor = &Name::cloopopenCursorDispatcher;
-					this->setCursorName = &Name::cloopsetCursorNameDispatcher;
-					this->deprecatedFree = &Name::cloopdeprecatedFreeDispatcher;
-					this->getFlags = &Name::cloopgetFlagsDispatcher;
-					this->getTimeout = &Name::cloopgetTimeoutDispatcher;
-					this->setTimeout = &Name::cloopsetTimeoutDispatcher;
-					this->createBatch = &Name::cloopcreateBatchDispatcher;
-					this->free = &Name::cloopfreeDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopgetInfoDispatcher(IStatement* self, IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::getInfo(&status2, itemsLength, items, bufferLength, buffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetTypeDispatcher(IStatement* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getType(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetPlanDispatcher(IStatement* self, IStatus* status, FB_BOOLEAN detailed) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPlan(&status2, detailed);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static ISC_UINT64 CLOOP_CARG cloopgetAffectedRecordsDispatcher(IStatement* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getAffectedRecords(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ISC_UINT64>(0);
-			}
-		}
-
-		static IMessageMetadata* CLOOP_CARG cloopgetInputMetadataDispatcher(IStatement* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getInputMetadata(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IMessageMetadata*>(0);
-			}
-		}
-
-		static IMessageMetadata* CLOOP_CARG cloopgetOutputMetadataDispatcher(IStatement* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOutputMetadata(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IMessageMetadata*>(0);
-			}
-		}
-
-		static ITransaction* CLOOP_CARG cloopexecuteDispatcher(IStatement* self, IStatus* status, ITransaction* transaction, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, void* outBuffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::execute(&status2, transaction, inMetadata, inBuffer, outMetadata, outBuffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ITransaction*>(0);
-			}
-		}
-
-		static IResultSet* CLOOP_CARG cloopopenCursorDispatcher(IStatement* self, IStatus* status, ITransaction* transaction, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, unsigned flags) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::openCursor(&status2, transaction, inMetadata, inBuffer, outMetadata, flags);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IResultSet*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetCursorNameDispatcher(IStatement* self, IStatus* status, const char* name) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setCursorName(&status2, name);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdeprecatedFreeDispatcher(IStatement* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deprecatedFree(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetFlagsDispatcher(IStatement* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getFlags(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetTimeoutDispatcher(IStatement* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getTimeout(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetTimeoutDispatcher(IStatement* self, IStatus* status, unsigned timeOut) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setTimeout(&status2, timeOut);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static IBatch* CLOOP_CARG cloopcreateBatchDispatcher(IStatement* self, IStatus* status, IMessageMetadata* inMetadata, unsigned parLength, const unsigned char* par) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::createBatch(&status2, inMetadata, parLength, par);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IBatch*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopfreeDispatcher(IStatement* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::free(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IStatement> > > > >
-	class IStatementImpl : public IStatementBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IStatementImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IStatementImpl()
-		{
-		}
-
-		virtual void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) = 0;
-		virtual unsigned getType(StatusType* status) = 0;
-		virtual const char* getPlan(StatusType* status, FB_BOOLEAN detailed) = 0;
-		virtual ISC_UINT64 getAffectedRecords(StatusType* status) = 0;
-		virtual IMessageMetadata* getInputMetadata(StatusType* status) = 0;
-		virtual IMessageMetadata* getOutputMetadata(StatusType* status) = 0;
-		virtual ITransaction* execute(StatusType* status, ITransaction* transaction, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, void* outBuffer) = 0;
-		virtual IResultSet* openCursor(StatusType* status, ITransaction* transaction, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, unsigned flags) = 0;
-		virtual void setCursorName(StatusType* status, const char* name) = 0;
-		virtual void deprecatedFree(StatusType* status) = 0;
-		virtual unsigned getFlags(StatusType* status) = 0;
-		virtual unsigned getTimeout(StatusType* status) = 0;
-		virtual void setTimeout(StatusType* status, unsigned timeOut) = 0;
-		virtual IBatch* createBatch(StatusType* status, IMessageMetadata* inMetadata, unsigned parLength, const unsigned char* par) = 0;
-		virtual void free(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IBatchBaseImpl : public Base
-	{
-	public:
-		typedef IBatch Declaration;
-
-		IBatchBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->add = &Name::cloopaddDispatcher;
-					this->addBlob = &Name::cloopaddBlobDispatcher;
-					this->appendBlobData = &Name::cloopappendBlobDataDispatcher;
-					this->addBlobStream = &Name::cloopaddBlobStreamDispatcher;
-					this->registerBlob = &Name::cloopregisterBlobDispatcher;
-					this->execute = &Name::cloopexecuteDispatcher;
-					this->cancel = &Name::cloopcancelDispatcher;
-					this->getBlobAlignment = &Name::cloopgetBlobAlignmentDispatcher;
-					this->getMetadata = &Name::cloopgetMetadataDispatcher;
-					this->setDefaultBpb = &Name::cloopsetDefaultBpbDispatcher;
-					this->deprecatedClose = &Name::cloopdeprecatedCloseDispatcher;
-					this->close = &Name::cloopcloseDispatcher;
-					this->getInfo = &Name::cloopgetInfoDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopaddDispatcher(IBatch* self, IStatus* status, unsigned count, const void* inBuffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::add(&status2, count, inBuffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddBlobDispatcher(IBatch* self, IStatus* status, unsigned length, const void* inBuffer, ISC_QUAD* blobId, unsigned parLength, const unsigned char* par) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::addBlob(&status2, length, inBuffer, blobId, parLength, par);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopappendBlobDataDispatcher(IBatch* self, IStatus* status, unsigned length, const void* inBuffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::appendBlobData(&status2, length, inBuffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddBlobStreamDispatcher(IBatch* self, IStatus* status, unsigned length, const void* inBuffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::addBlobStream(&status2, length, inBuffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopregisterBlobDispatcher(IBatch* self, IStatus* status, const ISC_QUAD* existingBlob, ISC_QUAD* blobId) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::registerBlob(&status2, existingBlob, blobId);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static IBatchCompletionState* CLOOP_CARG cloopexecuteDispatcher(IBatch* self, IStatus* status, ITransaction* transaction) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::execute(&status2, transaction);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IBatchCompletionState*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopcancelDispatcher(IBatch* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::cancel(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetBlobAlignmentDispatcher(IBatch* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getBlobAlignment(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static IMessageMetadata* CLOOP_CARG cloopgetMetadataDispatcher(IBatch* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getMetadata(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IMessageMetadata*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetDefaultBpbDispatcher(IBatch* self, IStatus* status, unsigned parLength, const unsigned char* par) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setDefaultBpb(&status2, parLength, par);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdeprecatedCloseDispatcher(IBatch* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deprecatedClose(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopcloseDispatcher(IBatch* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::close(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopgetInfoDispatcher(IBatch* self, IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::getInfo(&status2, itemsLength, items, bufferLength, buffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IBatch> > > > >
-	class IBatchImpl : public IBatchBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IBatchImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IBatchImpl()
-		{
-		}
-
-		virtual void add(StatusType* status, unsigned count, const void* inBuffer) = 0;
-		virtual void addBlob(StatusType* status, unsigned length, const void* inBuffer, ISC_QUAD* blobId, unsigned parLength, const unsigned char* par) = 0;
-		virtual void appendBlobData(StatusType* status, unsigned length, const void* inBuffer) = 0;
-		virtual void addBlobStream(StatusType* status, unsigned length, const void* inBuffer) = 0;
-		virtual void registerBlob(StatusType* status, const ISC_QUAD* existingBlob, ISC_QUAD* blobId) = 0;
-		virtual IBatchCompletionState* execute(StatusType* status, ITransaction* transaction) = 0;
-		virtual void cancel(StatusType* status) = 0;
-		virtual unsigned getBlobAlignment(StatusType* status) = 0;
-		virtual IMessageMetadata* getMetadata(StatusType* status) = 0;
-		virtual void setDefaultBpb(StatusType* status, unsigned parLength, const unsigned char* par) = 0;
-		virtual void deprecatedClose(StatusType* status) = 0;
-		virtual void close(StatusType* status) = 0;
-		virtual void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IBatchCompletionStateBaseImpl : public Base
-	{
-	public:
-		typedef IBatchCompletionState Declaration;
-
-		IBatchCompletionStateBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->dispose = &Name::cloopdisposeDispatcher;
-					this->getSize = &Name::cloopgetSizeDispatcher;
-					this->getState = &Name::cloopgetStateDispatcher;
-					this->findError = &Name::cloopfindErrorDispatcher;
-					this->getStatus = &Name::cloopgetStatusDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static unsigned CLOOP_CARG cloopgetSizeDispatcher(IBatchCompletionState* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getSize(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetStateDispatcher(IBatchCompletionState* self, IStatus* status, unsigned pos) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getState(&status2, pos);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopfindErrorDispatcher(IBatchCompletionState* self, IStatus* status, unsigned pos) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::findError(&status2, pos);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopgetStatusDispatcher(IBatchCompletionState* self, IStatus* status, IStatus* to, unsigned pos) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::getStatus(&status2, to, pos);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdisposeDispatcher(IDisposable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::dispose();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IDisposableImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IBatchCompletionState> > > > >
-	class IBatchCompletionStateImpl : public IBatchCompletionStateBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IBatchCompletionStateImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IBatchCompletionStateImpl()
-		{
-		}
-
-		virtual unsigned getSize(StatusType* status) = 0;
-		virtual int getState(StatusType* status, unsigned pos) = 0;
-		virtual unsigned findError(StatusType* status, unsigned pos) = 0;
-		virtual void getStatus(StatusType* status, IStatus* to, unsigned pos) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IReplicatorBaseImpl : public Base
-	{
-	public:
-		typedef IReplicator Declaration;
-
-		IReplicatorBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->process = &Name::cloopprocessDispatcher;
-					this->deprecatedClose = &Name::cloopdeprecatedCloseDispatcher;
-					this->close = &Name::cloopcloseDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopprocessDispatcher(IReplicator* self, IStatus* status, unsigned length, const unsigned char* data) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::process(&status2, length, data);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdeprecatedCloseDispatcher(IReplicator* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deprecatedClose(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopcloseDispatcher(IReplicator* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::close(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IReplicator> > > > >
-	class IReplicatorImpl : public IReplicatorBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IReplicatorImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IReplicatorImpl()
-		{
-		}
-
-		virtual void process(StatusType* status, unsigned length, const unsigned char* data) = 0;
-		virtual void deprecatedClose(StatusType* status) = 0;
-		virtual void close(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IRequestBaseImpl : public Base
-	{
-	public:
-		typedef IRequest Declaration;
-
-		IRequestBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->receive = &Name::cloopreceiveDispatcher;
-					this->send = &Name::cloopsendDispatcher;
-					this->getInfo = &Name::cloopgetInfoDispatcher;
-					this->start = &Name::cloopstartDispatcher;
-					this->startAndSend = &Name::cloopstartAndSendDispatcher;
-					this->unwind = &Name::cloopunwindDispatcher;
-					this->deprecatedFree = &Name::cloopdeprecatedFreeDispatcher;
-					this->free = &Name::cloopfreeDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopreceiveDispatcher(IRequest* self, IStatus* status, int level, unsigned msgType, unsigned length, void* message) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::receive(&status2, level, msgType, length, message);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsendDispatcher(IRequest* self, IStatus* status, int level, unsigned msgType, unsigned length, const void* message) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::send(&status2, level, msgType, length, message);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopgetInfoDispatcher(IRequest* self, IStatus* status, int level, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::getInfo(&status2, level, itemsLength, items, bufferLength, buffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopstartDispatcher(IRequest* self, IStatus* status, ITransaction* tra, int level) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::start(&status2, tra, level);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopstartAndSendDispatcher(IRequest* self, IStatus* status, ITransaction* tra, int level, unsigned msgType, unsigned length, const void* message) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::startAndSend(&status2, tra, level, msgType, length, message);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopunwindDispatcher(IRequest* self, IStatus* status, int level) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::unwind(&status2, level);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdeprecatedFreeDispatcher(IRequest* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deprecatedFree(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopfreeDispatcher(IRequest* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::free(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IRequest> > > > >
-	class IRequestImpl : public IRequestBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IRequestImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IRequestImpl()
-		{
-		}
-
-		virtual void receive(StatusType* status, int level, unsigned msgType, unsigned length, void* message) = 0;
-		virtual void send(StatusType* status, int level, unsigned msgType, unsigned length, const void* message) = 0;
-		virtual void getInfo(StatusType* status, int level, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) = 0;
-		virtual void start(StatusType* status, ITransaction* tra, int level) = 0;
-		virtual void startAndSend(StatusType* status, ITransaction* tra, int level, unsigned msgType, unsigned length, const void* message) = 0;
-		virtual void unwind(StatusType* status, int level) = 0;
-		virtual void deprecatedFree(StatusType* status) = 0;
-		virtual void free(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IEventsBaseImpl : public Base
-	{
-	public:
-		typedef IEvents Declaration;
-
-		IEventsBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->deprecatedCancel = &Name::cloopdeprecatedCancelDispatcher;
-					this->cancel = &Name::cloopcancelDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopdeprecatedCancelDispatcher(IEvents* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deprecatedCancel(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopcancelDispatcher(IEvents* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::cancel(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IEvents> > > > >
-	class IEventsImpl : public IEventsBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IEventsImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IEventsImpl()
-		{
-		}
-
-		virtual void deprecatedCancel(StatusType* status) = 0;
-		virtual void cancel(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IAttachmentBaseImpl : public Base
-	{
-	public:
-		typedef IAttachment Declaration;
-
-		IAttachmentBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->getInfo = &Name::cloopgetInfoDispatcher;
-					this->startTransaction = &Name::cloopstartTransactionDispatcher;
-					this->reconnectTransaction = &Name::cloopreconnectTransactionDispatcher;
-					this->compileRequest = &Name::cloopcompileRequestDispatcher;
-					this->transactRequest = &Name::clooptransactRequestDispatcher;
-					this->createBlob = &Name::cloopcreateBlobDispatcher;
-					this->openBlob = &Name::cloopopenBlobDispatcher;
-					this->getSlice = &Name::cloopgetSliceDispatcher;
-					this->putSlice = &Name::cloopputSliceDispatcher;
-					this->executeDyn = &Name::cloopexecuteDynDispatcher;
-					this->prepare = &Name::cloopprepareDispatcher;
-					this->execute = &Name::cloopexecuteDispatcher;
-					this->openCursor = &Name::cloopopenCursorDispatcher;
-					this->queEvents = &Name::cloopqueEventsDispatcher;
-					this->cancelOperation = &Name::cloopcancelOperationDispatcher;
-					this->ping = &Name::clooppingDispatcher;
-					this->deprecatedDetach = &Name::cloopdeprecatedDetachDispatcher;
-					this->deprecatedDropDatabase = &Name::cloopdeprecatedDropDatabaseDispatcher;
-					this->getIdleTimeout = &Name::cloopgetIdleTimeoutDispatcher;
-					this->setIdleTimeout = &Name::cloopsetIdleTimeoutDispatcher;
-					this->getStatementTimeout = &Name::cloopgetStatementTimeoutDispatcher;
-					this->setStatementTimeout = &Name::cloopsetStatementTimeoutDispatcher;
-					this->createBatch = &Name::cloopcreateBatchDispatcher;
-					this->createReplicator = &Name::cloopcreateReplicatorDispatcher;
-					this->detach = &Name::cloopdetachDispatcher;
-					this->dropDatabase = &Name::cloopdropDatabaseDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopgetInfoDispatcher(IAttachment* self, IStatus* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::getInfo(&status2, itemsLength, items, bufferLength, buffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static ITransaction* CLOOP_CARG cloopstartTransactionDispatcher(IAttachment* self, IStatus* status, unsigned tpbLength, const unsigned char* tpb) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::startTransaction(&status2, tpbLength, tpb);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ITransaction*>(0);
-			}
-		}
-
-		static ITransaction* CLOOP_CARG cloopreconnectTransactionDispatcher(IAttachment* self, IStatus* status, unsigned length, const unsigned char* id) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::reconnectTransaction(&status2, length, id);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ITransaction*>(0);
-			}
-		}
-
-		static IRequest* CLOOP_CARG cloopcompileRequestDispatcher(IAttachment* self, IStatus* status, unsigned blrLength, const unsigned char* blr) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::compileRequest(&status2, blrLength, blr);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IRequest*>(0);
-			}
-		}
-
-		static void CLOOP_CARG clooptransactRequestDispatcher(IAttachment* self, IStatus* status, ITransaction* transaction, unsigned blrLength, const unsigned char* blr, unsigned inMsgLength, const unsigned char* inMsg, unsigned outMsgLength, unsigned char* outMsg) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::transactRequest(&status2, transaction, blrLength, blr, inMsgLength, inMsg, outMsgLength, outMsg);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static IBlob* CLOOP_CARG cloopcreateBlobDispatcher(IAttachment* self, IStatus* status, ITransaction* transaction, ISC_QUAD* id, unsigned bpbLength, const unsigned char* bpb) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::createBlob(&status2, transaction, id, bpbLength, bpb);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IBlob*>(0);
-			}
-		}
-
-		static IBlob* CLOOP_CARG cloopopenBlobDispatcher(IAttachment* self, IStatus* status, ITransaction* transaction, ISC_QUAD* id, unsigned bpbLength, const unsigned char* bpb) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::openBlob(&status2, transaction, id, bpbLength, bpb);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IBlob*>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetSliceDispatcher(IAttachment* self, IStatus* status, ITransaction* transaction, ISC_QUAD* id, unsigned sdlLength, const unsigned char* sdl, unsigned paramLength, const unsigned char* param, int sliceLength, unsigned char* slice) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getSlice(&status2, transaction, id, sdlLength, sdl, paramLength, param, sliceLength, slice);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopputSliceDispatcher(IAttachment* self, IStatus* status, ITransaction* transaction, ISC_QUAD* id, unsigned sdlLength, const unsigned char* sdl, unsigned paramLength, const unsigned char* param, int sliceLength, unsigned char* slice) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::putSlice(&status2, transaction, id, sdlLength, sdl, paramLength, param, sliceLength, slice);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopexecuteDynDispatcher(IAttachment* self, IStatus* status, ITransaction* transaction, unsigned length, const unsigned char* dyn) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::executeDyn(&status2, transaction, length, dyn);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static IStatement* CLOOP_CARG cloopprepareDispatcher(IAttachment* self, IStatus* status, ITransaction* tra, unsigned stmtLength, const char* sqlStmt, unsigned dialect, unsigned flags) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::prepare(&status2, tra, stmtLength, sqlStmt, dialect, flags);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IStatement*>(0);
-			}
-		}
-
-		static ITransaction* CLOOP_CARG cloopexecuteDispatcher(IAttachment* self, IStatus* status, ITransaction* transaction, unsigned stmtLength, const char* sqlStmt, unsigned dialect, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, void* outBuffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::execute(&status2, transaction, stmtLength, sqlStmt, dialect, inMetadata, inBuffer, outMetadata, outBuffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ITransaction*>(0);
-			}
-		}
-
-		static IResultSet* CLOOP_CARG cloopopenCursorDispatcher(IAttachment* self, IStatus* status, ITransaction* transaction, unsigned stmtLength, const char* sqlStmt, unsigned dialect, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, const char* cursorName, unsigned cursorFlags) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::openCursor(&status2, transaction, stmtLength, sqlStmt, dialect, inMetadata, inBuffer, outMetadata, cursorName, cursorFlags);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IResultSet*>(0);
-			}
-		}
-
-		static IEvents* CLOOP_CARG cloopqueEventsDispatcher(IAttachment* self, IStatus* status, IEventCallback* callback, unsigned length, const unsigned char* events) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::queEvents(&status2, callback, length, events);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IEvents*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopcancelOperationDispatcher(IAttachment* self, IStatus* status, int option) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::cancelOperation(&status2, option);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG clooppingDispatcher(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::ping(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdeprecatedDetachDispatcher(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deprecatedDetach(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdeprecatedDropDatabaseDispatcher(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deprecatedDropDatabase(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetIdleTimeoutDispatcher(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getIdleTimeout(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetIdleTimeoutDispatcher(IAttachment* self, IStatus* status, unsigned timeOut) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setIdleTimeout(&status2, timeOut);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetStatementTimeoutDispatcher(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getStatementTimeout(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetStatementTimeoutDispatcher(IAttachment* self, IStatus* status, unsigned timeOut) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setStatementTimeout(&status2, timeOut);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static IBatch* CLOOP_CARG cloopcreateBatchDispatcher(IAttachment* self, IStatus* status, ITransaction* transaction, unsigned stmtLength, const char* sqlStmt, unsigned dialect, IMessageMetadata* inMetadata, unsigned parLength, const unsigned char* par) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::createBatch(&status2, transaction, stmtLength, sqlStmt, dialect, inMetadata, parLength, par);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IBatch*>(0);
-			}
-		}
-
-		static IReplicator* CLOOP_CARG cloopcreateReplicatorDispatcher(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::createReplicator(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IReplicator*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdetachDispatcher(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::detach(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdropDatabaseDispatcher(IAttachment* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::dropDatabase(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IAttachment> > > > >
-	class IAttachmentImpl : public IAttachmentBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IAttachmentImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IAttachmentImpl()
-		{
-		}
-
-		virtual void getInfo(StatusType* status, unsigned itemsLength, const unsigned char* items, unsigned bufferLength, unsigned char* buffer) = 0;
-		virtual ITransaction* startTransaction(StatusType* status, unsigned tpbLength, const unsigned char* tpb) = 0;
-		virtual ITransaction* reconnectTransaction(StatusType* status, unsigned length, const unsigned char* id) = 0;
-		virtual IRequest* compileRequest(StatusType* status, unsigned blrLength, const unsigned char* blr) = 0;
-		virtual void transactRequest(StatusType* status, ITransaction* transaction, unsigned blrLength, const unsigned char* blr, unsigned inMsgLength, const unsigned char* inMsg, unsigned outMsgLength, unsigned char* outMsg) = 0;
-		virtual IBlob* createBlob(StatusType* status, ITransaction* transaction, ISC_QUAD* id, unsigned bpbLength, const unsigned char* bpb) = 0;
-		virtual IBlob* openBlob(StatusType* status, ITransaction* transaction, ISC_QUAD* id, unsigned bpbLength, const unsigned char* bpb) = 0;
-		virtual int getSlice(StatusType* status, ITransaction* transaction, ISC_QUAD* id, unsigned sdlLength, const unsigned char* sdl, unsigned paramLength, const unsigned char* param, int sliceLength, unsigned char* slice) = 0;
-		virtual void putSlice(StatusType* status, ITransaction* transaction, ISC_QUAD* id, unsigned sdlLength, const unsigned char* sdl, unsigned paramLength, const unsigned char* param, int sliceLength, unsigned char* slice) = 0;
-		virtual void executeDyn(StatusType* status, ITransaction* transaction, unsigned length, const unsigned char* dyn) = 0;
-		virtual IStatement* prepare(StatusType* status, ITransaction* tra, unsigned stmtLength, const char* sqlStmt, unsigned dialect, unsigned flags) = 0;
-		virtual ITransaction* execute(StatusType* status, ITransaction* transaction, unsigned stmtLength, const char* sqlStmt, unsigned dialect, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, void* outBuffer) = 0;
-		virtual IResultSet* openCursor(StatusType* status, ITransaction* transaction, unsigned stmtLength, const char* sqlStmt, unsigned dialect, IMessageMetadata* inMetadata, void* inBuffer, IMessageMetadata* outMetadata, const char* cursorName, unsigned cursorFlags) = 0;
-		virtual IEvents* queEvents(StatusType* status, IEventCallback* callback, unsigned length, const unsigned char* events) = 0;
-		virtual void cancelOperation(StatusType* status, int option) = 0;
-		virtual void ping(StatusType* status) = 0;
-		virtual void deprecatedDetach(StatusType* status) = 0;
-		virtual void deprecatedDropDatabase(StatusType* status) = 0;
-		virtual unsigned getIdleTimeout(StatusType* status) = 0;
-		virtual void setIdleTimeout(StatusType* status, unsigned timeOut) = 0;
-		virtual unsigned getStatementTimeout(StatusType* status) = 0;
-		virtual void setStatementTimeout(StatusType* status, unsigned timeOut) = 0;
-		virtual IBatch* createBatch(StatusType* status, ITransaction* transaction, unsigned stmtLength, const char* sqlStmt, unsigned dialect, IMessageMetadata* inMetadata, unsigned parLength, const unsigned char* par) = 0;
-		virtual IReplicator* createReplicator(StatusType* status) = 0;
-		virtual void detach(StatusType* status) = 0;
-		virtual void dropDatabase(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IServiceBaseImpl : public Base
-	{
-	public:
-		typedef IService Declaration;
-
-		IServiceBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->deprecatedDetach = &Name::cloopdeprecatedDetachDispatcher;
-					this->query = &Name::cloopqueryDispatcher;
-					this->start = &Name::cloopstartDispatcher;
-					this->detach = &Name::cloopdetachDispatcher;
-					this->cancel = &Name::cloopcancelDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopdeprecatedDetachDispatcher(IService* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deprecatedDetach(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopqueryDispatcher(IService* self, IStatus* status, unsigned sendLength, const unsigned char* sendItems, unsigned receiveLength, const unsigned char* receiveItems, unsigned bufferLength, unsigned char* buffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::query(&status2, sendLength, sendItems, receiveLength, receiveItems, bufferLength, buffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopstartDispatcher(IService* self, IStatus* status, unsigned spbLength, const unsigned char* spb) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::start(&status2, spbLength, spb);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdetachDispatcher(IService* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::detach(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopcancelDispatcher(IService* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::cancel(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IService> > > > >
-	class IServiceImpl : public IServiceBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IServiceImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IServiceImpl()
-		{
-		}
-
-		virtual void deprecatedDetach(StatusType* status) = 0;
-		virtual void query(StatusType* status, unsigned sendLength, const unsigned char* sendItems, unsigned receiveLength, const unsigned char* receiveItems, unsigned bufferLength, unsigned char* buffer) = 0;
-		virtual void start(StatusType* status, unsigned spbLength, const unsigned char* spb) = 0;
-		virtual void detach(StatusType* status) = 0;
-		virtual void cancel(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IProviderBaseImpl : public Base
-	{
-	public:
-		typedef IProvider Declaration;
-
-		IProviderBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->setOwner = &Name::cloopsetOwnerDispatcher;
-					this->getOwner = &Name::cloopgetOwnerDispatcher;
-					this->attachDatabase = &Name::cloopattachDatabaseDispatcher;
-					this->createDatabase = &Name::cloopcreateDatabaseDispatcher;
-					this->attachServiceManager = &Name::cloopattachServiceManagerDispatcher;
-					this->shutdown = &Name::cloopshutdownDispatcher;
-					this->setDbCryptCallback = &Name::cloopsetDbCryptCallbackDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static IAttachment* CLOOP_CARG cloopattachDatabaseDispatcher(IProvider* self, IStatus* status, const char* fileName, unsigned dpbLength, const unsigned char* dpb) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::attachDatabase(&status2, fileName, dpbLength, dpb);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IAttachment*>(0);
-			}
-		}
-
-		static IAttachment* CLOOP_CARG cloopcreateDatabaseDispatcher(IProvider* self, IStatus* status, const char* fileName, unsigned dpbLength, const unsigned char* dpb) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::createDatabase(&status2, fileName, dpbLength, dpb);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IAttachment*>(0);
-			}
-		}
-
-		static IService* CLOOP_CARG cloopattachServiceManagerDispatcher(IProvider* self, IStatus* status, const char* service, unsigned spbLength, const unsigned char* spb) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::attachServiceManager(&status2, service, spbLength, spb);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IService*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopshutdownDispatcher(IProvider* self, IStatus* status, unsigned timeout, const int reason) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::shutdown(&status2, timeout, reason);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetDbCryptCallbackDispatcher(IProvider* self, IStatus* status, ICryptKeyCallback* cryptCallback) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setDbCryptCallback(&status2, cryptCallback);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetOwnerDispatcher(IPluginBase* self, IReferenceCounted* r) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setOwner(r);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static IReferenceCounted* CLOOP_CARG cloopgetOwnerDispatcher(IPluginBase* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOwner();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IReferenceCounted*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IPluginBaseImpl<Name, StatusType, Inherit<IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IProvider> > > > > > >
-	class IProviderImpl : public IProviderBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IProviderImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IProviderImpl()
-		{
-		}
-
-		virtual IAttachment* attachDatabase(StatusType* status, const char* fileName, unsigned dpbLength, const unsigned char* dpb) = 0;
-		virtual IAttachment* createDatabase(StatusType* status, const char* fileName, unsigned dpbLength, const unsigned char* dpb) = 0;
-		virtual IService* attachServiceManager(StatusType* status, const char* service, unsigned spbLength, const unsigned char* spb) = 0;
-		virtual void shutdown(StatusType* status, unsigned timeout, const int reason) = 0;
-		virtual void setDbCryptCallback(StatusType* status, ICryptKeyCallback* cryptCallback) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IDtcStartBaseImpl : public Base
-	{
-	public:
-		typedef IDtcStart Declaration;
-
-		IDtcStartBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->dispose = &Name::cloopdisposeDispatcher;
-					this->addAttachment = &Name::cloopaddAttachmentDispatcher;
-					this->addWithTpb = &Name::cloopaddWithTpbDispatcher;
-					this->start = &Name::cloopstartDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopaddAttachmentDispatcher(IDtcStart* self, IStatus* status, IAttachment* att) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::addAttachment(&status2, att);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddWithTpbDispatcher(IDtcStart* self, IStatus* status, IAttachment* att, unsigned length, const unsigned char* tpb) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::addWithTpb(&status2, att, length, tpb);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static ITransaction* CLOOP_CARG cloopstartDispatcher(IDtcStart* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::start(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ITransaction*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdisposeDispatcher(IDisposable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::dispose();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IDisposableImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IDtcStart> > > > >
-	class IDtcStartImpl : public IDtcStartBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IDtcStartImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IDtcStartImpl()
-		{
-		}
-
-		virtual void addAttachment(StatusType* status, IAttachment* att) = 0;
-		virtual void addWithTpb(StatusType* status, IAttachment* att, unsigned length, const unsigned char* tpb) = 0;
-		virtual ITransaction* start(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IDtcBaseImpl : public Base
-	{
-	public:
-		typedef IDtc Declaration;
-
-		IDtcBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->join = &Name::cloopjoinDispatcher;
-					this->startBuilder = &Name::cloopstartBuilderDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static ITransaction* CLOOP_CARG cloopjoinDispatcher(IDtc* self, IStatus* status, ITransaction* one, ITransaction* two) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::join(&status2, one, two);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ITransaction*>(0);
-			}
-		}
-
-		static IDtcStart* CLOOP_CARG cloopstartBuilderDispatcher(IDtc* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::startBuilder(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IDtcStart*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IDtc> > >
-	class IDtcImpl : public IDtcBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IDtcImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IDtcImpl()
-		{
-		}
-
-		virtual ITransaction* join(StatusType* status, ITransaction* one, ITransaction* two) = 0;
-		virtual IDtcStart* startBuilder(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IAuthBaseImpl : public Base
-	{
-	public:
-		typedef IAuth Declaration;
-
-		IAuthBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->setOwner = &Name::cloopsetOwnerDispatcher;
-					this->getOwner = &Name::cloopgetOwnerDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopsetOwnerDispatcher(IPluginBase* self, IReferenceCounted* r) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setOwner(r);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static IReferenceCounted* CLOOP_CARG cloopgetOwnerDispatcher(IPluginBase* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOwner();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IReferenceCounted*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IPluginBaseImpl<Name, StatusType, Inherit<IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IAuth> > > > > > >
-	class IAuthImpl : public IAuthBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IAuthImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IAuthImpl()
-		{
-		}
-
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IWriterBaseImpl : public Base
-	{
-	public:
-		typedef IWriter Declaration;
-
-		IWriterBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->reset = &Name::cloopresetDispatcher;
-					this->add = &Name::cloopaddDispatcher;
-					this->setType = &Name::cloopsetTypeDispatcher;
-					this->setDb = &Name::cloopsetDbDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopresetDispatcher(IWriter* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::reset();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddDispatcher(IWriter* self, IStatus* status, const char* name) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::add(&status2, name);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetTypeDispatcher(IWriter* self, IStatus* status, const char* value) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setType(&status2, value);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetDbDispatcher(IWriter* self, IStatus* status, const char* value) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setDb(&status2, value);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IWriter> > >
-	class IWriterImpl : public IWriterBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IWriterImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IWriterImpl()
-		{
-		}
-
-		virtual void reset() = 0;
-		virtual void add(StatusType* status, const char* name) = 0;
-		virtual void setType(StatusType* status, const char* value) = 0;
-		virtual void setDb(StatusType* status, const char* value) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IServerBlockBaseImpl : public Base
-	{
-	public:
-		typedef IServerBlock Declaration;
-
-		IServerBlockBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getLogin = &Name::cloopgetLoginDispatcher;
-					this->getData = &Name::cloopgetDataDispatcher;
-					this->putData = &Name::cloopputDataDispatcher;
-					this->newKey = &Name::cloopnewKeyDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetLoginDispatcher(IServerBlock* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getLogin();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const unsigned char* CLOOP_CARG cloopgetDataDispatcher(IServerBlock* self, unsigned* length) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getData(length);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const unsigned char*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopputDataDispatcher(IServerBlock* self, IStatus* status, unsigned length, const void* data) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::putData(&status2, length, data);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static ICryptKey* CLOOP_CARG cloopnewKeyDispatcher(IServerBlock* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::newKey(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ICryptKey*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IServerBlock> > >
-	class IServerBlockImpl : public IServerBlockBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IServerBlockImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IServerBlockImpl()
-		{
-		}
-
-		virtual const char* getLogin() = 0;
-		virtual const unsigned char* getData(unsigned* length) = 0;
-		virtual void putData(StatusType* status, unsigned length, const void* data) = 0;
-		virtual ICryptKey* newKey(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IClientBlockBaseImpl : public Base
-	{
-	public:
-		typedef IClientBlock Declaration;
-
-		IClientBlockBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->getLogin = &Name::cloopgetLoginDispatcher;
-					this->getPassword = &Name::cloopgetPasswordDispatcher;
-					this->getData = &Name::cloopgetDataDispatcher;
-					this->putData = &Name::cloopputDataDispatcher;
-					this->newKey = &Name::cloopnewKeyDispatcher;
-					this->getAuthBlock = &Name::cloopgetAuthBlockDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetLoginDispatcher(IClientBlock* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getLogin();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetPasswordDispatcher(IClientBlock* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPassword();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const unsigned char* CLOOP_CARG cloopgetDataDispatcher(IClientBlock* self, unsigned* length) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getData(length);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const unsigned char*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopputDataDispatcher(IClientBlock* self, IStatus* status, unsigned length, const void* data) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::putData(&status2, length, data);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static ICryptKey* CLOOP_CARG cloopnewKeyDispatcher(IClientBlock* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::newKey(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ICryptKey*>(0);
-			}
-		}
-
-		static IAuthBlock* CLOOP_CARG cloopgetAuthBlockDispatcher(IClientBlock* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getAuthBlock(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IAuthBlock*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IClientBlock> > > > >
-	class IClientBlockImpl : public IClientBlockBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IClientBlockImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IClientBlockImpl()
-		{
-		}
-
-		virtual const char* getLogin() = 0;
-		virtual const char* getPassword() = 0;
-		virtual const unsigned char* getData(unsigned* length) = 0;
-		virtual void putData(StatusType* status, unsigned length, const void* data) = 0;
-		virtual ICryptKey* newKey(StatusType* status) = 0;
-		virtual IAuthBlock* getAuthBlock(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IServerBaseImpl : public Base
-	{
-	public:
-		typedef IServer Declaration;
-
-		IServerBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->setOwner = &Name::cloopsetOwnerDispatcher;
-					this->getOwner = &Name::cloopgetOwnerDispatcher;
-					this->authenticate = &Name::cloopauthenticateDispatcher;
-					this->setDbCryptCallback = &Name::cloopsetDbCryptCallbackDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static int CLOOP_CARG cloopauthenticateDispatcher(IServer* self, IStatus* status, IServerBlock* sBlock, IWriter* writerInterface) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::authenticate(&status2, sBlock, writerInterface);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetDbCryptCallbackDispatcher(IServer* self, IStatus* status, ICryptKeyCallback* cryptCallback) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setDbCryptCallback(&status2, cryptCallback);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetOwnerDispatcher(IPluginBase* self, IReferenceCounted* r) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setOwner(r);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static IReferenceCounted* CLOOP_CARG cloopgetOwnerDispatcher(IPluginBase* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOwner();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IReferenceCounted*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IAuthImpl<Name, StatusType, Inherit<IPluginBaseImpl<Name, StatusType, Inherit<IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IServer> > > > > > > > >
-	class IServerImpl : public IServerBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IServerImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IServerImpl()
-		{
-		}
-
-		virtual int authenticate(StatusType* status, IServerBlock* sBlock, IWriter* writerInterface) = 0;
-		virtual void setDbCryptCallback(StatusType* status, ICryptKeyCallback* cryptCallback) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IClientBaseImpl : public Base
-	{
-	public:
-		typedef IClient Declaration;
-
-		IClientBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->setOwner = &Name::cloopsetOwnerDispatcher;
-					this->getOwner = &Name::cloopgetOwnerDispatcher;
-					this->authenticate = &Name::cloopauthenticateDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static int CLOOP_CARG cloopauthenticateDispatcher(IClient* self, IStatus* status, IClientBlock* cBlock) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::authenticate(&status2, cBlock);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetOwnerDispatcher(IPluginBase* self, IReferenceCounted* r) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setOwner(r);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static IReferenceCounted* CLOOP_CARG cloopgetOwnerDispatcher(IPluginBase* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOwner();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IReferenceCounted*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IAuthImpl<Name, StatusType, Inherit<IPluginBaseImpl<Name, StatusType, Inherit<IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IClient> > > > > > > > >
-	class IClientImpl : public IClientBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IClientImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IClientImpl()
-		{
-		}
-
-		virtual int authenticate(StatusType* status, IClientBlock* cBlock) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IUserFieldBaseImpl : public Base
-	{
-	public:
-		typedef IUserField Declaration;
-
-		IUserFieldBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->entered = &Name::cloopenteredDispatcher;
-					this->specified = &Name::cloopspecifiedDispatcher;
-					this->setEntered = &Name::cloopsetEnteredDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static int CLOOP_CARG cloopenteredDispatcher(IUserField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::entered();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopspecifiedDispatcher(IUserField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::specified();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetEnteredDispatcher(IUserField* self, IStatus* status, int newValue) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setEntered(&status2, newValue);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IUserField> > >
-	class IUserFieldImpl : public IUserFieldBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IUserFieldImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IUserFieldImpl()
-		{
-		}
-
-		virtual int entered() = 0;
-		virtual int specified() = 0;
-		virtual void setEntered(StatusType* status, int newValue) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ICharUserFieldBaseImpl : public Base
-	{
-	public:
-		typedef ICharUserField Declaration;
-
-		ICharUserFieldBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->entered = &Name::cloopenteredDispatcher;
-					this->specified = &Name::cloopspecifiedDispatcher;
-					this->setEntered = &Name::cloopsetEnteredDispatcher;
-					this->get = &Name::cloopgetDispatcher;
-					this->set = &Name::cloopsetDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetDispatcher(ICharUserField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::get();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetDispatcher(ICharUserField* self, IStatus* status, const char* newValue) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::set(&status2, newValue);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static int CLOOP_CARG cloopenteredDispatcher(IUserField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::entered();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopspecifiedDispatcher(IUserField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::specified();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetEnteredDispatcher(IUserField* self, IStatus* status, int newValue) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setEntered(&status2, newValue);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IUserFieldImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<ICharUserField> > > > >
-	class ICharUserFieldImpl : public ICharUserFieldBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ICharUserFieldImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ICharUserFieldImpl()
-		{
-		}
-
-		virtual const char* get() = 0;
-		virtual void set(StatusType* status, const char* newValue) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IIntUserFieldBaseImpl : public Base
-	{
-	public:
-		typedef IIntUserField Declaration;
-
-		IIntUserFieldBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->entered = &Name::cloopenteredDispatcher;
-					this->specified = &Name::cloopspecifiedDispatcher;
-					this->setEntered = &Name::cloopsetEnteredDispatcher;
-					this->get = &Name::cloopgetDispatcher;
-					this->set = &Name::cloopsetDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static int CLOOP_CARG cloopgetDispatcher(IIntUserField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::get();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetDispatcher(IIntUserField* self, IStatus* status, int newValue) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::set(&status2, newValue);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static int CLOOP_CARG cloopenteredDispatcher(IUserField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::entered();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopspecifiedDispatcher(IUserField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::specified();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetEnteredDispatcher(IUserField* self, IStatus* status, int newValue) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setEntered(&status2, newValue);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IUserFieldImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IIntUserField> > > > >
-	class IIntUserFieldImpl : public IIntUserFieldBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IIntUserFieldImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IIntUserFieldImpl()
-		{
-		}
-
-		virtual int get() = 0;
-		virtual void set(StatusType* status, int newValue) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IUserBaseImpl : public Base
-	{
-	public:
-		typedef IUser Declaration;
-
-		IUserBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->operation = &Name::cloopoperationDispatcher;
-					this->userName = &Name::cloopuserNameDispatcher;
-					this->password = &Name::clooppasswordDispatcher;
-					this->firstName = &Name::cloopfirstNameDispatcher;
-					this->lastName = &Name::clooplastNameDispatcher;
-					this->middleName = &Name::cloopmiddleNameDispatcher;
-					this->comment = &Name::cloopcommentDispatcher;
-					this->attributes = &Name::cloopattributesDispatcher;
-					this->active = &Name::cloopactiveDispatcher;
-					this->admin = &Name::cloopadminDispatcher;
-					this->clear = &Name::cloopclearDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static unsigned CLOOP_CARG cloopoperationDispatcher(IUser* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::operation();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static ICharUserField* CLOOP_CARG cloopuserNameDispatcher(IUser* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::userName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ICharUserField*>(0);
-			}
-		}
-
-		static ICharUserField* CLOOP_CARG clooppasswordDispatcher(IUser* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::password();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ICharUserField*>(0);
-			}
-		}
-
-		static ICharUserField* CLOOP_CARG cloopfirstNameDispatcher(IUser* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::firstName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ICharUserField*>(0);
-			}
-		}
-
-		static ICharUserField* CLOOP_CARG clooplastNameDispatcher(IUser* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::lastName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ICharUserField*>(0);
-			}
-		}
-
-		static ICharUserField* CLOOP_CARG cloopmiddleNameDispatcher(IUser* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::middleName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ICharUserField*>(0);
-			}
-		}
-
-		static ICharUserField* CLOOP_CARG cloopcommentDispatcher(IUser* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::comment();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ICharUserField*>(0);
-			}
-		}
-
-		static ICharUserField* CLOOP_CARG cloopattributesDispatcher(IUser* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::attributes();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ICharUserField*>(0);
-			}
-		}
-
-		static IIntUserField* CLOOP_CARG cloopactiveDispatcher(IUser* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::active();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IIntUserField*>(0);
-			}
-		}
-
-		static IIntUserField* CLOOP_CARG cloopadminDispatcher(IUser* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::admin();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IIntUserField*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopclearDispatcher(IUser* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::clear(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IUser> > >
-	class IUserImpl : public IUserBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IUserImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IUserImpl()
-		{
-		}
-
-		virtual unsigned operation() = 0;
-		virtual ICharUserField* userName() = 0;
-		virtual ICharUserField* password() = 0;
-		virtual ICharUserField* firstName() = 0;
-		virtual ICharUserField* lastName() = 0;
-		virtual ICharUserField* middleName() = 0;
-		virtual ICharUserField* comment() = 0;
-		virtual ICharUserField* attributes() = 0;
-		virtual IIntUserField* active() = 0;
-		virtual IIntUserField* admin() = 0;
-		virtual void clear(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IListUsersBaseImpl : public Base
-	{
-	public:
-		typedef IListUsers Declaration;
-
-		IListUsersBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->list = &Name::clooplistDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG clooplistDispatcher(IListUsers* self, IStatus* status, IUser* user) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::list(&status2, user);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IListUsers> > >
-	class IListUsersImpl : public IListUsersBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IListUsersImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IListUsersImpl()
-		{
-		}
-
-		virtual void list(StatusType* status, IUser* user) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ILogonInfoBaseImpl : public Base
-	{
-	public:
-		typedef ILogonInfo Declaration;
-
-		ILogonInfoBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->name = &Name::cloopnameDispatcher;
-					this->role = &Name::clooproleDispatcher;
-					this->networkProtocol = &Name::cloopnetworkProtocolDispatcher;
-					this->remoteAddress = &Name::cloopremoteAddressDispatcher;
-					this->authBlock = &Name::cloopauthBlockDispatcher;
-					this->attachment = &Name::cloopattachmentDispatcher;
-					this->transaction = &Name::clooptransactionDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopnameDispatcher(ILogonInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::name();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG clooproleDispatcher(ILogonInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::role();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopnetworkProtocolDispatcher(ILogonInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::networkProtocol();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopremoteAddressDispatcher(ILogonInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::remoteAddress();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const unsigned char* CLOOP_CARG cloopauthBlockDispatcher(ILogonInfo* self, unsigned* length) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::authBlock(length);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const unsigned char*>(0);
-			}
-		}
-
-		static IAttachment* CLOOP_CARG cloopattachmentDispatcher(ILogonInfo* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::attachment(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IAttachment*>(0);
-			}
-		}
-
-		static ITransaction* CLOOP_CARG clooptransactionDispatcher(ILogonInfo* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::transaction(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ITransaction*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ILogonInfo> > >
-	class ILogonInfoImpl : public ILogonInfoBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ILogonInfoImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ILogonInfoImpl()
-		{
-		}
-
-		virtual const char* name() = 0;
-		virtual const char* role() = 0;
-		virtual const char* networkProtocol() = 0;
-		virtual const char* remoteAddress() = 0;
-		virtual const unsigned char* authBlock(unsigned* length) = 0;
-		virtual IAttachment* attachment(StatusType* status) = 0;
-		virtual ITransaction* transaction(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IManagementBaseImpl : public Base
-	{
-	public:
-		typedef IManagement Declaration;
-
-		IManagementBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->setOwner = &Name::cloopsetOwnerDispatcher;
-					this->getOwner = &Name::cloopgetOwnerDispatcher;
-					this->start = &Name::cloopstartDispatcher;
-					this->execute = &Name::cloopexecuteDispatcher;
-					this->commit = &Name::cloopcommitDispatcher;
-					this->rollback = &Name::clooprollbackDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopstartDispatcher(IManagement* self, IStatus* status, ILogonInfo* logonInfo) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::start(&status2, logonInfo);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static int CLOOP_CARG cloopexecuteDispatcher(IManagement* self, IStatus* status, IUser* user, IListUsers* callback) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::execute(&status2, user, callback);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopcommitDispatcher(IManagement* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::commit(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG clooprollbackDispatcher(IManagement* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::rollback(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetOwnerDispatcher(IPluginBase* self, IReferenceCounted* r) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setOwner(r);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static IReferenceCounted* CLOOP_CARG cloopgetOwnerDispatcher(IPluginBase* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOwner();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IReferenceCounted*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IPluginBaseImpl<Name, StatusType, Inherit<IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IManagement> > > > > > >
-	class IManagementImpl : public IManagementBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IManagementImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IManagementImpl()
-		{
-		}
-
-		virtual void start(StatusType* status, ILogonInfo* logonInfo) = 0;
-		virtual int execute(StatusType* status, IUser* user, IListUsers* callback) = 0;
-		virtual void commit(StatusType* status) = 0;
-		virtual void rollback(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IAuthBlockBaseImpl : public Base
-	{
-	public:
-		typedef IAuthBlock Declaration;
-
-		IAuthBlockBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getType = &Name::cloopgetTypeDispatcher;
-					this->getName = &Name::cloopgetNameDispatcher;
-					this->getPlugin = &Name::cloopgetPluginDispatcher;
-					this->getSecurityDb = &Name::cloopgetSecurityDbDispatcher;
-					this->getOriginalPlugin = &Name::cloopgetOriginalPluginDispatcher;
-					this->next = &Name::cloopnextDispatcher;
-					this->first = &Name::cloopfirstDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetTypeDispatcher(IAuthBlock* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getType();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetNameDispatcher(IAuthBlock* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetPluginDispatcher(IAuthBlock* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPlugin();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetSecurityDbDispatcher(IAuthBlock* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getSecurityDb();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetOriginalPluginDispatcher(IAuthBlock* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOriginalPlugin();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopnextDispatcher(IAuthBlock* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::next(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopfirstDispatcher(IAuthBlock* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::first(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IAuthBlock> > >
-	class IAuthBlockImpl : public IAuthBlockBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IAuthBlockImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IAuthBlockImpl()
-		{
-		}
-
-		virtual const char* getType() = 0;
-		virtual const char* getName() = 0;
-		virtual const char* getPlugin() = 0;
-		virtual const char* getSecurityDb() = 0;
-		virtual const char* getOriginalPlugin() = 0;
-		virtual FB_BOOLEAN next(StatusType* status) = 0;
-		virtual FB_BOOLEAN first(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IWireCryptPluginBaseImpl : public Base
-	{
-	public:
-		typedef IWireCryptPlugin Declaration;
-
-		IWireCryptPluginBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->setOwner = &Name::cloopsetOwnerDispatcher;
-					this->getOwner = &Name::cloopgetOwnerDispatcher;
-					this->getKnownTypes = &Name::cloopgetKnownTypesDispatcher;
-					this->setKey = &Name::cloopsetKeyDispatcher;
-					this->encrypt = &Name::cloopencryptDispatcher;
-					this->decrypt = &Name::cloopdecryptDispatcher;
-					this->getSpecificData = &Name::cloopgetSpecificDataDispatcher;
-					this->setSpecificData = &Name::cloopsetSpecificDataDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetKnownTypesDispatcher(IWireCryptPlugin* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getKnownTypes(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetKeyDispatcher(IWireCryptPlugin* self, IStatus* status, ICryptKey* key) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setKey(&status2, key);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopencryptDispatcher(IWireCryptPlugin* self, IStatus* status, unsigned length, const void* from, void* to) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::encrypt(&status2, length, from, to);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdecryptDispatcher(IWireCryptPlugin* self, IStatus* status, unsigned length, const void* from, void* to) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::decrypt(&status2, length, from, to);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static const unsigned char* CLOOP_CARG cloopgetSpecificDataDispatcher(IWireCryptPlugin* self, IStatus* status, const char* keyType, unsigned* length) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getSpecificData(&status2, keyType, length);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const unsigned char*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetSpecificDataDispatcher(IWireCryptPlugin* self, IStatus* status, const char* keyType, unsigned length, const unsigned char* data) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setSpecificData(&status2, keyType, length, data);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetOwnerDispatcher(IPluginBase* self, IReferenceCounted* r) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setOwner(r);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static IReferenceCounted* CLOOP_CARG cloopgetOwnerDispatcher(IPluginBase* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOwner();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IReferenceCounted*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IPluginBaseImpl<Name, StatusType, Inherit<IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IWireCryptPlugin> > > > > > >
-	class IWireCryptPluginImpl : public IWireCryptPluginBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IWireCryptPluginImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IWireCryptPluginImpl()
-		{
-		}
-
-		virtual const char* getKnownTypes(StatusType* status) = 0;
-		virtual void setKey(StatusType* status, ICryptKey* key) = 0;
-		virtual void encrypt(StatusType* status, unsigned length, const void* from, void* to) = 0;
-		virtual void decrypt(StatusType* status, unsigned length, const void* from, void* to) = 0;
-		virtual const unsigned char* getSpecificData(StatusType* status, const char* keyType, unsigned* length) = 0;
-		virtual void setSpecificData(StatusType* status, const char* keyType, unsigned length, const unsigned char* data) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ICryptKeyCallbackBaseImpl : public Base
-	{
-	public:
-		typedef ICryptKeyCallback Declaration;
-
-		ICryptKeyCallbackBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->callback = &Name::cloopcallbackDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static unsigned CLOOP_CARG cloopcallbackDispatcher(ICryptKeyCallback* self, unsigned dataLength, const void* data, unsigned bufferLength, void* buffer) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::callback(dataLength, data, bufferLength, buffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ICryptKeyCallback> > >
-	class ICryptKeyCallbackImpl : public ICryptKeyCallbackBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ICryptKeyCallbackImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ICryptKeyCallbackImpl()
-		{
-		}
-
-		virtual unsigned callback(unsigned dataLength, const void* data, unsigned bufferLength, void* buffer) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IKeyHolderPluginBaseImpl : public Base
-	{
-	public:
-		typedef IKeyHolderPlugin Declaration;
-
-		IKeyHolderPluginBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->setOwner = &Name::cloopsetOwnerDispatcher;
-					this->getOwner = &Name::cloopgetOwnerDispatcher;
-					this->keyCallback = &Name::cloopkeyCallbackDispatcher;
-					this->keyHandle = &Name::cloopkeyHandleDispatcher;
-					this->useOnlyOwnKeys = &Name::cloopuseOnlyOwnKeysDispatcher;
-					this->chainHandle = &Name::cloopchainHandleDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static int CLOOP_CARG cloopkeyCallbackDispatcher(IKeyHolderPlugin* self, IStatus* status, ICryptKeyCallback* callback) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::keyCallback(&status2, callback);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static ICryptKeyCallback* CLOOP_CARG cloopkeyHandleDispatcher(IKeyHolderPlugin* self, IStatus* status, const char* keyName) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::keyHandle(&status2, keyName);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ICryptKeyCallback*>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopuseOnlyOwnKeysDispatcher(IKeyHolderPlugin* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::useOnlyOwnKeys(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static ICryptKeyCallback* CLOOP_CARG cloopchainHandleDispatcher(IKeyHolderPlugin* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::chainHandle(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ICryptKeyCallback*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetOwnerDispatcher(IPluginBase* self, IReferenceCounted* r) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setOwner(r);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static IReferenceCounted* CLOOP_CARG cloopgetOwnerDispatcher(IPluginBase* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOwner();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IReferenceCounted*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IPluginBaseImpl<Name, StatusType, Inherit<IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IKeyHolderPlugin> > > > > > >
-	class IKeyHolderPluginImpl : public IKeyHolderPluginBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IKeyHolderPluginImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IKeyHolderPluginImpl()
-		{
-		}
-
-		virtual int keyCallback(StatusType* status, ICryptKeyCallback* callback) = 0;
-		virtual ICryptKeyCallback* keyHandle(StatusType* status, const char* keyName) = 0;
-		virtual FB_BOOLEAN useOnlyOwnKeys(StatusType* status) = 0;
-		virtual ICryptKeyCallback* chainHandle(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IDbCryptInfoBaseImpl : public Base
-	{
-	public:
-		typedef IDbCryptInfo Declaration;
-
-		IDbCryptInfoBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->getDatabaseFullPath = &Name::cloopgetDatabaseFullPathDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetDatabaseFullPathDispatcher(IDbCryptInfo* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDatabaseFullPath(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IDbCryptInfo> > > > >
-	class IDbCryptInfoImpl : public IDbCryptInfoBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IDbCryptInfoImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IDbCryptInfoImpl()
-		{
-		}
-
-		virtual const char* getDatabaseFullPath(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IDbCryptPluginBaseImpl : public Base
-	{
-	public:
-		typedef IDbCryptPlugin Declaration;
-
-		IDbCryptPluginBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->setOwner = &Name::cloopsetOwnerDispatcher;
-					this->getOwner = &Name::cloopgetOwnerDispatcher;
-					this->setKey = &Name::cloopsetKeyDispatcher;
-					this->encrypt = &Name::cloopencryptDispatcher;
-					this->decrypt = &Name::cloopdecryptDispatcher;
-					this->setInfo = &Name::cloopsetInfoDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopsetKeyDispatcher(IDbCryptPlugin* self, IStatus* status, unsigned length, IKeyHolderPlugin** sources, const char* keyName) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setKey(&status2, length, sources, keyName);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopencryptDispatcher(IDbCryptPlugin* self, IStatus* status, unsigned length, const void* from, void* to) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::encrypt(&status2, length, from, to);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdecryptDispatcher(IDbCryptPlugin* self, IStatus* status, unsigned length, const void* from, void* to) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::decrypt(&status2, length, from, to);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetInfoDispatcher(IDbCryptPlugin* self, IStatus* status, IDbCryptInfo* info) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setInfo(&status2, info);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetOwnerDispatcher(IPluginBase* self, IReferenceCounted* r) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setOwner(r);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static IReferenceCounted* CLOOP_CARG cloopgetOwnerDispatcher(IPluginBase* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOwner();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IReferenceCounted*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IPluginBaseImpl<Name, StatusType, Inherit<IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IDbCryptPlugin> > > > > > >
-	class IDbCryptPluginImpl : public IDbCryptPluginBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IDbCryptPluginImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IDbCryptPluginImpl()
-		{
-		}
-
-		virtual void setKey(StatusType* status, unsigned length, IKeyHolderPlugin** sources, const char* keyName) = 0;
-		virtual void encrypt(StatusType* status, unsigned length, const void* from, void* to) = 0;
-		virtual void decrypt(StatusType* status, unsigned length, const void* from, void* to) = 0;
-		virtual void setInfo(StatusType* status, IDbCryptInfo* info) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IExternalContextBaseImpl : public Base
-	{
-	public:
-		typedef IExternalContext Declaration;
-
-		IExternalContextBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getMaster = &Name::cloopgetMasterDispatcher;
-					this->getEngine = &Name::cloopgetEngineDispatcher;
-					this->getAttachment = &Name::cloopgetAttachmentDispatcher;
-					this->getTransaction = &Name::cloopgetTransactionDispatcher;
-					this->getUserName = &Name::cloopgetUserNameDispatcher;
-					this->getDatabaseName = &Name::cloopgetDatabaseNameDispatcher;
-					this->getClientCharSet = &Name::cloopgetClientCharSetDispatcher;
-					this->obtainInfoCode = &Name::cloopobtainInfoCodeDispatcher;
-					this->getInfo = &Name::cloopgetInfoDispatcher;
-					this->setInfo = &Name::cloopsetInfoDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static IMaster* CLOOP_CARG cloopgetMasterDispatcher(IExternalContext* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getMaster();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IMaster*>(0);
-			}
-		}
-
-		static IExternalEngine* CLOOP_CARG cloopgetEngineDispatcher(IExternalContext* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getEngine(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IExternalEngine*>(0);
-			}
-		}
-
-		static IAttachment* CLOOP_CARG cloopgetAttachmentDispatcher(IExternalContext* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getAttachment(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IAttachment*>(0);
-			}
-		}
-
-		static ITransaction* CLOOP_CARG cloopgetTransactionDispatcher(IExternalContext* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getTransaction(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ITransaction*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetUserNameDispatcher(IExternalContext* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getUserName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetDatabaseNameDispatcher(IExternalContext* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDatabaseName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetClientCharSetDispatcher(IExternalContext* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getClientCharSet();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopobtainInfoCodeDispatcher(IExternalContext* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::obtainInfoCode();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static void* CLOOP_CARG cloopgetInfoDispatcher(IExternalContext* self, int code) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getInfo(code);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<void*>(0);
-			}
-		}
-
-		static void* CLOOP_CARG cloopsetInfoDispatcher(IExternalContext* self, int code, void* value) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::setInfo(code, value);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<void*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IExternalContext> > >
-	class IExternalContextImpl : public IExternalContextBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IExternalContextImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IExternalContextImpl()
-		{
-		}
-
-		virtual IMaster* getMaster() = 0;
-		virtual IExternalEngine* getEngine(StatusType* status) = 0;
-		virtual IAttachment* getAttachment(StatusType* status) = 0;
-		virtual ITransaction* getTransaction(StatusType* status) = 0;
-		virtual const char* getUserName() = 0;
-		virtual const char* getDatabaseName() = 0;
-		virtual const char* getClientCharSet() = 0;
-		virtual int obtainInfoCode() = 0;
-		virtual void* getInfo(int code) = 0;
-		virtual void* setInfo(int code, void* value) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IExternalResultSetBaseImpl : public Base
-	{
-	public:
-		typedef IExternalResultSet Declaration;
-
-		IExternalResultSetBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->dispose = &Name::cloopdisposeDispatcher;
-					this->fetch = &Name::cloopfetchDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopfetchDispatcher(IExternalResultSet* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::fetch(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdisposeDispatcher(IDisposable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::dispose();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IDisposableImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IExternalResultSet> > > > >
-	class IExternalResultSetImpl : public IExternalResultSetBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IExternalResultSetImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IExternalResultSetImpl()
-		{
-		}
-
-		virtual FB_BOOLEAN fetch(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IExternalFunctionBaseImpl : public Base
-	{
-	public:
-		typedef IExternalFunction Declaration;
-
-		IExternalFunctionBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->dispose = &Name::cloopdisposeDispatcher;
-					this->getCharSet = &Name::cloopgetCharSetDispatcher;
-					this->execute = &Name::cloopexecuteDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopgetCharSetDispatcher(IExternalFunction* self, IStatus* status, IExternalContext* context, char* name, unsigned nameSize) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::getCharSet(&status2, context, name, nameSize);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopexecuteDispatcher(IExternalFunction* self, IStatus* status, IExternalContext* context, void* inMsg, void* outMsg) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::execute(&status2, context, inMsg, outMsg);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdisposeDispatcher(IDisposable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::dispose();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IDisposableImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IExternalFunction> > > > >
-	class IExternalFunctionImpl : public IExternalFunctionBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IExternalFunctionImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IExternalFunctionImpl()
-		{
-		}
-
-		virtual void getCharSet(StatusType* status, IExternalContext* context, char* name, unsigned nameSize) = 0;
-		virtual void execute(StatusType* status, IExternalContext* context, void* inMsg, void* outMsg) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IExternalProcedureBaseImpl : public Base
-	{
-	public:
-		typedef IExternalProcedure Declaration;
-
-		IExternalProcedureBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->dispose = &Name::cloopdisposeDispatcher;
-					this->getCharSet = &Name::cloopgetCharSetDispatcher;
-					this->open = &Name::cloopopenDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopgetCharSetDispatcher(IExternalProcedure* self, IStatus* status, IExternalContext* context, char* name, unsigned nameSize) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::getCharSet(&status2, context, name, nameSize);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static IExternalResultSet* CLOOP_CARG cloopopenDispatcher(IExternalProcedure* self, IStatus* status, IExternalContext* context, void* inMsg, void* outMsg) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::open(&status2, context, inMsg, outMsg);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IExternalResultSet*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdisposeDispatcher(IDisposable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::dispose();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IDisposableImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IExternalProcedure> > > > >
-	class IExternalProcedureImpl : public IExternalProcedureBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IExternalProcedureImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IExternalProcedureImpl()
-		{
-		}
-
-		virtual void getCharSet(StatusType* status, IExternalContext* context, char* name, unsigned nameSize) = 0;
-		virtual IExternalResultSet* open(StatusType* status, IExternalContext* context, void* inMsg, void* outMsg) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IExternalTriggerBaseImpl : public Base
-	{
-	public:
-		typedef IExternalTrigger Declaration;
-
-		IExternalTriggerBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->dispose = &Name::cloopdisposeDispatcher;
-					this->getCharSet = &Name::cloopgetCharSetDispatcher;
-					this->execute = &Name::cloopexecuteDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopgetCharSetDispatcher(IExternalTrigger* self, IStatus* status, IExternalContext* context, char* name, unsigned nameSize) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::getCharSet(&status2, context, name, nameSize);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopexecuteDispatcher(IExternalTrigger* self, IStatus* status, IExternalContext* context, unsigned action, void* oldMsg, void* newMsg) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::execute(&status2, context, action, oldMsg, newMsg);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdisposeDispatcher(IDisposable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::dispose();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IDisposableImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IExternalTrigger> > > > >
-	class IExternalTriggerImpl : public IExternalTriggerBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IExternalTriggerImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IExternalTriggerImpl()
-		{
-		}
-
-		virtual void getCharSet(StatusType* status, IExternalContext* context, char* name, unsigned nameSize) = 0;
-		virtual void execute(StatusType* status, IExternalContext* context, unsigned action, void* oldMsg, void* newMsg) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IRoutineMetadataBaseImpl : public Base
-	{
-	public:
-		typedef IRoutineMetadata Declaration;
-
-		IRoutineMetadataBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getPackage = &Name::cloopgetPackageDispatcher;
-					this->getName = &Name::cloopgetNameDispatcher;
-					this->getEntryPoint = &Name::cloopgetEntryPointDispatcher;
-					this->getBody = &Name::cloopgetBodyDispatcher;
-					this->getInputMetadata = &Name::cloopgetInputMetadataDispatcher;
-					this->getOutputMetadata = &Name::cloopgetOutputMetadataDispatcher;
-					this->getTriggerMetadata = &Name::cloopgetTriggerMetadataDispatcher;
-					this->getTriggerTable = &Name::cloopgetTriggerTableDispatcher;
-					this->getTriggerType = &Name::cloopgetTriggerTypeDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetPackageDispatcher(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<const Name*>(self)->Name::getPackage(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetNameDispatcher(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<const Name*>(self)->Name::getName(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetEntryPointDispatcher(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<const Name*>(self)->Name::getEntryPoint(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetBodyDispatcher(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<const Name*>(self)->Name::getBody(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static IMessageMetadata* CLOOP_CARG cloopgetInputMetadataDispatcher(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<const Name*>(self)->Name::getInputMetadata(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IMessageMetadata*>(0);
-			}
-		}
-
-		static IMessageMetadata* CLOOP_CARG cloopgetOutputMetadataDispatcher(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<const Name*>(self)->Name::getOutputMetadata(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IMessageMetadata*>(0);
-			}
-		}
-
-		static IMessageMetadata* CLOOP_CARG cloopgetTriggerMetadataDispatcher(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<const Name*>(self)->Name::getTriggerMetadata(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IMessageMetadata*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetTriggerTableDispatcher(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<const Name*>(self)->Name::getTriggerTable(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetTriggerTypeDispatcher(const IRoutineMetadata* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<const Name*>(self)->Name::getTriggerType(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IRoutineMetadata> > >
-	class IRoutineMetadataImpl : public IRoutineMetadataBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IRoutineMetadataImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IRoutineMetadataImpl()
-		{
-		}
-
-		virtual const char* getPackage(StatusType* status) const = 0;
-		virtual const char* getName(StatusType* status) const = 0;
-		virtual const char* getEntryPoint(StatusType* status) const = 0;
-		virtual const char* getBody(StatusType* status) const = 0;
-		virtual IMessageMetadata* getInputMetadata(StatusType* status) const = 0;
-		virtual IMessageMetadata* getOutputMetadata(StatusType* status) const = 0;
-		virtual IMessageMetadata* getTriggerMetadata(StatusType* status) const = 0;
-		virtual const char* getTriggerTable(StatusType* status) const = 0;
-		virtual unsigned getTriggerType(StatusType* status) const = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IExternalEngineBaseImpl : public Base
-	{
-	public:
-		typedef IExternalEngine Declaration;
-
-		IExternalEngineBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->setOwner = &Name::cloopsetOwnerDispatcher;
-					this->getOwner = &Name::cloopgetOwnerDispatcher;
-					this->open = &Name::cloopopenDispatcher;
-					this->openAttachment = &Name::cloopopenAttachmentDispatcher;
-					this->closeAttachment = &Name::cloopcloseAttachmentDispatcher;
-					this->makeFunction = &Name::cloopmakeFunctionDispatcher;
-					this->makeProcedure = &Name::cloopmakeProcedureDispatcher;
-					this->makeTrigger = &Name::cloopmakeTriggerDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopopenDispatcher(IExternalEngine* self, IStatus* status, IExternalContext* context, char* charSet, unsigned charSetSize) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::open(&status2, context, charSet, charSetSize);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopopenAttachmentDispatcher(IExternalEngine* self, IStatus* status, IExternalContext* context) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::openAttachment(&status2, context);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopcloseAttachmentDispatcher(IExternalEngine* self, IStatus* status, IExternalContext* context) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::closeAttachment(&status2, context);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static IExternalFunction* CLOOP_CARG cloopmakeFunctionDispatcher(IExternalEngine* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::makeFunction(&status2, context, metadata, inBuilder, outBuilder);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IExternalFunction*>(0);
-			}
-		}
-
-		static IExternalProcedure* CLOOP_CARG cloopmakeProcedureDispatcher(IExternalEngine* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::makeProcedure(&status2, context, metadata, inBuilder, outBuilder);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IExternalProcedure*>(0);
-			}
-		}
-
-		static IExternalTrigger* CLOOP_CARG cloopmakeTriggerDispatcher(IExternalEngine* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* fieldsBuilder) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::makeTrigger(&status2, context, metadata, fieldsBuilder);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IExternalTrigger*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetOwnerDispatcher(IPluginBase* self, IReferenceCounted* r) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setOwner(r);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static IReferenceCounted* CLOOP_CARG cloopgetOwnerDispatcher(IPluginBase* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOwner();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IReferenceCounted*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IPluginBaseImpl<Name, StatusType, Inherit<IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IExternalEngine> > > > > > >
-	class IExternalEngineImpl : public IExternalEngineBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IExternalEngineImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IExternalEngineImpl()
-		{
-		}
-
-		virtual void open(StatusType* status, IExternalContext* context, char* charSet, unsigned charSetSize) = 0;
-		virtual void openAttachment(StatusType* status, IExternalContext* context) = 0;
-		virtual void closeAttachment(StatusType* status, IExternalContext* context) = 0;
-		virtual IExternalFunction* makeFunction(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder) = 0;
-		virtual IExternalProcedure* makeProcedure(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder) = 0;
-		virtual IExternalTrigger* makeTrigger(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* fieldsBuilder) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITimerBaseImpl : public Base
-	{
-	public:
-		typedef ITimer Declaration;
-
-		ITimerBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->handler = &Name::cloophandlerDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloophandlerDispatcher(ITimer* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::handler();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<ITimer> > > > >
-	class ITimerImpl : public ITimerBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITimerImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITimerImpl()
-		{
-		}
-
-		virtual void handler() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITimerControlBaseImpl : public Base
-	{
-	public:
-		typedef ITimerControl Declaration;
-
-		ITimerControlBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->start = &Name::cloopstartDispatcher;
-					this->stop = &Name::cloopstopDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopstartDispatcher(ITimerControl* self, IStatus* status, ITimer* timer, ISC_UINT64 microSeconds) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::start(&status2, timer, microSeconds);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopstopDispatcher(ITimerControl* self, IStatus* status, ITimer* timer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::stop(&status2, timer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITimerControl> > >
-	class ITimerControlImpl : public ITimerControlBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITimerControlImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITimerControlImpl()
-		{
-		}
-
-		virtual void start(StatusType* status, ITimer* timer, ISC_UINT64 microSeconds) = 0;
-		virtual void stop(StatusType* status, ITimer* timer) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IVersionCallbackBaseImpl : public Base
-	{
-	public:
-		typedef IVersionCallback Declaration;
-
-		IVersionCallbackBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->callback = &Name::cloopcallbackDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopcallbackDispatcher(IVersionCallback* self, IStatus* status, const char* text) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::callback(&status2, text);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IVersionCallback> > >
-	class IVersionCallbackImpl : public IVersionCallbackBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IVersionCallbackImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IVersionCallbackImpl()
-		{
-		}
-
-		virtual void callback(StatusType* status, const char* text) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IUtilBaseImpl : public Base
-	{
-	public:
-		typedef IUtil Declaration;
-
-		IUtilBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getFbVersion = &Name::cloopgetFbVersionDispatcher;
-					this->loadBlob = &Name::clooploadBlobDispatcher;
-					this->dumpBlob = &Name::cloopdumpBlobDispatcher;
-					this->getPerfCounters = &Name::cloopgetPerfCountersDispatcher;
-					this->executeCreateDatabase = &Name::cloopexecuteCreateDatabaseDispatcher;
-					this->decodeDate = &Name::cloopdecodeDateDispatcher;
-					this->decodeTime = &Name::cloopdecodeTimeDispatcher;
-					this->encodeDate = &Name::cloopencodeDateDispatcher;
-					this->encodeTime = &Name::cloopencodeTimeDispatcher;
-					this->formatStatus = &Name::cloopformatStatusDispatcher;
-					this->getClientVersion = &Name::cloopgetClientVersionDispatcher;
-					this->getXpbBuilder = &Name::cloopgetXpbBuilderDispatcher;
-					this->setOffsets = &Name::cloopsetOffsetsDispatcher;
-					this->getDecFloat16 = &Name::cloopgetDecFloat16Dispatcher;
-					this->getDecFloat34 = &Name::cloopgetDecFloat34Dispatcher;
-					this->decodeTimeTz = &Name::cloopdecodeTimeTzDispatcher;
-					this->decodeTimeStampTz = &Name::cloopdecodeTimeStampTzDispatcher;
-					this->encodeTimeTz = &Name::cloopencodeTimeTzDispatcher;
-					this->encodeTimeStampTz = &Name::cloopencodeTimeStampTzDispatcher;
-					this->getInt128 = &Name::cloopgetInt128Dispatcher;
-					this->decodeTimeTzEx = &Name::cloopdecodeTimeTzExDispatcher;
-					this->decodeTimeStampTzEx = &Name::cloopdecodeTimeStampTzExDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopgetFbVersionDispatcher(IUtil* self, IStatus* status, IAttachment* att, IVersionCallback* callback) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::getFbVersion(&status2, att, callback);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG clooploadBlobDispatcher(IUtil* self, IStatus* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::loadBlob(&status2, blobId, att, tra, file, txt);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdumpBlobDispatcher(IUtil* self, IStatus* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::dumpBlob(&status2, blobId, att, tra, file, txt);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopgetPerfCountersDispatcher(IUtil* self, IStatus* status, IAttachment* att, const char* countersSet, ISC_INT64* counters) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::getPerfCounters(&status2, att, countersSet, counters);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static IAttachment* CLOOP_CARG cloopexecuteCreateDatabaseDispatcher(IUtil* self, IStatus* status, unsigned stmtLength, const char* creatDBstatement, unsigned dialect, FB_BOOLEAN* stmtIsCreateDb) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::executeCreateDatabase(&status2, stmtLength, creatDBstatement, dialect, stmtIsCreateDb);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IAttachment*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdecodeDateDispatcher(IUtil* self, ISC_DATE date, unsigned* year, unsigned* month, unsigned* day) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::decodeDate(date, year, month, day);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdecodeTimeDispatcher(IUtil* self, ISC_TIME time, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::decodeTime(time, hours, minutes, seconds, fractions);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static ISC_DATE CLOOP_CARG cloopencodeDateDispatcher(IUtil* self, unsigned year, unsigned month, unsigned day) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::encodeDate(year, month, day);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_DATE>(0);
-			}
-		}
-
-		static ISC_TIME CLOOP_CARG cloopencodeTimeDispatcher(IUtil* self, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::encodeTime(hours, minutes, seconds, fractions);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_TIME>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopformatStatusDispatcher(IUtil* self, char* buffer, unsigned bufferSize, IStatus* status) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::formatStatus(buffer, bufferSize, status);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetClientVersionDispatcher(IUtil* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getClientVersion();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static IXpbBuilder* CLOOP_CARG cloopgetXpbBuilderDispatcher(IUtil* self, IStatus* status, unsigned kind, const unsigned char* buf, unsigned len) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getXpbBuilder(&status2, kind, buf, len);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IXpbBuilder*>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopsetOffsetsDispatcher(IUtil* self, IStatus* status, IMessageMetadata* metadata, IOffsetsCallback* callback) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::setOffsets(&status2, metadata, callback);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static IDecFloat16* CLOOP_CARG cloopgetDecFloat16Dispatcher(IUtil* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDecFloat16(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IDecFloat16*>(0);
-			}
-		}
-
-		static IDecFloat34* CLOOP_CARG cloopgetDecFloat34Dispatcher(IUtil* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDecFloat34(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IDecFloat34*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdecodeTimeTzDispatcher(IUtil* self, IStatus* status, const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::decodeTimeTz(&status2, timeTz, hours, minutes, seconds, fractions, timeZoneBufferLength, timeZoneBuffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdecodeTimeStampTzDispatcher(IUtil* self, IStatus* status, const ISC_TIMESTAMP_TZ* timeStampTz, unsigned* year, unsigned* month, unsigned* day, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::decodeTimeStampTz(&status2, timeStampTz, year, month, day, hours, minutes, seconds, fractions, timeZoneBufferLength, timeZoneBuffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopencodeTimeTzDispatcher(IUtil* self, IStatus* status, ISC_TIME_TZ* timeTz, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions, const char* timeZone) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::encodeTimeTz(&status2, timeTz, hours, minutes, seconds, fractions, timeZone);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopencodeTimeStampTzDispatcher(IUtil* self, IStatus* status, ISC_TIMESTAMP_TZ* timeStampTz, unsigned year, unsigned month, unsigned day, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions, const char* timeZone) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::encodeTimeStampTz(&status2, timeStampTz, year, month, day, hours, minutes, seconds, fractions, timeZone);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static IInt128* CLOOP_CARG cloopgetInt128Dispatcher(IUtil* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getInt128(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IInt128*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdecodeTimeTzExDispatcher(IUtil* self, IStatus* status, const ISC_TIME_TZ_EX* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::decodeTimeTzEx(&status2, timeTz, hours, minutes, seconds, fractions, timeZoneBufferLength, timeZoneBuffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdecodeTimeStampTzExDispatcher(IUtil* self, IStatus* status, const ISC_TIMESTAMP_TZ_EX* timeStampTz, unsigned* year, unsigned* month, unsigned* day, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::decodeTimeStampTzEx(&status2, timeStampTz, year, month, day, hours, minutes, seconds, fractions, timeZoneBufferLength, timeZoneBuffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IUtil> > >
-	class IUtilImpl : public IUtilBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IUtilImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IUtilImpl()
-		{
-		}
-
-		virtual void getFbVersion(StatusType* status, IAttachment* att, IVersionCallback* callback) = 0;
-		virtual void loadBlob(StatusType* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt) = 0;
-		virtual void dumpBlob(StatusType* status, ISC_QUAD* blobId, IAttachment* att, ITransaction* tra, const char* file, FB_BOOLEAN txt) = 0;
-		virtual void getPerfCounters(StatusType* status, IAttachment* att, const char* countersSet, ISC_INT64* counters) = 0;
-		virtual IAttachment* executeCreateDatabase(StatusType* status, unsigned stmtLength, const char* creatDBstatement, unsigned dialect, FB_BOOLEAN* stmtIsCreateDb) = 0;
-		virtual void decodeDate(ISC_DATE date, unsigned* year, unsigned* month, unsigned* day) = 0;
-		virtual void decodeTime(ISC_TIME time, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions) = 0;
-		virtual ISC_DATE encodeDate(unsigned year, unsigned month, unsigned day) = 0;
-		virtual ISC_TIME encodeTime(unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions) = 0;
-		virtual unsigned formatStatus(char* buffer, unsigned bufferSize, IStatus* status) = 0;
-		virtual unsigned getClientVersion() = 0;
-		virtual IXpbBuilder* getXpbBuilder(StatusType* status, unsigned kind, const unsigned char* buf, unsigned len) = 0;
-		virtual unsigned setOffsets(StatusType* status, IMessageMetadata* metadata, IOffsetsCallback* callback) = 0;
-		virtual IDecFloat16* getDecFloat16(StatusType* status) = 0;
-		virtual IDecFloat34* getDecFloat34(StatusType* status) = 0;
-		virtual void decodeTimeTz(StatusType* status, const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer) = 0;
-		virtual void decodeTimeStampTz(StatusType* status, const ISC_TIMESTAMP_TZ* timeStampTz, unsigned* year, unsigned* month, unsigned* day, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer) = 0;
-		virtual void encodeTimeTz(StatusType* status, ISC_TIME_TZ* timeTz, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions, const char* timeZone) = 0;
-		virtual void encodeTimeStampTz(StatusType* status, ISC_TIMESTAMP_TZ* timeStampTz, unsigned year, unsigned month, unsigned day, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions, const char* timeZone) = 0;
-		virtual IInt128* getInt128(StatusType* status) = 0;
-		virtual void decodeTimeTzEx(StatusType* status, const ISC_TIME_TZ_EX* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer) = 0;
-		virtual void decodeTimeStampTzEx(StatusType* status, const ISC_TIMESTAMP_TZ_EX* timeStampTz, unsigned* year, unsigned* month, unsigned* day, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions, unsigned timeZoneBufferLength, char* timeZoneBuffer) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IOffsetsCallbackBaseImpl : public Base
-	{
-	public:
-		typedef IOffsetsCallback Declaration;
-
-		IOffsetsCallbackBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->setOffset = &Name::cloopsetOffsetDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopsetOffsetDispatcher(IOffsetsCallback* self, IStatus* status, unsigned index, unsigned offset, unsigned nullOffset) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setOffset(&status2, index, offset, nullOffset);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IOffsetsCallback> > >
-	class IOffsetsCallbackImpl : public IOffsetsCallbackBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IOffsetsCallbackImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IOffsetsCallbackImpl()
-		{
-		}
-
-		virtual void setOffset(StatusType* status, unsigned index, unsigned offset, unsigned nullOffset) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IXpbBuilderBaseImpl : public Base
-	{
-	public:
-		typedef IXpbBuilder Declaration;
-
-		IXpbBuilderBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->dispose = &Name::cloopdisposeDispatcher;
-					this->clear = &Name::cloopclearDispatcher;
-					this->removeCurrent = &Name::cloopremoveCurrentDispatcher;
-					this->insertInt = &Name::cloopinsertIntDispatcher;
-					this->insertBigInt = &Name::cloopinsertBigIntDispatcher;
-					this->insertBytes = &Name::cloopinsertBytesDispatcher;
-					this->insertString = &Name::cloopinsertStringDispatcher;
-					this->insertTag = &Name::cloopinsertTagDispatcher;
-					this->isEof = &Name::cloopisEofDispatcher;
-					this->moveNext = &Name::cloopmoveNextDispatcher;
-					this->rewind = &Name::clooprewindDispatcher;
-					this->findFirst = &Name::cloopfindFirstDispatcher;
-					this->findNext = &Name::cloopfindNextDispatcher;
-					this->getTag = &Name::cloopgetTagDispatcher;
-					this->getLength = &Name::cloopgetLengthDispatcher;
-					this->getInt = &Name::cloopgetIntDispatcher;
-					this->getBigInt = &Name::cloopgetBigIntDispatcher;
-					this->getString = &Name::cloopgetStringDispatcher;
-					this->getBytes = &Name::cloopgetBytesDispatcher;
-					this->getBufferLength = &Name::cloopgetBufferLengthDispatcher;
-					this->getBuffer = &Name::cloopgetBufferDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopclearDispatcher(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::clear(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopremoveCurrentDispatcher(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::removeCurrent(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopinsertIntDispatcher(IXpbBuilder* self, IStatus* status, unsigned char tag, int value) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::insertInt(&status2, tag, value);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopinsertBigIntDispatcher(IXpbBuilder* self, IStatus* status, unsigned char tag, ISC_INT64 value) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::insertBigInt(&status2, tag, value);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopinsertBytesDispatcher(IXpbBuilder* self, IStatus* status, unsigned char tag, const void* bytes, unsigned length) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::insertBytes(&status2, tag, bytes, length);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopinsertStringDispatcher(IXpbBuilder* self, IStatus* status, unsigned char tag, const char* str) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::insertString(&status2, tag, str);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopinsertTagDispatcher(IXpbBuilder* self, IStatus* status, unsigned char tag) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::insertTag(&status2, tag);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopisEofDispatcher(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::isEof(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopmoveNextDispatcher(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::moveNext(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG clooprewindDispatcher(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::rewind(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopfindFirstDispatcher(IXpbBuilder* self, IStatus* status, unsigned char tag) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::findFirst(&status2, tag);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopfindNextDispatcher(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::findNext(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static unsigned char CLOOP_CARG cloopgetTagDispatcher(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getTag(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned char>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetLengthDispatcher(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getLength(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetIntDispatcher(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getInt(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<int>(0);
-			}
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetBigIntDispatcher(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getBigInt(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetStringDispatcher(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getString(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const unsigned char* CLOOP_CARG cloopgetBytesDispatcher(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getBytes(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const unsigned char*>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetBufferLengthDispatcher(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getBufferLength(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static const unsigned char* CLOOP_CARG cloopgetBufferDispatcher(IXpbBuilder* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getBuffer(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const unsigned char*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdisposeDispatcher(IDisposable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::dispose();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IDisposableImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IXpbBuilder> > > > >
-	class IXpbBuilderImpl : public IXpbBuilderBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IXpbBuilderImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IXpbBuilderImpl()
-		{
-		}
-
-		virtual void clear(StatusType* status) = 0;
-		virtual void removeCurrent(StatusType* status) = 0;
-		virtual void insertInt(StatusType* status, unsigned char tag, int value) = 0;
-		virtual void insertBigInt(StatusType* status, unsigned char tag, ISC_INT64 value) = 0;
-		virtual void insertBytes(StatusType* status, unsigned char tag, const void* bytes, unsigned length) = 0;
-		virtual void insertString(StatusType* status, unsigned char tag, const char* str) = 0;
-		virtual void insertTag(StatusType* status, unsigned char tag) = 0;
-		virtual FB_BOOLEAN isEof(StatusType* status) = 0;
-		virtual void moveNext(StatusType* status) = 0;
-		virtual void rewind(StatusType* status) = 0;
-		virtual FB_BOOLEAN findFirst(StatusType* status, unsigned char tag) = 0;
-		virtual FB_BOOLEAN findNext(StatusType* status) = 0;
-		virtual unsigned char getTag(StatusType* status) = 0;
-		virtual unsigned getLength(StatusType* status) = 0;
-		virtual int getInt(StatusType* status) = 0;
-		virtual ISC_INT64 getBigInt(StatusType* status) = 0;
-		virtual const char* getString(StatusType* status) = 0;
-		virtual const unsigned char* getBytes(StatusType* status) = 0;
-		virtual unsigned getBufferLength(StatusType* status) = 0;
-		virtual const unsigned char* getBuffer(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceConnectionBaseImpl : public Base
-	{
-	public:
-		typedef ITraceConnection Declaration;
-
-		ITraceConnectionBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getKind = &Name::cloopgetKindDispatcher;
-					this->getProcessID = &Name::cloopgetProcessIDDispatcher;
-					this->getUserName = &Name::cloopgetUserNameDispatcher;
-					this->getRoleName = &Name::cloopgetRoleNameDispatcher;
-					this->getCharSet = &Name::cloopgetCharSetDispatcher;
-					this->getRemoteProtocol = &Name::cloopgetRemoteProtocolDispatcher;
-					this->getRemoteAddress = &Name::cloopgetRemoteAddressDispatcher;
-					this->getRemoteProcessID = &Name::cloopgetRemoteProcessIDDispatcher;
-					this->getRemoteProcessName = &Name::cloopgetRemoteProcessNameDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static unsigned CLOOP_CARG cloopgetKindDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getKind();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetProcessIDDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getProcessID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetUserNameDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getUserName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRoleNameDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRoleName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetCharSetDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getCharSet();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRemoteProtocolDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRemoteProtocol();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRemoteAddressDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRemoteAddress();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetRemoteProcessIDDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRemoteProcessID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRemoteProcessNameDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRemoteProcessName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITraceConnection> > >
-	class ITraceConnectionImpl : public ITraceConnectionBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceConnectionImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceConnectionImpl()
-		{
-		}
-
-		virtual unsigned getKind() = 0;
-		virtual int getProcessID() = 0;
-		virtual const char* getUserName() = 0;
-		virtual const char* getRoleName() = 0;
-		virtual const char* getCharSet() = 0;
-		virtual const char* getRemoteProtocol() = 0;
-		virtual const char* getRemoteAddress() = 0;
-		virtual int getRemoteProcessID() = 0;
-		virtual const char* getRemoteProcessName() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceDatabaseConnectionBaseImpl : public Base
-	{
-	public:
-		typedef ITraceDatabaseConnection Declaration;
-
-		ITraceDatabaseConnectionBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getKind = &Name::cloopgetKindDispatcher;
-					this->getProcessID = &Name::cloopgetProcessIDDispatcher;
-					this->getUserName = &Name::cloopgetUserNameDispatcher;
-					this->getRoleName = &Name::cloopgetRoleNameDispatcher;
-					this->getCharSet = &Name::cloopgetCharSetDispatcher;
-					this->getRemoteProtocol = &Name::cloopgetRemoteProtocolDispatcher;
-					this->getRemoteAddress = &Name::cloopgetRemoteAddressDispatcher;
-					this->getRemoteProcessID = &Name::cloopgetRemoteProcessIDDispatcher;
-					this->getRemoteProcessName = &Name::cloopgetRemoteProcessNameDispatcher;
-					this->getConnectionID = &Name::cloopgetConnectionIDDispatcher;
-					this->getDatabaseName = &Name::cloopgetDatabaseNameDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetConnectionIDDispatcher(ITraceDatabaseConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getConnectionID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetDatabaseNameDispatcher(ITraceDatabaseConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDatabaseName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetKindDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getKind();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetProcessIDDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getProcessID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetUserNameDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getUserName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRoleNameDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRoleName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetCharSetDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getCharSet();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRemoteProtocolDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRemoteProtocol();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRemoteAddressDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRemoteAddress();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetRemoteProcessIDDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRemoteProcessID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRemoteProcessNameDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRemoteProcessName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = ITraceConnectionImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<ITraceDatabaseConnection> > > > >
-	class ITraceDatabaseConnectionImpl : public ITraceDatabaseConnectionBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceDatabaseConnectionImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceDatabaseConnectionImpl()
-		{
-		}
-
-		virtual ISC_INT64 getConnectionID() = 0;
-		virtual const char* getDatabaseName() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceTransactionBaseImpl : public Base
-	{
-	public:
-		typedef ITraceTransaction Declaration;
-
-		ITraceTransactionBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getTransactionID = &Name::cloopgetTransactionIDDispatcher;
-					this->getReadOnly = &Name::cloopgetReadOnlyDispatcher;
-					this->getWait = &Name::cloopgetWaitDispatcher;
-					this->getIsolation = &Name::cloopgetIsolationDispatcher;
-					this->getPerf = &Name::cloopgetPerfDispatcher;
-					this->getInitialID = &Name::cloopgetInitialIDDispatcher;
-					this->getPreviousID = &Name::cloopgetPreviousIDDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetTransactionIDDispatcher(ITraceTransaction* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getTransactionID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopgetReadOnlyDispatcher(ITraceTransaction* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getReadOnly();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetWaitDispatcher(ITraceTransaction* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getWait();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetIsolationDispatcher(ITraceTransaction* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getIsolation();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceTransaction* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPerf();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<PerformanceInfo*>(0);
-			}
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetInitialIDDispatcher(ITraceTransaction* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getInitialID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetPreviousIDDispatcher(ITraceTransaction* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPreviousID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITraceTransaction> > >
-	class ITraceTransactionImpl : public ITraceTransactionBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceTransactionImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceTransactionImpl()
-		{
-		}
-
-		virtual ISC_INT64 getTransactionID() = 0;
-		virtual FB_BOOLEAN getReadOnly() = 0;
-		virtual int getWait() = 0;
-		virtual unsigned getIsolation() = 0;
-		virtual PerformanceInfo* getPerf() = 0;
-		virtual ISC_INT64 getInitialID() = 0;
-		virtual ISC_INT64 getPreviousID() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceParamsBaseImpl : public Base
-	{
-	public:
-		typedef ITraceParams Declaration;
-
-		ITraceParamsBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getCount = &Name::cloopgetCountDispatcher;
-					this->getParam = &Name::cloopgetParamDispatcher;
-					this->getTextUTF8 = &Name::cloopgetTextUTF8Dispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static unsigned CLOOP_CARG cloopgetCountDispatcher(ITraceParams* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getCount();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static const dsc* CLOOP_CARG cloopgetParamDispatcher(ITraceParams* self, unsigned idx) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getParam(idx);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const dsc*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetTextUTF8Dispatcher(ITraceParams* self, IStatus* status, unsigned idx) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::getTextUTF8(&status2, idx);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<const char*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITraceParams> > >
-	class ITraceParamsImpl : public ITraceParamsBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceParamsImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceParamsImpl()
-		{
-		}
-
-		virtual unsigned getCount() = 0;
-		virtual const dsc* getParam(unsigned idx) = 0;
-		virtual const char* getTextUTF8(StatusType* status, unsigned idx) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceStatementBaseImpl : public Base
-	{
-	public:
-		typedef ITraceStatement Declaration;
-
-		ITraceStatementBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getStmtID = &Name::cloopgetStmtIDDispatcher;
-					this->getPerf = &Name::cloopgetPerfDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetStmtIDDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getStmtID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPerf();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<PerformanceInfo*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITraceStatement> > >
-	class ITraceStatementImpl : public ITraceStatementBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceStatementImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceStatementImpl()
-		{
-		}
-
-		virtual ISC_INT64 getStmtID() = 0;
-		virtual PerformanceInfo* getPerf() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceSQLStatementBaseImpl : public Base
-	{
-	public:
-		typedef ITraceSQLStatement Declaration;
-
-		ITraceSQLStatementBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getStmtID = &Name::cloopgetStmtIDDispatcher;
-					this->getPerf = &Name::cloopgetPerfDispatcher;
-					this->getText = &Name::cloopgetTextDispatcher;
-					this->getPlan = &Name::cloopgetPlanDispatcher;
-					this->getInputs = &Name::cloopgetInputsDispatcher;
-					this->getTextUTF8 = &Name::cloopgetTextUTF8Dispatcher;
-					this->getExplainedPlan = &Name::cloopgetExplainedPlanDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetTextDispatcher(ITraceSQLStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getText();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetPlanDispatcher(ITraceSQLStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPlan();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static ITraceParams* CLOOP_CARG cloopgetInputsDispatcher(ITraceSQLStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getInputs();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ITraceParams*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetTextUTF8Dispatcher(ITraceSQLStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getTextUTF8();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetExplainedPlanDispatcher(ITraceSQLStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getExplainedPlan();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetStmtIDDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getStmtID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPerf();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<PerformanceInfo*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = ITraceStatementImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<ITraceSQLStatement> > > > >
-	class ITraceSQLStatementImpl : public ITraceSQLStatementBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceSQLStatementImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceSQLStatementImpl()
-		{
-		}
-
-		virtual const char* getText() = 0;
-		virtual const char* getPlan() = 0;
-		virtual ITraceParams* getInputs() = 0;
-		virtual const char* getTextUTF8() = 0;
-		virtual const char* getExplainedPlan() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceBLRStatementBaseImpl : public Base
-	{
-	public:
-		typedef ITraceBLRStatement Declaration;
-
-		ITraceBLRStatementBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getStmtID = &Name::cloopgetStmtIDDispatcher;
-					this->getPerf = &Name::cloopgetPerfDispatcher;
-					this->getData = &Name::cloopgetDataDispatcher;
-					this->getDataLength = &Name::cloopgetDataLengthDispatcher;
-					this->getText = &Name::cloopgetTextDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const unsigned char* CLOOP_CARG cloopgetDataDispatcher(ITraceBLRStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getData();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const unsigned char*>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetDataLengthDispatcher(ITraceBLRStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDataLength();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetTextDispatcher(ITraceBLRStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getText();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetStmtIDDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getStmtID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceStatement* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPerf();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<PerformanceInfo*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = ITraceStatementImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<ITraceBLRStatement> > > > >
-	class ITraceBLRStatementImpl : public ITraceBLRStatementBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceBLRStatementImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceBLRStatementImpl()
-		{
-		}
-
-		virtual const unsigned char* getData() = 0;
-		virtual unsigned getDataLength() = 0;
-		virtual const char* getText() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceDYNRequestBaseImpl : public Base
-	{
-	public:
-		typedef ITraceDYNRequest Declaration;
-
-		ITraceDYNRequestBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getData = &Name::cloopgetDataDispatcher;
-					this->getDataLength = &Name::cloopgetDataLengthDispatcher;
-					this->getText = &Name::cloopgetTextDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const unsigned char* CLOOP_CARG cloopgetDataDispatcher(ITraceDYNRequest* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getData();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const unsigned char*>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetDataLengthDispatcher(ITraceDYNRequest* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDataLength();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetTextDispatcher(ITraceDYNRequest* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getText();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITraceDYNRequest> > >
-	class ITraceDYNRequestImpl : public ITraceDYNRequestBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceDYNRequestImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceDYNRequestImpl()
-		{
-		}
-
-		virtual const unsigned char* getData() = 0;
-		virtual unsigned getDataLength() = 0;
-		virtual const char* getText() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceContextVariableBaseImpl : public Base
-	{
-	public:
-		typedef ITraceContextVariable Declaration;
-
-		ITraceContextVariableBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getNameSpace = &Name::cloopgetNameSpaceDispatcher;
-					this->getVarName = &Name::cloopgetVarNameDispatcher;
-					this->getVarValue = &Name::cloopgetVarValueDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetNameSpaceDispatcher(ITraceContextVariable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getNameSpace();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetVarNameDispatcher(ITraceContextVariable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getVarName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetVarValueDispatcher(ITraceContextVariable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getVarValue();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITraceContextVariable> > >
-	class ITraceContextVariableImpl : public ITraceContextVariableBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceContextVariableImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceContextVariableImpl()
-		{
-		}
-
-		virtual const char* getNameSpace() = 0;
-		virtual const char* getVarName() = 0;
-		virtual const char* getVarValue() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceProcedureBaseImpl : public Base
-	{
-	public:
-		typedef ITraceProcedure Declaration;
-
-		ITraceProcedureBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getProcName = &Name::cloopgetProcNameDispatcher;
-					this->getInputs = &Name::cloopgetInputsDispatcher;
-					this->getPerf = &Name::cloopgetPerfDispatcher;
-					this->getStmtID = &Name::cloopgetStmtIDDispatcher;
-					this->getPlan = &Name::cloopgetPlanDispatcher;
-					this->getExplainedPlan = &Name::cloopgetExplainedPlanDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetProcNameDispatcher(ITraceProcedure* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getProcName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static ITraceParams* CLOOP_CARG cloopgetInputsDispatcher(ITraceProcedure* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getInputs();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ITraceParams*>(0);
-			}
-		}
-
-		static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceProcedure* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPerf();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<PerformanceInfo*>(0);
-			}
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetStmtIDDispatcher(ITraceProcedure* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getStmtID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetPlanDispatcher(ITraceProcedure* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPlan();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetExplainedPlanDispatcher(ITraceProcedure* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getExplainedPlan();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITraceProcedure> > >
-	class ITraceProcedureImpl : public ITraceProcedureBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceProcedureImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceProcedureImpl()
-		{
-		}
-
-		virtual const char* getProcName() = 0;
-		virtual ITraceParams* getInputs() = 0;
-		virtual PerformanceInfo* getPerf() = 0;
-		virtual ISC_INT64 getStmtID() = 0;
-		virtual const char* getPlan() = 0;
-		virtual const char* getExplainedPlan() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceFunctionBaseImpl : public Base
-	{
-	public:
-		typedef ITraceFunction Declaration;
-
-		ITraceFunctionBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getFuncName = &Name::cloopgetFuncNameDispatcher;
-					this->getInputs = &Name::cloopgetInputsDispatcher;
-					this->getResult = &Name::cloopgetResultDispatcher;
-					this->getPerf = &Name::cloopgetPerfDispatcher;
-					this->getStmtID = &Name::cloopgetStmtIDDispatcher;
-					this->getPlan = &Name::cloopgetPlanDispatcher;
-					this->getExplainedPlan = &Name::cloopgetExplainedPlanDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetFuncNameDispatcher(ITraceFunction* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getFuncName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static ITraceParams* CLOOP_CARG cloopgetInputsDispatcher(ITraceFunction* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getInputs();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ITraceParams*>(0);
-			}
-		}
-
-		static ITraceParams* CLOOP_CARG cloopgetResultDispatcher(ITraceFunction* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getResult();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ITraceParams*>(0);
-			}
-		}
-
-		static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceFunction* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPerf();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<PerformanceInfo*>(0);
-			}
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetStmtIDDispatcher(ITraceFunction* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getStmtID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetPlanDispatcher(ITraceFunction* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPlan();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetExplainedPlanDispatcher(ITraceFunction* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getExplainedPlan();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITraceFunction> > >
-	class ITraceFunctionImpl : public ITraceFunctionBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceFunctionImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceFunctionImpl()
-		{
-		}
-
-		virtual const char* getFuncName() = 0;
-		virtual ITraceParams* getInputs() = 0;
-		virtual ITraceParams* getResult() = 0;
-		virtual PerformanceInfo* getPerf() = 0;
-		virtual ISC_INT64 getStmtID() = 0;
-		virtual const char* getPlan() = 0;
-		virtual const char* getExplainedPlan() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceTriggerBaseImpl : public Base
-	{
-	public:
-		typedef ITraceTrigger Declaration;
-
-		ITraceTriggerBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getTriggerName = &Name::cloopgetTriggerNameDispatcher;
-					this->getRelationName = &Name::cloopgetRelationNameDispatcher;
-					this->getAction = &Name::cloopgetActionDispatcher;
-					this->getWhich = &Name::cloopgetWhichDispatcher;
-					this->getPerf = &Name::cloopgetPerfDispatcher;
-					this->getStmtID = &Name::cloopgetStmtIDDispatcher;
-					this->getPlan = &Name::cloopgetPlanDispatcher;
-					this->getExplainedPlan = &Name::cloopgetExplainedPlanDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetTriggerNameDispatcher(ITraceTrigger* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getTriggerName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRelationNameDispatcher(ITraceTrigger* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRelationName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetActionDispatcher(ITraceTrigger* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getAction();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetWhichDispatcher(ITraceTrigger* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getWhich();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceTrigger* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPerf();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<PerformanceInfo*>(0);
-			}
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetStmtIDDispatcher(ITraceTrigger* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getStmtID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetPlanDispatcher(ITraceTrigger* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPlan();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetExplainedPlanDispatcher(ITraceTrigger* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getExplainedPlan();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITraceTrigger> > >
-	class ITraceTriggerImpl : public ITraceTriggerBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceTriggerImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceTriggerImpl()
-		{
-		}
-
-		virtual const char* getTriggerName() = 0;
-		virtual const char* getRelationName() = 0;
-		virtual int getAction() = 0;
-		virtual int getWhich() = 0;
-		virtual PerformanceInfo* getPerf() = 0;
-		virtual ISC_INT64 getStmtID() = 0;
-		virtual const char* getPlan() = 0;
-		virtual const char* getExplainedPlan() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceServiceConnectionBaseImpl : public Base
-	{
-	public:
-		typedef ITraceServiceConnection Declaration;
-
-		ITraceServiceConnectionBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getKind = &Name::cloopgetKindDispatcher;
-					this->getProcessID = &Name::cloopgetProcessIDDispatcher;
-					this->getUserName = &Name::cloopgetUserNameDispatcher;
-					this->getRoleName = &Name::cloopgetRoleNameDispatcher;
-					this->getCharSet = &Name::cloopgetCharSetDispatcher;
-					this->getRemoteProtocol = &Name::cloopgetRemoteProtocolDispatcher;
-					this->getRemoteAddress = &Name::cloopgetRemoteAddressDispatcher;
-					this->getRemoteProcessID = &Name::cloopgetRemoteProcessIDDispatcher;
-					this->getRemoteProcessName = &Name::cloopgetRemoteProcessNameDispatcher;
-					this->getServiceID = &Name::cloopgetServiceIDDispatcher;
-					this->getServiceMgr = &Name::cloopgetServiceMgrDispatcher;
-					this->getServiceName = &Name::cloopgetServiceNameDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void* CLOOP_CARG cloopgetServiceIDDispatcher(ITraceServiceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getServiceID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<void*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetServiceMgrDispatcher(ITraceServiceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getServiceMgr();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetServiceNameDispatcher(ITraceServiceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getServiceName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetKindDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getKind();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetProcessIDDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getProcessID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetUserNameDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getUserName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRoleNameDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRoleName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetCharSetDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getCharSet();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRemoteProtocolDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRemoteProtocol();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRemoteAddressDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRemoteAddress();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetRemoteProcessIDDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRemoteProcessID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetRemoteProcessNameDispatcher(ITraceConnection* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRemoteProcessName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = ITraceConnectionImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<ITraceServiceConnection> > > > >
-	class ITraceServiceConnectionImpl : public ITraceServiceConnectionBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceServiceConnectionImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceServiceConnectionImpl()
-		{
-		}
-
-		virtual void* getServiceID() = 0;
-		virtual const char* getServiceMgr() = 0;
-		virtual const char* getServiceName() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceStatusVectorBaseImpl : public Base
-	{
-	public:
-		typedef ITraceStatusVector Declaration;
-
-		ITraceStatusVectorBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->hasError = &Name::cloophasErrorDispatcher;
-					this->hasWarning = &Name::cloophasWarningDispatcher;
-					this->getStatus = &Name::cloopgetStatusDispatcher;
-					this->getText = &Name::cloopgetTextDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloophasErrorDispatcher(ITraceStatusVector* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::hasError();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloophasWarningDispatcher(ITraceStatusVector* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::hasWarning();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static IStatus* CLOOP_CARG cloopgetStatusDispatcher(ITraceStatusVector* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getStatus();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IStatus*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetTextDispatcher(ITraceStatusVector* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getText();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITraceStatusVector> > >
-	class ITraceStatusVectorImpl : public ITraceStatusVectorBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceStatusVectorImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceStatusVectorImpl()
-		{
-		}
-
-		virtual FB_BOOLEAN hasError() = 0;
-		virtual FB_BOOLEAN hasWarning() = 0;
-		virtual IStatus* getStatus() = 0;
-		virtual const char* getText() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceSweepInfoBaseImpl : public Base
-	{
-	public:
-		typedef ITraceSweepInfo Declaration;
-
-		ITraceSweepInfoBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getOIT = &Name::cloopgetOITDispatcher;
-					this->getOST = &Name::cloopgetOSTDispatcher;
-					this->getOAT = &Name::cloopgetOATDispatcher;
-					this->getNext = &Name::cloopgetNextDispatcher;
-					this->getPerf = &Name::cloopgetPerfDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetOITDispatcher(ITraceSweepInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOIT();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetOSTDispatcher(ITraceSweepInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOST();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetOATDispatcher(ITraceSweepInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOAT();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetNextDispatcher(ITraceSweepInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getNext();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static PerformanceInfo* CLOOP_CARG cloopgetPerfDispatcher(ITraceSweepInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getPerf();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<PerformanceInfo*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITraceSweepInfo> > >
-	class ITraceSweepInfoImpl : public ITraceSweepInfoBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceSweepInfoImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceSweepInfoImpl()
-		{
-		}
-
-		virtual ISC_INT64 getOIT() = 0;
-		virtual ISC_INT64 getOST() = 0;
-		virtual ISC_INT64 getOAT() = 0;
-		virtual ISC_INT64 getNext() = 0;
-		virtual PerformanceInfo* getPerf() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceLogWriterBaseImpl : public Base
-	{
-	public:
-		typedef ITraceLogWriter Declaration;
-
-		ITraceLogWriterBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->write = &Name::cloopwriteDispatcher;
-					this->write_s = &Name::cloopwrite_sDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static unsigned CLOOP_CARG cloopwriteDispatcher(ITraceLogWriter* self, const void* buf, unsigned size) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::write(buf, size);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopwrite_sDispatcher(ITraceLogWriter* self, IStatus* status, const void* buf, unsigned size) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::write_s(&status2, buf, size);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<ITraceLogWriter> > > > >
-	class ITraceLogWriterImpl : public ITraceLogWriterBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceLogWriterImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceLogWriterImpl()
-		{
-		}
-
-		virtual unsigned write(const void* buf, unsigned size) = 0;
-		virtual unsigned write_s(StatusType* status, const void* buf, unsigned size) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceInitInfoBaseImpl : public Base
-	{
-	public:
-		typedef ITraceInitInfo Declaration;
-
-		ITraceInitInfoBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getConfigText = &Name::cloopgetConfigTextDispatcher;
-					this->getTraceSessionID = &Name::cloopgetTraceSessionIDDispatcher;
-					this->getTraceSessionName = &Name::cloopgetTraceSessionNameDispatcher;
-					this->getFirebirdRootDirectory = &Name::cloopgetFirebirdRootDirectoryDispatcher;
-					this->getDatabaseName = &Name::cloopgetDatabaseNameDispatcher;
-					this->getConnection = &Name::cloopgetConnectionDispatcher;
-					this->getLogWriter = &Name::cloopgetLogWriterDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetConfigTextDispatcher(ITraceInitInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getConfigText();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetTraceSessionIDDispatcher(ITraceInitInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getTraceSessionID();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetTraceSessionNameDispatcher(ITraceInitInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getTraceSessionName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetFirebirdRootDirectoryDispatcher(ITraceInitInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getFirebirdRootDirectory();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static const char* CLOOP_CARG cloopgetDatabaseNameDispatcher(ITraceInitInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getDatabaseName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static ITraceDatabaseConnection* CLOOP_CARG cloopgetConnectionDispatcher(ITraceInitInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getConnection();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ITraceDatabaseConnection*>(0);
-			}
-		}
-
-		static ITraceLogWriter* CLOOP_CARG cloopgetLogWriterDispatcher(ITraceInitInfo* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getLogWriter();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ITraceLogWriter*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<ITraceInitInfo> > >
-	class ITraceInitInfoImpl : public ITraceInitInfoBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceInitInfoImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceInitInfoImpl()
-		{
-		}
-
-		virtual const char* getConfigText() = 0;
-		virtual int getTraceSessionID() = 0;
-		virtual const char* getTraceSessionName() = 0;
-		virtual const char* getFirebirdRootDirectory() = 0;
-		virtual const char* getDatabaseName() = 0;
-		virtual ITraceDatabaseConnection* getConnection() = 0;
-		virtual ITraceLogWriter* getLogWriter() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITracePluginBaseImpl : public Base
-	{
-	public:
-		typedef ITracePlugin Declaration;
-
-		ITracePluginBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->trace_get_error = &Name::clooptrace_get_errorDispatcher;
-					this->trace_attach = &Name::clooptrace_attachDispatcher;
-					this->trace_detach = &Name::clooptrace_detachDispatcher;
-					this->trace_transaction_start = &Name::clooptrace_transaction_startDispatcher;
-					this->trace_transaction_end = &Name::clooptrace_transaction_endDispatcher;
-					this->trace_proc_execute = &Name::clooptrace_proc_executeDispatcher;
-					this->trace_trigger_execute = &Name::clooptrace_trigger_executeDispatcher;
-					this->trace_set_context = &Name::clooptrace_set_contextDispatcher;
-					this->trace_dsql_prepare = &Name::clooptrace_dsql_prepareDispatcher;
-					this->trace_dsql_free = &Name::clooptrace_dsql_freeDispatcher;
-					this->trace_dsql_execute = &Name::clooptrace_dsql_executeDispatcher;
-					this->trace_blr_compile = &Name::clooptrace_blr_compileDispatcher;
-					this->trace_blr_execute = &Name::clooptrace_blr_executeDispatcher;
-					this->trace_dyn_execute = &Name::clooptrace_dyn_executeDispatcher;
-					this->trace_service_attach = &Name::clooptrace_service_attachDispatcher;
-					this->trace_service_start = &Name::clooptrace_service_startDispatcher;
-					this->trace_service_query = &Name::clooptrace_service_queryDispatcher;
-					this->trace_service_detach = &Name::clooptrace_service_detachDispatcher;
-					this->trace_event_error = &Name::clooptrace_event_errorDispatcher;
-					this->trace_event_sweep = &Name::clooptrace_event_sweepDispatcher;
-					this->trace_func_execute = &Name::clooptrace_func_executeDispatcher;
-					this->trace_dsql_restart = &Name::clooptrace_dsql_restartDispatcher;
-					this->trace_proc_compile = &Name::clooptrace_proc_compileDispatcher;
-					this->trace_func_compile = &Name::clooptrace_func_compileDispatcher;
-					this->trace_trigger_compile = &Name::clooptrace_trigger_compileDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG clooptrace_get_errorDispatcher(ITracePlugin* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_get_error();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_attachDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, FB_BOOLEAN create_db, unsigned att_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_attach(connection, create_db, att_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_detachDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, FB_BOOLEAN drop_db) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_detach(connection, drop_db);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_transaction_startDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, unsigned tpb_length, const unsigned char* tpb, unsigned tra_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_transaction_start(connection, transaction, tpb_length, tpb, tra_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_transaction_endDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, FB_BOOLEAN commit, FB_BOOLEAN retain_context, unsigned tra_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_transaction_end(connection, transaction, commit, retain_context, tra_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_proc_executeDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceProcedure* procedure, FB_BOOLEAN started, unsigned proc_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_proc_execute(connection, transaction, procedure, started, proc_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_trigger_executeDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceTrigger* trigger, FB_BOOLEAN started, unsigned trig_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_trigger_execute(connection, transaction, trigger, started, trig_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_set_contextDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceContextVariable* variable) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_set_context(connection, transaction, variable);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_dsql_prepareDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceSQLStatement* statement, ISC_INT64 time_millis, unsigned req_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_dsql_prepare(connection, transaction, statement, time_millis, req_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_dsql_freeDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceSQLStatement* statement, unsigned option) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_dsql_free(connection, statement, option);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_dsql_executeDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceSQLStatement* statement, FB_BOOLEAN started, unsigned req_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_dsql_execute(connection, transaction, statement, started, req_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_blr_compileDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceBLRStatement* statement, ISC_INT64 time_millis, unsigned req_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_blr_compile(connection, transaction, statement, time_millis, req_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_blr_executeDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceBLRStatement* statement, unsigned req_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_blr_execute(connection, transaction, statement, req_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_dyn_executeDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceDYNRequest* request, ISC_INT64 time_millis, unsigned req_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_dyn_execute(connection, transaction, request, time_millis, req_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_service_attachDispatcher(ITracePlugin* self, ITraceServiceConnection* service, unsigned att_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_service_attach(service, att_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_service_startDispatcher(ITracePlugin* self, ITraceServiceConnection* service, unsigned switches_length, const char* switches, unsigned start_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_service_start(service, switches_length, switches, start_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_service_queryDispatcher(ITracePlugin* self, ITraceServiceConnection* service, unsigned send_item_length, const unsigned char* send_items, unsigned recv_item_length, const unsigned char* recv_items, unsigned query_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_service_query(service, send_item_length, send_items, recv_item_length, recv_items, query_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_service_detachDispatcher(ITracePlugin* self, ITraceServiceConnection* service, unsigned detach_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_service_detach(service, detach_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_event_errorDispatcher(ITracePlugin* self, ITraceConnection* connection, ITraceStatusVector* status, const char* function) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_event_error(connection, status, function);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_event_sweepDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceSweepInfo* sweep, unsigned sweep_state) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_event_sweep(connection, sweep, sweep_state);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_func_executeDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceFunction* function, FB_BOOLEAN started, unsigned func_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_func_execute(connection, transaction, function, started, func_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_dsql_restartDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceSQLStatement* statement, unsigned number) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_dsql_restart(connection, transaction, statement, number);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_proc_compileDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceProcedure* procedure, ISC_INT64 time_millis, unsigned proc_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_proc_compile(connection, procedure, time_millis, proc_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_func_compileDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceFunction* function, ISC_INT64 time_millis, unsigned func_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_func_compile(connection, function, time_millis, func_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static FB_BOOLEAN CLOOP_CARG clooptrace_trigger_compileDispatcher(ITracePlugin* self, ITraceDatabaseConnection* connection, ITraceTrigger* trigger, ISC_INT64 time_millis, unsigned trig_result) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_trigger_compile(connection, trigger, time_millis, trig_result);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<ITracePlugin> > > > >
-	class ITracePluginImpl : public ITracePluginBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITracePluginImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITracePluginImpl()
-		{
-		}
-
-		virtual const char* trace_get_error() = 0;
-		virtual FB_BOOLEAN trace_attach(ITraceDatabaseConnection* connection, FB_BOOLEAN create_db, unsigned att_result) = 0;
-		virtual FB_BOOLEAN trace_detach(ITraceDatabaseConnection* connection, FB_BOOLEAN drop_db) = 0;
-		virtual FB_BOOLEAN trace_transaction_start(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, unsigned tpb_length, const unsigned char* tpb, unsigned tra_result) = 0;
-		virtual FB_BOOLEAN trace_transaction_end(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, FB_BOOLEAN commit, FB_BOOLEAN retain_context, unsigned tra_result) = 0;
-		virtual FB_BOOLEAN trace_proc_execute(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceProcedure* procedure, FB_BOOLEAN started, unsigned proc_result) = 0;
-		virtual FB_BOOLEAN trace_trigger_execute(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceTrigger* trigger, FB_BOOLEAN started, unsigned trig_result) = 0;
-		virtual FB_BOOLEAN trace_set_context(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceContextVariable* variable) = 0;
-		virtual FB_BOOLEAN trace_dsql_prepare(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceSQLStatement* statement, ISC_INT64 time_millis, unsigned req_result) = 0;
-		virtual FB_BOOLEAN trace_dsql_free(ITraceDatabaseConnection* connection, ITraceSQLStatement* statement, unsigned option) = 0;
-		virtual FB_BOOLEAN trace_dsql_execute(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceSQLStatement* statement, FB_BOOLEAN started, unsigned req_result) = 0;
-		virtual FB_BOOLEAN trace_blr_compile(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceBLRStatement* statement, ISC_INT64 time_millis, unsigned req_result) = 0;
-		virtual FB_BOOLEAN trace_blr_execute(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceBLRStatement* statement, unsigned req_result) = 0;
-		virtual FB_BOOLEAN trace_dyn_execute(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceDYNRequest* request, ISC_INT64 time_millis, unsigned req_result) = 0;
-		virtual FB_BOOLEAN trace_service_attach(ITraceServiceConnection* service, unsigned att_result) = 0;
-		virtual FB_BOOLEAN trace_service_start(ITraceServiceConnection* service, unsigned switches_length, const char* switches, unsigned start_result) = 0;
-		virtual FB_BOOLEAN trace_service_query(ITraceServiceConnection* service, unsigned send_item_length, const unsigned char* send_items, unsigned recv_item_length, const unsigned char* recv_items, unsigned query_result) = 0;
-		virtual FB_BOOLEAN trace_service_detach(ITraceServiceConnection* service, unsigned detach_result) = 0;
-		virtual FB_BOOLEAN trace_event_error(ITraceConnection* connection, ITraceStatusVector* status, const char* function) = 0;
-		virtual FB_BOOLEAN trace_event_sweep(ITraceDatabaseConnection* connection, ITraceSweepInfo* sweep, unsigned sweep_state) = 0;
-		virtual FB_BOOLEAN trace_func_execute(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceFunction* function, FB_BOOLEAN started, unsigned func_result) = 0;
-		virtual FB_BOOLEAN trace_dsql_restart(ITraceDatabaseConnection* connection, ITraceTransaction* transaction, ITraceSQLStatement* statement, unsigned number) = 0;
-		virtual FB_BOOLEAN trace_proc_compile(ITraceDatabaseConnection* connection, ITraceProcedure* procedure, ISC_INT64 time_millis, unsigned proc_result) = 0;
-		virtual FB_BOOLEAN trace_func_compile(ITraceDatabaseConnection* connection, ITraceFunction* function, ISC_INT64 time_millis, unsigned func_result) = 0;
-		virtual FB_BOOLEAN trace_trigger_compile(ITraceDatabaseConnection* connection, ITraceTrigger* trigger, ISC_INT64 time_millis, unsigned trig_result) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class ITraceFactoryBaseImpl : public Base
-	{
-	public:
-		typedef ITraceFactory Declaration;
-
-		ITraceFactoryBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->setOwner = &Name::cloopsetOwnerDispatcher;
-					this->getOwner = &Name::cloopgetOwnerDispatcher;
-					this->trace_needs = &Name::clooptrace_needsDispatcher;
-					this->trace_create = &Name::clooptrace_createDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static ISC_UINT64 CLOOP_CARG clooptrace_needsDispatcher(ITraceFactory* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_needs();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_UINT64>(0);
-			}
-		}
-
-		static ITracePlugin* CLOOP_CARG clooptrace_createDispatcher(ITraceFactory* self, IStatus* status, ITraceInitInfo* init_info) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::trace_create(&status2, init_info);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<ITracePlugin*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetOwnerDispatcher(IPluginBase* self, IReferenceCounted* r) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setOwner(r);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static IReferenceCounted* CLOOP_CARG cloopgetOwnerDispatcher(IPluginBase* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOwner();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IReferenceCounted*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IPluginBaseImpl<Name, StatusType, Inherit<IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<ITraceFactory> > > > > > >
-	class ITraceFactoryImpl : public ITraceFactoryBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		ITraceFactoryImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~ITraceFactoryImpl()
-		{
-		}
-
-		virtual ISC_UINT64 trace_needs() = 0;
-		virtual ITracePlugin* trace_create(StatusType* status, ITraceInitInfo* init_info) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IUdrFunctionFactoryBaseImpl : public Base
-	{
-	public:
-		typedef IUdrFunctionFactory Declaration;
-
-		IUdrFunctionFactoryBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->dispose = &Name::cloopdisposeDispatcher;
-					this->setup = &Name::cloopsetupDispatcher;
-					this->newItem = &Name::cloopnewItemDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopsetupDispatcher(IUdrFunctionFactory* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setup(&status2, context, metadata, inBuilder, outBuilder);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static IExternalFunction* CLOOP_CARG cloopnewItemDispatcher(IUdrFunctionFactory* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::newItem(&status2, context, metadata);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IExternalFunction*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdisposeDispatcher(IDisposable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::dispose();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IDisposableImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IUdrFunctionFactory> > > > >
-	class IUdrFunctionFactoryImpl : public IUdrFunctionFactoryBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IUdrFunctionFactoryImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IUdrFunctionFactoryImpl()
-		{
-		}
-
-		virtual void setup(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder) = 0;
-		virtual IExternalFunction* newItem(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IUdrProcedureFactoryBaseImpl : public Base
-	{
-	public:
-		typedef IUdrProcedureFactory Declaration;
-
-		IUdrProcedureFactoryBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->dispose = &Name::cloopdisposeDispatcher;
-					this->setup = &Name::cloopsetupDispatcher;
-					this->newItem = &Name::cloopnewItemDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopsetupDispatcher(IUdrProcedureFactory* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setup(&status2, context, metadata, inBuilder, outBuilder);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static IExternalProcedure* CLOOP_CARG cloopnewItemDispatcher(IUdrProcedureFactory* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::newItem(&status2, context, metadata);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IExternalProcedure*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdisposeDispatcher(IDisposable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::dispose();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IDisposableImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IUdrProcedureFactory> > > > >
-	class IUdrProcedureFactoryImpl : public IUdrProcedureFactoryBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IUdrProcedureFactoryImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IUdrProcedureFactoryImpl()
-		{
-		}
-
-		virtual void setup(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* inBuilder, IMetadataBuilder* outBuilder) = 0;
-		virtual IExternalProcedure* newItem(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IUdrTriggerFactoryBaseImpl : public Base
-	{
-	public:
-		typedef IUdrTriggerFactory Declaration;
-
-		IUdrTriggerFactoryBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->dispose = &Name::cloopdisposeDispatcher;
-					this->setup = &Name::cloopsetupDispatcher;
-					this->newItem = &Name::cloopnewItemDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopsetupDispatcher(IUdrTriggerFactory* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* fieldsBuilder) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setup(&status2, context, metadata, fieldsBuilder);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static IExternalTrigger* CLOOP_CARG cloopnewItemDispatcher(IUdrTriggerFactory* self, IStatus* status, IExternalContext* context, IRoutineMetadata* metadata) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::newItem(&status2, context, metadata);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IExternalTrigger*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdisposeDispatcher(IDisposable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::dispose();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IDisposableImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IUdrTriggerFactory> > > > >
-	class IUdrTriggerFactoryImpl : public IUdrTriggerFactoryBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IUdrTriggerFactoryImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IUdrTriggerFactoryImpl()
-		{
-		}
-
-		virtual void setup(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata, IMetadataBuilder* fieldsBuilder) = 0;
-		virtual IExternalTrigger* newItem(StatusType* status, IExternalContext* context, IRoutineMetadata* metadata) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IUdrPluginBaseImpl : public Base
-	{
-	public:
-		typedef IUdrPlugin Declaration;
-
-		IUdrPluginBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getMaster = &Name::cloopgetMasterDispatcher;
-					this->registerFunction = &Name::cloopregisterFunctionDispatcher;
-					this->registerProcedure = &Name::cloopregisterProcedureDispatcher;
-					this->registerTrigger = &Name::cloopregisterTriggerDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static IMaster* CLOOP_CARG cloopgetMasterDispatcher(IUdrPlugin* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getMaster();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IMaster*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopregisterFunctionDispatcher(IUdrPlugin* self, IStatus* status, const char* name, IUdrFunctionFactory* factory) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::registerFunction(&status2, name, factory);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopregisterProcedureDispatcher(IUdrPlugin* self, IStatus* status, const char* name, IUdrProcedureFactory* factory) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::registerProcedure(&status2, name, factory);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopregisterTriggerDispatcher(IUdrPlugin* self, IStatus* status, const char* name, IUdrTriggerFactory* factory) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::registerTrigger(&status2, name, factory);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IUdrPlugin> > >
-	class IUdrPluginImpl : public IUdrPluginBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IUdrPluginImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IUdrPluginImpl()
-		{
-		}
-
-		virtual IMaster* getMaster() = 0;
-		virtual void registerFunction(StatusType* status, const char* name, IUdrFunctionFactory* factory) = 0;
-		virtual void registerProcedure(StatusType* status, const char* name, IUdrProcedureFactory* factory) = 0;
-		virtual void registerTrigger(StatusType* status, const char* name, IUdrTriggerFactory* factory) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IDecFloat16BaseImpl : public Base
-	{
-	public:
-		typedef IDecFloat16 Declaration;
-
-		IDecFloat16BaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->toBcd = &Name::clooptoBcdDispatcher;
-					this->toString = &Name::clooptoStringDispatcher;
-					this->fromBcd = &Name::cloopfromBcdDispatcher;
-					this->fromString = &Name::cloopfromStringDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG clooptoBcdDispatcher(IDecFloat16* self, const FB_DEC16* from, int* sign, unsigned char* bcd, int* exp) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::toBcd(from, sign, bcd, exp);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG clooptoStringDispatcher(IDecFloat16* self, IStatus* status, const FB_DEC16* from, unsigned bufferLength, char* buffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::toString(&status2, from, bufferLength, buffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopfromBcdDispatcher(IDecFloat16* self, int sign, const unsigned char* bcd, int exp, FB_DEC16* to) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::fromBcd(sign, bcd, exp, to);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopfromStringDispatcher(IDecFloat16* self, IStatus* status, const char* from, FB_DEC16* to) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::fromString(&status2, from, to);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IDecFloat16> > >
-	class IDecFloat16Impl : public IDecFloat16BaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IDecFloat16Impl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IDecFloat16Impl()
-		{
-		}
-
-		virtual void toBcd(const FB_DEC16* from, int* sign, unsigned char* bcd, int* exp) = 0;
-		virtual void toString(StatusType* status, const FB_DEC16* from, unsigned bufferLength, char* buffer) = 0;
-		virtual void fromBcd(int sign, const unsigned char* bcd, int exp, FB_DEC16* to) = 0;
-		virtual void fromString(StatusType* status, const char* from, FB_DEC16* to) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IDecFloat34BaseImpl : public Base
-	{
-	public:
-		typedef IDecFloat34 Declaration;
-
-		IDecFloat34BaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->toBcd = &Name::clooptoBcdDispatcher;
-					this->toString = &Name::clooptoStringDispatcher;
-					this->fromBcd = &Name::cloopfromBcdDispatcher;
-					this->fromString = &Name::cloopfromStringDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG clooptoBcdDispatcher(IDecFloat34* self, const FB_DEC34* from, int* sign, unsigned char* bcd, int* exp) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::toBcd(from, sign, bcd, exp);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG clooptoStringDispatcher(IDecFloat34* self, IStatus* status, const FB_DEC34* from, unsigned bufferLength, char* buffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::toString(&status2, from, bufferLength, buffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopfromBcdDispatcher(IDecFloat34* self, int sign, const unsigned char* bcd, int exp, FB_DEC34* to) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::fromBcd(sign, bcd, exp, to);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopfromStringDispatcher(IDecFloat34* self, IStatus* status, const char* from, FB_DEC34* to) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::fromString(&status2, from, to);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IDecFloat34> > >
-	class IDecFloat34Impl : public IDecFloat34BaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IDecFloat34Impl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IDecFloat34Impl()
-		{
-		}
-
-		virtual void toBcd(const FB_DEC34* from, int* sign, unsigned char* bcd, int* exp) = 0;
-		virtual void toString(StatusType* status, const FB_DEC34* from, unsigned bufferLength, char* buffer) = 0;
-		virtual void fromBcd(int sign, const unsigned char* bcd, int exp, FB_DEC34* to) = 0;
-		virtual void fromString(StatusType* status, const char* from, FB_DEC34* to) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IInt128BaseImpl : public Base
-	{
-	public:
-		typedef IInt128 Declaration;
-
-		IInt128BaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->toString = &Name::clooptoStringDispatcher;
-					this->fromString = &Name::cloopfromStringDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG clooptoStringDispatcher(IInt128* self, IStatus* status, const FB_I128* from, int scale, unsigned bufferLength, char* buffer) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::toString(&status2, from, scale, bufferLength, buffer);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopfromStringDispatcher(IInt128* self, IStatus* status, int scale, const char* from, FB_I128* to) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::fromString(&status2, scale, from, to);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IInt128> > >
-	class IInt128Impl : public IInt128BaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IInt128Impl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IInt128Impl()
-		{
-		}
-
-		virtual void toString(StatusType* status, const FB_I128* from, int scale, unsigned bufferLength, char* buffer) = 0;
-		virtual void fromString(StatusType* status, int scale, const char* from, FB_I128* to) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IReplicatedFieldBaseImpl : public Base
-	{
-	public:
-		typedef IReplicatedField Declaration;
-
-		IReplicatedFieldBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getName = &Name::cloopgetNameDispatcher;
-					this->getType = &Name::cloopgetTypeDispatcher;
-					this->getSubType = &Name::cloopgetSubTypeDispatcher;
-					this->getScale = &Name::cloopgetScaleDispatcher;
-					this->getLength = &Name::cloopgetLengthDispatcher;
-					this->getCharSet = &Name::cloopgetCharSetDispatcher;
-					this->getData = &Name::cloopgetDataDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static const char* CLOOP_CARG cloopgetNameDispatcher(IReplicatedField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getName();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const char*>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetTypeDispatcher(IReplicatedField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getType();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetSubTypeDispatcher(IReplicatedField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getSubType();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopgetScaleDispatcher(IReplicatedField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getScale();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetLengthDispatcher(IReplicatedField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getLength();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetCharSetDispatcher(IReplicatedField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getCharSet();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static const void* CLOOP_CARG cloopgetDataDispatcher(IReplicatedField* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getData();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const void*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IReplicatedField> > >
-	class IReplicatedFieldImpl : public IReplicatedFieldBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IReplicatedFieldImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IReplicatedFieldImpl()
-		{
-		}
-
-		virtual const char* getName() = 0;
-		virtual unsigned getType() = 0;
-		virtual int getSubType() = 0;
-		virtual int getScale() = 0;
-		virtual unsigned getLength() = 0;
-		virtual unsigned getCharSet() = 0;
-		virtual const void* getData() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IReplicatedRecordBaseImpl : public Base
-	{
-	public:
-		typedef IReplicatedRecord Declaration;
-
-		IReplicatedRecordBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getCount = &Name::cloopgetCountDispatcher;
-					this->getField = &Name::cloopgetFieldDispatcher;
-					this->getRawLength = &Name::cloopgetRawLengthDispatcher;
-					this->getRawData = &Name::cloopgetRawDataDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static unsigned CLOOP_CARG cloopgetCountDispatcher(IReplicatedRecord* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getCount();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static IReplicatedField* CLOOP_CARG cloopgetFieldDispatcher(IReplicatedRecord* self, unsigned index) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getField(index);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IReplicatedField*>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetRawLengthDispatcher(IReplicatedRecord* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRawLength();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static const unsigned char* CLOOP_CARG cloopgetRawDataDispatcher(IReplicatedRecord* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getRawData();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<const unsigned char*>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IReplicatedRecord> > >
-	class IReplicatedRecordImpl : public IReplicatedRecordBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IReplicatedRecordImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IReplicatedRecordImpl()
-		{
-		}
-
-		virtual unsigned getCount() = 0;
-		virtual IReplicatedField* getField(unsigned index) = 0;
-		virtual unsigned getRawLength() = 0;
-		virtual const unsigned char* getRawData() = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IReplicatedTransactionBaseImpl : public Base
-	{
-	public:
-		typedef IReplicatedTransaction Declaration;
-
-		IReplicatedTransactionBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->dispose = &Name::cloopdisposeDispatcher;
-					this->prepare = &Name::cloopprepareDispatcher;
-					this->commit = &Name::cloopcommitDispatcher;
-					this->rollback = &Name::clooprollbackDispatcher;
-					this->startSavepoint = &Name::cloopstartSavepointDispatcher;
-					this->releaseSavepoint = &Name::cloopreleaseSavepointDispatcher;
-					this->rollbackSavepoint = &Name::clooprollbackSavepointDispatcher;
-					this->insertRecord = &Name::cloopinsertRecordDispatcher;
-					this->updateRecord = &Name::cloopupdateRecordDispatcher;
-					this->deleteRecord = &Name::cloopdeleteRecordDispatcher;
-					this->executeSql = &Name::cloopexecuteSqlDispatcher;
-					this->executeSqlIntl = &Name::cloopexecuteSqlIntlDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopprepareDispatcher(IReplicatedTransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::prepare(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopcommitDispatcher(IReplicatedTransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::commit(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG clooprollbackDispatcher(IReplicatedTransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::rollback(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopstartSavepointDispatcher(IReplicatedTransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::startSavepoint(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopreleaseSavepointDispatcher(IReplicatedTransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::releaseSavepoint(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG clooprollbackSavepointDispatcher(IReplicatedTransaction* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::rollbackSavepoint(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopinsertRecordDispatcher(IReplicatedTransaction* self, IStatus* status, const char* name, IReplicatedRecord* record) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::insertRecord(&status2, name, record);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopupdateRecordDispatcher(IReplicatedTransaction* self, IStatus* status, const char* name, IReplicatedRecord* orgRecord, IReplicatedRecord* newRecord) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::updateRecord(&status2, name, orgRecord, newRecord);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdeleteRecordDispatcher(IReplicatedTransaction* self, IStatus* status, const char* name, IReplicatedRecord* record) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::deleteRecord(&status2, name, record);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopexecuteSqlDispatcher(IReplicatedTransaction* self, IStatus* status, const char* sql) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::executeSql(&status2, sql);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopexecuteSqlIntlDispatcher(IReplicatedTransaction* self, IStatus* status, unsigned charset, const char* sql) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::executeSqlIntl(&status2, charset, sql);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdisposeDispatcher(IDisposable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::dispose();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IDisposableImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IReplicatedTransaction> > > > >
-	class IReplicatedTransactionImpl : public IReplicatedTransactionBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IReplicatedTransactionImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IReplicatedTransactionImpl()
-		{
-		}
-
-		virtual void prepare(StatusType* status) = 0;
-		virtual void commit(StatusType* status) = 0;
-		virtual void rollback(StatusType* status) = 0;
-		virtual void startSavepoint(StatusType* status) = 0;
-		virtual void releaseSavepoint(StatusType* status) = 0;
-		virtual void rollbackSavepoint(StatusType* status) = 0;
-		virtual void insertRecord(StatusType* status, const char* name, IReplicatedRecord* record) = 0;
-		virtual void updateRecord(StatusType* status, const char* name, IReplicatedRecord* orgRecord, IReplicatedRecord* newRecord) = 0;
-		virtual void deleteRecord(StatusType* status, const char* name, IReplicatedRecord* record) = 0;
-		virtual void executeSql(StatusType* status, const char* sql) = 0;
-		virtual void executeSqlIntl(StatusType* status, unsigned charset, const char* sql) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IReplicatedSessionBaseImpl : public Base
-	{
-	public:
-		typedef IReplicatedSession Declaration;
-
-		IReplicatedSessionBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->setOwner = &Name::cloopsetOwnerDispatcher;
-					this->getOwner = &Name::cloopgetOwnerDispatcher;
-					this->init = &Name::cloopinitDispatcher;
-					this->startTransaction = &Name::cloopstartTransactionDispatcher;
-					this->cleanupTransaction = &Name::cloopcleanupTransactionDispatcher;
-					this->setSequence = &Name::cloopsetSequenceDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static FB_BOOLEAN CLOOP_CARG cloopinitDispatcher(IReplicatedSession* self, IStatus* status, IAttachment* attachment) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::init(&status2, attachment);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<FB_BOOLEAN>(0);
-			}
-		}
-
-		static IReplicatedTransaction* CLOOP_CARG cloopstartTransactionDispatcher(IReplicatedSession* self, IStatus* status, ITransaction* transaction, ISC_INT64 number) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::startTransaction(&status2, transaction, number);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IReplicatedTransaction*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopcleanupTransactionDispatcher(IReplicatedSession* self, IStatus* status, ISC_INT64 number) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::cleanupTransaction(&status2, number);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetSequenceDispatcher(IReplicatedSession* self, IStatus* status, const char* name, ISC_INT64 value) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::setSequence(&status2, name, value);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetOwnerDispatcher(IPluginBase* self, IReferenceCounted* r) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setOwner(r);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static IReferenceCounted* CLOOP_CARG cloopgetOwnerDispatcher(IPluginBase* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOwner();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IReferenceCounted*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IPluginBaseImpl<Name, StatusType, Inherit<IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IReplicatedSession> > > > > > >
-	class IReplicatedSessionImpl : public IReplicatedSessionBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IReplicatedSessionImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IReplicatedSessionImpl()
-		{
-		}
-
-		virtual FB_BOOLEAN init(StatusType* status, IAttachment* attachment) = 0;
-		virtual IReplicatedTransaction* startTransaction(StatusType* status, ITransaction* transaction, ISC_INT64 number) = 0;
-		virtual void cleanupTransaction(StatusType* status, ISC_INT64 number) = 0;
-		virtual void setSequence(StatusType* status, const char* name, ISC_INT64 value) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IProfilerPluginBaseImpl : public Base
-	{
-	public:
-		typedef IProfilerPlugin Declaration;
-
-		IProfilerPluginBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->addRef = &Name::cloopaddRefDispatcher;
-					this->release = &Name::cloopreleaseDispatcher;
-					this->setOwner = &Name::cloopsetOwnerDispatcher;
-					this->getOwner = &Name::cloopgetOwnerDispatcher;
-					this->init = &Name::cloopinitDispatcher;
-					this->startSession = &Name::cloopstartSessionDispatcher;
-					this->flush = &Name::cloopflushDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static void CLOOP_CARG cloopinitDispatcher(IProfilerPlugin* self, IStatus* status, IAttachment* attachment, ISC_UINT64 ticksFrequency) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::init(&status2, attachment, ticksFrequency);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static IProfilerSession* CLOOP_CARG cloopstartSessionDispatcher(IProfilerPlugin* self, IStatus* status, const char* description, const char* options, ISC_TIMESTAMP_TZ timestamp) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				return static_cast<Name*>(self)->Name::startSession(&status2, description, options, timestamp);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-				return static_cast<IProfilerSession*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopflushDispatcher(IProfilerPlugin* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::flush(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopsetOwnerDispatcher(IPluginBase* self, IReferenceCounted* r) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::setOwner(r);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static IReferenceCounted* CLOOP_CARG cloopgetOwnerDispatcher(IPluginBase* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getOwner();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<IReferenceCounted*>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopaddRefDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::addRef();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static int CLOOP_CARG cloopreleaseDispatcher(IReferenceCounted* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::release();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<int>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IPluginBaseImpl<Name, StatusType, Inherit<IReferenceCountedImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IProfilerPlugin> > > > > > >
-	class IProfilerPluginImpl : public IProfilerPluginBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IProfilerPluginImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IProfilerPluginImpl()
-		{
-		}
-
-		virtual void init(StatusType* status, IAttachment* attachment, ISC_UINT64 ticksFrequency) = 0;
-		virtual IProfilerSession* startSession(StatusType* status, const char* description, const char* options, ISC_TIMESTAMP_TZ timestamp) = 0;
-		virtual void flush(StatusType* status) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IProfilerSessionBaseImpl : public Base
-	{
-	public:
-		typedef IProfilerSession Declaration;
-
-		IProfilerSessionBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->dispose = &Name::cloopdisposeDispatcher;
-					this->getId = &Name::cloopgetIdDispatcher;
-					this->getFlags = &Name::cloopgetFlagsDispatcher;
-					this->cancel = &Name::cloopcancelDispatcher;
-					this->finish = &Name::cloopfinishDispatcher;
-					this->defineStatement = &Name::cloopdefineStatementDispatcher;
-					this->defineCursor = &Name::cloopdefineCursorDispatcher;
-					this->defineRecordSource = &Name::cloopdefineRecordSourceDispatcher;
-					this->onRequestStart = &Name::clooponRequestStartDispatcher;
-					this->onRequestFinish = &Name::clooponRequestFinishDispatcher;
-					this->beforePsqlLineColumn = &Name::cloopbeforePsqlLineColumnDispatcher;
-					this->afterPsqlLineColumn = &Name::cloopafterPsqlLineColumnDispatcher;
-					this->beforeRecordSourceOpen = &Name::cloopbeforeRecordSourceOpenDispatcher;
-					this->afterRecordSourceOpen = &Name::cloopafterRecordSourceOpenDispatcher;
-					this->beforeRecordSourceGetRecord = &Name::cloopbeforeRecordSourceGetRecordDispatcher;
-					this->afterRecordSourceGetRecord = &Name::cloopafterRecordSourceGetRecordDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static ISC_INT64 CLOOP_CARG cloopgetIdDispatcher(IProfilerSession* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getId();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_INT64>(0);
-			}
-		}
-
-		static unsigned CLOOP_CARG cloopgetFlagsDispatcher(IProfilerSession* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getFlags();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<unsigned>(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopcancelDispatcher(IProfilerSession* self, IStatus* status) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::cancel(&status2);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopfinishDispatcher(IProfilerSession* self, IStatus* status, ISC_TIMESTAMP_TZ timestamp) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::finish(&status2, timestamp);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdefineStatementDispatcher(IProfilerSession* self, IStatus* status, ISC_INT64 statementId, ISC_INT64 parentStatementId, const char* type, const char* packageName, const char* routineName, const char* sqlText) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::defineStatement(&status2, statementId, parentStatementId, type, packageName, routineName, sqlText);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopdefineCursorDispatcher(IProfilerSession* self, ISC_INT64 statementId, unsigned cursorId, const char* name, unsigned line, unsigned column) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::defineCursor(statementId, cursorId, name, line, column);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdefineRecordSourceDispatcher(IProfilerSession* self, ISC_INT64 statementId, unsigned cursorId, unsigned recSourceId, unsigned level, const char* accessPath, unsigned parentRecSourceId) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::defineRecordSource(statementId, cursorId, recSourceId, level, accessPath, parentRecSourceId);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG clooponRequestStartDispatcher(IProfilerSession* self, IStatus* status, ISC_INT64 statementId, ISC_INT64 requestId, ISC_INT64 callerStatementId, ISC_INT64 callerRequestId, ISC_TIMESTAMP_TZ timestamp) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::onRequestStart(&status2, statementId, requestId, callerStatementId, callerRequestId, timestamp);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG clooponRequestFinishDispatcher(IProfilerSession* self, IStatus* status, ISC_INT64 statementId, ISC_INT64 requestId, ISC_TIMESTAMP_TZ timestamp, IProfilerStats* stats) CLOOP_NOEXCEPT
-		{
-			StatusType status2(status);
-
-			try
-			{
-				static_cast<Name*>(self)->Name::onRequestFinish(&status2, statementId, requestId, timestamp, stats);
-			}
-			catch (...)
-			{
-				StatusType::catchException(&status2);
-			}
-		}
-
-		static void CLOOP_CARG cloopbeforePsqlLineColumnDispatcher(IProfilerSession* self, ISC_INT64 statementId, ISC_INT64 requestId, unsigned line, unsigned column) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::beforePsqlLineColumn(statementId, requestId, line, column);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopafterPsqlLineColumnDispatcher(IProfilerSession* self, ISC_INT64 statementId, ISC_INT64 requestId, unsigned line, unsigned column, IProfilerStats* stats) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::afterPsqlLineColumn(statementId, requestId, line, column, stats);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopbeforeRecordSourceOpenDispatcher(IProfilerSession* self, ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::beforeRecordSourceOpen(statementId, requestId, cursorId, recSourceId);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopafterRecordSourceOpenDispatcher(IProfilerSession* self, ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId, IProfilerStats* stats) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::afterRecordSourceOpen(statementId, requestId, cursorId, recSourceId, stats);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopbeforeRecordSourceGetRecordDispatcher(IProfilerSession* self, ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::beforeRecordSourceGetRecord(statementId, requestId, cursorId, recSourceId);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopafterRecordSourceGetRecordDispatcher(IProfilerSession* self, ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId, IProfilerStats* stats) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::afterRecordSourceGetRecord(statementId, requestId, cursorId, recSourceId, stats);
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-
-		static void CLOOP_CARG cloopdisposeDispatcher(IDisposable* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				static_cast<Name*>(self)->Name::dispose();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IDisposableImpl<Name, StatusType, Inherit<IVersionedImpl<Name, StatusType, Inherit<IProfilerSession> > > > >
-	class IProfilerSessionImpl : public IProfilerSessionBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IProfilerSessionImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IProfilerSessionImpl()
-		{
-		}
-
-		virtual ISC_INT64 getId() = 0;
-		virtual unsigned getFlags() = 0;
-		virtual void cancel(StatusType* status) = 0;
-		virtual void finish(StatusType* status, ISC_TIMESTAMP_TZ timestamp) = 0;
-		virtual void defineStatement(StatusType* status, ISC_INT64 statementId, ISC_INT64 parentStatementId, const char* type, const char* packageName, const char* routineName, const char* sqlText) = 0;
-		virtual void defineCursor(ISC_INT64 statementId, unsigned cursorId, const char* name, unsigned line, unsigned column) = 0;
-		virtual void defineRecordSource(ISC_INT64 statementId, unsigned cursorId, unsigned recSourceId, unsigned level, const char* accessPath, unsigned parentRecSourceId) = 0;
-		virtual void onRequestStart(StatusType* status, ISC_INT64 statementId, ISC_INT64 requestId, ISC_INT64 callerStatementId, ISC_INT64 callerRequestId, ISC_TIMESTAMP_TZ timestamp) = 0;
-		virtual void onRequestFinish(StatusType* status, ISC_INT64 statementId, ISC_INT64 requestId, ISC_TIMESTAMP_TZ timestamp, IProfilerStats* stats) = 0;
-		virtual void beforePsqlLineColumn(ISC_INT64 statementId, ISC_INT64 requestId, unsigned line, unsigned column) = 0;
-		virtual void afterPsqlLineColumn(ISC_INT64 statementId, ISC_INT64 requestId, unsigned line, unsigned column, IProfilerStats* stats) = 0;
-		virtual void beforeRecordSourceOpen(ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId) = 0;
-		virtual void afterRecordSourceOpen(ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId, IProfilerStats* stats) = 0;
-		virtual void beforeRecordSourceGetRecord(ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId) = 0;
-		virtual void afterRecordSourceGetRecord(ISC_INT64 statementId, ISC_INT64 requestId, unsigned cursorId, unsigned recSourceId, IProfilerStats* stats) = 0;
-	};
-
-	template <typename Name, typename StatusType, typename Base>
-	class IProfilerStatsBaseImpl : public Base
-	{
-	public:
-		typedef IProfilerStats Declaration;
-
-		IProfilerStatsBaseImpl(DoNotInherit = DoNotInherit())
-		{
-			static struct VTableImpl : Base::VTable
-			{
-				VTableImpl()
-				{
-					this->version = Base::VERSION;
-					this->getElapsedTicks = &Name::cloopgetElapsedTicksDispatcher;
-				}
-			} vTable;
-
-			this->cloopVTable = &vTable;
-		}
-
-		static ISC_UINT64 CLOOP_CARG cloopgetElapsedTicksDispatcher(IProfilerStats* self) CLOOP_NOEXCEPT
-		{
-			try
-			{
-				return static_cast<Name*>(self)->Name::getElapsedTicks();
-			}
-			catch (...)
-			{
-				StatusType::catchException(0);
-				return static_cast<ISC_UINT64>(0);
-			}
-		}
-	};
-
-	template <typename Name, typename StatusType, typename Base = IVersionedImpl<Name, StatusType, Inherit<IProfilerStats> > >
-	class IProfilerStatsImpl : public IProfilerStatsBaseImpl<Name, StatusType, Base>
-	{
-	protected:
-		IProfilerStatsImpl(DoNotInherit = DoNotInherit())
-		{
-		}
-
-	public:
-		virtual ~IProfilerStatsImpl()
-		{
-		}
-
-		virtual ISC_UINT64 getElapsedTicks() = 0;
-	};
-};
-
-
-#endif	// IDL_FB_INTERFACES_H
diff --git a/FBClient.Headers/firebird/Interface.h b/FBClient.Headers/firebird/Interface.h
deleted file mode 100644
index 5af60dca..00000000
--- a/FBClient.Headers/firebird/Interface.h
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- *	PROGRAM:		Firebird interface.
- *	MODULE:			firebird/Interface.h
- *	DESCRIPTION:	Base class for all FB interfaces / plugins.
- *
- *  The contents of this file are subject to the Initial
- *  Developer's Public License Version 1.0 (the "License");
- *  you may not use this file except in compliance with the
- *  License. You may obtain a copy of the License at
- *  http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
- *
- *  Software distributed under the License is distributed AS IS,
- *  WITHOUT WARRANTY OF ANY KIND, either express or implied.
- *  See the License for the specific language governing rights
- *  and limitations under the License.
- *
- *  The Original Code was created by Alex Peshkov
- *  for the Firebird Open Source RDBMS project.
- *
- *  Copyright (c) 2010 Alex Peshkov <peshkoff at mail.ru>
- *  and all contributors signed below.
- *
- *  All Rights Reserved.
- *  Contributor(s): ______________________________________.
- *
- *
- */
-
-#ifndef FB_INTERFACE_H
-#define FB_INTERFACE_H
-
-#include "ibase.h"
-#include <assert.h>
-
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
-#define CLOOP_CARG __cdecl
-#endif
-
-struct dsc;
-
-namespace Firebird
-{
-
-// Performance counters for individual table
-typedef int ntrace_relation_t;
-struct TraceCounts
-{
-	// Per-table performance counters, must correspond to RuntimeStatistics::StatType
-	// between RECORD_FIRST_ITEM and RECORD_LAST_ITEM
-	enum RecordCounters
-	{
-		SEQ_READS = 0,
-		IDX_READS,
-		UPDATES,
-		INSERTS,
-		DELETES,
-		BACKOUTS,
-		PURGES,
-		EXPUNGES,
-		LOCKS,
-		WAITS,
-		CONFLICTS,
-		BACKVERSION_READS,
-		FRAGMENT_READS,
-		RPT_READS,
-		IMGC
-	};
-
-	ntrace_relation_t	trc_relation_id;	// Relation ID
-	const char*			trc_relation_name;	// Relation name
-	const ISC_INT64*	trc_counters;	    // Pointer to allow easy addition of new counters
-};
-
-// Performance statistics for operation
-struct PerformanceInfo
-{
-	// IO performance counters, must correspond to RuntimeStatistics::StatType
-	// between PAGE_FETCHES and (not including) RECORD_FIRST_ITEM
-	enum PageCounters
-	{
-		FETCHES = 0,
-		READS,
-		MARKS,
-		WRITES
-	};
-
-	ISC_INT64 pin_time;				// Total operation time in milliseconds
-	ISC_INT64* pin_counters;		// Pointer to allow easy addition of new counters
-
-	size_t pin_count;				// Number of relations involved in analysis
-	struct TraceCounts* pin_tables; // Pointer to array with table stats
-
-	ISC_INT64 pin_records_fetched;	// records fetched from statement/procedure
-};
-
-inline const intptr_t* stubError()
-{
-	static const intptr_t codes[] = {
-		isc_arg_gds, isc_random,
-		isc_arg_string, (intptr_t) "Unrecognized exception in Status interface",
-		isc_arg_end
-	};
-
-	return codes;
-}
-
-} // namespace Firebird
-
-#ifndef FB_UsedInYValve
-#define FB_UsedInYValve false
-#endif
-
-#include "IdlFbInterfaces.h"
-
-namespace Firebird
-{
-	class FbException
-	{
-	public:
-		FbException(IStatus* aStatus, const ISC_STATUS* vector)
-		{
-			aStatus->setErrors(vector);
-			status = aStatus->clone();
-		}
-
-		FbException(IStatus* aStatus)
-			: status(aStatus->clone())
-		{
-		}
-
-		FbException(const FbException& copy)
-			: status(copy.status->clone())
-		{
-		}
-
-		FbException& operator =(const FbException& copy)
-		{
-			status->dispose();
-			status = copy.status->clone();
-			return *this;
-		}
-
-		virtual ~FbException()
-		{
-			status->dispose();
-		}
-
-	public:
-		static void check(ISC_STATUS code, IStatus* status, const ISC_STATUS* vector)
-		{
-			if (code != 0 && vector[1])
-				throw FbException(status, vector);
-		}
-
-	public:
-		IStatus* getStatus() const
-		{
-			return status;
-		}
-
-	private:
-		IStatus* status;
-	};
-
-	template <typename T>
-	class BaseStatusWrapper : public IStatusImpl<T, T>
-	{
-	public:
-		BaseStatusWrapper(IStatus* aStatus)
-			: status(aStatus),
-			  dirty(false)
-		{
-		}
-
-	public:
-		static void catchException(IStatus* status)
-		{
-			if (!status)
-				return;
-
-			try
-			{
-				throw;
-			}
-			catch (const FbException& e)
-			{
-				status->setErrors(e.getStatus()->getErrors());
-			}
-			catch (...)
-			{
-				ISC_STATUS statusVector[] = {
-					isc_arg_gds, isc_random,
-					isc_arg_string, (ISC_STATUS) "Unrecognized C++ exception",
-					isc_arg_end};
-				status->setErrors(statusVector);
-			}
-		}
-
-		static void clearException(BaseStatusWrapper* status)
-		{
-			status->clearException();
-		}
-
-		void clearException()
-		{
-			if (dirty)
-			{
-				dirty = false;
-				status->init();
-			}
-		}
-
-		bool isDirty() const
-		{
-			return dirty;
-		}
-
-		bool hasData() const
-		{
-			return getState() & IStatus::STATE_ERRORS;
-		}
-
-		bool isEmpty() const
-		{
-			return !hasData();
-		}
-
-		bool isSuccess() const
-		{
-			return isEmpty();
-		}
-
-		static void setVersionError(IStatus* status, const char* interfaceName,
-			unsigned currentVersion, unsigned expectedVersion)
-		{
-			intptr_t codes[] = {
-				isc_arg_gds,
-				isc_interface_version_too_old,
-				isc_arg_number,
-				(intptr_t) expectedVersion,
-				isc_arg_number,
-				(intptr_t) currentVersion,
-				isc_arg_string,
-				(intptr_t) interfaceName,
-				isc_arg_end
-			};
-
-			status->setErrors(codes);
-		}
-
-	public:
-		virtual void dispose()
-		{
-			// Disposes only the delegated status. Let the user destroy this instance.
-			status->dispose();
-		}
-
-		virtual void init()
-		{
-			clearException();
-		}
-
-		virtual unsigned getState() const
-		{
-			return dirty ? status->getState() : 0;
-		}
-
-		virtual void setErrors2(unsigned length, const intptr_t* value)
-		{
-			dirty = true;
-			status->setErrors2(length, value);
-		}
-
-		virtual void setWarnings2(unsigned length, const intptr_t* value)
-		{
-			dirty = true;
-			status->setWarnings2(length, value);
-		}
-
-		virtual void setErrors(const intptr_t* value)
-		{
-			dirty = true;
-			status->setErrors(value);
-		}
-
-		virtual void setWarnings(const intptr_t* value)
-		{
-			dirty = true;
-			status->setWarnings(value);
-		}
-
-		virtual const intptr_t* getErrors() const
-		{
-			return dirty ? status->getErrors() : cleanStatus();
-		}
-
-		virtual const intptr_t* getWarnings() const
-		{
-			return dirty ? status->getWarnings() : cleanStatus();
-		}
-
-		virtual IStatus* clone() const
-		{
-			return status->clone();
-		}
-
-	protected:
-		IStatus* status;
-		bool dirty;
-
-		static const intptr_t* cleanStatus()
-		{
-			static intptr_t clean[3] = {1, 0, 0};
-			return clean;
-		}
-	};
-
-	class CheckStatusWrapper : public BaseStatusWrapper<CheckStatusWrapper>
-	{
-	public:
-		CheckStatusWrapper(IStatus* aStatus)
-			: BaseStatusWrapper(aStatus)
-		{
-		}
-
-	public:
-		static void checkException(CheckStatusWrapper* /* status */)
-		{
-		}
-	};
-
-	class ThrowStatusWrapper : public BaseStatusWrapper<ThrowStatusWrapper>
-	{
-	public:
-		ThrowStatusWrapper(IStatus* aStatus)
-			: BaseStatusWrapper(aStatus)
-		{
-		}
-
-	public:
-		static void checkException(ThrowStatusWrapper* status)
-		{
-			if (status->dirty && (status->getState() & IStatus::STATE_ERRORS))
-				throw FbException(status->status);
-		}
-	};
-
-#ifdef FB_API_VER	// internal hack
-	class Helper
-	{
-	public:
-		template <typename StatusType>
-		static isc_db_handle getIscDbHandle(StatusType* status, IAttachment* attachment)
-		{
-			if (!attachment)
-				return 0;
-
-			ISC_STATUS_ARRAY statusVector = {0};
-			isc_db_handle handle = 0;
-
-			fb_get_database_handle(statusVector, &handle, attachment);
-
-			if (!handle)
-			{
-				status->setErrors(statusVector);
-				StatusType::checkException(status);
-			}
-
-			return handle;
-		}
-
-		template <typename StatusType>
-		static isc_db_handle getIscDbHandle(StatusType* status, IExternalContext* context)
-		{
-			IAttachment* attachment = context->getAttachment(status);
-
-			if (!attachment)
-				return 0;
-
-			try
-			{
-				isc_db_handle handle = getIscDbHandle(status, attachment);
-				attachment->release();
-				return handle;
-			}
-			catch (...)
-			{
-				attachment->release();
-				throw;
-			}
-		}
-
-		template <typename StatusType>
-		static isc_tr_handle getIscTrHandle(StatusType* status, ITransaction* transaction)
-		{
-			if (!transaction)
-				return 0;
-
-			ISC_STATUS_ARRAY statusVector = {0};
-			isc_tr_handle handle = 0;
-
-			fb_get_transaction_handle(statusVector, &handle, transaction);
-
-			if (!handle)
-			{
-				status->setErrors(statusVector);
-				StatusType::checkException(status);
-			}
-
-			return handle;
-		}
-
-		template <typename StatusType>
-		static isc_tr_handle getIscTrHandle(StatusType* status, IExternalContext* context)
-		{
-			ITransaction* transaction = context->getTransaction(status);
-
-			if (!transaction)
-				return 0;
-
-			try
-			{
-				isc_tr_handle handle = getIscTrHandle(status, transaction);
-				transaction->release();
-				return handle;
-			}
-			catch (...)
-			{
-				transaction->release();
-				throw;
-			}
-		}
-	};
-#endif	// FB_API_VER
-
-	// Additional API function.
-	// Should be used only in non-plugin modules.
-	// All plugins including providers should use passed at init time interface instead.
-	extern "C" IMaster* ISC_EXPORT fb_get_master_interface();
-
-} // namespace Firebird
-
-#define FB_PLUGIN_ENTRY_POINT firebird_plugin
-#define FB_UDR_PLUGIN_ENTRY_POINT firebird_udr_plugin
-
-#endif // FB_INTERFACE_H
diff --git a/FBClient.Headers/firebird/Message.h b/FBClient.Headers/firebird/Message.h
deleted file mode 100644
index a1477750..00000000
--- a/FBClient.Headers/firebird/Message.h
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
- *  The contents of this file are subject to the Initial
- *  Developer's Public License Version 1.0 (the "License");
- *  you may not use this file except in compliance with the
- *  License. You may obtain a copy of the License at
- *  http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
- *
- *  Software distributed under the License is distributed AS IS,
- *  WITHOUT WARRANTY OF ANY KIND, either express or implied.
- *  See the License for the specific language governing rights
- *  and limitations under the License.
- *
- *  The Original Code was created by Adriano dos Santos Fernandes
- *  for the Firebird Open Source RDBMS project.
- *
- *  Copyright (c) 2011 Adriano dos Santos Fernandes <adrianosf@uol.com.br>
- *  and all contributors signed below.
- *
- *  All Rights Reserved.
- *  Contributor(s): ______________________________________.
- */
-
-#ifndef FIREBIRD_MESSAGE_H
-#define FIREBIRD_MESSAGE_H
-
-#include "ibase.h"
-#include "./Interface.h"
-#include "./impl/boost/preprocessor/seq/for_each_i.hpp"
-#include <assert.h>
-#include <string.h>
-
-#if defined(__linux__) && defined(__i386__)
-#define FB__INT64_ALIGNAS alignas(8)
-#else
-#define FB__INT64_ALIGNAS
-#endif
-
-#define FB_MESSAGE(name, statusType, fields)	\
-	FB__MESSAGE_I(name, statusType, 2, FB_BOOST_PP_CAT(FB__MESSAGE_X fields, 0), )
-
-#define FB__MESSAGE_X(x, y) ((x, y)) FB__MESSAGE_Y
-#define FB__MESSAGE_Y(x, y) ((x, y)) FB__MESSAGE_X
-#define FB__MESSAGE_X0
-#define FB__MESSAGE_Y0
-
-#define FB_TRIGGER_MESSAGE(name, statusType, fields)	\
-	FB__MESSAGE_I(name, statusType, 3, FB_BOOST_PP_CAT(FB_TRIGGER_MESSAGE_X fields, 0), \
-		FB_TRIGGER_MESSAGE_MOVE_NAMES(name, fields))
-
-#define FB_TRIGGER_MESSAGE_X(x, y, z) ((x, y, z)) FB_TRIGGER_MESSAGE_Y
-#define FB_TRIGGER_MESSAGE_Y(x, y, z) ((x, y, z)) FB_TRIGGER_MESSAGE_X
-#define FB_TRIGGER_MESSAGE_X0
-#define FB_TRIGGER_MESSAGE_Y0
-
-#define FB__MESSAGE_I(name, statusType, size, fields, moveNames)	\
-	struct name	\
-	{	\
-		struct Type	\
-		{	\
-			FB_BOOST_PP_SEQ_FOR_EACH_I(FB__MESSAGE_FIELD, size, fields)	\
-		};	\
-		\
-		static void setup(statusType* status, ::Firebird::IMetadataBuilder* builder)	\
-		{	\
-			unsigned index = 0;	\
-			moveNames	\
-			FB_BOOST_PP_SEQ_FOR_EACH_I(FB__MESSAGE_META, size, fields)	\
-		}	\
-		\
-		name(statusType* status, ::Firebird::IMaster* master)	\
-			: desc(master, status, FB_BOOST_PP_SEQ_SIZE(fields), setup)	\
-		{	\
-		}	\
-		\
-		::Firebird::IMessageMetadata* getMetadata() const	\
-		{	\
-			return desc.getMetadata();	\
-		}	\
-		\
-		void clear()	\
-		{	\
-			memset(&data, 0, sizeof(data));	\
-		}	\
-		\
-		Type* getData()	\
-		{	\
-			return &data;	\
-		}	\
-		\
-		const Type* getData() const	\
-		{	\
-			return &data;	\
-		}	\
-		\
-		Type* operator ->()	\
-		{	\
-			return getData();	\
-		}	\
-		\
-		const Type* operator ->() const	\
-		{	\
-			return getData();	\
-		}	\
-		\
-		Type data;	\
-		::Firebird::MessageDesc desc;	\
-	}
-
-#define FB__MESSAGE_FIELD(r, _, i, xy)	\
-	FB_BOOST_PP_CAT(FB__TYPE_, FB_BOOST_PP_TUPLE_ELEM(_, 0, xy)) FB_BOOST_PP_TUPLE_ELEM(_, 1, xy);	\
-	ISC_SHORT FB_BOOST_PP_CAT(FB_BOOST_PP_TUPLE_ELEM(_, 1, xy), Null);
-
-#define FB__MESSAGE_META(r, _, i, xy)	\
-	FB_BOOST_PP_CAT(FB__META_, FB_BOOST_PP_TUPLE_ELEM(_, 0, xy))	\
-	++index;
-
-// Types - metadata
-
-#define FB__META_FB_SCALED_SMALLINT(scale)	\
-	builder->setType(status, index, SQL_SHORT);	\
-	builder->setLength(status, index, sizeof(ISC_SHORT));	\
-	builder->setScale(status, index, scale);
-
-#define FB__META_FB_SCALED_INTEGER(scale)	\
-	builder->setType(status, index, SQL_LONG);	\
-	builder->setLength(status, index, sizeof(ISC_LONG));	\
-	builder->setScale(status, index, scale);
-
-#define FB__META_FB_SCALED_BIGINT(scale)	\
-	builder->setType(status, index, SQL_INT64);	\
-	builder->setLength(status, index, sizeof(ISC_INT64));	\
-	builder->setScale(status, index, scale);
-
-#define FB__META_FB_FLOAT	\
-	builder->setType(status, index, SQL_FLOAT);	\
-	builder->setLength(status, index, sizeof(float));
-
-#define FB__META_FB_DOUBLE	\
-	builder->setType(status, index, SQL_DOUBLE);	\
-	builder->setLength(status, index, sizeof(double));
-
-#define FB__META_FB_DECFLOAT16	\
-	builder->setType(status, index, SQL_DEC16);	\
-	builder->setLength(status, index, sizeof(FB_DEC16));
-
-#define FB__META_FB_DECFLOAT34	\
-	builder->setType(status, index, SQL_DEC34);	\
-	builder->setLength(status, index, sizeof(FB_DEC34));
-
-#define FB__META_FB_BLOB	\
-	builder->setType(status, index, SQL_BLOB);	\
-	builder->setLength(status, index, sizeof(ISC_QUAD));
-
-#define FB__META_FB_BOOLEAN	\
-	builder->setType(status, index, SQL_BOOLEAN);	\
-	builder->setLength(status, index, sizeof(FB_BOOLEAN));
-
-#define FB__META_FB_DATE	\
-	builder->setType(status, index, SQL_DATE);	\
-	builder->setLength(status, index, sizeof(::Firebird::FbDate));
-
-#define FB__META_FB_TIME	\
-	builder->setType(status, index, SQL_TIME);	\
-	builder->setLength(status, index, sizeof(::Firebird::FbTime));
-
-#define FB__META_FB_TIME_TZ	\
-	builder->setType(status, index, SQL_TIME_TZ);	\
-	builder->setLength(status, index, sizeof(::Firebird::FbTimeTz));
-
-#define FB__META_FB_TIME_TZ_EX	\
-	builder->setType(status, index, SQL_TIME_TZ_EX);	\
-	builder->setLength(status, index, sizeof(::Firebird::FbTimeTzEx));
-
-#define FB__META_FB_TIMESTAMP	\
-	builder->setType(status, index, SQL_TIMESTAMP);	\
-	builder->setLength(status, index, sizeof(::Firebird::FbTimestamp));
-
-#define FB__META_FB_TIMESTAMP_TZ	\
-	builder->setType(status, index, SQL_TIMESTAMP_TZ);	\
-	builder->setLength(status, index, sizeof(::Firebird::FbTimestampTz));
-
-#define FB__META_FB_TIMESTAMP_TZ_EX	\
-	builder->setType(status, index, SQL_TIMESTAMP_TZ_EX);	\
-	builder->setLength(status, index, sizeof(::Firebird::FbTimestampTzEx));
-
-#define FB__META_FB_CHAR(len)	\
-	builder->setType(status, index, SQL_TEXT);	\
-	builder->setLength(status, index, len);
-
-#define FB__META_FB_VARCHAR(len)	\
-	builder->setType(status, index, SQL_VARYING);	\
-	builder->setLength(status, index, len);
-
-#define FB__META_FB_INTL_CHAR(len, charSet)	\
-	builder->setType(status, index, SQL_TEXT);	\
-	builder->setLength(status, index, len);	\
-	builder->setCharSet(status, index, charSet);
-
-#define FB__META_FB_INTL_VARCHAR(len, charSet)	\
-	builder->setType(status, index, SQL_VARYING);	\
-	builder->setLength(status, index, len);	\
-	builder->setCharSet(status, index, charSet);
-
-#define FB__META_FB_SMALLINT			FB__META_FB_SCALED_SMALLINT(0)
-#define FB__META_FB_INTEGER				FB__META_FB_SCALED_INTEGER(0)
-#define FB__META_FB_BIGINT				FB__META_FB_SCALED_BIGINT(0)
-
-// Types - struct
-
-#define FB__TYPE_FB_SCALED_SMALLINT(x)			ISC_SHORT
-#define FB__TYPE_FB_SCALED_INTEGER(x)			ISC_LONG
-#define FB__TYPE_FB_SCALED_BIGINT(x)			FB__INT64_ALIGNAS ISC_INT64
-#define FB__TYPE_FB_SMALLINT					ISC_SHORT
-#define FB__TYPE_FB_INTEGER						ISC_LONG
-#define FB__TYPE_FB_BIGINT						FB__INT64_ALIGNAS ISC_INT64
-#define FB__TYPE_FB_FLOAT						float
-#define FB__TYPE_FB_DOUBLE						double
-#define FB__TYPE_FB_DECFLOAT16					FB__INT64_ALIGNAS FB_DEC16
-#define FB__TYPE_FB_DECFLOAT34					FB__INT64_ALIGNAS FB_DEC34
-#define FB__TYPE_FB_BLOB						ISC_QUAD
-#define FB__TYPE_FB_BOOLEAN						ISC_UCHAR
-#define FB__TYPE_FB_DATE						::Firebird::FbDate
-#define FB__TYPE_FB_TIME						::Firebird::FbTime
-#define FB__TYPE_FB_TIME_TZ						::Firebird::FbTimeTz
-#define FB__TYPE_FB_TIME_TZ_EX					::Firebird::FbTimeTzEx
-#define FB__TYPE_FB_TIMESTAMP					::Firebird::FbTimestamp
-#define FB__TYPE_FB_TIMESTAMP_TZ				::Firebird::FbTimestampTz
-#define FB__TYPE_FB_TIMESTAMP_TZ_EX				::Firebird::FbTimestampTzEx
-#define FB__TYPE_FB_CHAR(len)					::Firebird::FbChar<(len)>
-#define FB__TYPE_FB_VARCHAR(len)				::Firebird::FbVarChar<(len)>
-#define FB__TYPE_FB_INTL_CHAR(len, charSet)		::Firebird::FbChar<(len)>
-#define FB__TYPE_FB_INTL_VARCHAR(len, charSet)	::Firebird::FbVarChar<(len)>
-
-#define FB_TRIGGER_MESSAGE_MOVE_NAMES(name, fields)	\
-	FB_TRIGGER_MESSAGE_MOVE_NAMES_I(name, 3, FB_BOOST_PP_CAT(FB_TRIGGER_MESSAGE_MOVE_NAMES_X fields, 0))
-
-#define FB_TRIGGER_MESSAGE_MOVE_NAMES_X(x, y, z) ((x, y, z)) FB_TRIGGER_MESSAGE_MOVE_NAMES_Y
-#define FB_TRIGGER_MESSAGE_MOVE_NAMES_Y(x, y, z) ((x, y, z)) FB_TRIGGER_MESSAGE_MOVE_NAMES_X
-#define FB_TRIGGER_MESSAGE_MOVE_NAMES_X0
-#define FB_TRIGGER_MESSAGE_MOVE_NAMES_Y0
-
-#define FB_TRIGGER_MESSAGE_MOVE_NAMES_I(name, size, fields)	\
-	FB_BOOST_PP_SEQ_FOR_EACH_I(FB_TRIGGER_MESSAGE_MOVE_NAME, size, fields)	\
-	builder->truncate(status, index);	\
-	index = 0;
-
-#define FB_TRIGGER_MESSAGE_MOVE_NAME(r, _, i, xy)	\
-	builder->moveNameToIndex(status, FB_BOOST_PP_TUPLE_ELEM(_, 2, xy), index++);
-
-
-namespace Firebird {
-
-
-template <unsigned N>
-struct FbChar
-{
-	char str[N];
-};
-
-template <unsigned N>
-struct FbVarChar
-{
-	ISC_USHORT length;
-	char str[N];
-
-	void set(const char* s)
-	{
-		size_t len = strlen(s);
-		assert(len <= N);
-		length = (ISC_USHORT) (len <= N ? len : N);
-		memcpy(str, s, length);
-	}
-
-	void set(const char* s, unsigned len)
-	{
-		assert(len <= N);
-		length = (ISC_USHORT) (len <= N ? len : N);
-		memcpy(str, s, length);
-	}
-};
-
-// This class has memory layout identical to ISC_DATE.
-class FbDate
-{
-public:
-	void decode(IUtil* util, unsigned* year, unsigned* month, unsigned* day) const
-	{
-		util->decodeDate(value, year, month, day);
-	}
-
-	unsigned getYear(IUtil* util) const
-	{
-		unsigned year;
-		decode(util, &year, NULL, NULL);
-		return year;
-	}
-
-	unsigned getMonth(IUtil* util) const
-	{
-		unsigned month;
-		decode(util, NULL, &month, NULL);
-		return month;
-	}
-
-	unsigned getDay(IUtil* util) const
-	{
-		unsigned day;
-		decode(util, NULL, NULL, &day);
-		return day;
-	}
-
-	void encode(IUtil* util, unsigned year, unsigned month, unsigned day)
-	{
-		value = util->encodeDate(year, month, day);
-	}
-
-public:
-	FbDate& operator=(const ISC_DATE& val)
-	{
-		*(this) = *(const FbDate*) &val;
-		return *this;
-	}
-
-	operator ISC_DATE&()
-	{
-		return *(ISC_DATE*) this;
-	}
-
-	operator const ISC_DATE&() const
-	{
-		return *(ISC_DATE*) this;
-	}
-
-public:
-	ISC_DATE value;
-};
-
-// This class has memory layout identical to ISC_TIME.
-class FbTime
-{
-public:
-	void decode(IUtil* util, unsigned* hours, unsigned* minutes, unsigned* seconds,
-		unsigned* fractions) const
-	{
-		util->decodeTime(value, hours, minutes, seconds, fractions);
-	}
-
-	unsigned getHours(IUtil* util) const
-	{
-		unsigned hours;
-		decode(util, &hours, NULL, NULL, NULL);
-		return hours;
-	}
-
-	unsigned getMinutes(IUtil* util) const
-	{
-		unsigned minutes;
-		decode(util, NULL, &minutes, NULL, NULL);
-		return minutes;
-	}
-
-	unsigned getSeconds(IUtil* util) const
-	{
-		unsigned seconds;
-		decode(util, NULL, NULL, &seconds, NULL);
-		return seconds;
-	}
-
-	unsigned getFractions(IUtil* util) const
-	{
-		unsigned fractions;
-		decode(util, NULL, NULL, NULL, &fractions);
-		return fractions;
-	}
-
-	void encode(IUtil* util, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions)
-	{
-		value = util->encodeTime(hours, minutes, seconds, fractions);
-	}
-
-public:
-	FbTime& operator=(const ISC_TIME& val)
-	{
-		*(this) = *(const FbTime*) &val;
-		return *this;
-	}
-
-	operator ISC_TIME&()
-	{
-		return *(ISC_TIME*) this;
-	}
-
-	operator const ISC_TIME&() const
-	{
-		return *(ISC_TIME*) this;
-	}
-
-public:
-	ISC_TIME value;
-};
-
-// This class has memory layout identical to ISC_TIME_TZ.
-class FbTimeTz
-{
-public:
-	FbTimeTz& operator=(const ISC_TIME_TZ& val)
-	{
-		*(this) = *(const FbTimeTz*) &val;
-		return *this;
-	}
-
-	operator ISC_TIME_TZ&()
-	{
-		return *(ISC_TIME_TZ*) this;
-	}
-
-	operator const ISC_TIME_TZ&() const
-	{
-		return *(ISC_TIME_TZ*) this;
-	}
-
-public:
-	FbTime utcTime;
-	ISC_USHORT timeZone;
-};
-
-// This class has memory layout identical to ISC_TIME_TZ_EX.
-class FbTimeTzEx
-{
-public:
-	FbTimeTzEx& operator=(const ISC_TIME_TZ_EX& val)
-	{
-		*(this) = *(const FbTimeTzEx*) &val;
-		return *this;
-	}
-
-	operator ISC_TIME_TZ_EX&()
-	{
-		return *(ISC_TIME_TZ_EX*) this;
-	}
-
-	operator const ISC_TIME_TZ_EX&() const
-	{
-		return *(ISC_TIME_TZ_EX*) this;
-	}
-
-public:
-	FbTime utcTime;
-	ISC_USHORT timeZone;
-	ISC_SHORT extOffset;
-};
-
-// This class has memory layout identical to ISC_TIMESTAMP.
-class FbTimestamp
-{
-public:
-	FbTimestamp& operator=(const ISC_TIMESTAMP& val)
-	{
-		*(this) = *(const FbTimestamp*) &val;
-		return *this;
-	}
-
-	operator ISC_TIMESTAMP&()
-	{
-		return *(ISC_TIMESTAMP*) this;
-	}
-
-	operator const ISC_TIMESTAMP&() const
-	{
-		return *(ISC_TIMESTAMP*) this;
-	}
-
-public:
-	FbDate date;
-	FbTime time;
-};
-
-// This class has memory layout identical to ISC_TIMESTAMP_TZ.
-class FbTimestampTz
-{
-public:
-	FbTimestampTz& operator=(const ISC_TIMESTAMP_TZ& val)
-	{
-		*(this) = *(const FbTimestampTz*) &val;
-		return *this;
-	}
-
-	operator ISC_TIMESTAMP_TZ&()
-	{
-		return *(ISC_TIMESTAMP_TZ*) this;
-	}
-
-	operator const ISC_TIMESTAMP_TZ&() const
-	{
-		return *(ISC_TIMESTAMP_TZ*) this;
-	}
-
-public:
-	FbTimestamp utcTimestamp;
-	ISC_USHORT timeZone;
-};
-
-// This class has memory layout identical to ISC_TIMESTAMP_TZ_EX.
-class FbTimestampTzEx
-{
-public:
-	FbTimestampTzEx& operator=(const ISC_TIMESTAMP_TZ_EX& val)
-	{
-		*(this) = *(const FbTimestampTzEx*) &val;
-		return *this;
-	}
-
-	operator ISC_TIMESTAMP_TZ_EX&()
-	{
-		return *(ISC_TIMESTAMP_TZ_EX*) this;
-	}
-
-	operator const ISC_TIMESTAMP_TZ_EX&() const
-	{
-		return *(ISC_TIMESTAMP_TZ_EX*) this;
-	}
-
-public:
-	FbTimestamp utcTimestamp;
-	ISC_USHORT timeZone;
-	ISC_SHORT extOffset;
-};
-
-class MessageDesc
-{
-public:
-	template <typename StatusType>
-	MessageDesc(IMaster* master, StatusType* status, unsigned count,
-		void (*setup)(StatusType*, IMetadataBuilder*))
-	{
-		IMetadataBuilder* builder = master->getMetadataBuilder(status, count);
-
-		setup(status, builder);
-
-		metadata = builder->getMetadata(status);
-
-		builder->release();
-	}
-
-	~MessageDesc()
-	{
-		metadata->release();
-	}
-
-	IMessageMetadata* getMetadata() const
-	{
-		return metadata;
-	}
-
-private:
-	IMessageMetadata* metadata;
-};
-
-
-}	// namespace Firebird
-
-#endif	// FIREBIRD_MESSAGE_H
diff --git a/FBClient.Headers/firebird/TimeZones.h b/FBClient.Headers/firebird/TimeZones.h
deleted file mode 100644
index 85432985..00000000
--- a/FBClient.Headers/firebird/TimeZones.h
+++ /dev/null
@@ -1,644 +0,0 @@
-#ifndef FIREBIRD_TIME_ZONES_H
-#define FIREBIRD_TIME_ZONES_H
-
-// The content of this file is generated with help of update-ids utility Do not edit.
-
-#define fb_tzid_gmt                                  65535 /* GMT */
-#define fb_tzid_act                                  65534 /* ACT */
-#define fb_tzid_aet                                  65533 /* AET */
-#define fb_tzid_agt                                  65532 /* AGT */
-#define fb_tzid_art                                  65531 /* ART */
-#define fb_tzid_ast                                  65530 /* AST */
-#define fb_tzid_africa_abidjan                       65529 /* Africa/Abidjan */
-#define fb_tzid_africa_accra                         65528 /* Africa/Accra */
-#define fb_tzid_africa_addis_ababa                   65527 /* Africa/Addis_Ababa */
-#define fb_tzid_africa_algiers                       65526 /* Africa/Algiers */
-#define fb_tzid_africa_asmara                        65525 /* Africa/Asmara */
-#define fb_tzid_africa_asmera                        65524 /* Africa/Asmera */
-#define fb_tzid_africa_bamako                        65523 /* Africa/Bamako */
-#define fb_tzid_africa_bangui                        65522 /* Africa/Bangui */
-#define fb_tzid_africa_banjul                        65521 /* Africa/Banjul */
-#define fb_tzid_africa_bissau                        65520 /* Africa/Bissau */
-#define fb_tzid_africa_blantyre                      65519 /* Africa/Blantyre */
-#define fb_tzid_africa_brazzaville                   65518 /* Africa/Brazzaville */
-#define fb_tzid_africa_bujumbura                     65517 /* Africa/Bujumbura */
-#define fb_tzid_africa_cairo                         65516 /* Africa/Cairo */
-#define fb_tzid_africa_casablanca                    65515 /* Africa/Casablanca */
-#define fb_tzid_africa_ceuta                         65514 /* Africa/Ceuta */
-#define fb_tzid_africa_conakry                       65513 /* Africa/Conakry */
-#define fb_tzid_africa_dakar                         65512 /* Africa/Dakar */
-#define fb_tzid_africa_dar_es_salaam                 65511 /* Africa/Dar_es_Salaam */
-#define fb_tzid_africa_djibouti                      65510 /* Africa/Djibouti */
-#define fb_tzid_africa_douala                        65509 /* Africa/Douala */
-#define fb_tzid_africa_el_aaiun                      65508 /* Africa/El_Aaiun */
-#define fb_tzid_africa_freetown                      65507 /* Africa/Freetown */
-#define fb_tzid_africa_gaborone                      65506 /* Africa/Gaborone */
-#define fb_tzid_africa_harare                        65505 /* Africa/Harare */
-#define fb_tzid_africa_johannesburg                  65504 /* Africa/Johannesburg */
-#define fb_tzid_africa_juba                          65503 /* Africa/Juba */
-#define fb_tzid_africa_kampala                       65502 /* Africa/Kampala */
-#define fb_tzid_africa_khartoum                      65501 /* Africa/Khartoum */
-#define fb_tzid_africa_kigali                        65500 /* Africa/Kigali */
-#define fb_tzid_africa_kinshasa                      65499 /* Africa/Kinshasa */
-#define fb_tzid_africa_lagos                         65498 /* Africa/Lagos */
-#define fb_tzid_africa_libreville                    65497 /* Africa/Libreville */
-#define fb_tzid_africa_lome                          65496 /* Africa/Lome */
-#define fb_tzid_africa_luanda                        65495 /* Africa/Luanda */
-#define fb_tzid_africa_lubumbashi                    65494 /* Africa/Lubumbashi */
-#define fb_tzid_africa_lusaka                        65493 /* Africa/Lusaka */
-#define fb_tzid_africa_malabo                        65492 /* Africa/Malabo */
-#define fb_tzid_africa_maputo                        65491 /* Africa/Maputo */
-#define fb_tzid_africa_maseru                        65490 /* Africa/Maseru */
-#define fb_tzid_africa_mbabane                       65489 /* Africa/Mbabane */
-#define fb_tzid_africa_mogadishu                     65488 /* Africa/Mogadishu */
-#define fb_tzid_africa_monrovia                      65487 /* Africa/Monrovia */
-#define fb_tzid_africa_nairobi                       65486 /* Africa/Nairobi */
-#define fb_tzid_africa_ndjamena                      65485 /* Africa/Ndjamena */
-#define fb_tzid_africa_niamey                        65484 /* Africa/Niamey */
-#define fb_tzid_africa_nouakchott                    65483 /* Africa/Nouakchott */
-#define fb_tzid_africa_ouagadougou                   65482 /* Africa/Ouagadougou */
-#define fb_tzid_africa_porto_novo                    65481 /* Africa/Porto-Novo */
-#define fb_tzid_africa_sao_tome                      65480 /* Africa/Sao_Tome */
-#define fb_tzid_africa_timbuktu                      65479 /* Africa/Timbuktu */
-#define fb_tzid_africa_tripoli                       65478 /* Africa/Tripoli */
-#define fb_tzid_africa_tunis                         65477 /* Africa/Tunis */
-#define fb_tzid_africa_windhoek                      65476 /* Africa/Windhoek */
-#define fb_tzid_america_adak                         65475 /* America/Adak */
-#define fb_tzid_america_anchorage                    65474 /* America/Anchorage */
-#define fb_tzid_america_anguilla                     65473 /* America/Anguilla */
-#define fb_tzid_america_antigua                      65472 /* America/Antigua */
-#define fb_tzid_america_araguaina                    65471 /* America/Araguaina */
-#define fb_tzid_america_argentina_buenos_aires       65470 /* America/Argentina/Buenos_Aires */
-#define fb_tzid_america_argentina_catamarca          65469 /* America/Argentina/Catamarca */
-#define fb_tzid_america_argentina_comodrivadavia     65468 /* America/Argentina/ComodRivadavia */
-#define fb_tzid_america_argentina_cordoba            65467 /* America/Argentina/Cordoba */
-#define fb_tzid_america_argentina_jujuy              65466 /* America/Argentina/Jujuy */
-#define fb_tzid_america_argentina_la_rioja           65465 /* America/Argentina/La_Rioja */
-#define fb_tzid_america_argentina_mendoza            65464 /* America/Argentina/Mendoza */
-#define fb_tzid_america_argentina_rio_gallegos       65463 /* America/Argentina/Rio_Gallegos */
-#define fb_tzid_america_argentina_salta              65462 /* America/Argentina/Salta */
-#define fb_tzid_america_argentina_san_juan           65461 /* America/Argentina/San_Juan */
-#define fb_tzid_america_argentina_san_luis           65460 /* America/Argentina/San_Luis */
-#define fb_tzid_america_argentina_tucuman            65459 /* America/Argentina/Tucuman */
-#define fb_tzid_america_argentina_ushuaia            65458 /* America/Argentina/Ushuaia */
-#define fb_tzid_america_aruba                        65457 /* America/Aruba */
-#define fb_tzid_america_asuncion                     65456 /* America/Asuncion */
-#define fb_tzid_america_atikokan                     65455 /* America/Atikokan */
-#define fb_tzid_america_atka                         65454 /* America/Atka */
-#define fb_tzid_america_bahia                        65453 /* America/Bahia */
-#define fb_tzid_america_bahia_banderas               65452 /* America/Bahia_Banderas */
-#define fb_tzid_america_barbados                     65451 /* America/Barbados */
-#define fb_tzid_america_belem                        65450 /* America/Belem */
-#define fb_tzid_america_belize                       65449 /* America/Belize */
-#define fb_tzid_america_blanc_sablon                 65448 /* America/Blanc-Sablon */
-#define fb_tzid_america_boa_vista                    65447 /* America/Boa_Vista */
-#define fb_tzid_america_bogota                       65446 /* America/Bogota */
-#define fb_tzid_america_boise                        65445 /* America/Boise */
-#define fb_tzid_america_buenos_aires                 65444 /* America/Buenos_Aires */
-#define fb_tzid_america_cambridge_bay                65443 /* America/Cambridge_Bay */
-#define fb_tzid_america_campo_grande                 65442 /* America/Campo_Grande */
-#define fb_tzid_america_cancun                       65441 /* America/Cancun */
-#define fb_tzid_america_caracas                      65440 /* America/Caracas */
-#define fb_tzid_america_catamarca                    65439 /* America/Catamarca */
-#define fb_tzid_america_cayenne                      65438 /* America/Cayenne */
-#define fb_tzid_america_cayman                       65437 /* America/Cayman */
-#define fb_tzid_america_chicago                      65436 /* America/Chicago */
-#define fb_tzid_america_chihuahua                    65435 /* America/Chihuahua */
-#define fb_tzid_america_coral_harbour                65434 /* America/Coral_Harbour */
-#define fb_tzid_america_cordoba                      65433 /* America/Cordoba */
-#define fb_tzid_america_costa_rica                   65432 /* America/Costa_Rica */
-#define fb_tzid_america_creston                      65431 /* America/Creston */
-#define fb_tzid_america_cuiaba                       65430 /* America/Cuiaba */
-#define fb_tzid_america_curacao                      65429 /* America/Curacao */
-#define fb_tzid_america_danmarkshavn                 65428 /* America/Danmarkshavn */
-#define fb_tzid_america_dawson                       65427 /* America/Dawson */
-#define fb_tzid_america_dawson_creek                 65426 /* America/Dawson_Creek */
-#define fb_tzid_america_denver                       65425 /* America/Denver */
-#define fb_tzid_america_detroit                      65424 /* America/Detroit */
-#define fb_tzid_america_dominica                     65423 /* America/Dominica */
-#define fb_tzid_america_edmonton                     65422 /* America/Edmonton */
-#define fb_tzid_america_eirunepe                     65421 /* America/Eirunepe */
-#define fb_tzid_america_el_salvador                  65420 /* America/El_Salvador */
-#define fb_tzid_america_ensenada                     65419 /* America/Ensenada */
-#define fb_tzid_america_fort_nelson                  65418 /* America/Fort_Nelson */
-#define fb_tzid_america_fort_wayne                   65417 /* America/Fort_Wayne */
-#define fb_tzid_america_fortaleza                    65416 /* America/Fortaleza */
-#define fb_tzid_america_glace_bay                    65415 /* America/Glace_Bay */
-#define fb_tzid_america_godthab                      65414 /* America/Godthab */
-#define fb_tzid_america_goose_bay                    65413 /* America/Goose_Bay */
-#define fb_tzid_america_grand_turk                   65412 /* America/Grand_Turk */
-#define fb_tzid_america_grenada                      65411 /* America/Grenada */
-#define fb_tzid_america_guadeloupe                   65410 /* America/Guadeloupe */
-#define fb_tzid_america_guatemala                    65409 /* America/Guatemala */
-#define fb_tzid_america_guayaquil                    65408 /* America/Guayaquil */
-#define fb_tzid_america_guyana                       65407 /* America/Guyana */
-#define fb_tzid_america_halifax                      65406 /* America/Halifax */
-#define fb_tzid_america_havana                       65405 /* America/Havana */
-#define fb_tzid_america_hermosillo                   65404 /* America/Hermosillo */
-#define fb_tzid_america_indiana_indianapolis         65403 /* America/Indiana/Indianapolis */
-#define fb_tzid_america_indiana_knox                 65402 /* America/Indiana/Knox */
-#define fb_tzid_america_indiana_marengo              65401 /* America/Indiana/Marengo */
-#define fb_tzid_america_indiana_petersburg           65400 /* America/Indiana/Petersburg */
-#define fb_tzid_america_indiana_tell_city            65399 /* America/Indiana/Tell_City */
-#define fb_tzid_america_indiana_vevay                65398 /* America/Indiana/Vevay */
-#define fb_tzid_america_indiana_vincennes            65397 /* America/Indiana/Vincennes */
-#define fb_tzid_america_indiana_winamac              65396 /* America/Indiana/Winamac */
-#define fb_tzid_america_indianapolis                 65395 /* America/Indianapolis */
-#define fb_tzid_america_inuvik                       65394 /* America/Inuvik */
-#define fb_tzid_america_iqaluit                      65393 /* America/Iqaluit */
-#define fb_tzid_america_jamaica                      65392 /* America/Jamaica */
-#define fb_tzid_america_jujuy                        65391 /* America/Jujuy */
-#define fb_tzid_america_juneau                       65390 /* America/Juneau */
-#define fb_tzid_america_kentucky_louisville          65389 /* America/Kentucky/Louisville */
-#define fb_tzid_america_kentucky_monticello          65388 /* America/Kentucky/Monticello */
-#define fb_tzid_america_knox_in                      65387 /* America/Knox_IN */
-#define fb_tzid_america_kralendijk                   65386 /* America/Kralendijk */
-#define fb_tzid_america_la_paz                       65385 /* America/La_Paz */
-#define fb_tzid_america_lima                         65384 /* America/Lima */
-#define fb_tzid_america_los_angeles                  65383 /* America/Los_Angeles */
-#define fb_tzid_america_louisville                   65382 /* America/Louisville */
-#define fb_tzid_america_lower_princes                65381 /* America/Lower_Princes */
-#define fb_tzid_america_maceio                       65380 /* America/Maceio */
-#define fb_tzid_america_managua                      65379 /* America/Managua */
-#define fb_tzid_america_manaus                       65378 /* America/Manaus */
-#define fb_tzid_america_marigot                      65377 /* America/Marigot */
-#define fb_tzid_america_martinique                   65376 /* America/Martinique */
-#define fb_tzid_america_matamoros                    65375 /* America/Matamoros */
-#define fb_tzid_america_mazatlan                     65374 /* America/Mazatlan */
-#define fb_tzid_america_mendoza                      65373 /* America/Mendoza */
-#define fb_tzid_america_menominee                    65372 /* America/Menominee */
-#define fb_tzid_america_merida                       65371 /* America/Merida */
-#define fb_tzid_america_metlakatla                   65370 /* America/Metlakatla */
-#define fb_tzid_america_mexico_city                  65369 /* America/Mexico_City */
-#define fb_tzid_america_miquelon                     65368 /* America/Miquelon */
-#define fb_tzid_america_moncton                      65367 /* America/Moncton */
-#define fb_tzid_america_monterrey                    65366 /* America/Monterrey */
-#define fb_tzid_america_montevideo                   65365 /* America/Montevideo */
-#define fb_tzid_america_montreal                     65364 /* America/Montreal */
-#define fb_tzid_america_montserrat                   65363 /* America/Montserrat */
-#define fb_tzid_america_nassau                       65362 /* America/Nassau */
-#define fb_tzid_america_new_york                     65361 /* America/New_York */
-#define fb_tzid_america_nipigon                      65360 /* America/Nipigon */
-#define fb_tzid_america_nome                         65359 /* America/Nome */
-#define fb_tzid_america_noronha                      65358 /* America/Noronha */
-#define fb_tzid_america_north_dakota_beulah          65357 /* America/North_Dakota/Beulah */
-#define fb_tzid_america_north_dakota_center          65356 /* America/North_Dakota/Center */
-#define fb_tzid_america_north_dakota_new_salem       65355 /* America/North_Dakota/New_Salem */
-#define fb_tzid_america_ojinaga                      65354 /* America/Ojinaga */
-#define fb_tzid_america_panama                       65353 /* America/Panama */
-#define fb_tzid_america_pangnirtung                  65352 /* America/Pangnirtung */
-#define fb_tzid_america_paramaribo                   65351 /* America/Paramaribo */
-#define fb_tzid_america_phoenix                      65350 /* America/Phoenix */
-#define fb_tzid_america_port_au_prince               65349 /* America/Port-au-Prince */
-#define fb_tzid_america_port_of_spain                65348 /* America/Port_of_Spain */
-#define fb_tzid_america_porto_acre                   65347 /* America/Porto_Acre */
-#define fb_tzid_america_porto_velho                  65346 /* America/Porto_Velho */
-#define fb_tzid_america_puerto_rico                  65345 /* America/Puerto_Rico */
-#define fb_tzid_america_punta_arenas                 65344 /* America/Punta_Arenas */
-#define fb_tzid_america_rainy_river                  65343 /* America/Rainy_River */
-#define fb_tzid_america_rankin_inlet                 65342 /* America/Rankin_Inlet */
-#define fb_tzid_america_recife                       65341 /* America/Recife */
-#define fb_tzid_america_regina                       65340 /* America/Regina */
-#define fb_tzid_america_resolute                     65339 /* America/Resolute */
-#define fb_tzid_america_rio_branco                   65338 /* America/Rio_Branco */
-#define fb_tzid_america_rosario                      65337 /* America/Rosario */
-#define fb_tzid_america_santa_isabel                 65336 /* America/Santa_Isabel */
-#define fb_tzid_america_santarem                     65335 /* America/Santarem */
-#define fb_tzid_america_santiago                     65334 /* America/Santiago */
-#define fb_tzid_america_santo_domingo                65333 /* America/Santo_Domingo */
-#define fb_tzid_america_sao_paulo                    65332 /* America/Sao_Paulo */
-#define fb_tzid_america_scoresbysund                 65331 /* America/Scoresbysund */
-#define fb_tzid_america_shiprock                     65330 /* America/Shiprock */
-#define fb_tzid_america_sitka                        65329 /* America/Sitka */
-#define fb_tzid_america_st_barthelemy                65328 /* America/St_Barthelemy */
-#define fb_tzid_america_st_johns                     65327 /* America/St_Johns */
-#define fb_tzid_america_st_kitts                     65326 /* America/St_Kitts */
-#define fb_tzid_america_st_lucia                     65325 /* America/St_Lucia */
-#define fb_tzid_america_st_thomas                    65324 /* America/St_Thomas */
-#define fb_tzid_america_st_vincent                   65323 /* America/St_Vincent */
-#define fb_tzid_america_swift_current                65322 /* America/Swift_Current */
-#define fb_tzid_america_tegucigalpa                  65321 /* America/Tegucigalpa */
-#define fb_tzid_america_thule                        65320 /* America/Thule */
-#define fb_tzid_america_thunder_bay                  65319 /* America/Thunder_Bay */
-#define fb_tzid_america_tijuana                      65318 /* America/Tijuana */
-#define fb_tzid_america_toronto                      65317 /* America/Toronto */
-#define fb_tzid_america_tortola                      65316 /* America/Tortola */
-#define fb_tzid_america_vancouver                    65315 /* America/Vancouver */
-#define fb_tzid_america_virgin                       65314 /* America/Virgin */
-#define fb_tzid_america_whitehorse                   65313 /* America/Whitehorse */
-#define fb_tzid_america_winnipeg                     65312 /* America/Winnipeg */
-#define fb_tzid_america_yakutat                      65311 /* America/Yakutat */
-#define fb_tzid_america_yellowknife                  65310 /* America/Yellowknife */
-#define fb_tzid_antarctica_casey                     65309 /* Antarctica/Casey */
-#define fb_tzid_antarctica_davis                     65308 /* Antarctica/Davis */
-#define fb_tzid_antarctica_dumontdurville            65307 /* Antarctica/DumontDUrville */
-#define fb_tzid_antarctica_macquarie                 65306 /* Antarctica/Macquarie */
-#define fb_tzid_antarctica_mawson                    65305 /* Antarctica/Mawson */
-#define fb_tzid_antarctica_mcmurdo                   65304 /* Antarctica/McMurdo */
-#define fb_tzid_antarctica_palmer                    65303 /* Antarctica/Palmer */
-#define fb_tzid_antarctica_rothera                   65302 /* Antarctica/Rothera */
-#define fb_tzid_antarctica_south_pole                65301 /* Antarctica/South_Pole */
-#define fb_tzid_antarctica_syowa                     65300 /* Antarctica/Syowa */
-#define fb_tzid_antarctica_troll                     65299 /* Antarctica/Troll */
-#define fb_tzid_antarctica_vostok                    65298 /* Antarctica/Vostok */
-#define fb_tzid_arctic_longyearbyen                  65297 /* Arctic/Longyearbyen */
-#define fb_tzid_asia_aden                            65296 /* Asia/Aden */
-#define fb_tzid_asia_almaty                          65295 /* Asia/Almaty */
-#define fb_tzid_asia_amman                           65294 /* Asia/Amman */
-#define fb_tzid_asia_anadyr                          65293 /* Asia/Anadyr */
-#define fb_tzid_asia_aqtau                           65292 /* Asia/Aqtau */
-#define fb_tzid_asia_aqtobe                          65291 /* Asia/Aqtobe */
-#define fb_tzid_asia_ashgabat                        65290 /* Asia/Ashgabat */
-#define fb_tzid_asia_ashkhabad                       65289 /* Asia/Ashkhabad */
-#define fb_tzid_asia_atyrau                          65288 /* Asia/Atyrau */
-#define fb_tzid_asia_baghdad                         65287 /* Asia/Baghdad */
-#define fb_tzid_asia_bahrain                         65286 /* Asia/Bahrain */
-#define fb_tzid_asia_baku                            65285 /* Asia/Baku */
-#define fb_tzid_asia_bangkok                         65284 /* Asia/Bangkok */
-#define fb_tzid_asia_barnaul                         65283 /* Asia/Barnaul */
-#define fb_tzid_asia_beirut                          65282 /* Asia/Beirut */
-#define fb_tzid_asia_bishkek                         65281 /* Asia/Bishkek */
-#define fb_tzid_asia_brunei                          65280 /* Asia/Brunei */
-#define fb_tzid_asia_calcutta                        65279 /* Asia/Calcutta */
-#define fb_tzid_asia_chita                           65278 /* Asia/Chita */
-#define fb_tzid_asia_choibalsan                      65277 /* Asia/Choibalsan */
-#define fb_tzid_asia_chongqing                       65276 /* Asia/Chongqing */
-#define fb_tzid_asia_chungking                       65275 /* Asia/Chungking */
-#define fb_tzid_asia_colombo                         65274 /* Asia/Colombo */
-#define fb_tzid_asia_dacca                           65273 /* Asia/Dacca */
-#define fb_tzid_asia_damascus                        65272 /* Asia/Damascus */
-#define fb_tzid_asia_dhaka                           65271 /* Asia/Dhaka */
-#define fb_tzid_asia_dili                            65270 /* Asia/Dili */
-#define fb_tzid_asia_dubai                           65269 /* Asia/Dubai */
-#define fb_tzid_asia_dushanbe                        65268 /* Asia/Dushanbe */
-#define fb_tzid_asia_famagusta                       65267 /* Asia/Famagusta */
-#define fb_tzid_asia_gaza                            65266 /* Asia/Gaza */
-#define fb_tzid_asia_harbin                          65265 /* Asia/Harbin */
-#define fb_tzid_asia_hebron                          65264 /* Asia/Hebron */
-#define fb_tzid_asia_ho_chi_minh                     65263 /* Asia/Ho_Chi_Minh */
-#define fb_tzid_asia_hong_kong                       65262 /* Asia/Hong_Kong */
-#define fb_tzid_asia_hovd                            65261 /* Asia/Hovd */
-#define fb_tzid_asia_irkutsk                         65260 /* Asia/Irkutsk */
-#define fb_tzid_asia_istanbul                        65259 /* Asia/Istanbul */
-#define fb_tzid_asia_jakarta                         65258 /* Asia/Jakarta */
-#define fb_tzid_asia_jayapura                        65257 /* Asia/Jayapura */
-#define fb_tzid_asia_jerusalem                       65256 /* Asia/Jerusalem */
-#define fb_tzid_asia_kabul                           65255 /* Asia/Kabul */
-#define fb_tzid_asia_kamchatka                       65254 /* Asia/Kamchatka */
-#define fb_tzid_asia_karachi                         65253 /* Asia/Karachi */
-#define fb_tzid_asia_kashgar                         65252 /* Asia/Kashgar */
-#define fb_tzid_asia_kathmandu                       65251 /* Asia/Kathmandu */
-#define fb_tzid_asia_katmandu                        65250 /* Asia/Katmandu */
-#define fb_tzid_asia_khandyga                        65249 /* Asia/Khandyga */
-#define fb_tzid_asia_kolkata                         65248 /* Asia/Kolkata */
-#define fb_tzid_asia_krasnoyarsk                     65247 /* Asia/Krasnoyarsk */
-#define fb_tzid_asia_kuala_lumpur                    65246 /* Asia/Kuala_Lumpur */
-#define fb_tzid_asia_kuching                         65245 /* Asia/Kuching */
-#define fb_tzid_asia_kuwait                          65244 /* Asia/Kuwait */
-#define fb_tzid_asia_macao                           65243 /* Asia/Macao */
-#define fb_tzid_asia_macau                           65242 /* Asia/Macau */
-#define fb_tzid_asia_magadan                         65241 /* Asia/Magadan */
-#define fb_tzid_asia_makassar                        65240 /* Asia/Makassar */
-#define fb_tzid_asia_manila                          65239 /* Asia/Manila */
-#define fb_tzid_asia_muscat                          65238 /* Asia/Muscat */
-#define fb_tzid_asia_nicosia                         65237 /* Asia/Nicosia */
-#define fb_tzid_asia_novokuznetsk                    65236 /* Asia/Novokuznetsk */
-#define fb_tzid_asia_novosibirsk                     65235 /* Asia/Novosibirsk */
-#define fb_tzid_asia_omsk                            65234 /* Asia/Omsk */
-#define fb_tzid_asia_oral                            65233 /* Asia/Oral */
-#define fb_tzid_asia_phnom_penh                      65232 /* Asia/Phnom_Penh */
-#define fb_tzid_asia_pontianak                       65231 /* Asia/Pontianak */
-#define fb_tzid_asia_pyongyang                       65230 /* Asia/Pyongyang */
-#define fb_tzid_asia_qatar                           65229 /* Asia/Qatar */
-#define fb_tzid_asia_qyzylorda                       65228 /* Asia/Qyzylorda */
-#define fb_tzid_asia_rangoon                         65227 /* Asia/Rangoon */
-#define fb_tzid_asia_riyadh                          65226 /* Asia/Riyadh */
-#define fb_tzid_asia_saigon                          65225 /* Asia/Saigon */
-#define fb_tzid_asia_sakhalin                        65224 /* Asia/Sakhalin */
-#define fb_tzid_asia_samarkand                       65223 /* Asia/Samarkand */
-#define fb_tzid_asia_seoul                           65222 /* Asia/Seoul */
-#define fb_tzid_asia_shanghai                        65221 /* Asia/Shanghai */
-#define fb_tzid_asia_singapore                       65220 /* Asia/Singapore */
-#define fb_tzid_asia_srednekolymsk                   65219 /* Asia/Srednekolymsk */
-#define fb_tzid_asia_taipei                          65218 /* Asia/Taipei */
-#define fb_tzid_asia_tashkent                        65217 /* Asia/Tashkent */
-#define fb_tzid_asia_tbilisi                         65216 /* Asia/Tbilisi */
-#define fb_tzid_asia_tehran                          65215 /* Asia/Tehran */
-#define fb_tzid_asia_tel_aviv                        65214 /* Asia/Tel_Aviv */
-#define fb_tzid_asia_thimbu                          65213 /* Asia/Thimbu */
-#define fb_tzid_asia_thimphu                         65212 /* Asia/Thimphu */
-#define fb_tzid_asia_tokyo                           65211 /* Asia/Tokyo */
-#define fb_tzid_asia_tomsk                           65210 /* Asia/Tomsk */
-#define fb_tzid_asia_ujung_pandang                   65209 /* Asia/Ujung_Pandang */
-#define fb_tzid_asia_ulaanbaatar                     65208 /* Asia/Ulaanbaatar */
-#define fb_tzid_asia_ulan_bator                      65207 /* Asia/Ulan_Bator */
-#define fb_tzid_asia_urumqi                          65206 /* Asia/Urumqi */
-#define fb_tzid_asia_ust_nera                        65205 /* Asia/Ust-Nera */
-#define fb_tzid_asia_vientiane                       65204 /* Asia/Vientiane */
-#define fb_tzid_asia_vladivostok                     65203 /* Asia/Vladivostok */
-#define fb_tzid_asia_yakutsk                         65202 /* Asia/Yakutsk */
-#define fb_tzid_asia_yangon                          65201 /* Asia/Yangon */
-#define fb_tzid_asia_yekaterinburg                   65200 /* Asia/Yekaterinburg */
-#define fb_tzid_asia_yerevan                         65199 /* Asia/Yerevan */
-#define fb_tzid_atlantic_azores                      65198 /* Atlantic/Azores */
-#define fb_tzid_atlantic_bermuda                     65197 /* Atlantic/Bermuda */
-#define fb_tzid_atlantic_canary                      65196 /* Atlantic/Canary */
-#define fb_tzid_atlantic_cape_verde                  65195 /* Atlantic/Cape_Verde */
-#define fb_tzid_atlantic_faeroe                      65194 /* Atlantic/Faeroe */
-#define fb_tzid_atlantic_faroe                       65193 /* Atlantic/Faroe */
-#define fb_tzid_atlantic_jan_mayen                   65192 /* Atlantic/Jan_Mayen */
-#define fb_tzid_atlantic_madeira                     65191 /* Atlantic/Madeira */
-#define fb_tzid_atlantic_reykjavik                   65190 /* Atlantic/Reykjavik */
-#define fb_tzid_atlantic_south_georgia               65189 /* Atlantic/South_Georgia */
-#define fb_tzid_atlantic_st_helena                   65188 /* Atlantic/St_Helena */
-#define fb_tzid_atlantic_stanley                     65187 /* Atlantic/Stanley */
-#define fb_tzid_australia_act                        65186 /* Australia/ACT */
-#define fb_tzid_australia_adelaide                   65185 /* Australia/Adelaide */
-#define fb_tzid_australia_brisbane                   65184 /* Australia/Brisbane */
-#define fb_tzid_australia_broken_hill                65183 /* Australia/Broken_Hill */
-#define fb_tzid_australia_canberra                   65182 /* Australia/Canberra */
-#define fb_tzid_australia_currie                     65181 /* Australia/Currie */
-#define fb_tzid_australia_darwin                     65180 /* Australia/Darwin */
-#define fb_tzid_australia_eucla                      65179 /* Australia/Eucla */
-#define fb_tzid_australia_hobart                     65178 /* Australia/Hobart */
-#define fb_tzid_australia_lhi                        65177 /* Australia/LHI */
-#define fb_tzid_australia_lindeman                   65176 /* Australia/Lindeman */
-#define fb_tzid_australia_lord_howe                  65175 /* Australia/Lord_Howe */
-#define fb_tzid_australia_melbourne                  65174 /* Australia/Melbourne */
-#define fb_tzid_australia_nsw                        65173 /* Australia/NSW */
-#define fb_tzid_australia_north                      65172 /* Australia/North */
-#define fb_tzid_australia_perth                      65171 /* Australia/Perth */
-#define fb_tzid_australia_queensland                 65170 /* Australia/Queensland */
-#define fb_tzid_australia_south                      65169 /* Australia/South */
-#define fb_tzid_australia_sydney                     65168 /* Australia/Sydney */
-#define fb_tzid_australia_tasmania                   65167 /* Australia/Tasmania */
-#define fb_tzid_australia_victoria                   65166 /* Australia/Victoria */
-#define fb_tzid_australia_west                       65165 /* Australia/West */
-#define fb_tzid_australia_yancowinna                 65164 /* Australia/Yancowinna */
-#define fb_tzid_bet                                  65163 /* BET */
-#define fb_tzid_bst                                  65162 /* BST */
-#define fb_tzid_brazil_acre                          65161 /* Brazil/Acre */
-#define fb_tzid_brazil_denoronha                     65160 /* Brazil/DeNoronha */
-#define fb_tzid_brazil_east                          65159 /* Brazil/East */
-#define fb_tzid_brazil_west                          65158 /* Brazil/West */
-#define fb_tzid_cat                                  65157 /* CAT */
-#define fb_tzid_cet                                  65156 /* CET */
-#define fb_tzid_cnt                                  65155 /* CNT */
-#define fb_tzid_cst                                  65154 /* CST */
-#define fb_tzid_cst6cdt                              65153 /* CST6CDT */
-#define fb_tzid_ctt                                  65152 /* CTT */
-#define fb_tzid_canada_atlantic                      65151 /* Canada/Atlantic */
-#define fb_tzid_canada_central                       65150 /* Canada/Central */
-#define fb_tzid_canada_east_saskatchewan             65149 /* Canada/East-Saskatchewan */
-#define fb_tzid_canada_eastern                       65148 /* Canada/Eastern */
-#define fb_tzid_canada_mountain                      65147 /* Canada/Mountain */
-#define fb_tzid_canada_newfoundland                  65146 /* Canada/Newfoundland */
-#define fb_tzid_canada_pacific                       65145 /* Canada/Pacific */
-#define fb_tzid_canada_saskatchewan                  65144 /* Canada/Saskatchewan */
-#define fb_tzid_canada_yukon                         65143 /* Canada/Yukon */
-#define fb_tzid_chile_continental                    65142 /* Chile/Continental */
-#define fb_tzid_chile_easterisland                   65141 /* Chile/EasterIsland */
-#define fb_tzid_cuba                                 65140 /* Cuba */
-#define fb_tzid_eat                                  65139 /* EAT */
-#define fb_tzid_ect                                  65138 /* ECT */
-#define fb_tzid_eet                                  65137 /* EET */
-#define fb_tzid_est                                  65136 /* EST */
-#define fb_tzid_est5edt                              65135 /* EST5EDT */
-#define fb_tzid_egypt                                65134 /* Egypt */
-#define fb_tzid_eire                                 65133 /* Eire */
-#define fb_tzid_etc_gmt                              65132 /* Etc/GMT */
-#define fb_tzid_etc_gmt_plus_0                       65131 /* Etc/GMT+0 */
-#define fb_tzid_etc_gmt_plus_1                       65130 /* Etc/GMT+1 */
-#define fb_tzid_etc_gmt_plus_10                      65129 /* Etc/GMT+10 */
-#define fb_tzid_etc_gmt_plus_11                      65128 /* Etc/GMT+11 */
-#define fb_tzid_etc_gmt_plus_12                      65127 /* Etc/GMT+12 */
-#define fb_tzid_etc_gmt_plus_2                       65126 /* Etc/GMT+2 */
-#define fb_tzid_etc_gmt_plus_3                       65125 /* Etc/GMT+3 */
-#define fb_tzid_etc_gmt_plus_4                       65124 /* Etc/GMT+4 */
-#define fb_tzid_etc_gmt_plus_5                       65123 /* Etc/GMT+5 */
-#define fb_tzid_etc_gmt_plus_6                       65122 /* Etc/GMT+6 */
-#define fb_tzid_etc_gmt_plus_7                       65121 /* Etc/GMT+7 */
-#define fb_tzid_etc_gmt_plus_8                       65120 /* Etc/GMT+8 */
-#define fb_tzid_etc_gmt_plus_9                       65119 /* Etc/GMT+9 */
-#define fb_tzid_etc_gmt_minus_0                      65118 /* Etc/GMT-0 */
-#define fb_tzid_etc_gmt_minus_1                      65117 /* Etc/GMT-1 */
-#define fb_tzid_etc_gmt_minus_10                     65116 /* Etc/GMT-10 */
-#define fb_tzid_etc_gmt_minus_11                     65115 /* Etc/GMT-11 */
-#define fb_tzid_etc_gmt_minus_12                     65114 /* Etc/GMT-12 */
-#define fb_tzid_etc_gmt_minus_13                     65113 /* Etc/GMT-13 */
-#define fb_tzid_etc_gmt_minus_14                     65112 /* Etc/GMT-14 */
-#define fb_tzid_etc_gmt_minus_2                      65111 /* Etc/GMT-2 */
-#define fb_tzid_etc_gmt_minus_3                      65110 /* Etc/GMT-3 */
-#define fb_tzid_etc_gmt_minus_4                      65109 /* Etc/GMT-4 */
-#define fb_tzid_etc_gmt_minus_5                      65108 /* Etc/GMT-5 */
-#define fb_tzid_etc_gmt_minus_6                      65107 /* Etc/GMT-6 */
-#define fb_tzid_etc_gmt_minus_7                      65106 /* Etc/GMT-7 */
-#define fb_tzid_etc_gmt_minus_8                      65105 /* Etc/GMT-8 */
-#define fb_tzid_etc_gmt_minus_9                      65104 /* Etc/GMT-9 */
-#define fb_tzid_etc_gmt0                             65103 /* Etc/GMT0 */
-#define fb_tzid_etc_greenwich                        65102 /* Etc/Greenwich */
-#define fb_tzid_etc_uct                              65101 /* Etc/UCT */
-#define fb_tzid_etc_utc                              65100 /* Etc/UTC */
-#define fb_tzid_etc_universal                        65099 /* Etc/Universal */
-#define fb_tzid_etc_zulu                             65098 /* Etc/Zulu */
-#define fb_tzid_europe_amsterdam                     65097 /* Europe/Amsterdam */
-#define fb_tzid_europe_andorra                       65096 /* Europe/Andorra */
-#define fb_tzid_europe_astrakhan                     65095 /* Europe/Astrakhan */
-#define fb_tzid_europe_athens                        65094 /* Europe/Athens */
-#define fb_tzid_europe_belfast                       65093 /* Europe/Belfast */
-#define fb_tzid_europe_belgrade                      65092 /* Europe/Belgrade */
-#define fb_tzid_europe_berlin                        65091 /* Europe/Berlin */
-#define fb_tzid_europe_bratislava                    65090 /* Europe/Bratislava */
-#define fb_tzid_europe_brussels                      65089 /* Europe/Brussels */
-#define fb_tzid_europe_bucharest                     65088 /* Europe/Bucharest */
-#define fb_tzid_europe_budapest                      65087 /* Europe/Budapest */
-#define fb_tzid_europe_busingen                      65086 /* Europe/Busingen */
-#define fb_tzid_europe_chisinau                      65085 /* Europe/Chisinau */
-#define fb_tzid_europe_copenhagen                    65084 /* Europe/Copenhagen */
-#define fb_tzid_europe_dublin                        65083 /* Europe/Dublin */
-#define fb_tzid_europe_gibraltar                     65082 /* Europe/Gibraltar */
-#define fb_tzid_europe_guernsey                      65081 /* Europe/Guernsey */
-#define fb_tzid_europe_helsinki                      65080 /* Europe/Helsinki */
-#define fb_tzid_europe_isle_of_man                   65079 /* Europe/Isle_of_Man */
-#define fb_tzid_europe_istanbul                      65078 /* Europe/Istanbul */
-#define fb_tzid_europe_jersey                        65077 /* Europe/Jersey */
-#define fb_tzid_europe_kaliningrad                   65076 /* Europe/Kaliningrad */
-#define fb_tzid_europe_kiev                          65075 /* Europe/Kiev */
-#define fb_tzid_europe_kirov                         65074 /* Europe/Kirov */
-#define fb_tzid_europe_lisbon                        65073 /* Europe/Lisbon */
-#define fb_tzid_europe_ljubljana                     65072 /* Europe/Ljubljana */
-#define fb_tzid_europe_london                        65071 /* Europe/London */
-#define fb_tzid_europe_luxembourg                    65070 /* Europe/Luxembourg */
-#define fb_tzid_europe_madrid                        65069 /* Europe/Madrid */
-#define fb_tzid_europe_malta                         65068 /* Europe/Malta */
-#define fb_tzid_europe_mariehamn                     65067 /* Europe/Mariehamn */
-#define fb_tzid_europe_minsk                         65066 /* Europe/Minsk */
-#define fb_tzid_europe_monaco                        65065 /* Europe/Monaco */
-#define fb_tzid_europe_moscow                        65064 /* Europe/Moscow */
-#define fb_tzid_europe_nicosia                       65063 /* Europe/Nicosia */
-#define fb_tzid_europe_oslo                          65062 /* Europe/Oslo */
-#define fb_tzid_europe_paris                         65061 /* Europe/Paris */
-#define fb_tzid_europe_podgorica                     65060 /* Europe/Podgorica */
-#define fb_tzid_europe_prague                        65059 /* Europe/Prague */
-#define fb_tzid_europe_riga                          65058 /* Europe/Riga */
-#define fb_tzid_europe_rome                          65057 /* Europe/Rome */
-#define fb_tzid_europe_samara                        65056 /* Europe/Samara */
-#define fb_tzid_europe_san_marino                    65055 /* Europe/San_Marino */
-#define fb_tzid_europe_sarajevo                      65054 /* Europe/Sarajevo */
-#define fb_tzid_europe_saratov                       65053 /* Europe/Saratov */
-#define fb_tzid_europe_simferopol                    65052 /* Europe/Simferopol */
-#define fb_tzid_europe_skopje                        65051 /* Europe/Skopje */
-#define fb_tzid_europe_sofia                         65050 /* Europe/Sofia */
-#define fb_tzid_europe_stockholm                     65049 /* Europe/Stockholm */
-#define fb_tzid_europe_tallinn                       65048 /* Europe/Tallinn */
-#define fb_tzid_europe_tirane                        65047 /* Europe/Tirane */
-#define fb_tzid_europe_tiraspol                      65046 /* Europe/Tiraspol */
-#define fb_tzid_europe_ulyanovsk                     65045 /* Europe/Ulyanovsk */
-#define fb_tzid_europe_uzhgorod                      65044 /* Europe/Uzhgorod */
-#define fb_tzid_europe_vaduz                         65043 /* Europe/Vaduz */
-#define fb_tzid_europe_vatican                       65042 /* Europe/Vatican */
-#define fb_tzid_europe_vienna                        65041 /* Europe/Vienna */
-#define fb_tzid_europe_vilnius                       65040 /* Europe/Vilnius */
-#define fb_tzid_europe_volgograd                     65039 /* Europe/Volgograd */
-#define fb_tzid_europe_warsaw                        65038 /* Europe/Warsaw */
-#define fb_tzid_europe_zagreb                        65037 /* Europe/Zagreb */
-#define fb_tzid_europe_zaporozhye                    65036 /* Europe/Zaporozhye */
-#define fb_tzid_europe_zurich                        65035 /* Europe/Zurich */
-#define fb_tzid_factory                              65034 /* Factory */
-#define fb_tzid_gb                                   65033 /* GB */
-#define fb_tzid_gb_eire                              65032 /* GB-Eire */
-#define fb_tzid_gmt_plus_0                           65031 /* GMT+0 */
-#define fb_tzid_gmt_minus_0                          65030 /* GMT-0 */
-#define fb_tzid_gmt0                                 65029 /* GMT0 */
-#define fb_tzid_greenwich                            65028 /* Greenwich */
-#define fb_tzid_hst                                  65027 /* HST */
-#define fb_tzid_hongkong                             65026 /* Hongkong */
-#define fb_tzid_iet                                  65025 /* IET */
-#define fb_tzid_ist                                  65024 /* IST */
-#define fb_tzid_iceland                              65023 /* Iceland */
-#define fb_tzid_indian_antananarivo                  65022 /* Indian/Antananarivo */
-#define fb_tzid_indian_chagos                        65021 /* Indian/Chagos */
-#define fb_tzid_indian_christmas                     65020 /* Indian/Christmas */
-#define fb_tzid_indian_cocos                         65019 /* Indian/Cocos */
-#define fb_tzid_indian_comoro                        65018 /* Indian/Comoro */
-#define fb_tzid_indian_kerguelen                     65017 /* Indian/Kerguelen */
-#define fb_tzid_indian_mahe                          65016 /* Indian/Mahe */
-#define fb_tzid_indian_maldives                      65015 /* Indian/Maldives */
-#define fb_tzid_indian_mauritius                     65014 /* Indian/Mauritius */
-#define fb_tzid_indian_mayotte                       65013 /* Indian/Mayotte */
-#define fb_tzid_indian_reunion                       65012 /* Indian/Reunion */
-#define fb_tzid_iran                                 65011 /* Iran */
-#define fb_tzid_israel                               65010 /* Israel */
-#define fb_tzid_jst                                  65009 /* JST */
-#define fb_tzid_jamaica                              65008 /* Jamaica */
-#define fb_tzid_japan                                65007 /* Japan */
-#define fb_tzid_kwajalein                            65006 /* Kwajalein */
-#define fb_tzid_libya                                65005 /* Libya */
-#define fb_tzid_met                                  65004 /* MET */
-#define fb_tzid_mit                                  65003 /* MIT */
-#define fb_tzid_mst                                  65002 /* MST */
-#define fb_tzid_mst7mdt                              65001 /* MST7MDT */
-#define fb_tzid_mexico_bajanorte                     65000 /* Mexico/BajaNorte */
-#define fb_tzid_mexico_bajasur                       64999 /* Mexico/BajaSur */
-#define fb_tzid_mexico_general                       64998 /* Mexico/General */
-#define fb_tzid_net                                  64997 /* NET */
-#define fb_tzid_nst                                  64996 /* NST */
-#define fb_tzid_nz                                   64995 /* NZ */
-#define fb_tzid_nz_chat                              64994 /* NZ-CHAT */
-#define fb_tzid_navajo                               64993 /* Navajo */
-#define fb_tzid_plt                                  64992 /* PLT */
-#define fb_tzid_pnt                                  64991 /* PNT */
-#define fb_tzid_prc                                  64990 /* PRC */
-#define fb_tzid_prt                                  64989 /* PRT */
-#define fb_tzid_pst                                  64988 /* PST */
-#define fb_tzid_pst8pdt                              64987 /* PST8PDT */
-#define fb_tzid_pacific_apia                         64986 /* Pacific/Apia */
-#define fb_tzid_pacific_auckland                     64985 /* Pacific/Auckland */
-#define fb_tzid_pacific_bougainville                 64984 /* Pacific/Bougainville */
-#define fb_tzid_pacific_chatham                      64983 /* Pacific/Chatham */
-#define fb_tzid_pacific_chuuk                        64982 /* Pacific/Chuuk */
-#define fb_tzid_pacific_easter                       64981 /* Pacific/Easter */
-#define fb_tzid_pacific_efate                        64980 /* Pacific/Efate */
-#define fb_tzid_pacific_enderbury                    64979 /* Pacific/Enderbury */
-#define fb_tzid_pacific_fakaofo                      64978 /* Pacific/Fakaofo */
-#define fb_tzid_pacific_fiji                         64977 /* Pacific/Fiji */
-#define fb_tzid_pacific_funafuti                     64976 /* Pacific/Funafuti */
-#define fb_tzid_pacific_galapagos                    64975 /* Pacific/Galapagos */
-#define fb_tzid_pacific_gambier                      64974 /* Pacific/Gambier */
-#define fb_tzid_pacific_guadalcanal                  64973 /* Pacific/Guadalcanal */
-#define fb_tzid_pacific_guam                         64972 /* Pacific/Guam */
-#define fb_tzid_pacific_honolulu                     64971 /* Pacific/Honolulu */
-#define fb_tzid_pacific_johnston                     64970 /* Pacific/Johnston */
-#define fb_tzid_pacific_kiritimati                   64969 /* Pacific/Kiritimati */
-#define fb_tzid_pacific_kosrae                       64968 /* Pacific/Kosrae */
-#define fb_tzid_pacific_kwajalein                    64967 /* Pacific/Kwajalein */
-#define fb_tzid_pacific_majuro                       64966 /* Pacific/Majuro */
-#define fb_tzid_pacific_marquesas                    64965 /* Pacific/Marquesas */
-#define fb_tzid_pacific_midway                       64964 /* Pacific/Midway */
-#define fb_tzid_pacific_nauru                        64963 /* Pacific/Nauru */
-#define fb_tzid_pacific_niue                         64962 /* Pacific/Niue */
-#define fb_tzid_pacific_norfolk                      64961 /* Pacific/Norfolk */
-#define fb_tzid_pacific_noumea                       64960 /* Pacific/Noumea */
-#define fb_tzid_pacific_pago_pago                    64959 /* Pacific/Pago_Pago */
-#define fb_tzid_pacific_palau                        64958 /* Pacific/Palau */
-#define fb_tzid_pacific_pitcairn                     64957 /* Pacific/Pitcairn */
-#define fb_tzid_pacific_pohnpei                      64956 /* Pacific/Pohnpei */
-#define fb_tzid_pacific_ponape                       64955 /* Pacific/Ponape */
-#define fb_tzid_pacific_port_moresby                 64954 /* Pacific/Port_Moresby */
-#define fb_tzid_pacific_rarotonga                    64953 /* Pacific/Rarotonga */
-#define fb_tzid_pacific_saipan                       64952 /* Pacific/Saipan */
-#define fb_tzid_pacific_samoa                        64951 /* Pacific/Samoa */
-#define fb_tzid_pacific_tahiti                       64950 /* Pacific/Tahiti */
-#define fb_tzid_pacific_tarawa                       64949 /* Pacific/Tarawa */
-#define fb_tzid_pacific_tongatapu                    64948 /* Pacific/Tongatapu */
-#define fb_tzid_pacific_truk                         64947 /* Pacific/Truk */
-#define fb_tzid_pacific_wake                         64946 /* Pacific/Wake */
-#define fb_tzid_pacific_wallis                       64945 /* Pacific/Wallis */
-#define fb_tzid_pacific_yap                          64944 /* Pacific/Yap */
-#define fb_tzid_poland                               64943 /* Poland */
-#define fb_tzid_portugal                             64942 /* Portugal */
-#define fb_tzid_roc                                  64941 /* ROC */
-#define fb_tzid_rok                                  64940 /* ROK */
-#define fb_tzid_sst                                  64939 /* SST */
-#define fb_tzid_singapore                            64938 /* Singapore */
-#define fb_tzid_systemv_ast4                         64937 /* SystemV/AST4 */
-#define fb_tzid_systemv_ast4adt                      64936 /* SystemV/AST4ADT */
-#define fb_tzid_systemv_cst6                         64935 /* SystemV/CST6 */
-#define fb_tzid_systemv_cst6cdt                      64934 /* SystemV/CST6CDT */
-#define fb_tzid_systemv_est5                         64933 /* SystemV/EST5 */
-#define fb_tzid_systemv_est5edt                      64932 /* SystemV/EST5EDT */
-#define fb_tzid_systemv_hst10                        64931 /* SystemV/HST10 */
-#define fb_tzid_systemv_mst7                         64930 /* SystemV/MST7 */
-#define fb_tzid_systemv_mst7mdt                      64929 /* SystemV/MST7MDT */
-#define fb_tzid_systemv_pst8                         64928 /* SystemV/PST8 */
-#define fb_tzid_systemv_pst8pdt                      64927 /* SystemV/PST8PDT */
-#define fb_tzid_systemv_yst9                         64926 /* SystemV/YST9 */
-#define fb_tzid_systemv_yst9ydt                      64925 /* SystemV/YST9YDT */
-#define fb_tzid_turkey                               64924 /* Turkey */
-#define fb_tzid_uct                                  64923 /* UCT */
-#define fb_tzid_us_alaska                            64922 /* US/Alaska */
-#define fb_tzid_us_aleutian                          64921 /* US/Aleutian */
-#define fb_tzid_us_arizona                           64920 /* US/Arizona */
-#define fb_tzid_us_central                           64919 /* US/Central */
-#define fb_tzid_us_east_indiana                      64918 /* US/East-Indiana */
-#define fb_tzid_us_eastern                           64917 /* US/Eastern */
-#define fb_tzid_us_hawaii                            64916 /* US/Hawaii */
-#define fb_tzid_us_indiana_starke                    64915 /* US/Indiana-Starke */
-#define fb_tzid_us_michigan                          64914 /* US/Michigan */
-#define fb_tzid_us_mountain                          64913 /* US/Mountain */
-#define fb_tzid_us_pacific                           64912 /* US/Pacific */
-#define fb_tzid_us_pacific_new                       64911 /* US/Pacific-New */
-#define fb_tzid_us_samoa                             64910 /* US/Samoa */
-#define fb_tzid_utc                                  64909 /* UTC */
-#define fb_tzid_universal                            64908 /* Universal */
-#define fb_tzid_vst                                  64907 /* VST */
-#define fb_tzid_w_su                                 64906 /* W-SU */
-#define fb_tzid_wet                                  64905 /* WET */
-#define fb_tzid_zulu                                 64904 /* Zulu */
-#define fb_tzid_america_nuuk                         64903 /* America/Nuuk */
-#define fb_tzid_asia_qostanay                        64902 /* Asia/Qostanay */
-#define fb_tzid_pacific_kanton                       64901 /* Pacific/Kanton */
-#define fb_tzid_europe_kyiv                          64900 /* Europe/Kyiv */
-#define fb_tzid_america_ciudad_juarez                64899 /* America/Ciudad_Juarez */
-
-#endif /* FIREBIRD_TIME_ZONES_H */
diff --git a/FBClient.Headers/firebird/UdrCppEngine.h b/FBClient.Headers/firebird/UdrCppEngine.h
deleted file mode 100644
index d9aac7e5..00000000
--- a/FBClient.Headers/firebird/UdrCppEngine.h
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- *  The contents of this file are subject to the Initial
- *  Developer's Public License Version 1.0 (the "License");
- *  you may not use this file except in compliance with the
- *  License. You may obtain a copy of the License at
- *  http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
- *
- *  Software distributed under the License is distributed AS IS,
- *  WITHOUT WARRANTY OF ANY KIND, either express or implied.
- *  See the License for the specific language governing rights
- *  and limitations under the License.
- *
- *  The Original Code was created by Adriano dos Santos Fernandes
- *  for the Firebird Open Source RDBMS project.
- *
- *  Copyright (c) 2008 Adriano dos Santos Fernandes <adrianosf@uol.com.br>
- *  and all contributors signed below.
- *
- *  All Rights Reserved.
- *  Contributor(s): ______________________________________.
- */
-
-#ifndef FIREBIRD_UDR_CPP_ENGINE
-#define FIREBIRD_UDR_CPP_ENGINE
-
-#ifndef FB_UDR_STATUS_TYPE
-#error FB_UDR_STATUS_TYPE must be defined with the Status class before UdrCppEngine.h inclusion.
-#endif
-
-#include "./Message.h"
-#include <string.h>
-
-
-// Build must export firebird_udr_plugin function.
-#define FB_UDR_IMPLEMENT_ENTRY_POINT	\
-	namespace Firebird	\
-	{	\
-		namespace Udr	\
-		{	\
-			RegistrationNode<IUdrFunctionFactory>* regFunctions = NULL;	\
-			RegistrationNode<IUdrProcedureFactory>* regProcedures = NULL;	\
-			RegistrationNode<IUdrTriggerFactory>* regTriggers = NULL;	\
-		}	\
-	}	\
-	\
-	extern "C" FB_DLL_EXPORT FB_BOOLEAN* FB_UDR_PLUGIN_ENTRY_POINT(::Firebird::IStatus* status,	\
-		FB_BOOLEAN* theirUnloadFlag, ::Firebird::IUdrPlugin* udrPlugin)	\
-	{	\
-		::Firebird::Udr::FactoryRegistration::finish(status, udrPlugin);	\
-		\
-		class UnloadDetector	\
-		{	\
-		public:	\
-			UnloadDetector(FB_BOOLEAN* aTheirUnloadFlag, ::Firebird::IUdrPlugin* aUdrPlugin)	\
-				: myUnloadFlag(FB_FALSE),	\
-				  theirUnloadFlag(aTheirUnloadFlag),	\
-				  udrPlugin(aUdrPlugin)	\
-			{	\
-			}	\
-			\
-			~UnloadDetector()	\
-			{	\
-				if (!myUnloadFlag)	\
-					*theirUnloadFlag = FB_TRUE;	\
-			}	\
-		\
-			FB_BOOLEAN myUnloadFlag;	\
-			FB_BOOLEAN* theirUnloadFlag;	\
-			::Firebird::IUdrPlugin* udrPlugin;	\
-		};	\
-		\
-		static UnloadDetector unloadDetector(theirUnloadFlag, udrPlugin);	\
-		\
-		return &unloadDetector.myUnloadFlag;	\
-	}
-
-
-#define FB_UDR_BEGIN_FUNCTION(name)	\
-	namespace Func##name	\
-	{	\
-		class Impl;	\
-		\
-		static ::Firebird::Udr::FunctionFactoryImpl<Impl, FB_UDR_STATUS_TYPE> factory(#name);	\
-		\
-		class Impl : public ::Firebird::Udr::Function<Impl, FB_UDR_STATUS_TYPE>	\
-		{	\
-		public:	\
-			FB__UDR_COMMON_IMPL
-
-#define FB_UDR_END_FUNCTION	\
-		};	\
-	}
-
-#define FB_UDR_EXECUTE_FUNCTION	\
-	void execute(FB_UDR_STATUS_TYPE* status, ::Firebird::IExternalContext* context, \
-		void* in, void* out)	\
-	{	\
-		internalExecute(status, context, (InMessage::Type*) in, (OutMessage::Type*) out);	\
-	}	\
-	\
-	void internalExecute(FB_UDR_STATUS_TYPE* status, ::Firebird::IExternalContext* context, \
-		InMessage::Type* in, OutMessage::Type* out)
-
-
-#define FB_UDR_BEGIN_PROCEDURE(name)	\
-	namespace Proc##name	\
-	{	\
-		class Impl;	\
-		\
-		static ::Firebird::Udr::ProcedureFactoryImpl<Impl, FB_UDR_STATUS_TYPE> factory(#name);	\
-		\
-		class Impl : public ::Firebird::Udr::Procedure<Impl, FB_UDR_STATUS_TYPE>	\
-		{	\
-		public:	\
-			FB__UDR_COMMON_IMPL
-
-#define FB_UDR_END_PROCEDURE	\
-			};	\
-		};	\
-	}
-
-#define FB_UDR_EXECUTE_PROCEDURE	\
-	::Firebird::IExternalResultSet* open(FB_UDR_STATUS_TYPE* status, \
-		::Firebird::IExternalContext* context, void* in, void* out)	\
-	{	\
-		return new ResultSet(status, context, this, (InMessage::Type*) in, (OutMessage::Type*) out);	\
-	}	\
-	\
-	class ResultSet : public ::Firebird::Udr::ResultSet<ResultSet, Impl, InMessage, OutMessage, FB_UDR_STATUS_TYPE>	\
-	{	\
-	public:	\
-		ResultSet(FB_UDR_STATUS_TYPE* status, ::Firebird::IExternalContext* context,	\
-				Impl* const procedure, InMessage::Type* const in, OutMessage::Type* const out)	\
-			: ::Firebird::Udr::ResultSet<ResultSet, Impl, InMessage, OutMessage, FB_UDR_STATUS_TYPE>(	\
-					context, procedure, in, out)
-
-#define FB_UDR_FETCH_PROCEDURE	\
-	FB_BOOLEAN fetch(FB_UDR_STATUS_TYPE* status)	\
-	{	\
-		return (FB_BOOLEAN) internalFetch(status);	\
-	}	\
-	\
-	bool internalFetch(FB_UDR_STATUS_TYPE* status)
-
-
-#define FB_UDR_BEGIN_TRIGGER(name)	\
-	namespace Trig##name	\
-	{	\
-		class Impl;	\
-		\
-		static ::Firebird::Udr::TriggerFactoryImpl<Impl, FB_UDR_STATUS_TYPE> factory(#name);	\
-		\
-		class Impl : public ::Firebird::Udr::Trigger<Impl, FB_UDR_STATUS_TYPE>	\
-		{	\
-		public:	\
-			FB__UDR_COMMON_IMPL
-
-#define FB_UDR_END_TRIGGER	\
-		};	\
-	}
-
-#define FB_UDR_EXECUTE_TRIGGER	\
-	void execute(FB_UDR_STATUS_TYPE* status, ::Firebird::IExternalContext* context,	\
-		unsigned int action, void* oldFields, void* newFields)	\
-	{	\
-		internalExecute(status, context, action,	\
-			(FieldsMessage::Type*) oldFields, (FieldsMessage::Type*) newFields);	\
-	}	\
-	\
-	void internalExecute(FB_UDR_STATUS_TYPE* status, ::Firebird::IExternalContext* context,	\
-		unsigned int action, \
-		FieldsMessage::Type* oldFields, FieldsMessage::Type* newFields)
-
-
-#define FB_UDR_CONSTRUCTOR	\
-	Impl(FB_UDR_STATUS_TYPE* const status, ::Firebird::IExternalContext* const context,	\
-			::Firebird::IRoutineMetadata* const metadata__)	\
-		: master(context->getMaster()),	\
-		  metadata(metadata__)
-
-#define FB_UDR_DESTRUCTOR	\
-	~Impl()
-
-
-#define FB_UDR_MESSAGE(name, fields)	\
-	FB_MESSAGE(name, FB_UDR_STATUS_TYPE, fields)
-
-#define FB_UDR_TRIGGER_MESSAGE(name, fields)	\
-	FB_TRIGGER_MESSAGE(name, FB_UDR_STATUS_TYPE, fields)
-
-
-#define FB__UDR_COMMON_IMPL	\
-	Impl(const void* const, ::Firebird::IExternalContext* const context,	\
-			::Firebird::IRoutineMetadata* const aMetadata)	\
-		: master(context->getMaster()),	\
-		  metadata(aMetadata)	\
-	{	\
-	}	\
-	\
-	::Firebird::IMaster* master;	\
-	::Firebird::IRoutineMetadata* metadata;
-
-#define FB__UDR_COMMON_TYPE(name)	\
-	struct name	\
-	{	\
-		typedef unsigned char Type;	\
-		static void setup(FB_UDR_STATUS_TYPE*, ::Firebird::IMetadataBuilder*) {}	\
-	}
-
-
-namespace Firebird
-{
-	namespace Udr
-	{
-//------------------------------------------------------------------------------
-
-
-template <typename T, typename StatusType> class Procedure;
-
-
-template <typename This, typename Procedure, typename InMessage, typename OutMessage, typename StatusType>
-class ResultSet : public IExternalResultSetImpl<This, StatusType>
-{
-public:
-	ResultSet(IExternalContext* aContext, Procedure* aProcedure,
-				typename InMessage::Type* aIn, typename OutMessage::Type* aOut)
-		: context(aContext),
-		  procedure(aProcedure),
-		  in(aIn),
-		  out(aOut)
-	{
-	}
-
-public:
-	void dispose()
-	{
-		delete static_cast<This*>(this);
-	}
-
-protected:
-	IExternalContext* const context;
-	Procedure* const procedure;
-	typename InMessage::Type* const in;
-	typename OutMessage::Type* const out;
-};
-
-
-template <typename This, typename StatusType>
-class Function : public IExternalFunctionImpl<This, StatusType>
-{
-public:
-	FB__UDR_COMMON_TYPE(InMessage);
-	FB__UDR_COMMON_TYPE(OutMessage);
-
-	void dispose()
-	{
-		delete static_cast<This*>(this);
-	}
-
-	void getCharSet(StatusType* /*status*/, IExternalContext* /*context*/,
-		char* /*name*/, unsigned /*nameSize*/)
-	{
-	}
-};
-
-
-template <typename This, typename StatusType>
-class Procedure : public IExternalProcedureImpl<This, StatusType>
-{
-public:
-	FB__UDR_COMMON_TYPE(InMessage);
-	FB__UDR_COMMON_TYPE(OutMessage);
-
-	void dispose()
-	{
-		delete static_cast<This*>(this);
-	}
-
-	void getCharSet(StatusType* /*status*/, IExternalContext* /*context*/,
-		char* /*name*/, unsigned /*nameSize*/)
-	{
-	}
-};
-
-
-template <typename This, typename StatusType>
-class Trigger : public IExternalTriggerImpl<This, StatusType>
-{
-public:
-	FB__UDR_COMMON_TYPE(FieldsMessage);
-
-	void dispose()
-	{
-		delete static_cast<This*>(this);
-	}
-
-	void getCharSet(StatusType* /*status*/, IExternalContext* /*context*/,
-		char* /*name*/, unsigned /*nameSize*/)
-	{
-	}
-};
-
-
-template <typename T> struct RegistrationNode
-{
-	const char* name;
-	T* factory;
-	RegistrationNode<T>* next;
-};
-
-extern RegistrationNode<IUdrFunctionFactory>* regFunctions;
-extern RegistrationNode<IUdrProcedureFactory>* regProcedures;
-extern RegistrationNode<IUdrTriggerFactory>* regTriggers;
-
-class FactoryRegistration
-{
-public:
-	template <typename T> static void schedule(const char* name, T* factory,
-		RegistrationNode<T>** list)
-	{
-		RegistrationNode<T>* node = new RegistrationNode<T>();
-		node->name = name;
-		node->factory = factory;
-		node->next = *list;
-
-		*list = node;
-	}
-
-	static void finish(IStatus* status, IUdrPlugin* plugin)
-	{
-		CheckStatusWrapper statusWrapper(status);
-
-		if (!run<IUdrFunctionFactory>(&statusWrapper, plugin, &IUdrPlugin::registerFunction, regFunctions))
-			return;
-
-		if (!run<IUdrProcedureFactory>(&statusWrapper, plugin, &IUdrPlugin::registerProcedure, regProcedures))
-			return;
-
-		if (!run<IUdrTriggerFactory>(&statusWrapper, plugin, &IUdrPlugin::registerTrigger, regTriggers))
-			return;
-	}
-
-private:
-	template <typename T>
-	static bool run(CheckStatusWrapper* statusWrapper, IUdrPlugin* plugin,
-		void (IUdrPlugin::*routine)(CheckStatusWrapper* status, const char* name, T* factory),
-		RegistrationNode<T>* list)
-	{
-		for (RegistrationNode<T>* node = list; node; node = node->next)
-		{
-			(plugin->*routine)(statusWrapper, node->name, node->factory);
-
-			if (statusWrapper->getState() & IStatus::STATE_ERRORS)
-				return false;
-		}
-
-		return true;
-	}
-};
-
-
-template <typename T, typename StatusType> class FunctionFactoryImpl :
-	public IUdrFunctionFactoryImpl<FunctionFactoryImpl<T, StatusType>, StatusType>
-{
-public:
-	explicit FunctionFactoryImpl(const char* name)
-	{
-		FactoryRegistration::schedule<IUdrFunctionFactory>(name, this, &regFunctions);
-	}
-
-	void dispose()
-	{
-		// Do not delete this. The instances are statically allocated.
-	}
-
-	void setup(StatusType* status, IExternalContext* /*context*/,
-		IRoutineMetadata* /*metadata*/, IMetadataBuilder* in, IMetadataBuilder* out)
-	{
-		T::InMessage::setup(status, in);
-		T::OutMessage::setup(status, out);
-	}
-
-	IExternalFunction* newItem(StatusType* status, IExternalContext* context,
-		IRoutineMetadata* metadata)
-	{
-		return new T(status, context, metadata);
-	}
-};
-
-
-template <typename T, typename StatusType> class ProcedureFactoryImpl :
-	public IUdrProcedureFactoryImpl<ProcedureFactoryImpl<T, StatusType>, StatusType>
-{
-public:
-	explicit ProcedureFactoryImpl(const char* name)
-	{
-		FactoryRegistration::schedule<IUdrProcedureFactory>(name, this, &regProcedures);
-	}
-
-	void dispose()
-	{
-		// Do not delete this. The instances are statically allocated.
-	}
-
-	void setup(StatusType* status, IExternalContext* /*context*/,
-		IRoutineMetadata* /*metadata*/, IMetadataBuilder* in, IMetadataBuilder* out)
-	{
-		T::InMessage::setup(status, in);
-		T::OutMessage::setup(status, out);
-	}
-
-	IExternalProcedure* newItem(StatusType* status, IExternalContext* context,
-		IRoutineMetadata* metadata)
-	{
-		return new T(status, context, metadata);
-	}
-};
-
-
-template <typename T, typename StatusType> class TriggerFactoryImpl :
-	public IUdrTriggerFactoryImpl<TriggerFactoryImpl<T, StatusType>, StatusType>
-{
-public:
-	explicit TriggerFactoryImpl(const char* name)
-	{
-		FactoryRegistration::schedule<IUdrTriggerFactory>(name, this, &regTriggers);
-	}
-
-	void dispose()
-	{
-		// Do not delete this. The instances are statically allocated.
-	}
-
-	void setup(StatusType* status, IExternalContext* /*context*/,
-		IRoutineMetadata* /*metadata*/, IMetadataBuilder* fields)
-	{
-		T::FieldsMessage::setup(status, fields);
-	}
-
-	IExternalTrigger* newItem(StatusType* status, IExternalContext* context,
-		IRoutineMetadata* metadata)
-	{
-		return new T(status, context, metadata);
-	}
-};
-
-
-//------------------------------------------------------------------------------
-	}	// namespace Udr
-}	// namespace Firebird
-
-#endif	// FIREBIRD_UDR_CPP_ENGINE
diff --git a/FBClient.Headers/firebird/impl/blr.h b/FBClient.Headers/firebird/impl/blr.h
deleted file mode 100644
index ad2d56b1..00000000
--- a/FBClient.Headers/firebird/impl/blr.h
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
- *	PROGRAM:	C preprocessor
- *	MODULE:		blr.h
- *	DESCRIPTION:	BLR constants
- *
- * The contents of this file are subject to the Interbase Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy
- * of the License at http://www.Inprise.com/IPL.html
- *
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
- * or implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code was created by Inprise Corporation
- * and its predecessors. Portions created by Inprise Corporation are
- * Copyright (C) Inprise Corporation.
- *
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- *
- * Claudio Valderrama: 2001.6.18: Add blr_current_role.
- * 2002.09.28 Dmitry Yemanov: Reworked internal_info stuff, enhanced
- *                            exception handling in SPs/triggers,
- *                            implemented ROWS_AFFECTED system variable
- * 2002.10.21 Nickolay Samofatov: Added support for explicit pessimistic locks
- * 2002.10.29 Nickolay Samofatov: Added support for savepoints
- * 2003.10.05 Dmitry Yemanov: Added support for explicit cursors in PSQL
- * Adriano dos Santos Fernandes
- */
-
-#ifndef FIREBIRD_IMPL_BLR_H
-#define FIREBIRD_IMPL_BLR_H
-
-#define BLR_WORD(x)	UCHAR(x), UCHAR((x) >> 8)
-
-/*  WARNING: if you add a new BLR representing a data type, and the value
- *           is greater than the numerically greatest value which now
- *           represents a data type, you must change the define for
- *           DTYPE_BLR_MAX in jrd/align.h, and add the necessary entries
- *           to all the arrays in that file.
- */
-
-#define blr_text		(unsigned char)14
-#define blr_text2		(unsigned char)15	/* added in 3.2 JPN */
-#define blr_short		(unsigned char)7
-#define blr_long		(unsigned char)8
-#define blr_quad		(unsigned char)9
-#define blr_float		(unsigned char)10
-#define blr_double		(unsigned char)27
-#define blr_d_float		(unsigned char)11
-#define blr_timestamp		(unsigned char)35
-#define blr_varying		(unsigned char)37
-#define blr_varying2		(unsigned char)38	/* added in 3.2 JPN */
-#define blr_blob		(unsigned short)261
-#define blr_cstring		(unsigned char)40
-#define blr_cstring2    	(unsigned char)41	/* added in 3.2 JPN */
-#define blr_blob_id     	(unsigned char)45
-#define blr_sql_date		(unsigned char)12
-#define blr_sql_time		(unsigned char)13
-#define blr_int64           (unsigned char)16
-#define blr_blob2			(unsigned char)17
-#define blr_domain_name		(unsigned char)18
-#define blr_domain_name2	(unsigned char)19
-#define blr_not_nullable	(unsigned char)20
-#define blr_column_name		(unsigned char)21
-#define blr_column_name2	(unsigned char)22
-#define blr_bool			(unsigned char)23
-#define blr_dec64			(unsigned char)24
-#define blr_dec128			(unsigned char)25
-#define blr_int128			(unsigned char)26
-#define blr_sql_time_tz		(unsigned char)28
-#define blr_timestamp_tz	(unsigned char)29
-#define blr_ex_time_tz		(unsigned char)30
-#define blr_ex_timestamp_tz	(unsigned char)31
-
-// first sub parameter for blr_domain_name[2]
-#define blr_domain_type_of	(unsigned char)0
-#define blr_domain_full		(unsigned char)1
-
-/* Historical alias for pre V6 applications */
-#define blr_date		blr_timestamp
-
-#define blr_inner		(unsigned char)0
-#define blr_left		(unsigned char)1
-#define blr_right		(unsigned char)2
-#define blr_full		(unsigned char)3
-
-#define blr_gds_code			(unsigned char)0
-#define blr_sql_code			(unsigned char)1
-#define blr_exception			(unsigned char)2
-#define blr_trigger_code 		(unsigned char)3
-#define blr_default_code 		(unsigned char)4
-#define blr_raise				(unsigned char)5
-#define blr_exception_msg		(unsigned char)6
-#define blr_exception_params	(unsigned char)7
-#define blr_sql_state			(unsigned char)8
-
-#define blr_version4		(unsigned char)4
-#define blr_version5		(unsigned char)5
-//#define blr_version6		(unsigned char)6
-#define blr_eoc			(unsigned char)76
-#define blr_end			(unsigned char)255
-
-#define blr_assignment		(unsigned char)1
-#define blr_begin		(unsigned char)2
-#define blr_dcl_variable  	(unsigned char)3
-#define blr_message		(unsigned char)4
-#define blr_erase		(unsigned char)5
-//#define blr_fetch		(unsigned char)6
-#define blr_for			(unsigned char)7
-#define blr_if			(unsigned char)8
-#define blr_loop		(unsigned char)9
-#define blr_modify		(unsigned char)10
-#define blr_handler		(unsigned char)11
-#define blr_receive		(unsigned char)12
-#define blr_select		(unsigned char)13
-#define blr_send		(unsigned char)14
-#define blr_store		(unsigned char)15
-#define blr_label		(unsigned char)17
-#define blr_leave		(unsigned char)18
-#define blr_store2		(unsigned char)19
-#define blr_post		(unsigned char)20
-#define blr_literal		(unsigned char)21
-#define blr_dbkey		(unsigned char)22
-#define blr_field		(unsigned char)23
-#define blr_fid			(unsigned char)24
-#define blr_parameter		(unsigned char)25
-#define blr_variable		(unsigned char)26
-#define blr_average		(unsigned char)27
-#define blr_count		(unsigned char)28
-#define blr_maximum		(unsigned char)29
-#define blr_minimum		(unsigned char)30
-#define blr_total		(unsigned char)31
-#define blr_receive_batch	(unsigned char)32
-
-// unused code: 33
-
-#define blr_add			(unsigned char)34
-#define blr_subtract		(unsigned char)35
-#define blr_multiply		(unsigned char)36
-#define blr_divide		(unsigned char)37
-#define blr_negate		(unsigned char)38
-#define blr_concatenate		(unsigned char)39
-#define blr_substring		(unsigned char)40
-#define blr_parameter2		(unsigned char)41
-#define blr_from		(unsigned char)42
-#define blr_via			(unsigned char)43
-#define blr_user_name   	(unsigned char)44
-#define blr_null		(unsigned char)45
-
-#define blr_equiv			(unsigned char)46
-#define blr_eql			(unsigned char)47
-#define blr_neq			(unsigned char)48
-#define blr_gtr			(unsigned char)49
-#define blr_geq			(unsigned char)50
-#define blr_lss			(unsigned char)51
-#define blr_leq			(unsigned char)52
-#define blr_containing		(unsigned char)53
-#define blr_matching		(unsigned char)54
-#define blr_starting		(unsigned char)55
-#define blr_between		(unsigned char)56
-#define blr_or			(unsigned char)57
-#define blr_and			(unsigned char)58
-#define blr_not			(unsigned char)59
-#define blr_any			(unsigned char)60
-#define blr_missing		(unsigned char)61
-#define blr_unique		(unsigned char)62
-#define blr_like		(unsigned char)63
-#define blr_in_list		(unsigned char)64
-
-// unused codes: 65..66
-
-#define blr_rse			(unsigned char)67
-#define blr_first		(unsigned char)68
-#define blr_project		(unsigned char)69
-#define blr_sort		(unsigned char)70
-#define blr_boolean		(unsigned char)71
-#define blr_ascending		(unsigned char)72
-#define blr_descending		(unsigned char)73
-#define blr_relation		(unsigned char)74
-#define blr_rid			(unsigned char)75
-#define blr_union		(unsigned char)76
-#define blr_map			(unsigned char)77
-#define blr_group_by		(unsigned char)78
-#define blr_aggregate		(unsigned char)79
-#define blr_join_type		(unsigned char)80
-
-// unused codes: 81..82
-
-#define blr_agg_count		(unsigned char)83
-#define blr_agg_max		(unsigned char)84
-#define blr_agg_min		(unsigned char)85
-#define blr_agg_total		(unsigned char)86
-#define blr_agg_average		(unsigned char)87
-/* unsupported
-#define	blr_parameter3		(unsigned char)88
-#define blr_run_max		(unsigned char)89
-#define blr_run_min		(unsigned char)90
-#define blr_run_total		(unsigned char)91
-#define blr_run_average		(unsigned char)92
-*/
-#define blr_agg_count2		(unsigned char)93
-#define blr_agg_count_distinct	(unsigned char)94
-#define blr_agg_total_distinct	(unsigned char)95
-#define blr_agg_average_distinct (unsigned char)96
-
-// unused codes: 97..99
-
-#define blr_function		(unsigned char)100
-#define blr_gen_id		(unsigned char)101
-///#define blr_prot_mask		(unsigned char)102
-#define blr_upcase		(unsigned char)103
-///#define blr_lock_state		(unsigned char)104
-#define blr_value_if		(unsigned char)105
-#define blr_matching2		(unsigned char)106
-#define blr_index		(unsigned char)107
-#define blr_ansi_like		(unsigned char)108
-#define blr_scrollable		(unsigned char) 109
-#define blr_lateral_rse		(unsigned char) 110
-#define blr_optimize		(unsigned char) 111
-
-// unused codes: 112..117
-
-///#define blr_run_count		(unsigned char)118
-#define blr_rs_stream		(unsigned char)119
-#define blr_exec_proc		(unsigned char)120
-
-// unused codes: 121..123
-
-#define blr_procedure		(unsigned char)124
-#define blr_pid			(unsigned char)125
-#define blr_exec_pid		(unsigned char)126
-#define blr_singular		(unsigned char)127
-#define blr_abort		(unsigned char)128
-#define blr_block	 	(unsigned char)129
-#define blr_error_handler	(unsigned char)130
-
-#define blr_cast		(unsigned char)131
-
-#define blr_pid2			(unsigned char)132
-#define blr_procedure2		(unsigned char)133
-
-#define blr_start_savepoint	(unsigned char)134
-#define blr_end_savepoint	(unsigned char)135
-
-// unused codes: 136..138
-
-#define blr_plan		(unsigned char)139	/* access plan items */
-#define blr_merge		(unsigned char)140
-#define blr_join		(unsigned char)141
-#define blr_sequential		(unsigned char)142
-#define blr_navigational	(unsigned char)143
-#define blr_indices		(unsigned char)144
-#define blr_retrieve		(unsigned char)145
-
-#define blr_relation2		(unsigned char)146
-#define blr_rid2		(unsigned char)147
-
-// unused codes: 148..149
-
-#define blr_set_generator       (unsigned char)150
-
-#define blr_ansi_any		(unsigned char)151   /* required for NULL handling */
-#define blr_exists		(unsigned char)152   /* required for NULL handling */
-
-// unused codes: 153
-
-#define blr_record_version	(unsigned char)154	/* get tid of record */
-#define blr_stall		(unsigned char)155	/* fake server stall */
-
-// unused codes: 156..157
-
-#define blr_ansi_all		(unsigned char)158   /* required for NULL handling */
-
-#define blr_extract		(unsigned char)159
-
-/* sub parameters for blr_extract */
-
-#define blr_extract_year		(unsigned char)0
-#define blr_extract_month		(unsigned char)1
-#define blr_extract_day			(unsigned char)2
-#define blr_extract_hour		(unsigned char)3
-#define blr_extract_minute		(unsigned char)4
-#define blr_extract_second		(unsigned char)5
-#define blr_extract_weekday		(unsigned char)6
-#define blr_extract_yearday		(unsigned char)7
-#define blr_extract_millisecond	(unsigned char)8
-#define blr_extract_week		(unsigned char)9
-#define blr_extract_timezone_hour	(unsigned char)10
-#define blr_extract_timezone_minute	(unsigned char)11
-#define blr_extract_timezone_name	(unsigned char)12
-#define blr_extract_quarter		(unsigned char)13
-
-#define blr_current_date	(unsigned char)160
-#define blr_current_timestamp	(unsigned char)161
-#define blr_current_time	(unsigned char)162
-
-/* These codes reuse BLR code space */
-
-#define blr_post_arg		(unsigned char)163
-#define blr_exec_into		(unsigned char)164
-//#define blr_user_savepoint	(unsigned char)165
-#define blr_dcl_cursor		(unsigned char)166
-#define blr_cursor_stmt		(unsigned char)167
-#define blr_current_timestamp2	(unsigned char)168
-#define blr_current_time2	(unsigned char)169
-#define blr_agg_list		(unsigned char)170
-#define blr_agg_list_distinct	(unsigned char)171
-#define blr_modify2			(unsigned char)172
-
-// unused codes: 173
-
-/* FB 1.0 specific BLR */
-
-#define blr_current_role	(unsigned char)174
-#define blr_skip		(unsigned char)175
-
-/* FB 1.5 specific BLR */
-
-#define blr_exec_sql		(unsigned char)176
-#define blr_internal_info	(unsigned char)177
-#define blr_nullsfirst		(unsigned char)178
-#define blr_writelock		(unsigned char)179
-#define blr_nullslast       (unsigned char)180
-
-
-/* FB 2.0 specific BLR */
-
-#define blr_lowcase			(unsigned char)181
-#define blr_strlen			(unsigned char)182
-
-/* sub parameter for blr_strlen */
-#define blr_strlen_bit		(unsigned char)0
-#define blr_strlen_char		(unsigned char)1
-#define blr_strlen_octet	(unsigned char)2
-
-#define blr_trim			(unsigned char)183
-
-/* first sub parameter for blr_trim */
-#define blr_trim_both		(unsigned char)0
-#define blr_trim_leading	(unsigned char)1
-#define blr_trim_trailing	(unsigned char)2
-
-/* second sub parameter for blr_trim */
-#define blr_trim_spaces		(unsigned char)0
-#define blr_trim_characters	(unsigned char)1
-
-/* These codes are actions for cursors */
-
-#define blr_cursor_open			(unsigned char)0
-#define blr_cursor_close		(unsigned char)1
-#define blr_cursor_fetch		(unsigned char)2
-#define blr_cursor_fetch_scroll	(unsigned char)3
-
-/* scroll options */
-
-#define blr_scroll_forward		(unsigned char)0
-#define blr_scroll_backward		(unsigned char)1
-#define blr_scroll_bof			(unsigned char)2
-#define blr_scroll_eof			(unsigned char)3
-#define blr_scroll_absolute		(unsigned char)4
-#define blr_scroll_relative		(unsigned char)5
-
-/* FB 2.1 specific BLR */
-
-#define blr_init_variable	(unsigned char)184
-#define blr_recurse			(unsigned char)185
-#define blr_sys_function	(unsigned char)186
-
-// FB 2.5 specific BLR
-
-#define blr_auto_trans		(unsigned char)187
-#define blr_similar			(unsigned char)188
-#define blr_exec_stmt		(unsigned char)189
-
-// subcodes of blr_exec_stmt
-#define blr_exec_stmt_inputs		(unsigned char) 1	// input parameters count
-#define blr_exec_stmt_outputs		(unsigned char) 2	// output parameters count
-#define blr_exec_stmt_sql			(unsigned char) 3
-#define blr_exec_stmt_proc_block	(unsigned char) 4
-#define blr_exec_stmt_data_src		(unsigned char) 5
-#define blr_exec_stmt_user			(unsigned char) 6
-#define blr_exec_stmt_pwd			(unsigned char) 7
-#define blr_exec_stmt_tran    		(unsigned char) 8	// not implemented yet
-#define blr_exec_stmt_tran_clone	(unsigned char) 9	// make transaction parameters equal to current transaction
-#define blr_exec_stmt_privs			(unsigned char) 10
-#define blr_exec_stmt_in_params		(unsigned char) 11	// not named input parameters
-#define blr_exec_stmt_in_params2	(unsigned char) 12	// named input parameters
-#define blr_exec_stmt_out_params	(unsigned char) 13	// output parameters
-#define blr_exec_stmt_role			(unsigned char) 14
-#define blr_exec_stmt_in_excess		(unsigned char) 15  // excess input params numbers
-
-#define blr_stmt_expr				(unsigned char) 190
-#define blr_derived_expr			(unsigned char) 191
-
-// FB 3.0 specific BLR
-
-#define blr_procedure3				(unsigned char) 192
-#define blr_exec_proc2				(unsigned char) 193
-#define blr_function2				(unsigned char) 194
-#define blr_window					(unsigned char) 195
-#define blr_partition_by			(unsigned char) 196
-#define blr_continue_loop			(unsigned char) 197
-#define blr_procedure4				(unsigned char) 198
-#define blr_agg_function			(unsigned char) 199
-#define blr_substring_similar		(unsigned char) 200
-#define blr_bool_as_value			(unsigned char) 201
-#define blr_coalesce				(unsigned char) 202
-#define blr_decode					(unsigned char) 203
-#define blr_exec_subproc			(unsigned char) 204
-#define blr_subproc_decl			(unsigned char) 205
-#define blr_subproc					(unsigned char) 206
-#define blr_subfunc_decl			(unsigned char) 207
-#define blr_subfunc					(unsigned char) 208
-#define blr_record_version2			(unsigned char) 209
-#define blr_gen_id2					(unsigned char) 210 // NEXT VALUE FOR generator
-
-// FB 4.0 specific BLR
-
-#define blr_window_win				(unsigned char) 211
-
-// subcodes of blr_window_win
-#define blr_window_win_partition			(unsigned char) 1
-#define blr_window_win_order				(unsigned char) 2
-#define blr_window_win_map					(unsigned char) 3
-#define blr_window_win_extent_unit 			(unsigned char) 4
-#define blr_window_win_extent_frame_bound	(unsigned char) 5
-#define blr_window_win_extent_frame_value	(unsigned char) 6
-#define blr_window_win_exclusion			(unsigned char) 7
-
-#define blr_default					(unsigned char) 212
-#define blr_store3					(unsigned char) 213
-
-// subcodes of blr_store3
-#define blr_store_override_user			(unsigned char) 1
-#define blr_store_override_system		(unsigned char) 2
-
-#define blr_local_timestamp			(unsigned char) 214
-#define blr_local_time				(unsigned char) 215
-
-#define blr_at						(unsigned char) 216
-
-// subcodes of blr_at
-#define blr_at_local				(unsigned char) 0
-#define blr_at_zone					(unsigned char) 1
-
-#define blr_marks					(unsigned char) 217		// mark some blr code with specific flags
-
-// FB 5.0 specific BLR
-
-#define blr_dcl_local_table			(unsigned char) 218
-
-// subcodes of blr_dcl_local_table
-#define blr_dcl_local_table_format	(unsigned char) 1
-
-#define blr_local_table_truncate	(unsigned char) 219
-#define blr_local_table_id			(unsigned char) 220
-
-#define blr_outer_map				(unsigned char) 221
-#define blr_outer_map_message		(unsigned char) 1
-#define blr_outer_map_variable			(unsigned char) 2
-
-// json functions (reserved)
-#define blr_json_function			(unsigned char) 222
-
-#define blr_skip_locked				(unsigned char) 223
-
-#endif // FIREBIRD_IMPL_BLR_H
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/arithmetic/dec.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/arithmetic/dec.hpp
deleted file mode 100644
index 38cae026..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/arithmetic/dec.hpp
+++ /dev/null
@@ -1,288 +0,0 @@
-# /* Copyright (C) 2001
-#  * Housemarque Oy
-#  * http://www.housemarque.com
-#  *
-#  * Distributed under the Boost Software License, Version 1.0. (See
-#  * accompanying file LICENSE_1_0.txt or copy at
-#  * http://www.boost.org/LICENSE_1_0.txt)
-#  */
-#
-# /* Revised by Paul Mensonides (2002) */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_ARITHMETIC_DEC_HPP
-# define FB_BOOST_PREPROCESSOR_ARITHMETIC_DEC_HPP
-#
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-#
-# /* FB_BOOST_PP_DEC */
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_DEC(x) FB_BOOST_PP_DEC_I(x)
-# else
-#    define FB_BOOST_PP_DEC(x) FB_BOOST_PP_DEC_OO((x))
-#    define FB_BOOST_PP_DEC_OO(par) FB_BOOST_PP_DEC_I ## par
-# endif
-#
-# define FB_BOOST_PP_DEC_I(x) FB_BOOST_PP_DEC_ ## x
-#
-# define FB_BOOST_PP_DEC_0 0
-# define FB_BOOST_PP_DEC_1 0
-# define FB_BOOST_PP_DEC_2 1
-# define FB_BOOST_PP_DEC_3 2
-# define FB_BOOST_PP_DEC_4 3
-# define FB_BOOST_PP_DEC_5 4
-# define FB_BOOST_PP_DEC_6 5
-# define FB_BOOST_PP_DEC_7 6
-# define FB_BOOST_PP_DEC_8 7
-# define FB_BOOST_PP_DEC_9 8
-# define FB_BOOST_PP_DEC_10 9
-# define FB_BOOST_PP_DEC_11 10
-# define FB_BOOST_PP_DEC_12 11
-# define FB_BOOST_PP_DEC_13 12
-# define FB_BOOST_PP_DEC_14 13
-# define FB_BOOST_PP_DEC_15 14
-# define FB_BOOST_PP_DEC_16 15
-# define FB_BOOST_PP_DEC_17 16
-# define FB_BOOST_PP_DEC_18 17
-# define FB_BOOST_PP_DEC_19 18
-# define FB_BOOST_PP_DEC_20 19
-# define FB_BOOST_PP_DEC_21 20
-# define FB_BOOST_PP_DEC_22 21
-# define FB_BOOST_PP_DEC_23 22
-# define FB_BOOST_PP_DEC_24 23
-# define FB_BOOST_PP_DEC_25 24
-# define FB_BOOST_PP_DEC_26 25
-# define FB_BOOST_PP_DEC_27 26
-# define FB_BOOST_PP_DEC_28 27
-# define FB_BOOST_PP_DEC_29 28
-# define FB_BOOST_PP_DEC_30 29
-# define FB_BOOST_PP_DEC_31 30
-# define FB_BOOST_PP_DEC_32 31
-# define FB_BOOST_PP_DEC_33 32
-# define FB_BOOST_PP_DEC_34 33
-# define FB_BOOST_PP_DEC_35 34
-# define FB_BOOST_PP_DEC_36 35
-# define FB_BOOST_PP_DEC_37 36
-# define FB_BOOST_PP_DEC_38 37
-# define FB_BOOST_PP_DEC_39 38
-# define FB_BOOST_PP_DEC_40 39
-# define FB_BOOST_PP_DEC_41 40
-# define FB_BOOST_PP_DEC_42 41
-# define FB_BOOST_PP_DEC_43 42
-# define FB_BOOST_PP_DEC_44 43
-# define FB_BOOST_PP_DEC_45 44
-# define FB_BOOST_PP_DEC_46 45
-# define FB_BOOST_PP_DEC_47 46
-# define FB_BOOST_PP_DEC_48 47
-# define FB_BOOST_PP_DEC_49 48
-# define FB_BOOST_PP_DEC_50 49
-# define FB_BOOST_PP_DEC_51 50
-# define FB_BOOST_PP_DEC_52 51
-# define FB_BOOST_PP_DEC_53 52
-# define FB_BOOST_PP_DEC_54 53
-# define FB_BOOST_PP_DEC_55 54
-# define FB_BOOST_PP_DEC_56 55
-# define FB_BOOST_PP_DEC_57 56
-# define FB_BOOST_PP_DEC_58 57
-# define FB_BOOST_PP_DEC_59 58
-# define FB_BOOST_PP_DEC_60 59
-# define FB_BOOST_PP_DEC_61 60
-# define FB_BOOST_PP_DEC_62 61
-# define FB_BOOST_PP_DEC_63 62
-# define FB_BOOST_PP_DEC_64 63
-# define FB_BOOST_PP_DEC_65 64
-# define FB_BOOST_PP_DEC_66 65
-# define FB_BOOST_PP_DEC_67 66
-# define FB_BOOST_PP_DEC_68 67
-# define FB_BOOST_PP_DEC_69 68
-# define FB_BOOST_PP_DEC_70 69
-# define FB_BOOST_PP_DEC_71 70
-# define FB_BOOST_PP_DEC_72 71
-# define FB_BOOST_PP_DEC_73 72
-# define FB_BOOST_PP_DEC_74 73
-# define FB_BOOST_PP_DEC_75 74
-# define FB_BOOST_PP_DEC_76 75
-# define FB_BOOST_PP_DEC_77 76
-# define FB_BOOST_PP_DEC_78 77
-# define FB_BOOST_PP_DEC_79 78
-# define FB_BOOST_PP_DEC_80 79
-# define FB_BOOST_PP_DEC_81 80
-# define FB_BOOST_PP_DEC_82 81
-# define FB_BOOST_PP_DEC_83 82
-# define FB_BOOST_PP_DEC_84 83
-# define FB_BOOST_PP_DEC_85 84
-# define FB_BOOST_PP_DEC_86 85
-# define FB_BOOST_PP_DEC_87 86
-# define FB_BOOST_PP_DEC_88 87
-# define FB_BOOST_PP_DEC_89 88
-# define FB_BOOST_PP_DEC_90 89
-# define FB_BOOST_PP_DEC_91 90
-# define FB_BOOST_PP_DEC_92 91
-# define FB_BOOST_PP_DEC_93 92
-# define FB_BOOST_PP_DEC_94 93
-# define FB_BOOST_PP_DEC_95 94
-# define FB_BOOST_PP_DEC_96 95
-# define FB_BOOST_PP_DEC_97 96
-# define FB_BOOST_PP_DEC_98 97
-# define FB_BOOST_PP_DEC_99 98
-# define FB_BOOST_PP_DEC_100 99
-# define FB_BOOST_PP_DEC_101 100
-# define FB_BOOST_PP_DEC_102 101
-# define FB_BOOST_PP_DEC_103 102
-# define FB_BOOST_PP_DEC_104 103
-# define FB_BOOST_PP_DEC_105 104
-# define FB_BOOST_PP_DEC_106 105
-# define FB_BOOST_PP_DEC_107 106
-# define FB_BOOST_PP_DEC_108 107
-# define FB_BOOST_PP_DEC_109 108
-# define FB_BOOST_PP_DEC_110 109
-# define FB_BOOST_PP_DEC_111 110
-# define FB_BOOST_PP_DEC_112 111
-# define FB_BOOST_PP_DEC_113 112
-# define FB_BOOST_PP_DEC_114 113
-# define FB_BOOST_PP_DEC_115 114
-# define FB_BOOST_PP_DEC_116 115
-# define FB_BOOST_PP_DEC_117 116
-# define FB_BOOST_PP_DEC_118 117
-# define FB_BOOST_PP_DEC_119 118
-# define FB_BOOST_PP_DEC_120 119
-# define FB_BOOST_PP_DEC_121 120
-# define FB_BOOST_PP_DEC_122 121
-# define FB_BOOST_PP_DEC_123 122
-# define FB_BOOST_PP_DEC_124 123
-# define FB_BOOST_PP_DEC_125 124
-# define FB_BOOST_PP_DEC_126 125
-# define FB_BOOST_PP_DEC_127 126
-# define FB_BOOST_PP_DEC_128 127
-# define FB_BOOST_PP_DEC_129 128
-# define FB_BOOST_PP_DEC_130 129
-# define FB_BOOST_PP_DEC_131 130
-# define FB_BOOST_PP_DEC_132 131
-# define FB_BOOST_PP_DEC_133 132
-# define FB_BOOST_PP_DEC_134 133
-# define FB_BOOST_PP_DEC_135 134
-# define FB_BOOST_PP_DEC_136 135
-# define FB_BOOST_PP_DEC_137 136
-# define FB_BOOST_PP_DEC_138 137
-# define FB_BOOST_PP_DEC_139 138
-# define FB_BOOST_PP_DEC_140 139
-# define FB_BOOST_PP_DEC_141 140
-# define FB_BOOST_PP_DEC_142 141
-# define FB_BOOST_PP_DEC_143 142
-# define FB_BOOST_PP_DEC_144 143
-# define FB_BOOST_PP_DEC_145 144
-# define FB_BOOST_PP_DEC_146 145
-# define FB_BOOST_PP_DEC_147 146
-# define FB_BOOST_PP_DEC_148 147
-# define FB_BOOST_PP_DEC_149 148
-# define FB_BOOST_PP_DEC_150 149
-# define FB_BOOST_PP_DEC_151 150
-# define FB_BOOST_PP_DEC_152 151
-# define FB_BOOST_PP_DEC_153 152
-# define FB_BOOST_PP_DEC_154 153
-# define FB_BOOST_PP_DEC_155 154
-# define FB_BOOST_PP_DEC_156 155
-# define FB_BOOST_PP_DEC_157 156
-# define FB_BOOST_PP_DEC_158 157
-# define FB_BOOST_PP_DEC_159 158
-# define FB_BOOST_PP_DEC_160 159
-# define FB_BOOST_PP_DEC_161 160
-# define FB_BOOST_PP_DEC_162 161
-# define FB_BOOST_PP_DEC_163 162
-# define FB_BOOST_PP_DEC_164 163
-# define FB_BOOST_PP_DEC_165 164
-# define FB_BOOST_PP_DEC_166 165
-# define FB_BOOST_PP_DEC_167 166
-# define FB_BOOST_PP_DEC_168 167
-# define FB_BOOST_PP_DEC_169 168
-# define FB_BOOST_PP_DEC_170 169
-# define FB_BOOST_PP_DEC_171 170
-# define FB_BOOST_PP_DEC_172 171
-# define FB_BOOST_PP_DEC_173 172
-# define FB_BOOST_PP_DEC_174 173
-# define FB_BOOST_PP_DEC_175 174
-# define FB_BOOST_PP_DEC_176 175
-# define FB_BOOST_PP_DEC_177 176
-# define FB_BOOST_PP_DEC_178 177
-# define FB_BOOST_PP_DEC_179 178
-# define FB_BOOST_PP_DEC_180 179
-# define FB_BOOST_PP_DEC_181 180
-# define FB_BOOST_PP_DEC_182 181
-# define FB_BOOST_PP_DEC_183 182
-# define FB_BOOST_PP_DEC_184 183
-# define FB_BOOST_PP_DEC_185 184
-# define FB_BOOST_PP_DEC_186 185
-# define FB_BOOST_PP_DEC_187 186
-# define FB_BOOST_PP_DEC_188 187
-# define FB_BOOST_PP_DEC_189 188
-# define FB_BOOST_PP_DEC_190 189
-# define FB_BOOST_PP_DEC_191 190
-# define FB_BOOST_PP_DEC_192 191
-# define FB_BOOST_PP_DEC_193 192
-# define FB_BOOST_PP_DEC_194 193
-# define FB_BOOST_PP_DEC_195 194
-# define FB_BOOST_PP_DEC_196 195
-# define FB_BOOST_PP_DEC_197 196
-# define FB_BOOST_PP_DEC_198 197
-# define FB_BOOST_PP_DEC_199 198
-# define FB_BOOST_PP_DEC_200 199
-# define FB_BOOST_PP_DEC_201 200
-# define FB_BOOST_PP_DEC_202 201
-# define FB_BOOST_PP_DEC_203 202
-# define FB_BOOST_PP_DEC_204 203
-# define FB_BOOST_PP_DEC_205 204
-# define FB_BOOST_PP_DEC_206 205
-# define FB_BOOST_PP_DEC_207 206
-# define FB_BOOST_PP_DEC_208 207
-# define FB_BOOST_PP_DEC_209 208
-# define FB_BOOST_PP_DEC_210 209
-# define FB_BOOST_PP_DEC_211 210
-# define FB_BOOST_PP_DEC_212 211
-# define FB_BOOST_PP_DEC_213 212
-# define FB_BOOST_PP_DEC_214 213
-# define FB_BOOST_PP_DEC_215 214
-# define FB_BOOST_PP_DEC_216 215
-# define FB_BOOST_PP_DEC_217 216
-# define FB_BOOST_PP_DEC_218 217
-# define FB_BOOST_PP_DEC_219 218
-# define FB_BOOST_PP_DEC_220 219
-# define FB_BOOST_PP_DEC_221 220
-# define FB_BOOST_PP_DEC_222 221
-# define FB_BOOST_PP_DEC_223 222
-# define FB_BOOST_PP_DEC_224 223
-# define FB_BOOST_PP_DEC_225 224
-# define FB_BOOST_PP_DEC_226 225
-# define FB_BOOST_PP_DEC_227 226
-# define FB_BOOST_PP_DEC_228 227
-# define FB_BOOST_PP_DEC_229 228
-# define FB_BOOST_PP_DEC_230 229
-# define FB_BOOST_PP_DEC_231 230
-# define FB_BOOST_PP_DEC_232 231
-# define FB_BOOST_PP_DEC_233 232
-# define FB_BOOST_PP_DEC_234 233
-# define FB_BOOST_PP_DEC_235 234
-# define FB_BOOST_PP_DEC_236 235
-# define FB_BOOST_PP_DEC_237 236
-# define FB_BOOST_PP_DEC_238 237
-# define FB_BOOST_PP_DEC_239 238
-# define FB_BOOST_PP_DEC_240 239
-# define FB_BOOST_PP_DEC_241 240
-# define FB_BOOST_PP_DEC_242 241
-# define FB_BOOST_PP_DEC_243 242
-# define FB_BOOST_PP_DEC_244 243
-# define FB_BOOST_PP_DEC_245 244
-# define FB_BOOST_PP_DEC_246 245
-# define FB_BOOST_PP_DEC_247 246
-# define FB_BOOST_PP_DEC_248 247
-# define FB_BOOST_PP_DEC_249 248
-# define FB_BOOST_PP_DEC_250 249
-# define FB_BOOST_PP_DEC_251 250
-# define FB_BOOST_PP_DEC_252 251
-# define FB_BOOST_PP_DEC_253 252
-# define FB_BOOST_PP_DEC_254 253
-# define FB_BOOST_PP_DEC_255 254
-# define FB_BOOST_PP_DEC_256 255
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/arithmetic/inc.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/arithmetic/inc.hpp
deleted file mode 100644
index 200fed63..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/arithmetic/inc.hpp
+++ /dev/null
@@ -1,288 +0,0 @@
-# /* Copyright (C) 2001
-#  * Housemarque Oy
-#  * http://www.housemarque.com
-#  *
-#  * Distributed under the Boost Software License, Version 1.0. (See
-#  * accompanying file LICENSE_1_0.txt or copy at
-#  * http://www.boost.org/LICENSE_1_0.txt)
-#  */
-#
-# /* Revised by Paul Mensonides (2002) */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_ARITHMETIC_INC_HPP
-# define FB_BOOST_PREPROCESSOR_ARITHMETIC_INC_HPP
-#
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-#
-# /* FB_BOOST_PP_INC */
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_INC(x) FB_BOOST_PP_INC_I(x)
-# else
-#    define FB_BOOST_PP_INC(x) FB_BOOST_PP_INC_OO((x))
-#    define FB_BOOST_PP_INC_OO(par) FB_BOOST_PP_INC_I ## par
-# endif
-#
-# define FB_BOOST_PP_INC_I(x) FB_BOOST_PP_INC_ ## x
-#
-# define FB_BOOST_PP_INC_0 1
-# define FB_BOOST_PP_INC_1 2
-# define FB_BOOST_PP_INC_2 3
-# define FB_BOOST_PP_INC_3 4
-# define FB_BOOST_PP_INC_4 5
-# define FB_BOOST_PP_INC_5 6
-# define FB_BOOST_PP_INC_6 7
-# define FB_BOOST_PP_INC_7 8
-# define FB_BOOST_PP_INC_8 9
-# define FB_BOOST_PP_INC_9 10
-# define FB_BOOST_PP_INC_10 11
-# define FB_BOOST_PP_INC_11 12
-# define FB_BOOST_PP_INC_12 13
-# define FB_BOOST_PP_INC_13 14
-# define FB_BOOST_PP_INC_14 15
-# define FB_BOOST_PP_INC_15 16
-# define FB_BOOST_PP_INC_16 17
-# define FB_BOOST_PP_INC_17 18
-# define FB_BOOST_PP_INC_18 19
-# define FB_BOOST_PP_INC_19 20
-# define FB_BOOST_PP_INC_20 21
-# define FB_BOOST_PP_INC_21 22
-# define FB_BOOST_PP_INC_22 23
-# define FB_BOOST_PP_INC_23 24
-# define FB_BOOST_PP_INC_24 25
-# define FB_BOOST_PP_INC_25 26
-# define FB_BOOST_PP_INC_26 27
-# define FB_BOOST_PP_INC_27 28
-# define FB_BOOST_PP_INC_28 29
-# define FB_BOOST_PP_INC_29 30
-# define FB_BOOST_PP_INC_30 31
-# define FB_BOOST_PP_INC_31 32
-# define FB_BOOST_PP_INC_32 33
-# define FB_BOOST_PP_INC_33 34
-# define FB_BOOST_PP_INC_34 35
-# define FB_BOOST_PP_INC_35 36
-# define FB_BOOST_PP_INC_36 37
-# define FB_BOOST_PP_INC_37 38
-# define FB_BOOST_PP_INC_38 39
-# define FB_BOOST_PP_INC_39 40
-# define FB_BOOST_PP_INC_40 41
-# define FB_BOOST_PP_INC_41 42
-# define FB_BOOST_PP_INC_42 43
-# define FB_BOOST_PP_INC_43 44
-# define FB_BOOST_PP_INC_44 45
-# define FB_BOOST_PP_INC_45 46
-# define FB_BOOST_PP_INC_46 47
-# define FB_BOOST_PP_INC_47 48
-# define FB_BOOST_PP_INC_48 49
-# define FB_BOOST_PP_INC_49 50
-# define FB_BOOST_PP_INC_50 51
-# define FB_BOOST_PP_INC_51 52
-# define FB_BOOST_PP_INC_52 53
-# define FB_BOOST_PP_INC_53 54
-# define FB_BOOST_PP_INC_54 55
-# define FB_BOOST_PP_INC_55 56
-# define FB_BOOST_PP_INC_56 57
-# define FB_BOOST_PP_INC_57 58
-# define FB_BOOST_PP_INC_58 59
-# define FB_BOOST_PP_INC_59 60
-# define FB_BOOST_PP_INC_60 61
-# define FB_BOOST_PP_INC_61 62
-# define FB_BOOST_PP_INC_62 63
-# define FB_BOOST_PP_INC_63 64
-# define FB_BOOST_PP_INC_64 65
-# define FB_BOOST_PP_INC_65 66
-# define FB_BOOST_PP_INC_66 67
-# define FB_BOOST_PP_INC_67 68
-# define FB_BOOST_PP_INC_68 69
-# define FB_BOOST_PP_INC_69 70
-# define FB_BOOST_PP_INC_70 71
-# define FB_BOOST_PP_INC_71 72
-# define FB_BOOST_PP_INC_72 73
-# define FB_BOOST_PP_INC_73 74
-# define FB_BOOST_PP_INC_74 75
-# define FB_BOOST_PP_INC_75 76
-# define FB_BOOST_PP_INC_76 77
-# define FB_BOOST_PP_INC_77 78
-# define FB_BOOST_PP_INC_78 79
-# define FB_BOOST_PP_INC_79 80
-# define FB_BOOST_PP_INC_80 81
-# define FB_BOOST_PP_INC_81 82
-# define FB_BOOST_PP_INC_82 83
-# define FB_BOOST_PP_INC_83 84
-# define FB_BOOST_PP_INC_84 85
-# define FB_BOOST_PP_INC_85 86
-# define FB_BOOST_PP_INC_86 87
-# define FB_BOOST_PP_INC_87 88
-# define FB_BOOST_PP_INC_88 89
-# define FB_BOOST_PP_INC_89 90
-# define FB_BOOST_PP_INC_90 91
-# define FB_BOOST_PP_INC_91 92
-# define FB_BOOST_PP_INC_92 93
-# define FB_BOOST_PP_INC_93 94
-# define FB_BOOST_PP_INC_94 95
-# define FB_BOOST_PP_INC_95 96
-# define FB_BOOST_PP_INC_96 97
-# define FB_BOOST_PP_INC_97 98
-# define FB_BOOST_PP_INC_98 99
-# define FB_BOOST_PP_INC_99 100
-# define FB_BOOST_PP_INC_100 101
-# define FB_BOOST_PP_INC_101 102
-# define FB_BOOST_PP_INC_102 103
-# define FB_BOOST_PP_INC_103 104
-# define FB_BOOST_PP_INC_104 105
-# define FB_BOOST_PP_INC_105 106
-# define FB_BOOST_PP_INC_106 107
-# define FB_BOOST_PP_INC_107 108
-# define FB_BOOST_PP_INC_108 109
-# define FB_BOOST_PP_INC_109 110
-# define FB_BOOST_PP_INC_110 111
-# define FB_BOOST_PP_INC_111 112
-# define FB_BOOST_PP_INC_112 113
-# define FB_BOOST_PP_INC_113 114
-# define FB_BOOST_PP_INC_114 115
-# define FB_BOOST_PP_INC_115 116
-# define FB_BOOST_PP_INC_116 117
-# define FB_BOOST_PP_INC_117 118
-# define FB_BOOST_PP_INC_118 119
-# define FB_BOOST_PP_INC_119 120
-# define FB_BOOST_PP_INC_120 121
-# define FB_BOOST_PP_INC_121 122
-# define FB_BOOST_PP_INC_122 123
-# define FB_BOOST_PP_INC_123 124
-# define FB_BOOST_PP_INC_124 125
-# define FB_BOOST_PP_INC_125 126
-# define FB_BOOST_PP_INC_126 127
-# define FB_BOOST_PP_INC_127 128
-# define FB_BOOST_PP_INC_128 129
-# define FB_BOOST_PP_INC_129 130
-# define FB_BOOST_PP_INC_130 131
-# define FB_BOOST_PP_INC_131 132
-# define FB_BOOST_PP_INC_132 133
-# define FB_BOOST_PP_INC_133 134
-# define FB_BOOST_PP_INC_134 135
-# define FB_BOOST_PP_INC_135 136
-# define FB_BOOST_PP_INC_136 137
-# define FB_BOOST_PP_INC_137 138
-# define FB_BOOST_PP_INC_138 139
-# define FB_BOOST_PP_INC_139 140
-# define FB_BOOST_PP_INC_140 141
-# define FB_BOOST_PP_INC_141 142
-# define FB_BOOST_PP_INC_142 143
-# define FB_BOOST_PP_INC_143 144
-# define FB_BOOST_PP_INC_144 145
-# define FB_BOOST_PP_INC_145 146
-# define FB_BOOST_PP_INC_146 147
-# define FB_BOOST_PP_INC_147 148
-# define FB_BOOST_PP_INC_148 149
-# define FB_BOOST_PP_INC_149 150
-# define FB_BOOST_PP_INC_150 151
-# define FB_BOOST_PP_INC_151 152
-# define FB_BOOST_PP_INC_152 153
-# define FB_BOOST_PP_INC_153 154
-# define FB_BOOST_PP_INC_154 155
-# define FB_BOOST_PP_INC_155 156
-# define FB_BOOST_PP_INC_156 157
-# define FB_BOOST_PP_INC_157 158
-# define FB_BOOST_PP_INC_158 159
-# define FB_BOOST_PP_INC_159 160
-# define FB_BOOST_PP_INC_160 161
-# define FB_BOOST_PP_INC_161 162
-# define FB_BOOST_PP_INC_162 163
-# define FB_BOOST_PP_INC_163 164
-# define FB_BOOST_PP_INC_164 165
-# define FB_BOOST_PP_INC_165 166
-# define FB_BOOST_PP_INC_166 167
-# define FB_BOOST_PP_INC_167 168
-# define FB_BOOST_PP_INC_168 169
-# define FB_BOOST_PP_INC_169 170
-# define FB_BOOST_PP_INC_170 171
-# define FB_BOOST_PP_INC_171 172
-# define FB_BOOST_PP_INC_172 173
-# define FB_BOOST_PP_INC_173 174
-# define FB_BOOST_PP_INC_174 175
-# define FB_BOOST_PP_INC_175 176
-# define FB_BOOST_PP_INC_176 177
-# define FB_BOOST_PP_INC_177 178
-# define FB_BOOST_PP_INC_178 179
-# define FB_BOOST_PP_INC_179 180
-# define FB_BOOST_PP_INC_180 181
-# define FB_BOOST_PP_INC_181 182
-# define FB_BOOST_PP_INC_182 183
-# define FB_BOOST_PP_INC_183 184
-# define FB_BOOST_PP_INC_184 185
-# define FB_BOOST_PP_INC_185 186
-# define FB_BOOST_PP_INC_186 187
-# define FB_BOOST_PP_INC_187 188
-# define FB_BOOST_PP_INC_188 189
-# define FB_BOOST_PP_INC_189 190
-# define FB_BOOST_PP_INC_190 191
-# define FB_BOOST_PP_INC_191 192
-# define FB_BOOST_PP_INC_192 193
-# define FB_BOOST_PP_INC_193 194
-# define FB_BOOST_PP_INC_194 195
-# define FB_BOOST_PP_INC_195 196
-# define FB_BOOST_PP_INC_196 197
-# define FB_BOOST_PP_INC_197 198
-# define FB_BOOST_PP_INC_198 199
-# define FB_BOOST_PP_INC_199 200
-# define FB_BOOST_PP_INC_200 201
-# define FB_BOOST_PP_INC_201 202
-# define FB_BOOST_PP_INC_202 203
-# define FB_BOOST_PP_INC_203 204
-# define FB_BOOST_PP_INC_204 205
-# define FB_BOOST_PP_INC_205 206
-# define FB_BOOST_PP_INC_206 207
-# define FB_BOOST_PP_INC_207 208
-# define FB_BOOST_PP_INC_208 209
-# define FB_BOOST_PP_INC_209 210
-# define FB_BOOST_PP_INC_210 211
-# define FB_BOOST_PP_INC_211 212
-# define FB_BOOST_PP_INC_212 213
-# define FB_BOOST_PP_INC_213 214
-# define FB_BOOST_PP_INC_214 215
-# define FB_BOOST_PP_INC_215 216
-# define FB_BOOST_PP_INC_216 217
-# define FB_BOOST_PP_INC_217 218
-# define FB_BOOST_PP_INC_218 219
-# define FB_BOOST_PP_INC_219 220
-# define FB_BOOST_PP_INC_220 221
-# define FB_BOOST_PP_INC_221 222
-# define FB_BOOST_PP_INC_222 223
-# define FB_BOOST_PP_INC_223 224
-# define FB_BOOST_PP_INC_224 225
-# define FB_BOOST_PP_INC_225 226
-# define FB_BOOST_PP_INC_226 227
-# define FB_BOOST_PP_INC_227 228
-# define FB_BOOST_PP_INC_228 229
-# define FB_BOOST_PP_INC_229 230
-# define FB_BOOST_PP_INC_230 231
-# define FB_BOOST_PP_INC_231 232
-# define FB_BOOST_PP_INC_232 233
-# define FB_BOOST_PP_INC_233 234
-# define FB_BOOST_PP_INC_234 235
-# define FB_BOOST_PP_INC_235 236
-# define FB_BOOST_PP_INC_236 237
-# define FB_BOOST_PP_INC_237 238
-# define FB_BOOST_PP_INC_238 239
-# define FB_BOOST_PP_INC_239 240
-# define FB_BOOST_PP_INC_240 241
-# define FB_BOOST_PP_INC_241 242
-# define FB_BOOST_PP_INC_242 243
-# define FB_BOOST_PP_INC_243 244
-# define FB_BOOST_PP_INC_244 245
-# define FB_BOOST_PP_INC_245 246
-# define FB_BOOST_PP_INC_246 247
-# define FB_BOOST_PP_INC_247 248
-# define FB_BOOST_PP_INC_248 249
-# define FB_BOOST_PP_INC_249 250
-# define FB_BOOST_PP_INC_250 251
-# define FB_BOOST_PP_INC_251 252
-# define FB_BOOST_PP_INC_252 253
-# define FB_BOOST_PP_INC_253 254
-# define FB_BOOST_PP_INC_254 255
-# define FB_BOOST_PP_INC_255 256
-# define FB_BOOST_PP_INC_256 256
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/cat.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/cat.hpp
deleted file mode 100644
index 5e0761c2..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/cat.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-# /* Copyright (C) 2001
-#  * Housemarque Oy
-#  * http://www.housemarque.com
-#  *
-#  * Distributed under the Boost Software License, Version 1.0. (See
-#  * accompanying file LICENSE_1_0.txt or copy at
-#  * http://www.boost.org/LICENSE_1_0.txt)
-#  */
-#
-# /* Revised by Paul Mensonides (2002) */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_CAT_HPP
-# define FB_BOOST_PREPROCESSOR_CAT_HPP
-#
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-#
-# /* FB_BOOST_PP_CAT */
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_CAT(a, b) FB_BOOST_PP_CAT_I(a, b)
-# else
-#    define FB_BOOST_PP_CAT(a, b) FB_BOOST_PP_CAT_OO((a, b))
-#    define FB_BOOST_PP_CAT_OO(par) FB_BOOST_PP_CAT_I ## par
-# endif
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MSVC()
-#    define FB_BOOST_PP_CAT_I(a, b) a ## b
-# else
-#    define FB_BOOST_PP_CAT_I(a, b) FB_BOOST_PP_CAT_II(a ## b)
-#    define FB_BOOST_PP_CAT_II(res) res
-# endif
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/config/config.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/config/config.hpp
deleted file mode 100644
index 3a21332a..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/config/config.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-# /* **************************************************************************
-#  *                                                                          *
-#  *     (C) Copyright Paul Mensonides 2002.
-#  *     Distributed under the Boost Software License, Version 1.0. (See
-#  *     accompanying file LICENSE_1_0.txt or copy at
-#  *     http://www.boost.org/LICENSE_1_0.txt)
-#  *                                                                          *
-#  ************************************************************************** */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_CONFIG_CONFIG_HPP
-# define FB_BOOST_PREPROCESSOR_CONFIG_CONFIG_HPP
-#
-# /* FB_BOOST_PP_CONFIG_FLAGS */
-#
-# define FB_BOOST_PP_CONFIG_STRICT() 0x0001
-# define FB_BOOST_PP_CONFIG_IDEAL() 0x0002
-#
-# define FB_BOOST_PP_CONFIG_MSVC() 0x0004
-# define FB_BOOST_PP_CONFIG_MWCC() 0x0008
-# define FB_BOOST_PP_CONFIG_BCC() 0x0010
-# define FB_BOOST_PP_CONFIG_EDG() 0x0020
-# define FB_BOOST_PP_CONFIG_DMC() 0x0040
-#
-# ifndef FB_BOOST_PP_CONFIG_FLAGS
-#    if defined(__GCCXML__)
-#        define FB_BOOST_PP_CONFIG_FLAGS() (FB_BOOST_PP_CONFIG_STRICT())
-#    elif defined(__WAVE__)
-#        define FB_BOOST_PP_CONFIG_FLAGS() (FB_BOOST_PP_CONFIG_STRICT())
-#    elif defined(__MWERKS__) && __MWERKS__ >= 0x3200
-#        define FB_BOOST_PP_CONFIG_FLAGS() (FB_BOOST_PP_CONFIG_STRICT())
-#    elif defined(__EDG__) || defined(__EDG_VERSION__)
-#        if defined(_MSC_VER) && __EDG_VERSION__ >= 308
-#            define FB_BOOST_PP_CONFIG_FLAGS() (FB_BOOST_PP_CONFIG_MSVC())
-#        else
-#            define FB_BOOST_PP_CONFIG_FLAGS() (FB_BOOST_PP_CONFIG_EDG() | FB_BOOST_PP_CONFIG_STRICT())
-#        endif
-#    elif defined(__MWERKS__)
-#        define FB_BOOST_PP_CONFIG_FLAGS() (FB_BOOST_PP_CONFIG_MWCC())
-#    elif defined(__DMC__)
-#        define FB_BOOST_PP_CONFIG_FLAGS() (FB_BOOST_PP_CONFIG_DMC())
-#    elif defined(__BORLANDC__) && __BORLANDC__ >= 0x581
-#        define FB_BOOST_PP_CONFIG_FLAGS() (FB_BOOST_PP_CONFIG_STRICT())
-#    elif defined(__BORLANDC__) || defined(__IBMC__) || defined(__IBMCPP__) || defined(__SUNPRO_CC)
-#        define FB_BOOST_PP_CONFIG_FLAGS() (FB_BOOST_PP_CONFIG_BCC())
-#    elif defined(_MSC_VER)
-#        define FB_BOOST_PP_CONFIG_FLAGS() (FB_BOOST_PP_CONFIG_MSVC())
-#    else
-#        define FB_BOOST_PP_CONFIG_FLAGS() (FB_BOOST_PP_CONFIG_STRICT())
-#    endif
-# endif
-#
-# /* FB_BOOST_PP_CONFIG_EXTENDED_LINE_INFO */
-#
-# ifndef FB_BOOST_PP_CONFIG_EXTENDED_LINE_INFO
-#    define FB_BOOST_PP_CONFIG_EXTENDED_LINE_INFO 0
-# endif
-#
-# /* FB_BOOST_PP_CONFIG_ERRORS */
-#
-# ifndef FB_BOOST_PP_CONFIG_ERRORS
-#    ifdef NDEBUG
-#        define FB_BOOST_PP_CONFIG_ERRORS 0
-#    else
-#        define FB_BOOST_PP_CONFIG_ERRORS 1
-#    endif
-# endif
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/control/expr_if.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/control/expr_if.hpp
deleted file mode 100644
index 241ede08..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/control/expr_if.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-# /* Copyright (C) 2001
-#  * Housemarque Oy
-#  * http://www.housemarque.com
-#  *
-#  * Distributed under the Boost Software License, Version 1.0. (See
-#  * accompanying file LICENSE_1_0.txt or copy at
-#  * http://www.boost.org/LICENSE_1_0.txt)
-#  */
-#
-# /* Revised by Paul Mensonides (2002) */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_CONTROL_EXPR_IF_HPP
-# define FB_BOOST_PREPROCESSOR_CONTROL_EXPR_IF_HPP
-#
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-# include <firebird/impl/boost/preprocessor/control/expr_iif.hpp>
-# include <firebird/impl/boost/preprocessor/logical/bool.hpp>
-#
-# /* FB_BOOST_PP_EXPR_IF */
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_EDG()
-#    define FB_BOOST_PP_EXPR_IF(cond, expr) FB_BOOST_PP_EXPR_IIF(FB_BOOST_PP_BOOL(cond), expr)
-# else
-#    define FB_BOOST_PP_EXPR_IF(cond, expr) FB_BOOST_PP_EXPR_IF_I(cond, expr)
-#    define FB_BOOST_PP_EXPR_IF_I(cond, expr) FB_BOOST_PP_EXPR_IIF(FB_BOOST_PP_BOOL(cond), expr)
-# endif
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/control/expr_iif.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/control/expr_iif.hpp
deleted file mode 100644
index 45d2e167..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/control/expr_iif.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-# /* **************************************************************************
-#  *                                                                          *
-#  *     (C) Copyright Paul Mensonides 2002.
-#  *     Distributed under the Boost Software License, Version 1.0. (See
-#  *     accompanying file LICENSE_1_0.txt or copy at
-#  *     http://www.boost.org/LICENSE_1_0.txt)
-#  *                                                                          *
-#  ************************************************************************** */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_CONTROL_EXPR_IIF_HPP
-# define FB_BOOST_PREPROCESSOR_CONTROL_EXPR_IIF_HPP
-#
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-#
-# /* FB_BOOST_PP_EXPR_IIF */
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_EXPR_IIF(bit, expr) FB_BOOST_PP_EXPR_IIF_I(bit, expr)
-# else
-#    define FB_BOOST_PP_EXPR_IIF(bit, expr) FB_BOOST_PP_EXPR_IIF_OO((bit, expr))
-#    define FB_BOOST_PP_EXPR_IIF_OO(par) FB_BOOST_PP_EXPR_IIF_I ## par
-# endif
-#
-# define FB_BOOST_PP_EXPR_IIF_I(bit, expr) FB_BOOST_PP_EXPR_IIF_ ## bit(expr)
-#
-# define FB_BOOST_PP_EXPR_IIF_0(expr)
-# define FB_BOOST_PP_EXPR_IIF_1(expr) expr
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/control/if.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/control/if.hpp
deleted file mode 100644
index 3d63e7e3..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/control/if.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-# /* Copyright (C) 2001
-#  * Housemarque Oy
-#  * http://www.housemarque.com
-#  *
-#  * Distributed under the Boost Software License, Version 1.0. (See
-#  * accompanying file LICENSE_1_0.txt or copy at
-#  * http://www.boost.org/LICENSE_1_0.txt)
-#  */
-#
-# /* Revised by Paul Mensonides (2002) */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_CONTROL_IF_HPP
-# define FB_BOOST_PREPROCESSOR_CONTROL_IF_HPP
-#
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-# include <firebird/impl/boost/preprocessor/control/iif.hpp>
-# include <firebird/impl/boost/preprocessor/logical/bool.hpp>
-#
-# /* FB_BOOST_PP_IF */
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_EDG()
-#    define FB_BOOST_PP_IF(cond, t, f) FB_BOOST_PP_IIF(FB_BOOST_PP_BOOL(cond), t, f)
-# else
-#    define FB_BOOST_PP_IF(cond, t, f) FB_BOOST_PP_IF_I(cond, t, f)
-#    define FB_BOOST_PP_IF_I(cond, t, f) FB_BOOST_PP_IIF(FB_BOOST_PP_BOOL(cond), t, f)
-# endif
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/control/iif.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/control/iif.hpp
deleted file mode 100644
index 390f9496..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/control/iif.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-# /* **************************************************************************
-#  *                                                                          *
-#  *     (C) Copyright Paul Mensonides 2002.
-#  *     Distributed under the Boost Software License, Version 1.0. (See
-#  *     accompanying file LICENSE_1_0.txt or copy at
-#  *     http://www.boost.org/LICENSE_1_0.txt)
-#  *                                                                          *
-#  ************************************************************************** */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_CONTROL_IIF_HPP
-# define FB_BOOST_PREPROCESSOR_CONTROL_IIF_HPP
-#
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_IIF(bit, t, f) FB_BOOST_PP_IIF_I(bit, t, f)
-# else
-#    define FB_BOOST_PP_IIF(bit, t, f) FB_BOOST_PP_IIF_OO((bit, t, f))
-#    define FB_BOOST_PP_IIF_OO(par) FB_BOOST_PP_IIF_I ## par
-# endif
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MSVC()
-#    define FB_BOOST_PP_IIF_I(bit, t, f) FB_BOOST_PP_IIF_ ## bit(t, f)
-# else
-#    define FB_BOOST_PP_IIF_I(bit, t, f) FB_BOOST_PP_IIF_II(FB_BOOST_PP_IIF_ ## bit(t, f))
-#    define FB_BOOST_PP_IIF_II(id) id
-# endif
-#
-# define FB_BOOST_PP_IIF_0(t, f) f
-# define FB_BOOST_PP_IIF_1(t, f) t
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/debug/error.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/debug/error.hpp
deleted file mode 100644
index e9fffcca..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/debug/error.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-# /* **************************************************************************
-#  *                                                                          *
-#  *     (C) Copyright Paul Mensonides 2002.
-#  *     Distributed under the Boost Software License, Version 1.0. (See
-#  *     accompanying file LICENSE_1_0.txt or copy at
-#  *     http://www.boost.org/LICENSE_1_0.txt)
-#  *                                                                          *
-#  ************************************************************************** */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_DEBUG_ERROR_HPP
-# define FB_BOOST_PREPROCESSOR_DEBUG_ERROR_HPP
-#
-# include <firebird/impl/boost/preprocessor/cat.hpp>
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-#
-# /* FB_BOOST_PP_ERROR */
-#
-# if FB_BOOST_PP_CONFIG_ERRORS
-#    define FB_BOOST_PP_ERROR(code) FB_BOOST_PP_CAT(FB_BOOST_PP_ERROR_, code)
-# endif
-#
-# define FB_BOOST_PP_ERROR_0x0000 FB_BOOST_PP_ERROR(0x0000, FB_BOOST_PP_INDEX_OUT_OF_BOUNDS)
-# define FB_BOOST_PP_ERROR_0x0001 FB_BOOST_PP_ERROR(0x0001, FB_BOOST_PP_WHILE_OVERFLOW)
-# define FB_BOOST_PP_ERROR_0x0002 FB_BOOST_PP_ERROR(0x0002, FB_BOOST_PP_FOR_OVERFLOW)
-# define FB_BOOST_PP_ERROR_0x0003 FB_BOOST_PP_ERROR(0x0003, FB_BOOST_PP_REPEAT_OVERFLOW)
-# define FB_BOOST_PP_ERROR_0x0004 FB_BOOST_PP_ERROR(0x0004, FB_BOOST_PP_LIST_FOLD_OVERFLOW)
-# define FB_BOOST_PP_ERROR_0x0005 FB_BOOST_PP_ERROR(0x0005, FB_BOOST_PP_SEQ_FOLD_OVERFLOW)
-# define FB_BOOST_PP_ERROR_0x0006 FB_BOOST_PP_ERROR(0x0006, FB_BOOST_PP_ARITHMETIC_OVERFLOW)
-# define FB_BOOST_PP_ERROR_0x0007 FB_BOOST_PP_ERROR(0x0007, FB_BOOST_PP_DIVISION_BY_ZERO)
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/detail/auto_rec.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/detail/auto_rec.hpp
deleted file mode 100644
index 52e97749..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/detail/auto_rec.hpp
+++ /dev/null
@@ -1,293 +0,0 @@
-# /* **************************************************************************
-#  *                                                                          *
-#  *     (C) Copyright Paul Mensonides 2002.
-#  *     Distributed under the Boost Software License, Version 1.0. (See
-#  *     accompanying file LICENSE_1_0.txt or copy at
-#  *     http://www.boost.org/LICENSE_1_0.txt)
-#  *                                                                          *
-#  ************************************************************************** */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-#
-# if FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_DMC()
-#     include <firebird/impl/boost/preprocessor/detail/dmc/auto_rec.hpp>
-# else
-#
-# ifndef FB_BOOST_PREPROCESSOR_DETAIL_AUTO_REC_HPP
-# define FB_BOOST_PREPROCESSOR_DETAIL_AUTO_REC_HPP
-#
-# include <firebird/impl/boost/preprocessor/control/iif.hpp>
-#
-# /* FB_BOOST_PP_AUTO_REC */
-#
-# define FB_BOOST_PP_AUTO_REC(pred, n) FB_BOOST_PP_NODE_ENTRY_ ## n(pred)
-#
-# define FB_BOOST_PP_NODE_ENTRY_256(p) FB_BOOST_PP_NODE_128(p)(p)(p)(p)(p)(p)(p)(p)
-# define FB_BOOST_PP_NODE_ENTRY_128(p) FB_BOOST_PP_NODE_64(p)(p)(p)(p)(p)(p)(p)
-# define FB_BOOST_PP_NODE_ENTRY_64(p) FB_BOOST_PP_NODE_32(p)(p)(p)(p)(p)(p)
-# define FB_BOOST_PP_NODE_ENTRY_32(p) FB_BOOST_PP_NODE_16(p)(p)(p)(p)(p)
-# define FB_BOOST_PP_NODE_ENTRY_16(p) FB_BOOST_PP_NODE_8(p)(p)(p)(p)
-# define FB_BOOST_PP_NODE_ENTRY_8(p) FB_BOOST_PP_NODE_4(p)(p)(p)
-# define FB_BOOST_PP_NODE_ENTRY_4(p) FB_BOOST_PP_NODE_2(p)(p)
-# define FB_BOOST_PP_NODE_ENTRY_2(p) FB_BOOST_PP_NODE_1(p)
-#
-# define FB_BOOST_PP_NODE_128(p) FB_BOOST_PP_IIF(p(128), FB_BOOST_PP_NODE_64, FB_BOOST_PP_NODE_192)
-#    define FB_BOOST_PP_NODE_64(p) FB_BOOST_PP_IIF(p(64), FB_BOOST_PP_NODE_32, FB_BOOST_PP_NODE_96)
-#        define FB_BOOST_PP_NODE_32(p) FB_BOOST_PP_IIF(p(32), FB_BOOST_PP_NODE_16, FB_BOOST_PP_NODE_48)
-#            define FB_BOOST_PP_NODE_16(p) FB_BOOST_PP_IIF(p(16), FB_BOOST_PP_NODE_8, FB_BOOST_PP_NODE_24)
-#                define FB_BOOST_PP_NODE_8(p) FB_BOOST_PP_IIF(p(8), FB_BOOST_PP_NODE_4, FB_BOOST_PP_NODE_12)
-#                    define FB_BOOST_PP_NODE_4(p) FB_BOOST_PP_IIF(p(4), FB_BOOST_PP_NODE_2, FB_BOOST_PP_NODE_6)
-#                        define FB_BOOST_PP_NODE_2(p) FB_BOOST_PP_IIF(p(2), FB_BOOST_PP_NODE_1, FB_BOOST_PP_NODE_3)
-#                            define FB_BOOST_PP_NODE_1(p) FB_BOOST_PP_IIF(p(1), 1, 2)
-#                            define FB_BOOST_PP_NODE_3(p) FB_BOOST_PP_IIF(p(3), 3, 4)
-#                        define FB_BOOST_PP_NODE_6(p) FB_BOOST_PP_IIF(p(6), FB_BOOST_PP_NODE_5, FB_BOOST_PP_NODE_7)
-#                            define FB_BOOST_PP_NODE_5(p) FB_BOOST_PP_IIF(p(5), 5, 6)
-#                            define FB_BOOST_PP_NODE_7(p) FB_BOOST_PP_IIF(p(7), 7, 8)
-#                    define FB_BOOST_PP_NODE_12(p) FB_BOOST_PP_IIF(p(12), FB_BOOST_PP_NODE_10, FB_BOOST_PP_NODE_14)
-#                        define FB_BOOST_PP_NODE_10(p) FB_BOOST_PP_IIF(p(10), FB_BOOST_PP_NODE_9, FB_BOOST_PP_NODE_11)
-#                            define FB_BOOST_PP_NODE_9(p) FB_BOOST_PP_IIF(p(9), 9, 10)
-#                            define FB_BOOST_PP_NODE_11(p) FB_BOOST_PP_IIF(p(11), 11, 12)
-#                        define FB_BOOST_PP_NODE_14(p) FB_BOOST_PP_IIF(p(14), FB_BOOST_PP_NODE_13, FB_BOOST_PP_NODE_15)
-#                            define FB_BOOST_PP_NODE_13(p) FB_BOOST_PP_IIF(p(13), 13, 14)
-#                            define FB_BOOST_PP_NODE_15(p) FB_BOOST_PP_IIF(p(15), 15, 16)
-#                define FB_BOOST_PP_NODE_24(p) FB_BOOST_PP_IIF(p(24), FB_BOOST_PP_NODE_20, FB_BOOST_PP_NODE_28)
-#                    define FB_BOOST_PP_NODE_20(p) FB_BOOST_PP_IIF(p(20), FB_BOOST_PP_NODE_18, FB_BOOST_PP_NODE_22)
-#                        define FB_BOOST_PP_NODE_18(p) FB_BOOST_PP_IIF(p(18), FB_BOOST_PP_NODE_17, FB_BOOST_PP_NODE_19)
-#                            define FB_BOOST_PP_NODE_17(p) FB_BOOST_PP_IIF(p(17), 17, 18)
-#                            define FB_BOOST_PP_NODE_19(p) FB_BOOST_PP_IIF(p(19), 19, 20)
-#                        define FB_BOOST_PP_NODE_22(p) FB_BOOST_PP_IIF(p(22), FB_BOOST_PP_NODE_21, FB_BOOST_PP_NODE_23)
-#                            define FB_BOOST_PP_NODE_21(p) FB_BOOST_PP_IIF(p(21), 21, 22)
-#                            define FB_BOOST_PP_NODE_23(p) FB_BOOST_PP_IIF(p(23), 23, 24)
-#                    define FB_BOOST_PP_NODE_28(p) FB_BOOST_PP_IIF(p(28), FB_BOOST_PP_NODE_26, FB_BOOST_PP_NODE_30)
-#                        define FB_BOOST_PP_NODE_26(p) FB_BOOST_PP_IIF(p(26), FB_BOOST_PP_NODE_25, FB_BOOST_PP_NODE_27)
-#                            define FB_BOOST_PP_NODE_25(p) FB_BOOST_PP_IIF(p(25), 25, 26)
-#                            define FB_BOOST_PP_NODE_27(p) FB_BOOST_PP_IIF(p(27), 27, 28)
-#                        define FB_BOOST_PP_NODE_30(p) FB_BOOST_PP_IIF(p(30), FB_BOOST_PP_NODE_29, FB_BOOST_PP_NODE_31)
-#                            define FB_BOOST_PP_NODE_29(p) FB_BOOST_PP_IIF(p(29), 29, 30)
-#                            define FB_BOOST_PP_NODE_31(p) FB_BOOST_PP_IIF(p(31), 31, 32)
-#            define FB_BOOST_PP_NODE_48(p) FB_BOOST_PP_IIF(p(48), FB_BOOST_PP_NODE_40, FB_BOOST_PP_NODE_56)
-#                define FB_BOOST_PP_NODE_40(p) FB_BOOST_PP_IIF(p(40), FB_BOOST_PP_NODE_36, FB_BOOST_PP_NODE_44)
-#                    define FB_BOOST_PP_NODE_36(p) FB_BOOST_PP_IIF(p(36), FB_BOOST_PP_NODE_34, FB_BOOST_PP_NODE_38)
-#                        define FB_BOOST_PP_NODE_34(p) FB_BOOST_PP_IIF(p(34), FB_BOOST_PP_NODE_33, FB_BOOST_PP_NODE_35)
-#                            define FB_BOOST_PP_NODE_33(p) FB_BOOST_PP_IIF(p(33), 33, 34)
-#                            define FB_BOOST_PP_NODE_35(p) FB_BOOST_PP_IIF(p(35), 35, 36)
-#                        define FB_BOOST_PP_NODE_38(p) FB_BOOST_PP_IIF(p(38), FB_BOOST_PP_NODE_37, FB_BOOST_PP_NODE_39)
-#                            define FB_BOOST_PP_NODE_37(p) FB_BOOST_PP_IIF(p(37), 37, 38)
-#                            define FB_BOOST_PP_NODE_39(p) FB_BOOST_PP_IIF(p(39), 39, 40)
-#                    define FB_BOOST_PP_NODE_44(p) FB_BOOST_PP_IIF(p(44), FB_BOOST_PP_NODE_42, FB_BOOST_PP_NODE_46)
-#                        define FB_BOOST_PP_NODE_42(p) FB_BOOST_PP_IIF(p(42), FB_BOOST_PP_NODE_41, FB_BOOST_PP_NODE_43)
-#                            define FB_BOOST_PP_NODE_41(p) FB_BOOST_PP_IIF(p(41), 41, 42)
-#                            define FB_BOOST_PP_NODE_43(p) FB_BOOST_PP_IIF(p(43), 43, 44)
-#                        define FB_BOOST_PP_NODE_46(p) FB_BOOST_PP_IIF(p(46), FB_BOOST_PP_NODE_45, FB_BOOST_PP_NODE_47)
-#                            define FB_BOOST_PP_NODE_45(p) FB_BOOST_PP_IIF(p(45), 45, 46)
-#                            define FB_BOOST_PP_NODE_47(p) FB_BOOST_PP_IIF(p(47), 47, 48)
-#                define FB_BOOST_PP_NODE_56(p) FB_BOOST_PP_IIF(p(56), FB_BOOST_PP_NODE_52, FB_BOOST_PP_NODE_60)
-#                    define FB_BOOST_PP_NODE_52(p) FB_BOOST_PP_IIF(p(52), FB_BOOST_PP_NODE_50, FB_BOOST_PP_NODE_54)
-#                        define FB_BOOST_PP_NODE_50(p) FB_BOOST_PP_IIF(p(50), FB_BOOST_PP_NODE_49, FB_BOOST_PP_NODE_51)
-#                            define FB_BOOST_PP_NODE_49(p) FB_BOOST_PP_IIF(p(49), 49, 50)
-#                            define FB_BOOST_PP_NODE_51(p) FB_BOOST_PP_IIF(p(51), 51, 52)
-#                        define FB_BOOST_PP_NODE_54(p) FB_BOOST_PP_IIF(p(54), FB_BOOST_PP_NODE_53, FB_BOOST_PP_NODE_55)
-#                            define FB_BOOST_PP_NODE_53(p) FB_BOOST_PP_IIF(p(53), 53, 54)
-#                            define FB_BOOST_PP_NODE_55(p) FB_BOOST_PP_IIF(p(55), 55, 56)
-#                    define FB_BOOST_PP_NODE_60(p) FB_BOOST_PP_IIF(p(60), FB_BOOST_PP_NODE_58, FB_BOOST_PP_NODE_62)
-#                        define FB_BOOST_PP_NODE_58(p) FB_BOOST_PP_IIF(p(58), FB_BOOST_PP_NODE_57, FB_BOOST_PP_NODE_59)
-#                            define FB_BOOST_PP_NODE_57(p) FB_BOOST_PP_IIF(p(57), 57, 58)
-#                            define FB_BOOST_PP_NODE_59(p) FB_BOOST_PP_IIF(p(59), 59, 60)
-#                        define FB_BOOST_PP_NODE_62(p) FB_BOOST_PP_IIF(p(62), FB_BOOST_PP_NODE_61, FB_BOOST_PP_NODE_63)
-#                            define FB_BOOST_PP_NODE_61(p) FB_BOOST_PP_IIF(p(61), 61, 62)
-#                            define FB_BOOST_PP_NODE_63(p) FB_BOOST_PP_IIF(p(63), 63, 64)
-#        define FB_BOOST_PP_NODE_96(p) FB_BOOST_PP_IIF(p(96), FB_BOOST_PP_NODE_80, FB_BOOST_PP_NODE_112)
-#            define FB_BOOST_PP_NODE_80(p) FB_BOOST_PP_IIF(p(80), FB_BOOST_PP_NODE_72, FB_BOOST_PP_NODE_88)
-#                define FB_BOOST_PP_NODE_72(p) FB_BOOST_PP_IIF(p(72), FB_BOOST_PP_NODE_68, FB_BOOST_PP_NODE_76)
-#                    define FB_BOOST_PP_NODE_68(p) FB_BOOST_PP_IIF(p(68), FB_BOOST_PP_NODE_66, FB_BOOST_PP_NODE_70)
-#                        define FB_BOOST_PP_NODE_66(p) FB_BOOST_PP_IIF(p(66), FB_BOOST_PP_NODE_65, FB_BOOST_PP_NODE_67)
-#                            define FB_BOOST_PP_NODE_65(p) FB_BOOST_PP_IIF(p(65), 65, 66)
-#                            define FB_BOOST_PP_NODE_67(p) FB_BOOST_PP_IIF(p(67), 67, 68)
-#                        define FB_BOOST_PP_NODE_70(p) FB_BOOST_PP_IIF(p(70), FB_BOOST_PP_NODE_69, FB_BOOST_PP_NODE_71)
-#                            define FB_BOOST_PP_NODE_69(p) FB_BOOST_PP_IIF(p(69), 69, 70)
-#                            define FB_BOOST_PP_NODE_71(p) FB_BOOST_PP_IIF(p(71), 71, 72)
-#                    define FB_BOOST_PP_NODE_76(p) FB_BOOST_PP_IIF(p(76), FB_BOOST_PP_NODE_74, FB_BOOST_PP_NODE_78)
-#                        define FB_BOOST_PP_NODE_74(p) FB_BOOST_PP_IIF(p(74), FB_BOOST_PP_NODE_73, FB_BOOST_PP_NODE_75)
-#                            define FB_BOOST_PP_NODE_73(p) FB_BOOST_PP_IIF(p(73), 73, 74)
-#                            define FB_BOOST_PP_NODE_75(p) FB_BOOST_PP_IIF(p(75), 75, 76)
-#                        define FB_BOOST_PP_NODE_78(p) FB_BOOST_PP_IIF(p(78), FB_BOOST_PP_NODE_77, FB_BOOST_PP_NODE_79)
-#                            define FB_BOOST_PP_NODE_77(p) FB_BOOST_PP_IIF(p(77), 77, 78)
-#                            define FB_BOOST_PP_NODE_79(p) FB_BOOST_PP_IIF(p(79), 79, 80)
-#                define FB_BOOST_PP_NODE_88(p) FB_BOOST_PP_IIF(p(88), FB_BOOST_PP_NODE_84, FB_BOOST_PP_NODE_92)
-#                    define FB_BOOST_PP_NODE_84(p) FB_BOOST_PP_IIF(p(84), FB_BOOST_PP_NODE_82, FB_BOOST_PP_NODE_86)
-#                        define FB_BOOST_PP_NODE_82(p) FB_BOOST_PP_IIF(p(82), FB_BOOST_PP_NODE_81, FB_BOOST_PP_NODE_83)
-#                            define FB_BOOST_PP_NODE_81(p) FB_BOOST_PP_IIF(p(81), 81, 82)
-#                            define FB_BOOST_PP_NODE_83(p) FB_BOOST_PP_IIF(p(83), 83, 84)
-#                        define FB_BOOST_PP_NODE_86(p) FB_BOOST_PP_IIF(p(86), FB_BOOST_PP_NODE_85, FB_BOOST_PP_NODE_87)
-#                            define FB_BOOST_PP_NODE_85(p) FB_BOOST_PP_IIF(p(85), 85, 86)
-#                            define FB_BOOST_PP_NODE_87(p) FB_BOOST_PP_IIF(p(87), 87, 88)
-#                    define FB_BOOST_PP_NODE_92(p) FB_BOOST_PP_IIF(p(92), FB_BOOST_PP_NODE_90, FB_BOOST_PP_NODE_94)
-#                        define FB_BOOST_PP_NODE_90(p) FB_BOOST_PP_IIF(p(90), FB_BOOST_PP_NODE_89, FB_BOOST_PP_NODE_91)
-#                            define FB_BOOST_PP_NODE_89(p) FB_BOOST_PP_IIF(p(89), 89, 90)
-#                            define FB_BOOST_PP_NODE_91(p) FB_BOOST_PP_IIF(p(91), 91, 92)
-#                        define FB_BOOST_PP_NODE_94(p) FB_BOOST_PP_IIF(p(94), FB_BOOST_PP_NODE_93, FB_BOOST_PP_NODE_95)
-#                            define FB_BOOST_PP_NODE_93(p) FB_BOOST_PP_IIF(p(93), 93, 94)
-#                            define FB_BOOST_PP_NODE_95(p) FB_BOOST_PP_IIF(p(95), 95, 96)
-#            define FB_BOOST_PP_NODE_112(p) FB_BOOST_PP_IIF(p(112), FB_BOOST_PP_NODE_104, FB_BOOST_PP_NODE_120)
-#                define FB_BOOST_PP_NODE_104(p) FB_BOOST_PP_IIF(p(104), FB_BOOST_PP_NODE_100, FB_BOOST_PP_NODE_108)
-#                    define FB_BOOST_PP_NODE_100(p) FB_BOOST_PP_IIF(p(100), FB_BOOST_PP_NODE_98, FB_BOOST_PP_NODE_102)
-#                        define FB_BOOST_PP_NODE_98(p) FB_BOOST_PP_IIF(p(98), FB_BOOST_PP_NODE_97, FB_BOOST_PP_NODE_99)
-#                            define FB_BOOST_PP_NODE_97(p) FB_BOOST_PP_IIF(p(97), 97, 98)
-#                            define FB_BOOST_PP_NODE_99(p) FB_BOOST_PP_IIF(p(99), 99, 100)
-#                        define FB_BOOST_PP_NODE_102(p) FB_BOOST_PP_IIF(p(102), FB_BOOST_PP_NODE_101, FB_BOOST_PP_NODE_103)
-#                            define FB_BOOST_PP_NODE_101(p) FB_BOOST_PP_IIF(p(101), 101, 102)
-#                            define FB_BOOST_PP_NODE_103(p) FB_BOOST_PP_IIF(p(103), 103, 104)
-#                    define FB_BOOST_PP_NODE_108(p) FB_BOOST_PP_IIF(p(108), FB_BOOST_PP_NODE_106, FB_BOOST_PP_NODE_110)
-#                        define FB_BOOST_PP_NODE_106(p) FB_BOOST_PP_IIF(p(106), FB_BOOST_PP_NODE_105, FB_BOOST_PP_NODE_107)
-#                            define FB_BOOST_PP_NODE_105(p) FB_BOOST_PP_IIF(p(105), 105, 106)
-#                            define FB_BOOST_PP_NODE_107(p) FB_BOOST_PP_IIF(p(107), 107, 108)
-#                        define FB_BOOST_PP_NODE_110(p) FB_BOOST_PP_IIF(p(110), FB_BOOST_PP_NODE_109, FB_BOOST_PP_NODE_111)
-#                            define FB_BOOST_PP_NODE_109(p) FB_BOOST_PP_IIF(p(109), 109, 110)
-#                            define FB_BOOST_PP_NODE_111(p) FB_BOOST_PP_IIF(p(111), 111, 112)
-#                define FB_BOOST_PP_NODE_120(p) FB_BOOST_PP_IIF(p(120), FB_BOOST_PP_NODE_116, FB_BOOST_PP_NODE_124)
-#                    define FB_BOOST_PP_NODE_116(p) FB_BOOST_PP_IIF(p(116), FB_BOOST_PP_NODE_114, FB_BOOST_PP_NODE_118)
-#                        define FB_BOOST_PP_NODE_114(p) FB_BOOST_PP_IIF(p(114), FB_BOOST_PP_NODE_113, FB_BOOST_PP_NODE_115)
-#                            define FB_BOOST_PP_NODE_113(p) FB_BOOST_PP_IIF(p(113), 113, 114)
-#                            define FB_BOOST_PP_NODE_115(p) FB_BOOST_PP_IIF(p(115), 115, 116)
-#                        define FB_BOOST_PP_NODE_118(p) FB_BOOST_PP_IIF(p(118), FB_BOOST_PP_NODE_117, FB_BOOST_PP_NODE_119)
-#                            define FB_BOOST_PP_NODE_117(p) FB_BOOST_PP_IIF(p(117), 117, 118)
-#                            define FB_BOOST_PP_NODE_119(p) FB_BOOST_PP_IIF(p(119), 119, 120)
-#                    define FB_BOOST_PP_NODE_124(p) FB_BOOST_PP_IIF(p(124), FB_BOOST_PP_NODE_122, FB_BOOST_PP_NODE_126)
-#                        define FB_BOOST_PP_NODE_122(p) FB_BOOST_PP_IIF(p(122), FB_BOOST_PP_NODE_121, FB_BOOST_PP_NODE_123)
-#                            define FB_BOOST_PP_NODE_121(p) FB_BOOST_PP_IIF(p(121), 121, 122)
-#                            define FB_BOOST_PP_NODE_123(p) FB_BOOST_PP_IIF(p(123), 123, 124)
-#                        define FB_BOOST_PP_NODE_126(p) FB_BOOST_PP_IIF(p(126), FB_BOOST_PP_NODE_125, FB_BOOST_PP_NODE_127)
-#                            define FB_BOOST_PP_NODE_125(p) FB_BOOST_PP_IIF(p(125), 125, 126)
-#                            define FB_BOOST_PP_NODE_127(p) FB_BOOST_PP_IIF(p(127), 127, 128)
-#    define FB_BOOST_PP_NODE_192(p) FB_BOOST_PP_IIF(p(192), FB_BOOST_PP_NODE_160, FB_BOOST_PP_NODE_224)
-#        define FB_BOOST_PP_NODE_160(p) FB_BOOST_PP_IIF(p(160), FB_BOOST_PP_NODE_144, FB_BOOST_PP_NODE_176)
-#            define FB_BOOST_PP_NODE_144(p) FB_BOOST_PP_IIF(p(144), FB_BOOST_PP_NODE_136, FB_BOOST_PP_NODE_152)
-#                define FB_BOOST_PP_NODE_136(p) FB_BOOST_PP_IIF(p(136), FB_BOOST_PP_NODE_132, FB_BOOST_PP_NODE_140)
-#                    define FB_BOOST_PP_NODE_132(p) FB_BOOST_PP_IIF(p(132), FB_BOOST_PP_NODE_130, FB_BOOST_PP_NODE_134)
-#                        define FB_BOOST_PP_NODE_130(p) FB_BOOST_PP_IIF(p(130), FB_BOOST_PP_NODE_129, FB_BOOST_PP_NODE_131)
-#                            define FB_BOOST_PP_NODE_129(p) FB_BOOST_PP_IIF(p(129), 129, 130)
-#                            define FB_BOOST_PP_NODE_131(p) FB_BOOST_PP_IIF(p(131), 131, 132)
-#                        define FB_BOOST_PP_NODE_134(p) FB_BOOST_PP_IIF(p(134), FB_BOOST_PP_NODE_133, FB_BOOST_PP_NODE_135)
-#                            define FB_BOOST_PP_NODE_133(p) FB_BOOST_PP_IIF(p(133), 133, 134)
-#                            define FB_BOOST_PP_NODE_135(p) FB_BOOST_PP_IIF(p(135), 135, 136)
-#                    define FB_BOOST_PP_NODE_140(p) FB_BOOST_PP_IIF(p(140), FB_BOOST_PP_NODE_138, FB_BOOST_PP_NODE_142)
-#                        define FB_BOOST_PP_NODE_138(p) FB_BOOST_PP_IIF(p(138), FB_BOOST_PP_NODE_137, FB_BOOST_PP_NODE_139)
-#                            define FB_BOOST_PP_NODE_137(p) FB_BOOST_PP_IIF(p(137), 137, 138)
-#                            define FB_BOOST_PP_NODE_139(p) FB_BOOST_PP_IIF(p(139), 139, 140)
-#                        define FB_BOOST_PP_NODE_142(p) FB_BOOST_PP_IIF(p(142), FB_BOOST_PP_NODE_141, FB_BOOST_PP_NODE_143)
-#                            define FB_BOOST_PP_NODE_141(p) FB_BOOST_PP_IIF(p(141), 141, 142)
-#                            define FB_BOOST_PP_NODE_143(p) FB_BOOST_PP_IIF(p(143), 143, 144)
-#                define FB_BOOST_PP_NODE_152(p) FB_BOOST_PP_IIF(p(152), FB_BOOST_PP_NODE_148, FB_BOOST_PP_NODE_156)
-#                    define FB_BOOST_PP_NODE_148(p) FB_BOOST_PP_IIF(p(148), FB_BOOST_PP_NODE_146, FB_BOOST_PP_NODE_150)
-#                        define FB_BOOST_PP_NODE_146(p) FB_BOOST_PP_IIF(p(146), FB_BOOST_PP_NODE_145, FB_BOOST_PP_NODE_147)
-#                            define FB_BOOST_PP_NODE_145(p) FB_BOOST_PP_IIF(p(145), 145, 146)
-#                            define FB_BOOST_PP_NODE_147(p) FB_BOOST_PP_IIF(p(147), 147, 148)
-#                        define FB_BOOST_PP_NODE_150(p) FB_BOOST_PP_IIF(p(150), FB_BOOST_PP_NODE_149, FB_BOOST_PP_NODE_151)
-#                            define FB_BOOST_PP_NODE_149(p) FB_BOOST_PP_IIF(p(149), 149, 150)
-#                            define FB_BOOST_PP_NODE_151(p) FB_BOOST_PP_IIF(p(151), 151, 152)
-#                    define FB_BOOST_PP_NODE_156(p) FB_BOOST_PP_IIF(p(156), FB_BOOST_PP_NODE_154, FB_BOOST_PP_NODE_158)
-#                        define FB_BOOST_PP_NODE_154(p) FB_BOOST_PP_IIF(p(154), FB_BOOST_PP_NODE_153, FB_BOOST_PP_NODE_155)
-#                            define FB_BOOST_PP_NODE_153(p) FB_BOOST_PP_IIF(p(153), 153, 154)
-#                            define FB_BOOST_PP_NODE_155(p) FB_BOOST_PP_IIF(p(155), 155, 156)
-#                        define FB_BOOST_PP_NODE_158(p) FB_BOOST_PP_IIF(p(158), FB_BOOST_PP_NODE_157, FB_BOOST_PP_NODE_159)
-#                            define FB_BOOST_PP_NODE_157(p) FB_BOOST_PP_IIF(p(157), 157, 158)
-#                            define FB_BOOST_PP_NODE_159(p) FB_BOOST_PP_IIF(p(159), 159, 160)
-#            define FB_BOOST_PP_NODE_176(p) FB_BOOST_PP_IIF(p(176), FB_BOOST_PP_NODE_168, FB_BOOST_PP_NODE_184)
-#                define FB_BOOST_PP_NODE_168(p) FB_BOOST_PP_IIF(p(168), FB_BOOST_PP_NODE_164, FB_BOOST_PP_NODE_172)
-#                    define FB_BOOST_PP_NODE_164(p) FB_BOOST_PP_IIF(p(164), FB_BOOST_PP_NODE_162, FB_BOOST_PP_NODE_166)
-#                        define FB_BOOST_PP_NODE_162(p) FB_BOOST_PP_IIF(p(162), FB_BOOST_PP_NODE_161, FB_BOOST_PP_NODE_163)
-#                            define FB_BOOST_PP_NODE_161(p) FB_BOOST_PP_IIF(p(161), 161, 162)
-#                            define FB_BOOST_PP_NODE_163(p) FB_BOOST_PP_IIF(p(163), 163, 164)
-#                        define FB_BOOST_PP_NODE_166(p) FB_BOOST_PP_IIF(p(166), FB_BOOST_PP_NODE_165, FB_BOOST_PP_NODE_167)
-#                            define FB_BOOST_PP_NODE_165(p) FB_BOOST_PP_IIF(p(165), 165, 166)
-#                            define FB_BOOST_PP_NODE_167(p) FB_BOOST_PP_IIF(p(167), 167, 168)
-#                    define FB_BOOST_PP_NODE_172(p) FB_BOOST_PP_IIF(p(172), FB_BOOST_PP_NODE_170, FB_BOOST_PP_NODE_174)
-#                        define FB_BOOST_PP_NODE_170(p) FB_BOOST_PP_IIF(p(170), FB_BOOST_PP_NODE_169, FB_BOOST_PP_NODE_171)
-#                            define FB_BOOST_PP_NODE_169(p) FB_BOOST_PP_IIF(p(169), 169, 170)
-#                            define FB_BOOST_PP_NODE_171(p) FB_BOOST_PP_IIF(p(171), 171, 172)
-#                        define FB_BOOST_PP_NODE_174(p) FB_BOOST_PP_IIF(p(174), FB_BOOST_PP_NODE_173, FB_BOOST_PP_NODE_175)
-#                            define FB_BOOST_PP_NODE_173(p) FB_BOOST_PP_IIF(p(173), 173, 174)
-#                            define FB_BOOST_PP_NODE_175(p) FB_BOOST_PP_IIF(p(175), 175, 176)
-#                define FB_BOOST_PP_NODE_184(p) FB_BOOST_PP_IIF(p(184), FB_BOOST_PP_NODE_180, FB_BOOST_PP_NODE_188)
-#                    define FB_BOOST_PP_NODE_180(p) FB_BOOST_PP_IIF(p(180), FB_BOOST_PP_NODE_178, FB_BOOST_PP_NODE_182)
-#                        define FB_BOOST_PP_NODE_178(p) FB_BOOST_PP_IIF(p(178), FB_BOOST_PP_NODE_177, FB_BOOST_PP_NODE_179)
-#                            define FB_BOOST_PP_NODE_177(p) FB_BOOST_PP_IIF(p(177), 177, 178)
-#                            define FB_BOOST_PP_NODE_179(p) FB_BOOST_PP_IIF(p(179), 179, 180)
-#                        define FB_BOOST_PP_NODE_182(p) FB_BOOST_PP_IIF(p(182), FB_BOOST_PP_NODE_181, FB_BOOST_PP_NODE_183)
-#                            define FB_BOOST_PP_NODE_181(p) FB_BOOST_PP_IIF(p(181), 181, 182)
-#                            define FB_BOOST_PP_NODE_183(p) FB_BOOST_PP_IIF(p(183), 183, 184)
-#                    define FB_BOOST_PP_NODE_188(p) FB_BOOST_PP_IIF(p(188), FB_BOOST_PP_NODE_186, FB_BOOST_PP_NODE_190)
-#                        define FB_BOOST_PP_NODE_186(p) FB_BOOST_PP_IIF(p(186), FB_BOOST_PP_NODE_185, FB_BOOST_PP_NODE_187)
-#                            define FB_BOOST_PP_NODE_185(p) FB_BOOST_PP_IIF(p(185), 185, 186)
-#                            define FB_BOOST_PP_NODE_187(p) FB_BOOST_PP_IIF(p(187), 187, 188)
-#                        define FB_BOOST_PP_NODE_190(p) FB_BOOST_PP_IIF(p(190), FB_BOOST_PP_NODE_189, FB_BOOST_PP_NODE_191)
-#                            define FB_BOOST_PP_NODE_189(p) FB_BOOST_PP_IIF(p(189), 189, 190)
-#                            define FB_BOOST_PP_NODE_191(p) FB_BOOST_PP_IIF(p(191), 191, 192)
-#        define FB_BOOST_PP_NODE_224(p) FB_BOOST_PP_IIF(p(224), FB_BOOST_PP_NODE_208, FB_BOOST_PP_NODE_240)
-#            define FB_BOOST_PP_NODE_208(p) FB_BOOST_PP_IIF(p(208), FB_BOOST_PP_NODE_200, FB_BOOST_PP_NODE_216)
-#                define FB_BOOST_PP_NODE_200(p) FB_BOOST_PP_IIF(p(200), FB_BOOST_PP_NODE_196, FB_BOOST_PP_NODE_204)
-#                    define FB_BOOST_PP_NODE_196(p) FB_BOOST_PP_IIF(p(196), FB_BOOST_PP_NODE_194, FB_BOOST_PP_NODE_198)
-#                        define FB_BOOST_PP_NODE_194(p) FB_BOOST_PP_IIF(p(194), FB_BOOST_PP_NODE_193, FB_BOOST_PP_NODE_195)
-#                            define FB_BOOST_PP_NODE_193(p) FB_BOOST_PP_IIF(p(193), 193, 194)
-#                            define FB_BOOST_PP_NODE_195(p) FB_BOOST_PP_IIF(p(195), 195, 196)
-#                        define FB_BOOST_PP_NODE_198(p) FB_BOOST_PP_IIF(p(198), FB_BOOST_PP_NODE_197, FB_BOOST_PP_NODE_199)
-#                            define FB_BOOST_PP_NODE_197(p) FB_BOOST_PP_IIF(p(197), 197, 198)
-#                            define FB_BOOST_PP_NODE_199(p) FB_BOOST_PP_IIF(p(199), 199, 200)
-#                    define FB_BOOST_PP_NODE_204(p) FB_BOOST_PP_IIF(p(204), FB_BOOST_PP_NODE_202, FB_BOOST_PP_NODE_206)
-#                        define FB_BOOST_PP_NODE_202(p) FB_BOOST_PP_IIF(p(202), FB_BOOST_PP_NODE_201, FB_BOOST_PP_NODE_203)
-#                            define FB_BOOST_PP_NODE_201(p) FB_BOOST_PP_IIF(p(201), 201, 202)
-#                            define FB_BOOST_PP_NODE_203(p) FB_BOOST_PP_IIF(p(203), 203, 204)
-#                        define FB_BOOST_PP_NODE_206(p) FB_BOOST_PP_IIF(p(206), FB_BOOST_PP_NODE_205, FB_BOOST_PP_NODE_207)
-#                            define FB_BOOST_PP_NODE_205(p) FB_BOOST_PP_IIF(p(205), 205, 206)
-#                            define FB_BOOST_PP_NODE_207(p) FB_BOOST_PP_IIF(p(207), 207, 208)
-#                define FB_BOOST_PP_NODE_216(p) FB_BOOST_PP_IIF(p(216), FB_BOOST_PP_NODE_212, FB_BOOST_PP_NODE_220)
-#                    define FB_BOOST_PP_NODE_212(p) FB_BOOST_PP_IIF(p(212), FB_BOOST_PP_NODE_210, FB_BOOST_PP_NODE_214)
-#                        define FB_BOOST_PP_NODE_210(p) FB_BOOST_PP_IIF(p(210), FB_BOOST_PP_NODE_209, FB_BOOST_PP_NODE_211)
-#                            define FB_BOOST_PP_NODE_209(p) FB_BOOST_PP_IIF(p(209), 209, 210)
-#                            define FB_BOOST_PP_NODE_211(p) FB_BOOST_PP_IIF(p(211), 211, 212)
-#                        define FB_BOOST_PP_NODE_214(p) FB_BOOST_PP_IIF(p(214), FB_BOOST_PP_NODE_213, FB_BOOST_PP_NODE_215)
-#                            define FB_BOOST_PP_NODE_213(p) FB_BOOST_PP_IIF(p(213), 213, 214)
-#                            define FB_BOOST_PP_NODE_215(p) FB_BOOST_PP_IIF(p(215), 215, 216)
-#                    define FB_BOOST_PP_NODE_220(p) FB_BOOST_PP_IIF(p(220), FB_BOOST_PP_NODE_218, FB_BOOST_PP_NODE_222)
-#                        define FB_BOOST_PP_NODE_218(p) FB_BOOST_PP_IIF(p(218), FB_BOOST_PP_NODE_217, FB_BOOST_PP_NODE_219)
-#                            define FB_BOOST_PP_NODE_217(p) FB_BOOST_PP_IIF(p(217), 217, 218)
-#                            define FB_BOOST_PP_NODE_219(p) FB_BOOST_PP_IIF(p(219), 219, 220)
-#                        define FB_BOOST_PP_NODE_222(p) FB_BOOST_PP_IIF(p(222), FB_BOOST_PP_NODE_221, FB_BOOST_PP_NODE_223)
-#                            define FB_BOOST_PP_NODE_221(p) FB_BOOST_PP_IIF(p(221), 221, 222)
-#                            define FB_BOOST_PP_NODE_223(p) FB_BOOST_PP_IIF(p(223), 223, 224)
-#            define FB_BOOST_PP_NODE_240(p) FB_BOOST_PP_IIF(p(240), FB_BOOST_PP_NODE_232, FB_BOOST_PP_NODE_248)
-#                define FB_BOOST_PP_NODE_232(p) FB_BOOST_PP_IIF(p(232), FB_BOOST_PP_NODE_228, FB_BOOST_PP_NODE_236)
-#                    define FB_BOOST_PP_NODE_228(p) FB_BOOST_PP_IIF(p(228), FB_BOOST_PP_NODE_226, FB_BOOST_PP_NODE_230)
-#                        define FB_BOOST_PP_NODE_226(p) FB_BOOST_PP_IIF(p(226), FB_BOOST_PP_NODE_225, FB_BOOST_PP_NODE_227)
-#                            define FB_BOOST_PP_NODE_225(p) FB_BOOST_PP_IIF(p(225), 225, 226)
-#                            define FB_BOOST_PP_NODE_227(p) FB_BOOST_PP_IIF(p(227), 227, 228)
-#                        define FB_BOOST_PP_NODE_230(p) FB_BOOST_PP_IIF(p(230), FB_BOOST_PP_NODE_229, FB_BOOST_PP_NODE_231)
-#                            define FB_BOOST_PP_NODE_229(p) FB_BOOST_PP_IIF(p(229), 229, 230)
-#                            define FB_BOOST_PP_NODE_231(p) FB_BOOST_PP_IIF(p(231), 231, 232)
-#                    define FB_BOOST_PP_NODE_236(p) FB_BOOST_PP_IIF(p(236), FB_BOOST_PP_NODE_234, FB_BOOST_PP_NODE_238)
-#                        define FB_BOOST_PP_NODE_234(p) FB_BOOST_PP_IIF(p(234), FB_BOOST_PP_NODE_233, FB_BOOST_PP_NODE_235)
-#                            define FB_BOOST_PP_NODE_233(p) FB_BOOST_PP_IIF(p(233), 233, 234)
-#                            define FB_BOOST_PP_NODE_235(p) FB_BOOST_PP_IIF(p(235), 235, 236)
-#                        define FB_BOOST_PP_NODE_238(p) FB_BOOST_PP_IIF(p(238), FB_BOOST_PP_NODE_237, FB_BOOST_PP_NODE_239)
-#                            define FB_BOOST_PP_NODE_237(p) FB_BOOST_PP_IIF(p(237), 237, 238)
-#                            define FB_BOOST_PP_NODE_239(p) FB_BOOST_PP_IIF(p(239), 239, 240)
-#                define FB_BOOST_PP_NODE_248(p) FB_BOOST_PP_IIF(p(248), FB_BOOST_PP_NODE_244, FB_BOOST_PP_NODE_252)
-#                    define FB_BOOST_PP_NODE_244(p) FB_BOOST_PP_IIF(p(244), FB_BOOST_PP_NODE_242, FB_BOOST_PP_NODE_246)
-#                        define FB_BOOST_PP_NODE_242(p) FB_BOOST_PP_IIF(p(242), FB_BOOST_PP_NODE_241, FB_BOOST_PP_NODE_243)
-#                            define FB_BOOST_PP_NODE_241(p) FB_BOOST_PP_IIF(p(241), 241, 242)
-#                            define FB_BOOST_PP_NODE_243(p) FB_BOOST_PP_IIF(p(243), 243, 244)
-#                        define FB_BOOST_PP_NODE_246(p) FB_BOOST_PP_IIF(p(246), FB_BOOST_PP_NODE_245, FB_BOOST_PP_NODE_247)
-#                            define FB_BOOST_PP_NODE_245(p) FB_BOOST_PP_IIF(p(245), 245, 246)
-#                            define FB_BOOST_PP_NODE_247(p) FB_BOOST_PP_IIF(p(247), 247, 248)
-#                    define FB_BOOST_PP_NODE_252(p) FB_BOOST_PP_IIF(p(252), FB_BOOST_PP_NODE_250, FB_BOOST_PP_NODE_254)
-#                        define FB_BOOST_PP_NODE_250(p) FB_BOOST_PP_IIF(p(250), FB_BOOST_PP_NODE_249, FB_BOOST_PP_NODE_251)
-#                            define FB_BOOST_PP_NODE_249(p) FB_BOOST_PP_IIF(p(249), 249, 250)
-#                            define FB_BOOST_PP_NODE_251(p) FB_BOOST_PP_IIF(p(251), 251, 252)
-#                        define FB_BOOST_PP_NODE_254(p) FB_BOOST_PP_IIF(p(254), FB_BOOST_PP_NODE_253, FB_BOOST_PP_NODE_255)
-#                            define FB_BOOST_PP_NODE_253(p) FB_BOOST_PP_IIF(p(253), 253, 254)
-#                            define FB_BOOST_PP_NODE_255(p) FB_BOOST_PP_IIF(p(255), 255, 256)
-#
-# endif
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/detail/dmc/auto_rec.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/detail/dmc/auto_rec.hpp
deleted file mode 100644
index 99ed7322..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/detail/dmc/auto_rec.hpp
+++ /dev/null
@@ -1,286 +0,0 @@
-# /* **************************************************************************
-#  *                                                                          *
-#  *     (C) Copyright Paul Mensonides 2002.
-#  *     Distributed under the Boost Software License, Version 1.0. (See
-#  *     accompanying file LICENSE_1_0.txt or copy at
-#  *     http://www.boost.org/LICENSE_1_0.txt)
-#  *                                                                          *
-#  ************************************************************************** */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_DETAIL_AUTO_REC_HPP
-# define FB_BOOST_PREPROCESSOR_DETAIL_AUTO_REC_HPP
-#
-# include <firebird/impl/boost/preprocessor/control/iif.hpp>
-#
-# /* FB_BOOST_PP_AUTO_REC */
-#
-# define FB_BOOST_PP_AUTO_REC(pred, n) FB_BOOST_PP_NODE_ENTRY_ ## n(pred)
-#
-# define FB_BOOST_PP_NODE_ENTRY_256(p) FB_BOOST_PP_NODE_128(p)(p)(p)(p)(p)(p)(p)(p)
-# define FB_BOOST_PP_NODE_ENTRY_128(p) FB_BOOST_PP_NODE_64(p)(p)(p)(p)(p)(p)(p)
-# define FB_BOOST_PP_NODE_ENTRY_64(p) FB_BOOST_PP_NODE_32(p)(p)(p)(p)(p)(p)
-# define FB_BOOST_PP_NODE_ENTRY_32(p) FB_BOOST_PP_NODE_16(p)(p)(p)(p)(p)
-# define FB_BOOST_PP_NODE_ENTRY_16(p) FB_BOOST_PP_NODE_8(p)(p)(p)(p)
-# define FB_BOOST_PP_NODE_ENTRY_8(p) FB_BOOST_PP_NODE_4(p)(p)(p)
-# define FB_BOOST_PP_NODE_ENTRY_4(p) FB_BOOST_PP_NODE_2(p)(p)
-# define FB_BOOST_PP_NODE_ENTRY_2(p) FB_BOOST_PP_NODE_1(p)
-#
-# define FB_BOOST_PP_NODE_128(p) FB_BOOST_PP_IIF(p##(128), FB_BOOST_PP_NODE_64, FB_BOOST_PP_NODE_192)
-#    define FB_BOOST_PP_NODE_64(p) FB_BOOST_PP_IIF(p##(64), FB_BOOST_PP_NODE_32, FB_BOOST_PP_NODE_96)
-#        define FB_BOOST_PP_NODE_32(p) FB_BOOST_PP_IIF(p##(32), FB_BOOST_PP_NODE_16, FB_BOOST_PP_NODE_48)
-#            define FB_BOOST_PP_NODE_16(p) FB_BOOST_PP_IIF(p##(16), FB_BOOST_PP_NODE_8, FB_BOOST_PP_NODE_24)
-#                define FB_BOOST_PP_NODE_8(p) FB_BOOST_PP_IIF(p##(8), FB_BOOST_PP_NODE_4, FB_BOOST_PP_NODE_12)
-#                    define FB_BOOST_PP_NODE_4(p) FB_BOOST_PP_IIF(p##(4), FB_BOOST_PP_NODE_2, FB_BOOST_PP_NODE_6)
-#                        define FB_BOOST_PP_NODE_2(p) FB_BOOST_PP_IIF(p##(2), FB_BOOST_PP_NODE_1, FB_BOOST_PP_NODE_3)
-#                            define FB_BOOST_PP_NODE_1(p) FB_BOOST_PP_IIF(p##(1), 1, 2)
-#                            define FB_BOOST_PP_NODE_3(p) FB_BOOST_PP_IIF(p##(3), 3, 4)
-#                        define FB_BOOST_PP_NODE_6(p) FB_BOOST_PP_IIF(p##(6), FB_BOOST_PP_NODE_5, FB_BOOST_PP_NODE_7)
-#                            define FB_BOOST_PP_NODE_5(p) FB_BOOST_PP_IIF(p##(5), 5, 6)
-#                            define FB_BOOST_PP_NODE_7(p) FB_BOOST_PP_IIF(p##(7), 7, 8)
-#                    define FB_BOOST_PP_NODE_12(p) FB_BOOST_PP_IIF(p##(12), FB_BOOST_PP_NODE_10, FB_BOOST_PP_NODE_14)
-#                        define FB_BOOST_PP_NODE_10(p) FB_BOOST_PP_IIF(p##(10), FB_BOOST_PP_NODE_9, FB_BOOST_PP_NODE_11)
-#                            define FB_BOOST_PP_NODE_9(p) FB_BOOST_PP_IIF(p##(9), 9, 10)
-#                            define FB_BOOST_PP_NODE_11(p) FB_BOOST_PP_IIF(p##(11), 11, 12)
-#                        define FB_BOOST_PP_NODE_14(p) FB_BOOST_PP_IIF(p##(14), FB_BOOST_PP_NODE_13, FB_BOOST_PP_NODE_15)
-#                            define FB_BOOST_PP_NODE_13(p) FB_BOOST_PP_IIF(p##(13), 13, 14)
-#                            define FB_BOOST_PP_NODE_15(p) FB_BOOST_PP_IIF(p##(15), 15, 16)
-#                define FB_BOOST_PP_NODE_24(p) FB_BOOST_PP_IIF(p##(24), FB_BOOST_PP_NODE_20, FB_BOOST_PP_NODE_28)
-#                    define FB_BOOST_PP_NODE_20(p) FB_BOOST_PP_IIF(p##(20), FB_BOOST_PP_NODE_18, FB_BOOST_PP_NODE_22)
-#                        define FB_BOOST_PP_NODE_18(p) FB_BOOST_PP_IIF(p##(18), FB_BOOST_PP_NODE_17, FB_BOOST_PP_NODE_19)
-#                            define FB_BOOST_PP_NODE_17(p) FB_BOOST_PP_IIF(p##(17), 17, 18)
-#                            define FB_BOOST_PP_NODE_19(p) FB_BOOST_PP_IIF(p##(19), 19, 20)
-#                        define FB_BOOST_PP_NODE_22(p) FB_BOOST_PP_IIF(p##(22), FB_BOOST_PP_NODE_21, FB_BOOST_PP_NODE_23)
-#                            define FB_BOOST_PP_NODE_21(p) FB_BOOST_PP_IIF(p##(21), 21, 22)
-#                            define FB_BOOST_PP_NODE_23(p) FB_BOOST_PP_IIF(p##(23), 23, 24)
-#                    define FB_BOOST_PP_NODE_28(p) FB_BOOST_PP_IIF(p##(28), FB_BOOST_PP_NODE_26, FB_BOOST_PP_NODE_30)
-#                        define FB_BOOST_PP_NODE_26(p) FB_BOOST_PP_IIF(p##(26), FB_BOOST_PP_NODE_25, FB_BOOST_PP_NODE_27)
-#                            define FB_BOOST_PP_NODE_25(p) FB_BOOST_PP_IIF(p##(25), 25, 26)
-#                            define FB_BOOST_PP_NODE_27(p) FB_BOOST_PP_IIF(p##(27), 27, 28)
-#                        define FB_BOOST_PP_NODE_30(p) FB_BOOST_PP_IIF(p##(30), FB_BOOST_PP_NODE_29, FB_BOOST_PP_NODE_31)
-#                            define FB_BOOST_PP_NODE_29(p) FB_BOOST_PP_IIF(p##(29), 29, 30)
-#                            define FB_BOOST_PP_NODE_31(p) FB_BOOST_PP_IIF(p##(31), 31, 32)
-#            define FB_BOOST_PP_NODE_48(p) FB_BOOST_PP_IIF(p##(48), FB_BOOST_PP_NODE_40, FB_BOOST_PP_NODE_56)
-#                define FB_BOOST_PP_NODE_40(p) FB_BOOST_PP_IIF(p##(40), FB_BOOST_PP_NODE_36, FB_BOOST_PP_NODE_44)
-#                    define FB_BOOST_PP_NODE_36(p) FB_BOOST_PP_IIF(p##(36), FB_BOOST_PP_NODE_34, FB_BOOST_PP_NODE_38)
-#                        define FB_BOOST_PP_NODE_34(p) FB_BOOST_PP_IIF(p##(34), FB_BOOST_PP_NODE_33, FB_BOOST_PP_NODE_35)
-#                            define FB_BOOST_PP_NODE_33(p) FB_BOOST_PP_IIF(p##(33), 33, 34)
-#                            define FB_BOOST_PP_NODE_35(p) FB_BOOST_PP_IIF(p##(35), 35, 36)
-#                        define FB_BOOST_PP_NODE_38(p) FB_BOOST_PP_IIF(p##(38), FB_BOOST_PP_NODE_37, FB_BOOST_PP_NODE_39)
-#                            define FB_BOOST_PP_NODE_37(p) FB_BOOST_PP_IIF(p##(37), 37, 38)
-#                            define FB_BOOST_PP_NODE_39(p) FB_BOOST_PP_IIF(p##(39), 39, 40)
-#                    define FB_BOOST_PP_NODE_44(p) FB_BOOST_PP_IIF(p##(44), FB_BOOST_PP_NODE_42, FB_BOOST_PP_NODE_46)
-#                        define FB_BOOST_PP_NODE_42(p) FB_BOOST_PP_IIF(p##(42), FB_BOOST_PP_NODE_41, FB_BOOST_PP_NODE_43)
-#                            define FB_BOOST_PP_NODE_41(p) FB_BOOST_PP_IIF(p##(41), 41, 42)
-#                            define FB_BOOST_PP_NODE_43(p) FB_BOOST_PP_IIF(p##(43), 43, 44)
-#                        define FB_BOOST_PP_NODE_46(p) FB_BOOST_PP_IIF(p##(46), FB_BOOST_PP_NODE_45, FB_BOOST_PP_NODE_47)
-#                            define FB_BOOST_PP_NODE_45(p) FB_BOOST_PP_IIF(p##(45), 45, 46)
-#                            define FB_BOOST_PP_NODE_47(p) FB_BOOST_PP_IIF(p##(47), 47, 48)
-#                define FB_BOOST_PP_NODE_56(p) FB_BOOST_PP_IIF(p##(56), FB_BOOST_PP_NODE_52, FB_BOOST_PP_NODE_60)
-#                    define FB_BOOST_PP_NODE_52(p) FB_BOOST_PP_IIF(p##(52), FB_BOOST_PP_NODE_50, FB_BOOST_PP_NODE_54)
-#                        define FB_BOOST_PP_NODE_50(p) FB_BOOST_PP_IIF(p##(50), FB_BOOST_PP_NODE_49, FB_BOOST_PP_NODE_51)
-#                            define FB_BOOST_PP_NODE_49(p) FB_BOOST_PP_IIF(p##(49), 49, 50)
-#                            define FB_BOOST_PP_NODE_51(p) FB_BOOST_PP_IIF(p##(51), 51, 52)
-#                        define FB_BOOST_PP_NODE_54(p) FB_BOOST_PP_IIF(p##(54), FB_BOOST_PP_NODE_53, FB_BOOST_PP_NODE_55)
-#                            define FB_BOOST_PP_NODE_53(p) FB_BOOST_PP_IIF(p##(53), 53, 54)
-#                            define FB_BOOST_PP_NODE_55(p) FB_BOOST_PP_IIF(p##(55), 55, 56)
-#                    define FB_BOOST_PP_NODE_60(p) FB_BOOST_PP_IIF(p##(60), FB_BOOST_PP_NODE_58, FB_BOOST_PP_NODE_62)
-#                        define FB_BOOST_PP_NODE_58(p) FB_BOOST_PP_IIF(p##(58), FB_BOOST_PP_NODE_57, FB_BOOST_PP_NODE_59)
-#                            define FB_BOOST_PP_NODE_57(p) FB_BOOST_PP_IIF(p##(57), 57, 58)
-#                            define FB_BOOST_PP_NODE_59(p) FB_BOOST_PP_IIF(p##(59), 59, 60)
-#                        define FB_BOOST_PP_NODE_62(p) FB_BOOST_PP_IIF(p##(62), FB_BOOST_PP_NODE_61, FB_BOOST_PP_NODE_63)
-#                            define FB_BOOST_PP_NODE_61(p) FB_BOOST_PP_IIF(p##(61), 61, 62)
-#                            define FB_BOOST_PP_NODE_63(p) FB_BOOST_PP_IIF(p##(63), 63, 64)
-#        define FB_BOOST_PP_NODE_96(p) FB_BOOST_PP_IIF(p##(96), FB_BOOST_PP_NODE_80, FB_BOOST_PP_NODE_112)
-#            define FB_BOOST_PP_NODE_80(p) FB_BOOST_PP_IIF(p##(80), FB_BOOST_PP_NODE_72, FB_BOOST_PP_NODE_88)
-#                define FB_BOOST_PP_NODE_72(p) FB_BOOST_PP_IIF(p##(72), FB_BOOST_PP_NODE_68, FB_BOOST_PP_NODE_76)
-#                    define FB_BOOST_PP_NODE_68(p) FB_BOOST_PP_IIF(p##(68), FB_BOOST_PP_NODE_66, FB_BOOST_PP_NODE_70)
-#                        define FB_BOOST_PP_NODE_66(p) FB_BOOST_PP_IIF(p##(66), FB_BOOST_PP_NODE_65, FB_BOOST_PP_NODE_67)
-#                            define FB_BOOST_PP_NODE_65(p) FB_BOOST_PP_IIF(p##(65), 65, 66)
-#                            define FB_BOOST_PP_NODE_67(p) FB_BOOST_PP_IIF(p##(67), 67, 68)
-#                        define FB_BOOST_PP_NODE_70(p) FB_BOOST_PP_IIF(p##(70), FB_BOOST_PP_NODE_69, FB_BOOST_PP_NODE_71)
-#                            define FB_BOOST_PP_NODE_69(p) FB_BOOST_PP_IIF(p##(69), 69, 70)
-#                            define FB_BOOST_PP_NODE_71(p) FB_BOOST_PP_IIF(p##(71), 71, 72)
-#                    define FB_BOOST_PP_NODE_76(p) FB_BOOST_PP_IIF(p##(76), FB_BOOST_PP_NODE_74, FB_BOOST_PP_NODE_78)
-#                        define FB_BOOST_PP_NODE_74(p) FB_BOOST_PP_IIF(p##(74), FB_BOOST_PP_NODE_73, FB_BOOST_PP_NODE_75)
-#                            define FB_BOOST_PP_NODE_73(p) FB_BOOST_PP_IIF(p##(73), 73, 74)
-#                            define FB_BOOST_PP_NODE_75(p) FB_BOOST_PP_IIF(p##(75), 75, 76)
-#                        define FB_BOOST_PP_NODE_78(p) FB_BOOST_PP_IIF(p##(78), FB_BOOST_PP_NODE_77, FB_BOOST_PP_NODE_79)
-#                            define FB_BOOST_PP_NODE_77(p) FB_BOOST_PP_IIF(p##(77), 77, 78)
-#                            define FB_BOOST_PP_NODE_79(p) FB_BOOST_PP_IIF(p##(79), 79, 80)
-#                define FB_BOOST_PP_NODE_88(p) FB_BOOST_PP_IIF(p##(88), FB_BOOST_PP_NODE_84, FB_BOOST_PP_NODE_92)
-#                    define FB_BOOST_PP_NODE_84(p) FB_BOOST_PP_IIF(p##(84), FB_BOOST_PP_NODE_82, FB_BOOST_PP_NODE_86)
-#                        define FB_BOOST_PP_NODE_82(p) FB_BOOST_PP_IIF(p##(82), FB_BOOST_PP_NODE_81, FB_BOOST_PP_NODE_83)
-#                            define FB_BOOST_PP_NODE_81(p) FB_BOOST_PP_IIF(p##(81), 81, 82)
-#                            define FB_BOOST_PP_NODE_83(p) FB_BOOST_PP_IIF(p##(83), 83, 84)
-#                        define FB_BOOST_PP_NODE_86(p) FB_BOOST_PP_IIF(p##(86), FB_BOOST_PP_NODE_85, FB_BOOST_PP_NODE_87)
-#                            define FB_BOOST_PP_NODE_85(p) FB_BOOST_PP_IIF(p##(85), 85, 86)
-#                            define FB_BOOST_PP_NODE_87(p) FB_BOOST_PP_IIF(p##(87), 87, 88)
-#                    define FB_BOOST_PP_NODE_92(p) FB_BOOST_PP_IIF(p##(92), FB_BOOST_PP_NODE_90, FB_BOOST_PP_NODE_94)
-#                        define FB_BOOST_PP_NODE_90(p) FB_BOOST_PP_IIF(p##(90), FB_BOOST_PP_NODE_89, FB_BOOST_PP_NODE_91)
-#                            define FB_BOOST_PP_NODE_89(p) FB_BOOST_PP_IIF(p##(89), 89, 90)
-#                            define FB_BOOST_PP_NODE_91(p) FB_BOOST_PP_IIF(p##(91), 91, 92)
-#                        define FB_BOOST_PP_NODE_94(p) FB_BOOST_PP_IIF(p##(94), FB_BOOST_PP_NODE_93, FB_BOOST_PP_NODE_95)
-#                            define FB_BOOST_PP_NODE_93(p) FB_BOOST_PP_IIF(p##(93), 93, 94)
-#                            define FB_BOOST_PP_NODE_95(p) FB_BOOST_PP_IIF(p##(95), 95, 96)
-#            define FB_BOOST_PP_NODE_112(p) FB_BOOST_PP_IIF(p##(112), FB_BOOST_PP_NODE_104, FB_BOOST_PP_NODE_120)
-#                define FB_BOOST_PP_NODE_104(p) FB_BOOST_PP_IIF(p##(104), FB_BOOST_PP_NODE_100, FB_BOOST_PP_NODE_108)
-#                    define FB_BOOST_PP_NODE_100(p) FB_BOOST_PP_IIF(p##(100), FB_BOOST_PP_NODE_98, FB_BOOST_PP_NODE_102)
-#                        define FB_BOOST_PP_NODE_98(p) FB_BOOST_PP_IIF(p##(98), FB_BOOST_PP_NODE_97, FB_BOOST_PP_NODE_99)
-#                            define FB_BOOST_PP_NODE_97(p) FB_BOOST_PP_IIF(p##(97), 97, 98)
-#                            define FB_BOOST_PP_NODE_99(p) FB_BOOST_PP_IIF(p##(99), 99, 100)
-#                        define FB_BOOST_PP_NODE_102(p) FB_BOOST_PP_IIF(p##(102), FB_BOOST_PP_NODE_101, FB_BOOST_PP_NODE_103)
-#                            define FB_BOOST_PP_NODE_101(p) FB_BOOST_PP_IIF(p##(101), 101, 102)
-#                            define FB_BOOST_PP_NODE_103(p) FB_BOOST_PP_IIF(p##(103), 103, 104)
-#                    define FB_BOOST_PP_NODE_108(p) FB_BOOST_PP_IIF(p##(108), FB_BOOST_PP_NODE_106, FB_BOOST_PP_NODE_110)
-#                        define FB_BOOST_PP_NODE_106(p) FB_BOOST_PP_IIF(p##(106), FB_BOOST_PP_NODE_105, FB_BOOST_PP_NODE_107)
-#                            define FB_BOOST_PP_NODE_105(p) FB_BOOST_PP_IIF(p##(105), 105, 106)
-#                            define FB_BOOST_PP_NODE_107(p) FB_BOOST_PP_IIF(p##(107), 107, 108)
-#                        define FB_BOOST_PP_NODE_110(p) FB_BOOST_PP_IIF(p##(110), FB_BOOST_PP_NODE_109, FB_BOOST_PP_NODE_111)
-#                            define FB_BOOST_PP_NODE_109(p) FB_BOOST_PP_IIF(p##(109), 109, 110)
-#                            define FB_BOOST_PP_NODE_111(p) FB_BOOST_PP_IIF(p##(111), 111, 112)
-#                define FB_BOOST_PP_NODE_120(p) FB_BOOST_PP_IIF(p##(120), FB_BOOST_PP_NODE_116, FB_BOOST_PP_NODE_124)
-#                    define FB_BOOST_PP_NODE_116(p) FB_BOOST_PP_IIF(p##(116), FB_BOOST_PP_NODE_114, FB_BOOST_PP_NODE_118)
-#                        define FB_BOOST_PP_NODE_114(p) FB_BOOST_PP_IIF(p##(114), FB_BOOST_PP_NODE_113, FB_BOOST_PP_NODE_115)
-#                            define FB_BOOST_PP_NODE_113(p) FB_BOOST_PP_IIF(p##(113), 113, 114)
-#                            define FB_BOOST_PP_NODE_115(p) FB_BOOST_PP_IIF(p##(115), 115, 116)
-#                        define FB_BOOST_PP_NODE_118(p) FB_BOOST_PP_IIF(p##(118), FB_BOOST_PP_NODE_117, FB_BOOST_PP_NODE_119)
-#                            define FB_BOOST_PP_NODE_117(p) FB_BOOST_PP_IIF(p##(117), 117, 118)
-#                            define FB_BOOST_PP_NODE_119(p) FB_BOOST_PP_IIF(p##(119), 119, 120)
-#                    define FB_BOOST_PP_NODE_124(p) FB_BOOST_PP_IIF(p##(124), FB_BOOST_PP_NODE_122, FB_BOOST_PP_NODE_126)
-#                        define FB_BOOST_PP_NODE_122(p) FB_BOOST_PP_IIF(p##(122), FB_BOOST_PP_NODE_121, FB_BOOST_PP_NODE_123)
-#                            define FB_BOOST_PP_NODE_121(p) FB_BOOST_PP_IIF(p##(121), 121, 122)
-#                            define FB_BOOST_PP_NODE_123(p) FB_BOOST_PP_IIF(p##(123), 123, 124)
-#                        define FB_BOOST_PP_NODE_126(p) FB_BOOST_PP_IIF(p##(126), FB_BOOST_PP_NODE_125, FB_BOOST_PP_NODE_127)
-#                            define FB_BOOST_PP_NODE_125(p) FB_BOOST_PP_IIF(p##(125), 125, 126)
-#                            define FB_BOOST_PP_NODE_127(p) FB_BOOST_PP_IIF(p##(127), 127, 128)
-#    define FB_BOOST_PP_NODE_192(p) FB_BOOST_PP_IIF(p##(192), FB_BOOST_PP_NODE_160, FB_BOOST_PP_NODE_224)
-#        define FB_BOOST_PP_NODE_160(p) FB_BOOST_PP_IIF(p##(160), FB_BOOST_PP_NODE_144, FB_BOOST_PP_NODE_176)
-#            define FB_BOOST_PP_NODE_144(p) FB_BOOST_PP_IIF(p##(144), FB_BOOST_PP_NODE_136, FB_BOOST_PP_NODE_152)
-#                define FB_BOOST_PP_NODE_136(p) FB_BOOST_PP_IIF(p##(136), FB_BOOST_PP_NODE_132, FB_BOOST_PP_NODE_140)
-#                    define FB_BOOST_PP_NODE_132(p) FB_BOOST_PP_IIF(p##(132), FB_BOOST_PP_NODE_130, FB_BOOST_PP_NODE_134)
-#                        define FB_BOOST_PP_NODE_130(p) FB_BOOST_PP_IIF(p##(130), FB_BOOST_PP_NODE_129, FB_BOOST_PP_NODE_131)
-#                            define FB_BOOST_PP_NODE_129(p) FB_BOOST_PP_IIF(p##(129), 129, 130)
-#                            define FB_BOOST_PP_NODE_131(p) FB_BOOST_PP_IIF(p##(131), 131, 132)
-#                        define FB_BOOST_PP_NODE_134(p) FB_BOOST_PP_IIF(p##(134), FB_BOOST_PP_NODE_133, FB_BOOST_PP_NODE_135)
-#                            define FB_BOOST_PP_NODE_133(p) FB_BOOST_PP_IIF(p##(133), 133, 134)
-#                            define FB_BOOST_PP_NODE_135(p) FB_BOOST_PP_IIF(p##(135), 135, 136)
-#                    define FB_BOOST_PP_NODE_140(p) FB_BOOST_PP_IIF(p##(140), FB_BOOST_PP_NODE_138, FB_BOOST_PP_NODE_142)
-#                        define FB_BOOST_PP_NODE_138(p) FB_BOOST_PP_IIF(p##(138), FB_BOOST_PP_NODE_137, FB_BOOST_PP_NODE_139)
-#                            define FB_BOOST_PP_NODE_137(p) FB_BOOST_PP_IIF(p##(137), 137, 138)
-#                            define FB_BOOST_PP_NODE_139(p) FB_BOOST_PP_IIF(p##(139), 139, 140)
-#                        define FB_BOOST_PP_NODE_142(p) FB_BOOST_PP_IIF(p##(142), FB_BOOST_PP_NODE_141, FB_BOOST_PP_NODE_143)
-#                            define FB_BOOST_PP_NODE_141(p) FB_BOOST_PP_IIF(p##(141), 141, 142)
-#                            define FB_BOOST_PP_NODE_143(p) FB_BOOST_PP_IIF(p##(143), 143, 144)
-#                define FB_BOOST_PP_NODE_152(p) FB_BOOST_PP_IIF(p##(152), FB_BOOST_PP_NODE_148, FB_BOOST_PP_NODE_156)
-#                    define FB_BOOST_PP_NODE_148(p) FB_BOOST_PP_IIF(p##(148), FB_BOOST_PP_NODE_146, FB_BOOST_PP_NODE_150)
-#                        define FB_BOOST_PP_NODE_146(p) FB_BOOST_PP_IIF(p##(146), FB_BOOST_PP_NODE_145, FB_BOOST_PP_NODE_147)
-#                            define FB_BOOST_PP_NODE_145(p) FB_BOOST_PP_IIF(p##(145), 145, 146)
-#                            define FB_BOOST_PP_NODE_147(p) FB_BOOST_PP_IIF(p##(147), 147, 148)
-#                        define FB_BOOST_PP_NODE_150(p) FB_BOOST_PP_IIF(p##(150), FB_BOOST_PP_NODE_149, FB_BOOST_PP_NODE_151)
-#                            define FB_BOOST_PP_NODE_149(p) FB_BOOST_PP_IIF(p##(149), 149, 150)
-#                            define FB_BOOST_PP_NODE_151(p) FB_BOOST_PP_IIF(p##(151), 151, 152)
-#                    define FB_BOOST_PP_NODE_156(p) FB_BOOST_PP_IIF(p##(156), FB_BOOST_PP_NODE_154, FB_BOOST_PP_NODE_158)
-#                        define FB_BOOST_PP_NODE_154(p) FB_BOOST_PP_IIF(p##(154), FB_BOOST_PP_NODE_153, FB_BOOST_PP_NODE_155)
-#                            define FB_BOOST_PP_NODE_153(p) FB_BOOST_PP_IIF(p##(153), 153, 154)
-#                            define FB_BOOST_PP_NODE_155(p) FB_BOOST_PP_IIF(p##(155), 155, 156)
-#                        define FB_BOOST_PP_NODE_158(p) FB_BOOST_PP_IIF(p##(158), FB_BOOST_PP_NODE_157, FB_BOOST_PP_NODE_159)
-#                            define FB_BOOST_PP_NODE_157(p) FB_BOOST_PP_IIF(p##(157), 157, 158)
-#                            define FB_BOOST_PP_NODE_159(p) FB_BOOST_PP_IIF(p##(159), 159, 160)
-#            define FB_BOOST_PP_NODE_176(p) FB_BOOST_PP_IIF(p##(176), FB_BOOST_PP_NODE_168, FB_BOOST_PP_NODE_184)
-#                define FB_BOOST_PP_NODE_168(p) FB_BOOST_PP_IIF(p##(168), FB_BOOST_PP_NODE_164, FB_BOOST_PP_NODE_172)
-#                    define FB_BOOST_PP_NODE_164(p) FB_BOOST_PP_IIF(p##(164), FB_BOOST_PP_NODE_162, FB_BOOST_PP_NODE_166)
-#                        define FB_BOOST_PP_NODE_162(p) FB_BOOST_PP_IIF(p##(162), FB_BOOST_PP_NODE_161, FB_BOOST_PP_NODE_163)
-#                            define FB_BOOST_PP_NODE_161(p) FB_BOOST_PP_IIF(p##(161), 161, 162)
-#                            define FB_BOOST_PP_NODE_163(p) FB_BOOST_PP_IIF(p##(163), 163, 164)
-#                        define FB_BOOST_PP_NODE_166(p) FB_BOOST_PP_IIF(p##(166), FB_BOOST_PP_NODE_165, FB_BOOST_PP_NODE_167)
-#                            define FB_BOOST_PP_NODE_165(p) FB_BOOST_PP_IIF(p##(165), 165, 166)
-#                            define FB_BOOST_PP_NODE_167(p) FB_BOOST_PP_IIF(p##(167), 167, 168)
-#                    define FB_BOOST_PP_NODE_172(p) FB_BOOST_PP_IIF(p##(172), FB_BOOST_PP_NODE_170, FB_BOOST_PP_NODE_174)
-#                        define FB_BOOST_PP_NODE_170(p) FB_BOOST_PP_IIF(p##(170), FB_BOOST_PP_NODE_169, FB_BOOST_PP_NODE_171)
-#                            define FB_BOOST_PP_NODE_169(p) FB_BOOST_PP_IIF(p##(169), 169, 170)
-#                            define FB_BOOST_PP_NODE_171(p) FB_BOOST_PP_IIF(p##(171), 171, 172)
-#                        define FB_BOOST_PP_NODE_174(p) FB_BOOST_PP_IIF(p##(174), FB_BOOST_PP_NODE_173, FB_BOOST_PP_NODE_175)
-#                            define FB_BOOST_PP_NODE_173(p) FB_BOOST_PP_IIF(p##(173), 173, 174)
-#                            define FB_BOOST_PP_NODE_175(p) FB_BOOST_PP_IIF(p##(175), 175, 176)
-#                define FB_BOOST_PP_NODE_184(p) FB_BOOST_PP_IIF(p##(184), FB_BOOST_PP_NODE_180, FB_BOOST_PP_NODE_188)
-#                    define FB_BOOST_PP_NODE_180(p) FB_BOOST_PP_IIF(p##(180), FB_BOOST_PP_NODE_178, FB_BOOST_PP_NODE_182)
-#                        define FB_BOOST_PP_NODE_178(p) FB_BOOST_PP_IIF(p##(178), FB_BOOST_PP_NODE_177, FB_BOOST_PP_NODE_179)
-#                            define FB_BOOST_PP_NODE_177(p) FB_BOOST_PP_IIF(p##(177), 177, 178)
-#                            define FB_BOOST_PP_NODE_179(p) FB_BOOST_PP_IIF(p##(179), 179, 180)
-#                        define FB_BOOST_PP_NODE_182(p) FB_BOOST_PP_IIF(p##(182), FB_BOOST_PP_NODE_181, FB_BOOST_PP_NODE_183)
-#                            define FB_BOOST_PP_NODE_181(p) FB_BOOST_PP_IIF(p##(181), 181, 182)
-#                            define FB_BOOST_PP_NODE_183(p) FB_BOOST_PP_IIF(p##(183), 183, 184)
-#                    define FB_BOOST_PP_NODE_188(p) FB_BOOST_PP_IIF(p##(188), FB_BOOST_PP_NODE_186, FB_BOOST_PP_NODE_190)
-#                        define FB_BOOST_PP_NODE_186(p) FB_BOOST_PP_IIF(p##(186), FB_BOOST_PP_NODE_185, FB_BOOST_PP_NODE_187)
-#                            define FB_BOOST_PP_NODE_185(p) FB_BOOST_PP_IIF(p##(185), 185, 186)
-#                            define FB_BOOST_PP_NODE_187(p) FB_BOOST_PP_IIF(p##(187), 187, 188)
-#                        define FB_BOOST_PP_NODE_190(p) FB_BOOST_PP_IIF(p##(190), FB_BOOST_PP_NODE_189, FB_BOOST_PP_NODE_191)
-#                            define FB_BOOST_PP_NODE_189(p) FB_BOOST_PP_IIF(p##(189), 189, 190)
-#                            define FB_BOOST_PP_NODE_191(p) FB_BOOST_PP_IIF(p##(191), 191, 192)
-#        define FB_BOOST_PP_NODE_224(p) FB_BOOST_PP_IIF(p##(224), FB_BOOST_PP_NODE_208, FB_BOOST_PP_NODE_240)
-#            define FB_BOOST_PP_NODE_208(p) FB_BOOST_PP_IIF(p##(208), FB_BOOST_PP_NODE_200, FB_BOOST_PP_NODE_216)
-#                define FB_BOOST_PP_NODE_200(p) FB_BOOST_PP_IIF(p##(200), FB_BOOST_PP_NODE_196, FB_BOOST_PP_NODE_204)
-#                    define FB_BOOST_PP_NODE_196(p) FB_BOOST_PP_IIF(p##(196), FB_BOOST_PP_NODE_194, FB_BOOST_PP_NODE_198)
-#                        define FB_BOOST_PP_NODE_194(p) FB_BOOST_PP_IIF(p##(194), FB_BOOST_PP_NODE_193, FB_BOOST_PP_NODE_195)
-#                            define FB_BOOST_PP_NODE_193(p) FB_BOOST_PP_IIF(p##(193), 193, 194)
-#                            define FB_BOOST_PP_NODE_195(p) FB_BOOST_PP_IIF(p##(195), 195, 196)
-#                        define FB_BOOST_PP_NODE_198(p) FB_BOOST_PP_IIF(p##(198), FB_BOOST_PP_NODE_197, FB_BOOST_PP_NODE_199)
-#                            define FB_BOOST_PP_NODE_197(p) FB_BOOST_PP_IIF(p##(197), 197, 198)
-#                            define FB_BOOST_PP_NODE_199(p) FB_BOOST_PP_IIF(p##(199), 199, 200)
-#                    define FB_BOOST_PP_NODE_204(p) FB_BOOST_PP_IIF(p##(204), FB_BOOST_PP_NODE_202, FB_BOOST_PP_NODE_206)
-#                        define FB_BOOST_PP_NODE_202(p) FB_BOOST_PP_IIF(p##(202), FB_BOOST_PP_NODE_201, FB_BOOST_PP_NODE_203)
-#                            define FB_BOOST_PP_NODE_201(p) FB_BOOST_PP_IIF(p##(201), 201, 202)
-#                            define FB_BOOST_PP_NODE_203(p) FB_BOOST_PP_IIF(p##(203), 203, 204)
-#                        define FB_BOOST_PP_NODE_206(p) FB_BOOST_PP_IIF(p##(206), FB_BOOST_PP_NODE_205, FB_BOOST_PP_NODE_207)
-#                            define FB_BOOST_PP_NODE_205(p) FB_BOOST_PP_IIF(p##(205), 205, 206)
-#                            define FB_BOOST_PP_NODE_207(p) FB_BOOST_PP_IIF(p##(207), 207, 208)
-#                define FB_BOOST_PP_NODE_216(p) FB_BOOST_PP_IIF(p##(216), FB_BOOST_PP_NODE_212, FB_BOOST_PP_NODE_220)
-#                    define FB_BOOST_PP_NODE_212(p) FB_BOOST_PP_IIF(p##(212), FB_BOOST_PP_NODE_210, FB_BOOST_PP_NODE_214)
-#                        define FB_BOOST_PP_NODE_210(p) FB_BOOST_PP_IIF(p##(210), FB_BOOST_PP_NODE_209, FB_BOOST_PP_NODE_211)
-#                            define FB_BOOST_PP_NODE_209(p) FB_BOOST_PP_IIF(p##(209), 209, 210)
-#                            define FB_BOOST_PP_NODE_211(p) FB_BOOST_PP_IIF(p##(211), 211, 212)
-#                        define FB_BOOST_PP_NODE_214(p) FB_BOOST_PP_IIF(p##(214), FB_BOOST_PP_NODE_213, FB_BOOST_PP_NODE_215)
-#                            define FB_BOOST_PP_NODE_213(p) FB_BOOST_PP_IIF(p##(213), 213, 214)
-#                            define FB_BOOST_PP_NODE_215(p) FB_BOOST_PP_IIF(p##(215), 215, 216)
-#                    define FB_BOOST_PP_NODE_220(p) FB_BOOST_PP_IIF(p##(220), FB_BOOST_PP_NODE_218, FB_BOOST_PP_NODE_222)
-#                        define FB_BOOST_PP_NODE_218(p) FB_BOOST_PP_IIF(p##(218), FB_BOOST_PP_NODE_217, FB_BOOST_PP_NODE_219)
-#                            define FB_BOOST_PP_NODE_217(p) FB_BOOST_PP_IIF(p##(217), 217, 218)
-#                            define FB_BOOST_PP_NODE_219(p) FB_BOOST_PP_IIF(p##(219), 219, 220)
-#                        define FB_BOOST_PP_NODE_222(p) FB_BOOST_PP_IIF(p##(222), FB_BOOST_PP_NODE_221, FB_BOOST_PP_NODE_223)
-#                            define FB_BOOST_PP_NODE_221(p) FB_BOOST_PP_IIF(p##(221), 221, 222)
-#                            define FB_BOOST_PP_NODE_223(p) FB_BOOST_PP_IIF(p##(223), 223, 224)
-#            define FB_BOOST_PP_NODE_240(p) FB_BOOST_PP_IIF(p##(240), FB_BOOST_PP_NODE_232, FB_BOOST_PP_NODE_248)
-#                define FB_BOOST_PP_NODE_232(p) FB_BOOST_PP_IIF(p##(232), FB_BOOST_PP_NODE_228, FB_BOOST_PP_NODE_236)
-#                    define FB_BOOST_PP_NODE_228(p) FB_BOOST_PP_IIF(p##(228), FB_BOOST_PP_NODE_226, FB_BOOST_PP_NODE_230)
-#                        define FB_BOOST_PP_NODE_226(p) FB_BOOST_PP_IIF(p##(226), FB_BOOST_PP_NODE_225, FB_BOOST_PP_NODE_227)
-#                            define FB_BOOST_PP_NODE_225(p) FB_BOOST_PP_IIF(p##(225), 225, 226)
-#                            define FB_BOOST_PP_NODE_227(p) FB_BOOST_PP_IIF(p##(227), 227, 228)
-#                        define FB_BOOST_PP_NODE_230(p) FB_BOOST_PP_IIF(p##(230), FB_BOOST_PP_NODE_229, FB_BOOST_PP_NODE_231)
-#                            define FB_BOOST_PP_NODE_229(p) FB_BOOST_PP_IIF(p##(229), 229, 230)
-#                            define FB_BOOST_PP_NODE_231(p) FB_BOOST_PP_IIF(p##(231), 231, 232)
-#                    define FB_BOOST_PP_NODE_236(p) FB_BOOST_PP_IIF(p##(236), FB_BOOST_PP_NODE_234, FB_BOOST_PP_NODE_238)
-#                        define FB_BOOST_PP_NODE_234(p) FB_BOOST_PP_IIF(p##(234), FB_BOOST_PP_NODE_233, FB_BOOST_PP_NODE_235)
-#                            define FB_BOOST_PP_NODE_233(p) FB_BOOST_PP_IIF(p##(233), 233, 234)
-#                            define FB_BOOST_PP_NODE_235(p) FB_BOOST_PP_IIF(p##(235), 235, 236)
-#                        define FB_BOOST_PP_NODE_238(p) FB_BOOST_PP_IIF(p##(238), FB_BOOST_PP_NODE_237, FB_BOOST_PP_NODE_239)
-#                            define FB_BOOST_PP_NODE_237(p) FB_BOOST_PP_IIF(p##(237), 237, 238)
-#                            define FB_BOOST_PP_NODE_239(p) FB_BOOST_PP_IIF(p##(239), 239, 240)
-#                define FB_BOOST_PP_NODE_248(p) FB_BOOST_PP_IIF(p##(248), FB_BOOST_PP_NODE_244, FB_BOOST_PP_NODE_252)
-#                    define FB_BOOST_PP_NODE_244(p) FB_BOOST_PP_IIF(p##(244), FB_BOOST_PP_NODE_242, FB_BOOST_PP_NODE_246)
-#                        define FB_BOOST_PP_NODE_242(p) FB_BOOST_PP_IIF(p##(242), FB_BOOST_PP_NODE_241, FB_BOOST_PP_NODE_243)
-#                            define FB_BOOST_PP_NODE_241(p) FB_BOOST_PP_IIF(p##(241), 241, 242)
-#                            define FB_BOOST_PP_NODE_243(p) FB_BOOST_PP_IIF(p##(243), 243, 244)
-#                        define FB_BOOST_PP_NODE_246(p) FB_BOOST_PP_IIF(p##(246), FB_BOOST_PP_NODE_245, FB_BOOST_PP_NODE_247)
-#                            define FB_BOOST_PP_NODE_245(p) FB_BOOST_PP_IIF(p##(245), 245, 246)
-#                            define FB_BOOST_PP_NODE_247(p) FB_BOOST_PP_IIF(p##(247), 247, 248)
-#                    define FB_BOOST_PP_NODE_252(p) FB_BOOST_PP_IIF(p##(252), FB_BOOST_PP_NODE_250, FB_BOOST_PP_NODE_254)
-#                        define FB_BOOST_PP_NODE_250(p) FB_BOOST_PP_IIF(p##(250), FB_BOOST_PP_NODE_249, FB_BOOST_PP_NODE_251)
-#                            define FB_BOOST_PP_NODE_249(p) FB_BOOST_PP_IIF(p##(249), 249, 250)
-#                            define FB_BOOST_PP_NODE_251(p) FB_BOOST_PP_IIF(p##(251), 251, 252)
-#                        define FB_BOOST_PP_NODE_254(p) FB_BOOST_PP_IIF(p##(254), FB_BOOST_PP_NODE_253, FB_BOOST_PP_NODE_255)
-#                            define FB_BOOST_PP_NODE_253(p) FB_BOOST_PP_IIF(p##(253), 253, 254)
-#                            define FB_BOOST_PP_NODE_255(p) FB_BOOST_PP_IIF(p##(255), 255, 256)
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/facilities/empty.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/facilities/empty.hpp
deleted file mode 100644
index 455fb07b..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/facilities/empty.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-# /* Copyright (C) 2001
-#  * Housemarque Oy
-#  * http://www.housemarque.com
-#  *
-#  * Distributed under the Boost Software License, Version 1.0. (See
-#  * accompanying file LICENSE_1_0.txt or copy at
-#  * http://www.boost.org/LICENSE_1_0.txt)
-#  */
-#
-# /* Revised by Paul Mensonides (2002) */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_FACILITIES_EMPTY_HPP
-# define FB_BOOST_PREPROCESSOR_FACILITIES_EMPTY_HPP
-#
-# /* FB_BOOST_PP_EMPTY */
-#
-# define FB_BOOST_PP_EMPTY()
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/logical/bool.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/logical/bool.hpp
deleted file mode 100644
index aea1fa21..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/logical/bool.hpp
+++ /dev/null
@@ -1,288 +0,0 @@
-# /* Copyright (C) 2001
-#  * Housemarque Oy
-#  * http://www.housemarque.com
-#  *
-#  * Distributed under the Boost Software License, Version 1.0. (See
-#  * accompanying file LICENSE_1_0.txt or copy at
-#  * http://www.boost.org/LICENSE_1_0.txt)
-#  */
-#
-# /* Revised by Paul Mensonides (2002) */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_LOGICAL_BOOL_HPP
-# define FB_BOOST_PREPROCESSOR_LOGICAL_BOOL_HPP
-#
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-#
-# /* FB_BOOST_PP_BOOL */
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_BOOL(x) FB_BOOST_PP_BOOL_I(x)
-# else
-#    define FB_BOOST_PP_BOOL(x) FB_BOOST_PP_BOOL_OO((x))
-#    define FB_BOOST_PP_BOOL_OO(par) FB_BOOST_PP_BOOL_I ## par
-# endif
-#
-# define FB_BOOST_PP_BOOL_I(x) FB_BOOST_PP_BOOL_ ## x
-#
-# define FB_BOOST_PP_BOOL_0 0
-# define FB_BOOST_PP_BOOL_1 1
-# define FB_BOOST_PP_BOOL_2 1
-# define FB_BOOST_PP_BOOL_3 1
-# define FB_BOOST_PP_BOOL_4 1
-# define FB_BOOST_PP_BOOL_5 1
-# define FB_BOOST_PP_BOOL_6 1
-# define FB_BOOST_PP_BOOL_7 1
-# define FB_BOOST_PP_BOOL_8 1
-# define FB_BOOST_PP_BOOL_9 1
-# define FB_BOOST_PP_BOOL_10 1
-# define FB_BOOST_PP_BOOL_11 1
-# define FB_BOOST_PP_BOOL_12 1
-# define FB_BOOST_PP_BOOL_13 1
-# define FB_BOOST_PP_BOOL_14 1
-# define FB_BOOST_PP_BOOL_15 1
-# define FB_BOOST_PP_BOOL_16 1
-# define FB_BOOST_PP_BOOL_17 1
-# define FB_BOOST_PP_BOOL_18 1
-# define FB_BOOST_PP_BOOL_19 1
-# define FB_BOOST_PP_BOOL_20 1
-# define FB_BOOST_PP_BOOL_21 1
-# define FB_BOOST_PP_BOOL_22 1
-# define FB_BOOST_PP_BOOL_23 1
-# define FB_BOOST_PP_BOOL_24 1
-# define FB_BOOST_PP_BOOL_25 1
-# define FB_BOOST_PP_BOOL_26 1
-# define FB_BOOST_PP_BOOL_27 1
-# define FB_BOOST_PP_BOOL_28 1
-# define FB_BOOST_PP_BOOL_29 1
-# define FB_BOOST_PP_BOOL_30 1
-# define FB_BOOST_PP_BOOL_31 1
-# define FB_BOOST_PP_BOOL_32 1
-# define FB_BOOST_PP_BOOL_33 1
-# define FB_BOOST_PP_BOOL_34 1
-# define FB_BOOST_PP_BOOL_35 1
-# define FB_BOOST_PP_BOOL_36 1
-# define FB_BOOST_PP_BOOL_37 1
-# define FB_BOOST_PP_BOOL_38 1
-# define FB_BOOST_PP_BOOL_39 1
-# define FB_BOOST_PP_BOOL_40 1
-# define FB_BOOST_PP_BOOL_41 1
-# define FB_BOOST_PP_BOOL_42 1
-# define FB_BOOST_PP_BOOL_43 1
-# define FB_BOOST_PP_BOOL_44 1
-# define FB_BOOST_PP_BOOL_45 1
-# define FB_BOOST_PP_BOOL_46 1
-# define FB_BOOST_PP_BOOL_47 1
-# define FB_BOOST_PP_BOOL_48 1
-# define FB_BOOST_PP_BOOL_49 1
-# define FB_BOOST_PP_BOOL_50 1
-# define FB_BOOST_PP_BOOL_51 1
-# define FB_BOOST_PP_BOOL_52 1
-# define FB_BOOST_PP_BOOL_53 1
-# define FB_BOOST_PP_BOOL_54 1
-# define FB_BOOST_PP_BOOL_55 1
-# define FB_BOOST_PP_BOOL_56 1
-# define FB_BOOST_PP_BOOL_57 1
-# define FB_BOOST_PP_BOOL_58 1
-# define FB_BOOST_PP_BOOL_59 1
-# define FB_BOOST_PP_BOOL_60 1
-# define FB_BOOST_PP_BOOL_61 1
-# define FB_BOOST_PP_BOOL_62 1
-# define FB_BOOST_PP_BOOL_63 1
-# define FB_BOOST_PP_BOOL_64 1
-# define FB_BOOST_PP_BOOL_65 1
-# define FB_BOOST_PP_BOOL_66 1
-# define FB_BOOST_PP_BOOL_67 1
-# define FB_BOOST_PP_BOOL_68 1
-# define FB_BOOST_PP_BOOL_69 1
-# define FB_BOOST_PP_BOOL_70 1
-# define FB_BOOST_PP_BOOL_71 1
-# define FB_BOOST_PP_BOOL_72 1
-# define FB_BOOST_PP_BOOL_73 1
-# define FB_BOOST_PP_BOOL_74 1
-# define FB_BOOST_PP_BOOL_75 1
-# define FB_BOOST_PP_BOOL_76 1
-# define FB_BOOST_PP_BOOL_77 1
-# define FB_BOOST_PP_BOOL_78 1
-# define FB_BOOST_PP_BOOL_79 1
-# define FB_BOOST_PP_BOOL_80 1
-# define FB_BOOST_PP_BOOL_81 1
-# define FB_BOOST_PP_BOOL_82 1
-# define FB_BOOST_PP_BOOL_83 1
-# define FB_BOOST_PP_BOOL_84 1
-# define FB_BOOST_PP_BOOL_85 1
-# define FB_BOOST_PP_BOOL_86 1
-# define FB_BOOST_PP_BOOL_87 1
-# define FB_BOOST_PP_BOOL_88 1
-# define FB_BOOST_PP_BOOL_89 1
-# define FB_BOOST_PP_BOOL_90 1
-# define FB_BOOST_PP_BOOL_91 1
-# define FB_BOOST_PP_BOOL_92 1
-# define FB_BOOST_PP_BOOL_93 1
-# define FB_BOOST_PP_BOOL_94 1
-# define FB_BOOST_PP_BOOL_95 1
-# define FB_BOOST_PP_BOOL_96 1
-# define FB_BOOST_PP_BOOL_97 1
-# define FB_BOOST_PP_BOOL_98 1
-# define FB_BOOST_PP_BOOL_99 1
-# define FB_BOOST_PP_BOOL_100 1
-# define FB_BOOST_PP_BOOL_101 1
-# define FB_BOOST_PP_BOOL_102 1
-# define FB_BOOST_PP_BOOL_103 1
-# define FB_BOOST_PP_BOOL_104 1
-# define FB_BOOST_PP_BOOL_105 1
-# define FB_BOOST_PP_BOOL_106 1
-# define FB_BOOST_PP_BOOL_107 1
-# define FB_BOOST_PP_BOOL_108 1
-# define FB_BOOST_PP_BOOL_109 1
-# define FB_BOOST_PP_BOOL_110 1
-# define FB_BOOST_PP_BOOL_111 1
-# define FB_BOOST_PP_BOOL_112 1
-# define FB_BOOST_PP_BOOL_113 1
-# define FB_BOOST_PP_BOOL_114 1
-# define FB_BOOST_PP_BOOL_115 1
-# define FB_BOOST_PP_BOOL_116 1
-# define FB_BOOST_PP_BOOL_117 1
-# define FB_BOOST_PP_BOOL_118 1
-# define FB_BOOST_PP_BOOL_119 1
-# define FB_BOOST_PP_BOOL_120 1
-# define FB_BOOST_PP_BOOL_121 1
-# define FB_BOOST_PP_BOOL_122 1
-# define FB_BOOST_PP_BOOL_123 1
-# define FB_BOOST_PP_BOOL_124 1
-# define FB_BOOST_PP_BOOL_125 1
-# define FB_BOOST_PP_BOOL_126 1
-# define FB_BOOST_PP_BOOL_127 1
-# define FB_BOOST_PP_BOOL_128 1
-# define FB_BOOST_PP_BOOL_129 1
-# define FB_BOOST_PP_BOOL_130 1
-# define FB_BOOST_PP_BOOL_131 1
-# define FB_BOOST_PP_BOOL_132 1
-# define FB_BOOST_PP_BOOL_133 1
-# define FB_BOOST_PP_BOOL_134 1
-# define FB_BOOST_PP_BOOL_135 1
-# define FB_BOOST_PP_BOOL_136 1
-# define FB_BOOST_PP_BOOL_137 1
-# define FB_BOOST_PP_BOOL_138 1
-# define FB_BOOST_PP_BOOL_139 1
-# define FB_BOOST_PP_BOOL_140 1
-# define FB_BOOST_PP_BOOL_141 1
-# define FB_BOOST_PP_BOOL_142 1
-# define FB_BOOST_PP_BOOL_143 1
-# define FB_BOOST_PP_BOOL_144 1
-# define FB_BOOST_PP_BOOL_145 1
-# define FB_BOOST_PP_BOOL_146 1
-# define FB_BOOST_PP_BOOL_147 1
-# define FB_BOOST_PP_BOOL_148 1
-# define FB_BOOST_PP_BOOL_149 1
-# define FB_BOOST_PP_BOOL_150 1
-# define FB_BOOST_PP_BOOL_151 1
-# define FB_BOOST_PP_BOOL_152 1
-# define FB_BOOST_PP_BOOL_153 1
-# define FB_BOOST_PP_BOOL_154 1
-# define FB_BOOST_PP_BOOL_155 1
-# define FB_BOOST_PP_BOOL_156 1
-# define FB_BOOST_PP_BOOL_157 1
-# define FB_BOOST_PP_BOOL_158 1
-# define FB_BOOST_PP_BOOL_159 1
-# define FB_BOOST_PP_BOOL_160 1
-# define FB_BOOST_PP_BOOL_161 1
-# define FB_BOOST_PP_BOOL_162 1
-# define FB_BOOST_PP_BOOL_163 1
-# define FB_BOOST_PP_BOOL_164 1
-# define FB_BOOST_PP_BOOL_165 1
-# define FB_BOOST_PP_BOOL_166 1
-# define FB_BOOST_PP_BOOL_167 1
-# define FB_BOOST_PP_BOOL_168 1
-# define FB_BOOST_PP_BOOL_169 1
-# define FB_BOOST_PP_BOOL_170 1
-# define FB_BOOST_PP_BOOL_171 1
-# define FB_BOOST_PP_BOOL_172 1
-# define FB_BOOST_PP_BOOL_173 1
-# define FB_BOOST_PP_BOOL_174 1
-# define FB_BOOST_PP_BOOL_175 1
-# define FB_BOOST_PP_BOOL_176 1
-# define FB_BOOST_PP_BOOL_177 1
-# define FB_BOOST_PP_BOOL_178 1
-# define FB_BOOST_PP_BOOL_179 1
-# define FB_BOOST_PP_BOOL_180 1
-# define FB_BOOST_PP_BOOL_181 1
-# define FB_BOOST_PP_BOOL_182 1
-# define FB_BOOST_PP_BOOL_183 1
-# define FB_BOOST_PP_BOOL_184 1
-# define FB_BOOST_PP_BOOL_185 1
-# define FB_BOOST_PP_BOOL_186 1
-# define FB_BOOST_PP_BOOL_187 1
-# define FB_BOOST_PP_BOOL_188 1
-# define FB_BOOST_PP_BOOL_189 1
-# define FB_BOOST_PP_BOOL_190 1
-# define FB_BOOST_PP_BOOL_191 1
-# define FB_BOOST_PP_BOOL_192 1
-# define FB_BOOST_PP_BOOL_193 1
-# define FB_BOOST_PP_BOOL_194 1
-# define FB_BOOST_PP_BOOL_195 1
-# define FB_BOOST_PP_BOOL_196 1
-# define FB_BOOST_PP_BOOL_197 1
-# define FB_BOOST_PP_BOOL_198 1
-# define FB_BOOST_PP_BOOL_199 1
-# define FB_BOOST_PP_BOOL_200 1
-# define FB_BOOST_PP_BOOL_201 1
-# define FB_BOOST_PP_BOOL_202 1
-# define FB_BOOST_PP_BOOL_203 1
-# define FB_BOOST_PP_BOOL_204 1
-# define FB_BOOST_PP_BOOL_205 1
-# define FB_BOOST_PP_BOOL_206 1
-# define FB_BOOST_PP_BOOL_207 1
-# define FB_BOOST_PP_BOOL_208 1
-# define FB_BOOST_PP_BOOL_209 1
-# define FB_BOOST_PP_BOOL_210 1
-# define FB_BOOST_PP_BOOL_211 1
-# define FB_BOOST_PP_BOOL_212 1
-# define FB_BOOST_PP_BOOL_213 1
-# define FB_BOOST_PP_BOOL_214 1
-# define FB_BOOST_PP_BOOL_215 1
-# define FB_BOOST_PP_BOOL_216 1
-# define FB_BOOST_PP_BOOL_217 1
-# define FB_BOOST_PP_BOOL_218 1
-# define FB_BOOST_PP_BOOL_219 1
-# define FB_BOOST_PP_BOOL_220 1
-# define FB_BOOST_PP_BOOL_221 1
-# define FB_BOOST_PP_BOOL_222 1
-# define FB_BOOST_PP_BOOL_223 1
-# define FB_BOOST_PP_BOOL_224 1
-# define FB_BOOST_PP_BOOL_225 1
-# define FB_BOOST_PP_BOOL_226 1
-# define FB_BOOST_PP_BOOL_227 1
-# define FB_BOOST_PP_BOOL_228 1
-# define FB_BOOST_PP_BOOL_229 1
-# define FB_BOOST_PP_BOOL_230 1
-# define FB_BOOST_PP_BOOL_231 1
-# define FB_BOOST_PP_BOOL_232 1
-# define FB_BOOST_PP_BOOL_233 1
-# define FB_BOOST_PP_BOOL_234 1
-# define FB_BOOST_PP_BOOL_235 1
-# define FB_BOOST_PP_BOOL_236 1
-# define FB_BOOST_PP_BOOL_237 1
-# define FB_BOOST_PP_BOOL_238 1
-# define FB_BOOST_PP_BOOL_239 1
-# define FB_BOOST_PP_BOOL_240 1
-# define FB_BOOST_PP_BOOL_241 1
-# define FB_BOOST_PP_BOOL_242 1
-# define FB_BOOST_PP_BOOL_243 1
-# define FB_BOOST_PP_BOOL_244 1
-# define FB_BOOST_PP_BOOL_245 1
-# define FB_BOOST_PP_BOOL_246 1
-# define FB_BOOST_PP_BOOL_247 1
-# define FB_BOOST_PP_BOOL_248 1
-# define FB_BOOST_PP_BOOL_249 1
-# define FB_BOOST_PP_BOOL_250 1
-# define FB_BOOST_PP_BOOL_251 1
-# define FB_BOOST_PP_BOOL_252 1
-# define FB_BOOST_PP_BOOL_253 1
-# define FB_BOOST_PP_BOOL_254 1
-# define FB_BOOST_PP_BOOL_255 1
-# define FB_BOOST_PP_BOOL_256 1
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/detail/dmc/for.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/detail/dmc/for.hpp
deleted file mode 100644
index 8789748f..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/detail/dmc/for.hpp
+++ /dev/null
@@ -1,536 +0,0 @@
-# /* Copyright (C) 2001
-#  * Housemarque Oy
-#  * http://www.housemarque.com
-#  *
-#  * Distributed under the Boost Software License, Version 1.0. (See
-#  * accompanying file LICENSE_1_0.txt or copy at
-#  * http://www.boost.org/LICENSE_1_0.txt)
-#  */
-#
-# /* Revised by Paul Mensonides (2002) */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_REPETITION_DETAIL_FOR_HPP
-# define FB_BOOST_PREPROCESSOR_REPETITION_DETAIL_FOR_HPP
-#
-# include <firebird/impl/boost/preprocessor/control/expr_iif.hpp>
-# include <firebird/impl/boost/preprocessor/control/iif.hpp>
-# include <firebird/impl/boost/preprocessor/logical/bool.hpp>
-# include <firebird/impl/boost/preprocessor/tuple/eat.hpp>
-#
-# define FB_BOOST_PP_FOR_1(s, p, o, m) FB_BOOST_PP_FOR_1_C(FB_BOOST_PP_BOOL(p##(2, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_2(s, p, o, m) FB_BOOST_PP_FOR_2_C(FB_BOOST_PP_BOOL(p##(3, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_3(s, p, o, m) FB_BOOST_PP_FOR_3_C(FB_BOOST_PP_BOOL(p##(4, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_4(s, p, o, m) FB_BOOST_PP_FOR_4_C(FB_BOOST_PP_BOOL(p##(5, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_5(s, p, o, m) FB_BOOST_PP_FOR_5_C(FB_BOOST_PP_BOOL(p##(6, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_6(s, p, o, m) FB_BOOST_PP_FOR_6_C(FB_BOOST_PP_BOOL(p##(7, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_7(s, p, o, m) FB_BOOST_PP_FOR_7_C(FB_BOOST_PP_BOOL(p##(8, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_8(s, p, o, m) FB_BOOST_PP_FOR_8_C(FB_BOOST_PP_BOOL(p##(9, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_9(s, p, o, m) FB_BOOST_PP_FOR_9_C(FB_BOOST_PP_BOOL(p##(10, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_10(s, p, o, m) FB_BOOST_PP_FOR_10_C(FB_BOOST_PP_BOOL(p##(11, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_11(s, p, o, m) FB_BOOST_PP_FOR_11_C(FB_BOOST_PP_BOOL(p##(12, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_12(s, p, o, m) FB_BOOST_PP_FOR_12_C(FB_BOOST_PP_BOOL(p##(13, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_13(s, p, o, m) FB_BOOST_PP_FOR_13_C(FB_BOOST_PP_BOOL(p##(14, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_14(s, p, o, m) FB_BOOST_PP_FOR_14_C(FB_BOOST_PP_BOOL(p##(15, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_15(s, p, o, m) FB_BOOST_PP_FOR_15_C(FB_BOOST_PP_BOOL(p##(16, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_16(s, p, o, m) FB_BOOST_PP_FOR_16_C(FB_BOOST_PP_BOOL(p##(17, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_17(s, p, o, m) FB_BOOST_PP_FOR_17_C(FB_BOOST_PP_BOOL(p##(18, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_18(s, p, o, m) FB_BOOST_PP_FOR_18_C(FB_BOOST_PP_BOOL(p##(19, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_19(s, p, o, m) FB_BOOST_PP_FOR_19_C(FB_BOOST_PP_BOOL(p##(20, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_20(s, p, o, m) FB_BOOST_PP_FOR_20_C(FB_BOOST_PP_BOOL(p##(21, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_21(s, p, o, m) FB_BOOST_PP_FOR_21_C(FB_BOOST_PP_BOOL(p##(22, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_22(s, p, o, m) FB_BOOST_PP_FOR_22_C(FB_BOOST_PP_BOOL(p##(23, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_23(s, p, o, m) FB_BOOST_PP_FOR_23_C(FB_BOOST_PP_BOOL(p##(24, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_24(s, p, o, m) FB_BOOST_PP_FOR_24_C(FB_BOOST_PP_BOOL(p##(25, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_25(s, p, o, m) FB_BOOST_PP_FOR_25_C(FB_BOOST_PP_BOOL(p##(26, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_26(s, p, o, m) FB_BOOST_PP_FOR_26_C(FB_BOOST_PP_BOOL(p##(27, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_27(s, p, o, m) FB_BOOST_PP_FOR_27_C(FB_BOOST_PP_BOOL(p##(28, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_28(s, p, o, m) FB_BOOST_PP_FOR_28_C(FB_BOOST_PP_BOOL(p##(29, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_29(s, p, o, m) FB_BOOST_PP_FOR_29_C(FB_BOOST_PP_BOOL(p##(30, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_30(s, p, o, m) FB_BOOST_PP_FOR_30_C(FB_BOOST_PP_BOOL(p##(31, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_31(s, p, o, m) FB_BOOST_PP_FOR_31_C(FB_BOOST_PP_BOOL(p##(32, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_32(s, p, o, m) FB_BOOST_PP_FOR_32_C(FB_BOOST_PP_BOOL(p##(33, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_33(s, p, o, m) FB_BOOST_PP_FOR_33_C(FB_BOOST_PP_BOOL(p##(34, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_34(s, p, o, m) FB_BOOST_PP_FOR_34_C(FB_BOOST_PP_BOOL(p##(35, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_35(s, p, o, m) FB_BOOST_PP_FOR_35_C(FB_BOOST_PP_BOOL(p##(36, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_36(s, p, o, m) FB_BOOST_PP_FOR_36_C(FB_BOOST_PP_BOOL(p##(37, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_37(s, p, o, m) FB_BOOST_PP_FOR_37_C(FB_BOOST_PP_BOOL(p##(38, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_38(s, p, o, m) FB_BOOST_PP_FOR_38_C(FB_BOOST_PP_BOOL(p##(39, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_39(s, p, o, m) FB_BOOST_PP_FOR_39_C(FB_BOOST_PP_BOOL(p##(40, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_40(s, p, o, m) FB_BOOST_PP_FOR_40_C(FB_BOOST_PP_BOOL(p##(41, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_41(s, p, o, m) FB_BOOST_PP_FOR_41_C(FB_BOOST_PP_BOOL(p##(42, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_42(s, p, o, m) FB_BOOST_PP_FOR_42_C(FB_BOOST_PP_BOOL(p##(43, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_43(s, p, o, m) FB_BOOST_PP_FOR_43_C(FB_BOOST_PP_BOOL(p##(44, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_44(s, p, o, m) FB_BOOST_PP_FOR_44_C(FB_BOOST_PP_BOOL(p##(45, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_45(s, p, o, m) FB_BOOST_PP_FOR_45_C(FB_BOOST_PP_BOOL(p##(46, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_46(s, p, o, m) FB_BOOST_PP_FOR_46_C(FB_BOOST_PP_BOOL(p##(47, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_47(s, p, o, m) FB_BOOST_PP_FOR_47_C(FB_BOOST_PP_BOOL(p##(48, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_48(s, p, o, m) FB_BOOST_PP_FOR_48_C(FB_BOOST_PP_BOOL(p##(49, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_49(s, p, o, m) FB_BOOST_PP_FOR_49_C(FB_BOOST_PP_BOOL(p##(50, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_50(s, p, o, m) FB_BOOST_PP_FOR_50_C(FB_BOOST_PP_BOOL(p##(51, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_51(s, p, o, m) FB_BOOST_PP_FOR_51_C(FB_BOOST_PP_BOOL(p##(52, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_52(s, p, o, m) FB_BOOST_PP_FOR_52_C(FB_BOOST_PP_BOOL(p##(53, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_53(s, p, o, m) FB_BOOST_PP_FOR_53_C(FB_BOOST_PP_BOOL(p##(54, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_54(s, p, o, m) FB_BOOST_PP_FOR_54_C(FB_BOOST_PP_BOOL(p##(55, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_55(s, p, o, m) FB_BOOST_PP_FOR_55_C(FB_BOOST_PP_BOOL(p##(56, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_56(s, p, o, m) FB_BOOST_PP_FOR_56_C(FB_BOOST_PP_BOOL(p##(57, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_57(s, p, o, m) FB_BOOST_PP_FOR_57_C(FB_BOOST_PP_BOOL(p##(58, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_58(s, p, o, m) FB_BOOST_PP_FOR_58_C(FB_BOOST_PP_BOOL(p##(59, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_59(s, p, o, m) FB_BOOST_PP_FOR_59_C(FB_BOOST_PP_BOOL(p##(60, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_60(s, p, o, m) FB_BOOST_PP_FOR_60_C(FB_BOOST_PP_BOOL(p##(61, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_61(s, p, o, m) FB_BOOST_PP_FOR_61_C(FB_BOOST_PP_BOOL(p##(62, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_62(s, p, o, m) FB_BOOST_PP_FOR_62_C(FB_BOOST_PP_BOOL(p##(63, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_63(s, p, o, m) FB_BOOST_PP_FOR_63_C(FB_BOOST_PP_BOOL(p##(64, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_64(s, p, o, m) FB_BOOST_PP_FOR_64_C(FB_BOOST_PP_BOOL(p##(65, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_65(s, p, o, m) FB_BOOST_PP_FOR_65_C(FB_BOOST_PP_BOOL(p##(66, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_66(s, p, o, m) FB_BOOST_PP_FOR_66_C(FB_BOOST_PP_BOOL(p##(67, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_67(s, p, o, m) FB_BOOST_PP_FOR_67_C(FB_BOOST_PP_BOOL(p##(68, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_68(s, p, o, m) FB_BOOST_PP_FOR_68_C(FB_BOOST_PP_BOOL(p##(69, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_69(s, p, o, m) FB_BOOST_PP_FOR_69_C(FB_BOOST_PP_BOOL(p##(70, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_70(s, p, o, m) FB_BOOST_PP_FOR_70_C(FB_BOOST_PP_BOOL(p##(71, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_71(s, p, o, m) FB_BOOST_PP_FOR_71_C(FB_BOOST_PP_BOOL(p##(72, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_72(s, p, o, m) FB_BOOST_PP_FOR_72_C(FB_BOOST_PP_BOOL(p##(73, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_73(s, p, o, m) FB_BOOST_PP_FOR_73_C(FB_BOOST_PP_BOOL(p##(74, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_74(s, p, o, m) FB_BOOST_PP_FOR_74_C(FB_BOOST_PP_BOOL(p##(75, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_75(s, p, o, m) FB_BOOST_PP_FOR_75_C(FB_BOOST_PP_BOOL(p##(76, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_76(s, p, o, m) FB_BOOST_PP_FOR_76_C(FB_BOOST_PP_BOOL(p##(77, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_77(s, p, o, m) FB_BOOST_PP_FOR_77_C(FB_BOOST_PP_BOOL(p##(78, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_78(s, p, o, m) FB_BOOST_PP_FOR_78_C(FB_BOOST_PP_BOOL(p##(79, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_79(s, p, o, m) FB_BOOST_PP_FOR_79_C(FB_BOOST_PP_BOOL(p##(80, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_80(s, p, o, m) FB_BOOST_PP_FOR_80_C(FB_BOOST_PP_BOOL(p##(81, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_81(s, p, o, m) FB_BOOST_PP_FOR_81_C(FB_BOOST_PP_BOOL(p##(82, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_82(s, p, o, m) FB_BOOST_PP_FOR_82_C(FB_BOOST_PP_BOOL(p##(83, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_83(s, p, o, m) FB_BOOST_PP_FOR_83_C(FB_BOOST_PP_BOOL(p##(84, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_84(s, p, o, m) FB_BOOST_PP_FOR_84_C(FB_BOOST_PP_BOOL(p##(85, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_85(s, p, o, m) FB_BOOST_PP_FOR_85_C(FB_BOOST_PP_BOOL(p##(86, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_86(s, p, o, m) FB_BOOST_PP_FOR_86_C(FB_BOOST_PP_BOOL(p##(87, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_87(s, p, o, m) FB_BOOST_PP_FOR_87_C(FB_BOOST_PP_BOOL(p##(88, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_88(s, p, o, m) FB_BOOST_PP_FOR_88_C(FB_BOOST_PP_BOOL(p##(89, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_89(s, p, o, m) FB_BOOST_PP_FOR_89_C(FB_BOOST_PP_BOOL(p##(90, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_90(s, p, o, m) FB_BOOST_PP_FOR_90_C(FB_BOOST_PP_BOOL(p##(91, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_91(s, p, o, m) FB_BOOST_PP_FOR_91_C(FB_BOOST_PP_BOOL(p##(92, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_92(s, p, o, m) FB_BOOST_PP_FOR_92_C(FB_BOOST_PP_BOOL(p##(93, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_93(s, p, o, m) FB_BOOST_PP_FOR_93_C(FB_BOOST_PP_BOOL(p##(94, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_94(s, p, o, m) FB_BOOST_PP_FOR_94_C(FB_BOOST_PP_BOOL(p##(95, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_95(s, p, o, m) FB_BOOST_PP_FOR_95_C(FB_BOOST_PP_BOOL(p##(96, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_96(s, p, o, m) FB_BOOST_PP_FOR_96_C(FB_BOOST_PP_BOOL(p##(97, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_97(s, p, o, m) FB_BOOST_PP_FOR_97_C(FB_BOOST_PP_BOOL(p##(98, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_98(s, p, o, m) FB_BOOST_PP_FOR_98_C(FB_BOOST_PP_BOOL(p##(99, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_99(s, p, o, m) FB_BOOST_PP_FOR_99_C(FB_BOOST_PP_BOOL(p##(100, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_100(s, p, o, m) FB_BOOST_PP_FOR_100_C(FB_BOOST_PP_BOOL(p##(101, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_101(s, p, o, m) FB_BOOST_PP_FOR_101_C(FB_BOOST_PP_BOOL(p##(102, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_102(s, p, o, m) FB_BOOST_PP_FOR_102_C(FB_BOOST_PP_BOOL(p##(103, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_103(s, p, o, m) FB_BOOST_PP_FOR_103_C(FB_BOOST_PP_BOOL(p##(104, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_104(s, p, o, m) FB_BOOST_PP_FOR_104_C(FB_BOOST_PP_BOOL(p##(105, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_105(s, p, o, m) FB_BOOST_PP_FOR_105_C(FB_BOOST_PP_BOOL(p##(106, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_106(s, p, o, m) FB_BOOST_PP_FOR_106_C(FB_BOOST_PP_BOOL(p##(107, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_107(s, p, o, m) FB_BOOST_PP_FOR_107_C(FB_BOOST_PP_BOOL(p##(108, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_108(s, p, o, m) FB_BOOST_PP_FOR_108_C(FB_BOOST_PP_BOOL(p##(109, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_109(s, p, o, m) FB_BOOST_PP_FOR_109_C(FB_BOOST_PP_BOOL(p##(110, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_110(s, p, o, m) FB_BOOST_PP_FOR_110_C(FB_BOOST_PP_BOOL(p##(111, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_111(s, p, o, m) FB_BOOST_PP_FOR_111_C(FB_BOOST_PP_BOOL(p##(112, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_112(s, p, o, m) FB_BOOST_PP_FOR_112_C(FB_BOOST_PP_BOOL(p##(113, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_113(s, p, o, m) FB_BOOST_PP_FOR_113_C(FB_BOOST_PP_BOOL(p##(114, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_114(s, p, o, m) FB_BOOST_PP_FOR_114_C(FB_BOOST_PP_BOOL(p##(115, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_115(s, p, o, m) FB_BOOST_PP_FOR_115_C(FB_BOOST_PP_BOOL(p##(116, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_116(s, p, o, m) FB_BOOST_PP_FOR_116_C(FB_BOOST_PP_BOOL(p##(117, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_117(s, p, o, m) FB_BOOST_PP_FOR_117_C(FB_BOOST_PP_BOOL(p##(118, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_118(s, p, o, m) FB_BOOST_PP_FOR_118_C(FB_BOOST_PP_BOOL(p##(119, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_119(s, p, o, m) FB_BOOST_PP_FOR_119_C(FB_BOOST_PP_BOOL(p##(120, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_120(s, p, o, m) FB_BOOST_PP_FOR_120_C(FB_BOOST_PP_BOOL(p##(121, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_121(s, p, o, m) FB_BOOST_PP_FOR_121_C(FB_BOOST_PP_BOOL(p##(122, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_122(s, p, o, m) FB_BOOST_PP_FOR_122_C(FB_BOOST_PP_BOOL(p##(123, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_123(s, p, o, m) FB_BOOST_PP_FOR_123_C(FB_BOOST_PP_BOOL(p##(124, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_124(s, p, o, m) FB_BOOST_PP_FOR_124_C(FB_BOOST_PP_BOOL(p##(125, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_125(s, p, o, m) FB_BOOST_PP_FOR_125_C(FB_BOOST_PP_BOOL(p##(126, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_126(s, p, o, m) FB_BOOST_PP_FOR_126_C(FB_BOOST_PP_BOOL(p##(127, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_127(s, p, o, m) FB_BOOST_PP_FOR_127_C(FB_BOOST_PP_BOOL(p##(128, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_128(s, p, o, m) FB_BOOST_PP_FOR_128_C(FB_BOOST_PP_BOOL(p##(129, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_129(s, p, o, m) FB_BOOST_PP_FOR_129_C(FB_BOOST_PP_BOOL(p##(130, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_130(s, p, o, m) FB_BOOST_PP_FOR_130_C(FB_BOOST_PP_BOOL(p##(131, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_131(s, p, o, m) FB_BOOST_PP_FOR_131_C(FB_BOOST_PP_BOOL(p##(132, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_132(s, p, o, m) FB_BOOST_PP_FOR_132_C(FB_BOOST_PP_BOOL(p##(133, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_133(s, p, o, m) FB_BOOST_PP_FOR_133_C(FB_BOOST_PP_BOOL(p##(134, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_134(s, p, o, m) FB_BOOST_PP_FOR_134_C(FB_BOOST_PP_BOOL(p##(135, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_135(s, p, o, m) FB_BOOST_PP_FOR_135_C(FB_BOOST_PP_BOOL(p##(136, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_136(s, p, o, m) FB_BOOST_PP_FOR_136_C(FB_BOOST_PP_BOOL(p##(137, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_137(s, p, o, m) FB_BOOST_PP_FOR_137_C(FB_BOOST_PP_BOOL(p##(138, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_138(s, p, o, m) FB_BOOST_PP_FOR_138_C(FB_BOOST_PP_BOOL(p##(139, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_139(s, p, o, m) FB_BOOST_PP_FOR_139_C(FB_BOOST_PP_BOOL(p##(140, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_140(s, p, o, m) FB_BOOST_PP_FOR_140_C(FB_BOOST_PP_BOOL(p##(141, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_141(s, p, o, m) FB_BOOST_PP_FOR_141_C(FB_BOOST_PP_BOOL(p##(142, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_142(s, p, o, m) FB_BOOST_PP_FOR_142_C(FB_BOOST_PP_BOOL(p##(143, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_143(s, p, o, m) FB_BOOST_PP_FOR_143_C(FB_BOOST_PP_BOOL(p##(144, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_144(s, p, o, m) FB_BOOST_PP_FOR_144_C(FB_BOOST_PP_BOOL(p##(145, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_145(s, p, o, m) FB_BOOST_PP_FOR_145_C(FB_BOOST_PP_BOOL(p##(146, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_146(s, p, o, m) FB_BOOST_PP_FOR_146_C(FB_BOOST_PP_BOOL(p##(147, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_147(s, p, o, m) FB_BOOST_PP_FOR_147_C(FB_BOOST_PP_BOOL(p##(148, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_148(s, p, o, m) FB_BOOST_PP_FOR_148_C(FB_BOOST_PP_BOOL(p##(149, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_149(s, p, o, m) FB_BOOST_PP_FOR_149_C(FB_BOOST_PP_BOOL(p##(150, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_150(s, p, o, m) FB_BOOST_PP_FOR_150_C(FB_BOOST_PP_BOOL(p##(151, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_151(s, p, o, m) FB_BOOST_PP_FOR_151_C(FB_BOOST_PP_BOOL(p##(152, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_152(s, p, o, m) FB_BOOST_PP_FOR_152_C(FB_BOOST_PP_BOOL(p##(153, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_153(s, p, o, m) FB_BOOST_PP_FOR_153_C(FB_BOOST_PP_BOOL(p##(154, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_154(s, p, o, m) FB_BOOST_PP_FOR_154_C(FB_BOOST_PP_BOOL(p##(155, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_155(s, p, o, m) FB_BOOST_PP_FOR_155_C(FB_BOOST_PP_BOOL(p##(156, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_156(s, p, o, m) FB_BOOST_PP_FOR_156_C(FB_BOOST_PP_BOOL(p##(157, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_157(s, p, o, m) FB_BOOST_PP_FOR_157_C(FB_BOOST_PP_BOOL(p##(158, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_158(s, p, o, m) FB_BOOST_PP_FOR_158_C(FB_BOOST_PP_BOOL(p##(159, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_159(s, p, o, m) FB_BOOST_PP_FOR_159_C(FB_BOOST_PP_BOOL(p##(160, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_160(s, p, o, m) FB_BOOST_PP_FOR_160_C(FB_BOOST_PP_BOOL(p##(161, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_161(s, p, o, m) FB_BOOST_PP_FOR_161_C(FB_BOOST_PP_BOOL(p##(162, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_162(s, p, o, m) FB_BOOST_PP_FOR_162_C(FB_BOOST_PP_BOOL(p##(163, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_163(s, p, o, m) FB_BOOST_PP_FOR_163_C(FB_BOOST_PP_BOOL(p##(164, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_164(s, p, o, m) FB_BOOST_PP_FOR_164_C(FB_BOOST_PP_BOOL(p##(165, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_165(s, p, o, m) FB_BOOST_PP_FOR_165_C(FB_BOOST_PP_BOOL(p##(166, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_166(s, p, o, m) FB_BOOST_PP_FOR_166_C(FB_BOOST_PP_BOOL(p##(167, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_167(s, p, o, m) FB_BOOST_PP_FOR_167_C(FB_BOOST_PP_BOOL(p##(168, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_168(s, p, o, m) FB_BOOST_PP_FOR_168_C(FB_BOOST_PP_BOOL(p##(169, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_169(s, p, o, m) FB_BOOST_PP_FOR_169_C(FB_BOOST_PP_BOOL(p##(170, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_170(s, p, o, m) FB_BOOST_PP_FOR_170_C(FB_BOOST_PP_BOOL(p##(171, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_171(s, p, o, m) FB_BOOST_PP_FOR_171_C(FB_BOOST_PP_BOOL(p##(172, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_172(s, p, o, m) FB_BOOST_PP_FOR_172_C(FB_BOOST_PP_BOOL(p##(173, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_173(s, p, o, m) FB_BOOST_PP_FOR_173_C(FB_BOOST_PP_BOOL(p##(174, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_174(s, p, o, m) FB_BOOST_PP_FOR_174_C(FB_BOOST_PP_BOOL(p##(175, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_175(s, p, o, m) FB_BOOST_PP_FOR_175_C(FB_BOOST_PP_BOOL(p##(176, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_176(s, p, o, m) FB_BOOST_PP_FOR_176_C(FB_BOOST_PP_BOOL(p##(177, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_177(s, p, o, m) FB_BOOST_PP_FOR_177_C(FB_BOOST_PP_BOOL(p##(178, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_178(s, p, o, m) FB_BOOST_PP_FOR_178_C(FB_BOOST_PP_BOOL(p##(179, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_179(s, p, o, m) FB_BOOST_PP_FOR_179_C(FB_BOOST_PP_BOOL(p##(180, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_180(s, p, o, m) FB_BOOST_PP_FOR_180_C(FB_BOOST_PP_BOOL(p##(181, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_181(s, p, o, m) FB_BOOST_PP_FOR_181_C(FB_BOOST_PP_BOOL(p##(182, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_182(s, p, o, m) FB_BOOST_PP_FOR_182_C(FB_BOOST_PP_BOOL(p##(183, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_183(s, p, o, m) FB_BOOST_PP_FOR_183_C(FB_BOOST_PP_BOOL(p##(184, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_184(s, p, o, m) FB_BOOST_PP_FOR_184_C(FB_BOOST_PP_BOOL(p##(185, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_185(s, p, o, m) FB_BOOST_PP_FOR_185_C(FB_BOOST_PP_BOOL(p##(186, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_186(s, p, o, m) FB_BOOST_PP_FOR_186_C(FB_BOOST_PP_BOOL(p##(187, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_187(s, p, o, m) FB_BOOST_PP_FOR_187_C(FB_BOOST_PP_BOOL(p##(188, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_188(s, p, o, m) FB_BOOST_PP_FOR_188_C(FB_BOOST_PP_BOOL(p##(189, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_189(s, p, o, m) FB_BOOST_PP_FOR_189_C(FB_BOOST_PP_BOOL(p##(190, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_190(s, p, o, m) FB_BOOST_PP_FOR_190_C(FB_BOOST_PP_BOOL(p##(191, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_191(s, p, o, m) FB_BOOST_PP_FOR_191_C(FB_BOOST_PP_BOOL(p##(192, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_192(s, p, o, m) FB_BOOST_PP_FOR_192_C(FB_BOOST_PP_BOOL(p##(193, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_193(s, p, o, m) FB_BOOST_PP_FOR_193_C(FB_BOOST_PP_BOOL(p##(194, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_194(s, p, o, m) FB_BOOST_PP_FOR_194_C(FB_BOOST_PP_BOOL(p##(195, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_195(s, p, o, m) FB_BOOST_PP_FOR_195_C(FB_BOOST_PP_BOOL(p##(196, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_196(s, p, o, m) FB_BOOST_PP_FOR_196_C(FB_BOOST_PP_BOOL(p##(197, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_197(s, p, o, m) FB_BOOST_PP_FOR_197_C(FB_BOOST_PP_BOOL(p##(198, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_198(s, p, o, m) FB_BOOST_PP_FOR_198_C(FB_BOOST_PP_BOOL(p##(199, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_199(s, p, o, m) FB_BOOST_PP_FOR_199_C(FB_BOOST_PP_BOOL(p##(200, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_200(s, p, o, m) FB_BOOST_PP_FOR_200_C(FB_BOOST_PP_BOOL(p##(201, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_201(s, p, o, m) FB_BOOST_PP_FOR_201_C(FB_BOOST_PP_BOOL(p##(202, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_202(s, p, o, m) FB_BOOST_PP_FOR_202_C(FB_BOOST_PP_BOOL(p##(203, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_203(s, p, o, m) FB_BOOST_PP_FOR_203_C(FB_BOOST_PP_BOOL(p##(204, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_204(s, p, o, m) FB_BOOST_PP_FOR_204_C(FB_BOOST_PP_BOOL(p##(205, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_205(s, p, o, m) FB_BOOST_PP_FOR_205_C(FB_BOOST_PP_BOOL(p##(206, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_206(s, p, o, m) FB_BOOST_PP_FOR_206_C(FB_BOOST_PP_BOOL(p##(207, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_207(s, p, o, m) FB_BOOST_PP_FOR_207_C(FB_BOOST_PP_BOOL(p##(208, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_208(s, p, o, m) FB_BOOST_PP_FOR_208_C(FB_BOOST_PP_BOOL(p##(209, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_209(s, p, o, m) FB_BOOST_PP_FOR_209_C(FB_BOOST_PP_BOOL(p##(210, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_210(s, p, o, m) FB_BOOST_PP_FOR_210_C(FB_BOOST_PP_BOOL(p##(211, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_211(s, p, o, m) FB_BOOST_PP_FOR_211_C(FB_BOOST_PP_BOOL(p##(212, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_212(s, p, o, m) FB_BOOST_PP_FOR_212_C(FB_BOOST_PP_BOOL(p##(213, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_213(s, p, o, m) FB_BOOST_PP_FOR_213_C(FB_BOOST_PP_BOOL(p##(214, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_214(s, p, o, m) FB_BOOST_PP_FOR_214_C(FB_BOOST_PP_BOOL(p##(215, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_215(s, p, o, m) FB_BOOST_PP_FOR_215_C(FB_BOOST_PP_BOOL(p##(216, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_216(s, p, o, m) FB_BOOST_PP_FOR_216_C(FB_BOOST_PP_BOOL(p##(217, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_217(s, p, o, m) FB_BOOST_PP_FOR_217_C(FB_BOOST_PP_BOOL(p##(218, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_218(s, p, o, m) FB_BOOST_PP_FOR_218_C(FB_BOOST_PP_BOOL(p##(219, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_219(s, p, o, m) FB_BOOST_PP_FOR_219_C(FB_BOOST_PP_BOOL(p##(220, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_220(s, p, o, m) FB_BOOST_PP_FOR_220_C(FB_BOOST_PP_BOOL(p##(221, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_221(s, p, o, m) FB_BOOST_PP_FOR_221_C(FB_BOOST_PP_BOOL(p##(222, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_222(s, p, o, m) FB_BOOST_PP_FOR_222_C(FB_BOOST_PP_BOOL(p##(223, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_223(s, p, o, m) FB_BOOST_PP_FOR_223_C(FB_BOOST_PP_BOOL(p##(224, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_224(s, p, o, m) FB_BOOST_PP_FOR_224_C(FB_BOOST_PP_BOOL(p##(225, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_225(s, p, o, m) FB_BOOST_PP_FOR_225_C(FB_BOOST_PP_BOOL(p##(226, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_226(s, p, o, m) FB_BOOST_PP_FOR_226_C(FB_BOOST_PP_BOOL(p##(227, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_227(s, p, o, m) FB_BOOST_PP_FOR_227_C(FB_BOOST_PP_BOOL(p##(228, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_228(s, p, o, m) FB_BOOST_PP_FOR_228_C(FB_BOOST_PP_BOOL(p##(229, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_229(s, p, o, m) FB_BOOST_PP_FOR_229_C(FB_BOOST_PP_BOOL(p##(230, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_230(s, p, o, m) FB_BOOST_PP_FOR_230_C(FB_BOOST_PP_BOOL(p##(231, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_231(s, p, o, m) FB_BOOST_PP_FOR_231_C(FB_BOOST_PP_BOOL(p##(232, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_232(s, p, o, m) FB_BOOST_PP_FOR_232_C(FB_BOOST_PP_BOOL(p##(233, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_233(s, p, o, m) FB_BOOST_PP_FOR_233_C(FB_BOOST_PP_BOOL(p##(234, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_234(s, p, o, m) FB_BOOST_PP_FOR_234_C(FB_BOOST_PP_BOOL(p##(235, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_235(s, p, o, m) FB_BOOST_PP_FOR_235_C(FB_BOOST_PP_BOOL(p##(236, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_236(s, p, o, m) FB_BOOST_PP_FOR_236_C(FB_BOOST_PP_BOOL(p##(237, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_237(s, p, o, m) FB_BOOST_PP_FOR_237_C(FB_BOOST_PP_BOOL(p##(238, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_238(s, p, o, m) FB_BOOST_PP_FOR_238_C(FB_BOOST_PP_BOOL(p##(239, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_239(s, p, o, m) FB_BOOST_PP_FOR_239_C(FB_BOOST_PP_BOOL(p##(240, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_240(s, p, o, m) FB_BOOST_PP_FOR_240_C(FB_BOOST_PP_BOOL(p##(241, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_241(s, p, o, m) FB_BOOST_PP_FOR_241_C(FB_BOOST_PP_BOOL(p##(242, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_242(s, p, o, m) FB_BOOST_PP_FOR_242_C(FB_BOOST_PP_BOOL(p##(243, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_243(s, p, o, m) FB_BOOST_PP_FOR_243_C(FB_BOOST_PP_BOOL(p##(244, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_244(s, p, o, m) FB_BOOST_PP_FOR_244_C(FB_BOOST_PP_BOOL(p##(245, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_245(s, p, o, m) FB_BOOST_PP_FOR_245_C(FB_BOOST_PP_BOOL(p##(246, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_246(s, p, o, m) FB_BOOST_PP_FOR_246_C(FB_BOOST_PP_BOOL(p##(247, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_247(s, p, o, m) FB_BOOST_PP_FOR_247_C(FB_BOOST_PP_BOOL(p##(248, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_248(s, p, o, m) FB_BOOST_PP_FOR_248_C(FB_BOOST_PP_BOOL(p##(249, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_249(s, p, o, m) FB_BOOST_PP_FOR_249_C(FB_BOOST_PP_BOOL(p##(250, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_250(s, p, o, m) FB_BOOST_PP_FOR_250_C(FB_BOOST_PP_BOOL(p##(251, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_251(s, p, o, m) FB_BOOST_PP_FOR_251_C(FB_BOOST_PP_BOOL(p##(252, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_252(s, p, o, m) FB_BOOST_PP_FOR_252_C(FB_BOOST_PP_BOOL(p##(253, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_253(s, p, o, m) FB_BOOST_PP_FOR_253_C(FB_BOOST_PP_BOOL(p##(254, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_254(s, p, o, m) FB_BOOST_PP_FOR_254_C(FB_BOOST_PP_BOOL(p##(255, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_255(s, p, o, m) FB_BOOST_PP_FOR_255_C(FB_BOOST_PP_BOOL(p##(256, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_256(s, p, o, m) FB_BOOST_PP_FOR_256_C(FB_BOOST_PP_BOOL(p##(257, s)), s, p, o, m)
-#
-# define FB_BOOST_PP_FOR_1_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(2, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_2, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(2, s), p, o, m)
-# define FB_BOOST_PP_FOR_2_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(3, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_3, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(3, s), p, o, m)
-# define FB_BOOST_PP_FOR_3_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(4, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_4, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(4, s), p, o, m)
-# define FB_BOOST_PP_FOR_4_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(5, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_5, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(5, s), p, o, m)
-# define FB_BOOST_PP_FOR_5_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(6, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_6, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(6, s), p, o, m)
-# define FB_BOOST_PP_FOR_6_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(7, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_7, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(7, s), p, o, m)
-# define FB_BOOST_PP_FOR_7_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(8, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_8, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(8, s), p, o, m)
-# define FB_BOOST_PP_FOR_8_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(9, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_9, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(9, s), p, o, m)
-# define FB_BOOST_PP_FOR_9_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(10, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_10, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(10, s), p, o, m)
-# define FB_BOOST_PP_FOR_10_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(11, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_11, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(11, s), p, o, m)
-# define FB_BOOST_PP_FOR_11_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(12, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_12, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(12, s), p, o, m)
-# define FB_BOOST_PP_FOR_12_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(13, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_13, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(13, s), p, o, m)
-# define FB_BOOST_PP_FOR_13_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(14, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_14, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(14, s), p, o, m)
-# define FB_BOOST_PP_FOR_14_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(15, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_15, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(15, s), p, o, m)
-# define FB_BOOST_PP_FOR_15_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(16, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_16, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(16, s), p, o, m)
-# define FB_BOOST_PP_FOR_16_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(17, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_17, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(17, s), p, o, m)
-# define FB_BOOST_PP_FOR_17_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(18, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_18, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(18, s), p, o, m)
-# define FB_BOOST_PP_FOR_18_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(19, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_19, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(19, s), p, o, m)
-# define FB_BOOST_PP_FOR_19_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(20, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_20, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(20, s), p, o, m)
-# define FB_BOOST_PP_FOR_20_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(21, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_21, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(21, s), p, o, m)
-# define FB_BOOST_PP_FOR_21_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(22, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_22, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(22, s), p, o, m)
-# define FB_BOOST_PP_FOR_22_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(23, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_23, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(23, s), p, o, m)
-# define FB_BOOST_PP_FOR_23_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(24, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_24, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(24, s), p, o, m)
-# define FB_BOOST_PP_FOR_24_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(25, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_25, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(25, s), p, o, m)
-# define FB_BOOST_PP_FOR_25_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(26, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_26, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(26, s), p, o, m)
-# define FB_BOOST_PP_FOR_26_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(27, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_27, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(27, s), p, o, m)
-# define FB_BOOST_PP_FOR_27_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(28, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_28, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(28, s), p, o, m)
-# define FB_BOOST_PP_FOR_28_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(29, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_29, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(29, s), p, o, m)
-# define FB_BOOST_PP_FOR_29_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(30, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_30, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(30, s), p, o, m)
-# define FB_BOOST_PP_FOR_30_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(31, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_31, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(31, s), p, o, m)
-# define FB_BOOST_PP_FOR_31_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(32, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_32, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(32, s), p, o, m)
-# define FB_BOOST_PP_FOR_32_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(33, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_33, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(33, s), p, o, m)
-# define FB_BOOST_PP_FOR_33_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(34, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_34, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(34, s), p, o, m)
-# define FB_BOOST_PP_FOR_34_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(35, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_35, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(35, s), p, o, m)
-# define FB_BOOST_PP_FOR_35_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(36, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_36, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(36, s), p, o, m)
-# define FB_BOOST_PP_FOR_36_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(37, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_37, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(37, s), p, o, m)
-# define FB_BOOST_PP_FOR_37_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(38, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_38, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(38, s), p, o, m)
-# define FB_BOOST_PP_FOR_38_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(39, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_39, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(39, s), p, o, m)
-# define FB_BOOST_PP_FOR_39_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(40, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_40, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(40, s), p, o, m)
-# define FB_BOOST_PP_FOR_40_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(41, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_41, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(41, s), p, o, m)
-# define FB_BOOST_PP_FOR_41_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(42, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_42, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(42, s), p, o, m)
-# define FB_BOOST_PP_FOR_42_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(43, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_43, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(43, s), p, o, m)
-# define FB_BOOST_PP_FOR_43_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(44, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_44, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(44, s), p, o, m)
-# define FB_BOOST_PP_FOR_44_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(45, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_45, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(45, s), p, o, m)
-# define FB_BOOST_PP_FOR_45_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(46, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_46, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(46, s), p, o, m)
-# define FB_BOOST_PP_FOR_46_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(47, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_47, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(47, s), p, o, m)
-# define FB_BOOST_PP_FOR_47_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(48, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_48, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(48, s), p, o, m)
-# define FB_BOOST_PP_FOR_48_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(49, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_49, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(49, s), p, o, m)
-# define FB_BOOST_PP_FOR_49_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(50, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_50, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(50, s), p, o, m)
-# define FB_BOOST_PP_FOR_50_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(51, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_51, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(51, s), p, o, m)
-# define FB_BOOST_PP_FOR_51_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(52, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_52, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(52, s), p, o, m)
-# define FB_BOOST_PP_FOR_52_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(53, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_53, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(53, s), p, o, m)
-# define FB_BOOST_PP_FOR_53_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(54, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_54, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(54, s), p, o, m)
-# define FB_BOOST_PP_FOR_54_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(55, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_55, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(55, s), p, o, m)
-# define FB_BOOST_PP_FOR_55_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(56, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_56, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(56, s), p, o, m)
-# define FB_BOOST_PP_FOR_56_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(57, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_57, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(57, s), p, o, m)
-# define FB_BOOST_PP_FOR_57_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(58, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_58, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(58, s), p, o, m)
-# define FB_BOOST_PP_FOR_58_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(59, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_59, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(59, s), p, o, m)
-# define FB_BOOST_PP_FOR_59_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(60, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_60, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(60, s), p, o, m)
-# define FB_BOOST_PP_FOR_60_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(61, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_61, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(61, s), p, o, m)
-# define FB_BOOST_PP_FOR_61_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(62, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_62, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(62, s), p, o, m)
-# define FB_BOOST_PP_FOR_62_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(63, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_63, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(63, s), p, o, m)
-# define FB_BOOST_PP_FOR_63_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(64, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_64, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(64, s), p, o, m)
-# define FB_BOOST_PP_FOR_64_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(65, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_65, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(65, s), p, o, m)
-# define FB_BOOST_PP_FOR_65_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(66, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_66, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(66, s), p, o, m)
-# define FB_BOOST_PP_FOR_66_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(67, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_67, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(67, s), p, o, m)
-# define FB_BOOST_PP_FOR_67_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(68, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_68, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(68, s), p, o, m)
-# define FB_BOOST_PP_FOR_68_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(69, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_69, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(69, s), p, o, m)
-# define FB_BOOST_PP_FOR_69_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(70, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_70, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(70, s), p, o, m)
-# define FB_BOOST_PP_FOR_70_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(71, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_71, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(71, s), p, o, m)
-# define FB_BOOST_PP_FOR_71_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(72, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_72, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(72, s), p, o, m)
-# define FB_BOOST_PP_FOR_72_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(73, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_73, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(73, s), p, o, m)
-# define FB_BOOST_PP_FOR_73_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(74, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_74, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(74, s), p, o, m)
-# define FB_BOOST_PP_FOR_74_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(75, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_75, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(75, s), p, o, m)
-# define FB_BOOST_PP_FOR_75_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(76, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_76, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(76, s), p, o, m)
-# define FB_BOOST_PP_FOR_76_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(77, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_77, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(77, s), p, o, m)
-# define FB_BOOST_PP_FOR_77_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(78, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_78, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(78, s), p, o, m)
-# define FB_BOOST_PP_FOR_78_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(79, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_79, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(79, s), p, o, m)
-# define FB_BOOST_PP_FOR_79_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(80, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_80, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(80, s), p, o, m)
-# define FB_BOOST_PP_FOR_80_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(81, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_81, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(81, s), p, o, m)
-# define FB_BOOST_PP_FOR_81_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(82, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_82, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(82, s), p, o, m)
-# define FB_BOOST_PP_FOR_82_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(83, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_83, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(83, s), p, o, m)
-# define FB_BOOST_PP_FOR_83_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(84, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_84, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(84, s), p, o, m)
-# define FB_BOOST_PP_FOR_84_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(85, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_85, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(85, s), p, o, m)
-# define FB_BOOST_PP_FOR_85_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(86, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_86, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(86, s), p, o, m)
-# define FB_BOOST_PP_FOR_86_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(87, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_87, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(87, s), p, o, m)
-# define FB_BOOST_PP_FOR_87_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(88, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_88, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(88, s), p, o, m)
-# define FB_BOOST_PP_FOR_88_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(89, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_89, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(89, s), p, o, m)
-# define FB_BOOST_PP_FOR_89_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(90, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_90, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(90, s), p, o, m)
-# define FB_BOOST_PP_FOR_90_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(91, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_91, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(91, s), p, o, m)
-# define FB_BOOST_PP_FOR_91_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(92, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_92, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(92, s), p, o, m)
-# define FB_BOOST_PP_FOR_92_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(93, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_93, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(93, s), p, o, m)
-# define FB_BOOST_PP_FOR_93_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(94, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_94, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(94, s), p, o, m)
-# define FB_BOOST_PP_FOR_94_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(95, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_95, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(95, s), p, o, m)
-# define FB_BOOST_PP_FOR_95_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(96, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_96, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(96, s), p, o, m)
-# define FB_BOOST_PP_FOR_96_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(97, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_97, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(97, s), p, o, m)
-# define FB_BOOST_PP_FOR_97_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(98, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_98, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(98, s), p, o, m)
-# define FB_BOOST_PP_FOR_98_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(99, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_99, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(99, s), p, o, m)
-# define FB_BOOST_PP_FOR_99_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(100, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_100, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(100, s), p, o, m)
-# define FB_BOOST_PP_FOR_100_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(101, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_101, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(101, s), p, o, m)
-# define FB_BOOST_PP_FOR_101_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(102, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_102, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(102, s), p, o, m)
-# define FB_BOOST_PP_FOR_102_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(103, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_103, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(103, s), p, o, m)
-# define FB_BOOST_PP_FOR_103_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(104, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_104, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(104, s), p, o, m)
-# define FB_BOOST_PP_FOR_104_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(105, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_105, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(105, s), p, o, m)
-# define FB_BOOST_PP_FOR_105_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(106, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_106, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(106, s), p, o, m)
-# define FB_BOOST_PP_FOR_106_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(107, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_107, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(107, s), p, o, m)
-# define FB_BOOST_PP_FOR_107_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(108, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_108, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(108, s), p, o, m)
-# define FB_BOOST_PP_FOR_108_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(109, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_109, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(109, s), p, o, m)
-# define FB_BOOST_PP_FOR_109_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(110, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_110, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(110, s), p, o, m)
-# define FB_BOOST_PP_FOR_110_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(111, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_111, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(111, s), p, o, m)
-# define FB_BOOST_PP_FOR_111_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(112, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_112, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(112, s), p, o, m)
-# define FB_BOOST_PP_FOR_112_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(113, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_113, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(113, s), p, o, m)
-# define FB_BOOST_PP_FOR_113_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(114, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_114, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(114, s), p, o, m)
-# define FB_BOOST_PP_FOR_114_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(115, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_115, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(115, s), p, o, m)
-# define FB_BOOST_PP_FOR_115_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(116, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_116, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(116, s), p, o, m)
-# define FB_BOOST_PP_FOR_116_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(117, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_117, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(117, s), p, o, m)
-# define FB_BOOST_PP_FOR_117_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(118, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_118, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(118, s), p, o, m)
-# define FB_BOOST_PP_FOR_118_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(119, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_119, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(119, s), p, o, m)
-# define FB_BOOST_PP_FOR_119_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(120, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_120, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(120, s), p, o, m)
-# define FB_BOOST_PP_FOR_120_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(121, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_121, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(121, s), p, o, m)
-# define FB_BOOST_PP_FOR_121_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(122, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_122, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(122, s), p, o, m)
-# define FB_BOOST_PP_FOR_122_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(123, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_123, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(123, s), p, o, m)
-# define FB_BOOST_PP_FOR_123_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(124, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_124, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(124, s), p, o, m)
-# define FB_BOOST_PP_FOR_124_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(125, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_125, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(125, s), p, o, m)
-# define FB_BOOST_PP_FOR_125_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(126, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_126, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(126, s), p, o, m)
-# define FB_BOOST_PP_FOR_126_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(127, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_127, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(127, s), p, o, m)
-# define FB_BOOST_PP_FOR_127_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(128, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_128, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(128, s), p, o, m)
-# define FB_BOOST_PP_FOR_128_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(129, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_129, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(129, s), p, o, m)
-# define FB_BOOST_PP_FOR_129_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(130, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_130, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(130, s), p, o, m)
-# define FB_BOOST_PP_FOR_130_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(131, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_131, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(131, s), p, o, m)
-# define FB_BOOST_PP_FOR_131_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(132, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_132, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(132, s), p, o, m)
-# define FB_BOOST_PP_FOR_132_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(133, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_133, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(133, s), p, o, m)
-# define FB_BOOST_PP_FOR_133_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(134, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_134, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(134, s), p, o, m)
-# define FB_BOOST_PP_FOR_134_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(135, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_135, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(135, s), p, o, m)
-# define FB_BOOST_PP_FOR_135_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(136, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_136, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(136, s), p, o, m)
-# define FB_BOOST_PP_FOR_136_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(137, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_137, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(137, s), p, o, m)
-# define FB_BOOST_PP_FOR_137_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(138, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_138, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(138, s), p, o, m)
-# define FB_BOOST_PP_FOR_138_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(139, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_139, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(139, s), p, o, m)
-# define FB_BOOST_PP_FOR_139_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(140, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_140, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(140, s), p, o, m)
-# define FB_BOOST_PP_FOR_140_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(141, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_141, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(141, s), p, o, m)
-# define FB_BOOST_PP_FOR_141_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(142, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_142, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(142, s), p, o, m)
-# define FB_BOOST_PP_FOR_142_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(143, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_143, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(143, s), p, o, m)
-# define FB_BOOST_PP_FOR_143_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(144, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_144, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(144, s), p, o, m)
-# define FB_BOOST_PP_FOR_144_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(145, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_145, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(145, s), p, o, m)
-# define FB_BOOST_PP_FOR_145_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(146, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_146, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(146, s), p, o, m)
-# define FB_BOOST_PP_FOR_146_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(147, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_147, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(147, s), p, o, m)
-# define FB_BOOST_PP_FOR_147_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(148, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_148, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(148, s), p, o, m)
-# define FB_BOOST_PP_FOR_148_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(149, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_149, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(149, s), p, o, m)
-# define FB_BOOST_PP_FOR_149_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(150, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_150, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(150, s), p, o, m)
-# define FB_BOOST_PP_FOR_150_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(151, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_151, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(151, s), p, o, m)
-# define FB_BOOST_PP_FOR_151_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(152, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_152, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(152, s), p, o, m)
-# define FB_BOOST_PP_FOR_152_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(153, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_153, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(153, s), p, o, m)
-# define FB_BOOST_PP_FOR_153_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(154, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_154, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(154, s), p, o, m)
-# define FB_BOOST_PP_FOR_154_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(155, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_155, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(155, s), p, o, m)
-# define FB_BOOST_PP_FOR_155_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(156, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_156, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(156, s), p, o, m)
-# define FB_BOOST_PP_FOR_156_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(157, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_157, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(157, s), p, o, m)
-# define FB_BOOST_PP_FOR_157_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(158, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_158, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(158, s), p, o, m)
-# define FB_BOOST_PP_FOR_158_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(159, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_159, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(159, s), p, o, m)
-# define FB_BOOST_PP_FOR_159_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(160, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_160, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(160, s), p, o, m)
-# define FB_BOOST_PP_FOR_160_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(161, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_161, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(161, s), p, o, m)
-# define FB_BOOST_PP_FOR_161_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(162, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_162, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(162, s), p, o, m)
-# define FB_BOOST_PP_FOR_162_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(163, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_163, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(163, s), p, o, m)
-# define FB_BOOST_PP_FOR_163_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(164, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_164, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(164, s), p, o, m)
-# define FB_BOOST_PP_FOR_164_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(165, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_165, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(165, s), p, o, m)
-# define FB_BOOST_PP_FOR_165_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(166, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_166, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(166, s), p, o, m)
-# define FB_BOOST_PP_FOR_166_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(167, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_167, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(167, s), p, o, m)
-# define FB_BOOST_PP_FOR_167_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(168, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_168, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(168, s), p, o, m)
-# define FB_BOOST_PP_FOR_168_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(169, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_169, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(169, s), p, o, m)
-# define FB_BOOST_PP_FOR_169_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(170, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_170, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(170, s), p, o, m)
-# define FB_BOOST_PP_FOR_170_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(171, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_171, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(171, s), p, o, m)
-# define FB_BOOST_PP_FOR_171_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(172, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_172, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(172, s), p, o, m)
-# define FB_BOOST_PP_FOR_172_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(173, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_173, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(173, s), p, o, m)
-# define FB_BOOST_PP_FOR_173_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(174, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_174, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(174, s), p, o, m)
-# define FB_BOOST_PP_FOR_174_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(175, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_175, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(175, s), p, o, m)
-# define FB_BOOST_PP_FOR_175_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(176, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_176, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(176, s), p, o, m)
-# define FB_BOOST_PP_FOR_176_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(177, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_177, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(177, s), p, o, m)
-# define FB_BOOST_PP_FOR_177_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(178, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_178, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(178, s), p, o, m)
-# define FB_BOOST_PP_FOR_178_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(179, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_179, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(179, s), p, o, m)
-# define FB_BOOST_PP_FOR_179_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(180, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_180, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(180, s), p, o, m)
-# define FB_BOOST_PP_FOR_180_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(181, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_181, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(181, s), p, o, m)
-# define FB_BOOST_PP_FOR_181_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(182, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_182, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(182, s), p, o, m)
-# define FB_BOOST_PP_FOR_182_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(183, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_183, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(183, s), p, o, m)
-# define FB_BOOST_PP_FOR_183_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(184, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_184, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(184, s), p, o, m)
-# define FB_BOOST_PP_FOR_184_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(185, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_185, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(185, s), p, o, m)
-# define FB_BOOST_PP_FOR_185_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(186, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_186, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(186, s), p, o, m)
-# define FB_BOOST_PP_FOR_186_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(187, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_187, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(187, s), p, o, m)
-# define FB_BOOST_PP_FOR_187_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(188, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_188, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(188, s), p, o, m)
-# define FB_BOOST_PP_FOR_188_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(189, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_189, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(189, s), p, o, m)
-# define FB_BOOST_PP_FOR_189_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(190, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_190, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(190, s), p, o, m)
-# define FB_BOOST_PP_FOR_190_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(191, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_191, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(191, s), p, o, m)
-# define FB_BOOST_PP_FOR_191_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(192, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_192, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(192, s), p, o, m)
-# define FB_BOOST_PP_FOR_192_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(193, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_193, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(193, s), p, o, m)
-# define FB_BOOST_PP_FOR_193_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(194, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_194, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(194, s), p, o, m)
-# define FB_BOOST_PP_FOR_194_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(195, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_195, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(195, s), p, o, m)
-# define FB_BOOST_PP_FOR_195_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(196, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_196, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(196, s), p, o, m)
-# define FB_BOOST_PP_FOR_196_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(197, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_197, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(197, s), p, o, m)
-# define FB_BOOST_PP_FOR_197_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(198, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_198, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(198, s), p, o, m)
-# define FB_BOOST_PP_FOR_198_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(199, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_199, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(199, s), p, o, m)
-# define FB_BOOST_PP_FOR_199_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(200, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_200, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(200, s), p, o, m)
-# define FB_BOOST_PP_FOR_200_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(201, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_201, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(201, s), p, o, m)
-# define FB_BOOST_PP_FOR_201_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(202, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_202, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(202, s), p, o, m)
-# define FB_BOOST_PP_FOR_202_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(203, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_203, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(203, s), p, o, m)
-# define FB_BOOST_PP_FOR_203_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(204, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_204, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(204, s), p, o, m)
-# define FB_BOOST_PP_FOR_204_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(205, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_205, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(205, s), p, o, m)
-# define FB_BOOST_PP_FOR_205_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(206, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_206, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(206, s), p, o, m)
-# define FB_BOOST_PP_FOR_206_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(207, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_207, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(207, s), p, o, m)
-# define FB_BOOST_PP_FOR_207_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(208, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_208, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(208, s), p, o, m)
-# define FB_BOOST_PP_FOR_208_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(209, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_209, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(209, s), p, o, m)
-# define FB_BOOST_PP_FOR_209_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(210, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_210, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(210, s), p, o, m)
-# define FB_BOOST_PP_FOR_210_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(211, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_211, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(211, s), p, o, m)
-# define FB_BOOST_PP_FOR_211_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(212, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_212, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(212, s), p, o, m)
-# define FB_BOOST_PP_FOR_212_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(213, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_213, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(213, s), p, o, m)
-# define FB_BOOST_PP_FOR_213_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(214, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_214, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(214, s), p, o, m)
-# define FB_BOOST_PP_FOR_214_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(215, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_215, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(215, s), p, o, m)
-# define FB_BOOST_PP_FOR_215_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(216, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_216, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(216, s), p, o, m)
-# define FB_BOOST_PP_FOR_216_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(217, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_217, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(217, s), p, o, m)
-# define FB_BOOST_PP_FOR_217_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(218, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_218, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(218, s), p, o, m)
-# define FB_BOOST_PP_FOR_218_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(219, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_219, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(219, s), p, o, m)
-# define FB_BOOST_PP_FOR_219_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(220, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_220, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(220, s), p, o, m)
-# define FB_BOOST_PP_FOR_220_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(221, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_221, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(221, s), p, o, m)
-# define FB_BOOST_PP_FOR_221_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(222, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_222, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(222, s), p, o, m)
-# define FB_BOOST_PP_FOR_222_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(223, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_223, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(223, s), p, o, m)
-# define FB_BOOST_PP_FOR_223_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(224, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_224, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(224, s), p, o, m)
-# define FB_BOOST_PP_FOR_224_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(225, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_225, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(225, s), p, o, m)
-# define FB_BOOST_PP_FOR_225_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(226, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_226, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(226, s), p, o, m)
-# define FB_BOOST_PP_FOR_226_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(227, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_227, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(227, s), p, o, m)
-# define FB_BOOST_PP_FOR_227_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(228, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_228, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(228, s), p, o, m)
-# define FB_BOOST_PP_FOR_228_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(229, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_229, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(229, s), p, o, m)
-# define FB_BOOST_PP_FOR_229_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(230, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_230, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(230, s), p, o, m)
-# define FB_BOOST_PP_FOR_230_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(231, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_231, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(231, s), p, o, m)
-# define FB_BOOST_PP_FOR_231_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(232, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_232, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(232, s), p, o, m)
-# define FB_BOOST_PP_FOR_232_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(233, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_233, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(233, s), p, o, m)
-# define FB_BOOST_PP_FOR_233_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(234, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_234, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(234, s), p, o, m)
-# define FB_BOOST_PP_FOR_234_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(235, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_235, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(235, s), p, o, m)
-# define FB_BOOST_PP_FOR_235_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(236, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_236, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(236, s), p, o, m)
-# define FB_BOOST_PP_FOR_236_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(237, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_237, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(237, s), p, o, m)
-# define FB_BOOST_PP_FOR_237_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(238, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_238, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(238, s), p, o, m)
-# define FB_BOOST_PP_FOR_238_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(239, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_239, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(239, s), p, o, m)
-# define FB_BOOST_PP_FOR_239_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(240, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_240, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(240, s), p, o, m)
-# define FB_BOOST_PP_FOR_240_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(241, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_241, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(241, s), p, o, m)
-# define FB_BOOST_PP_FOR_241_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(242, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_242, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(242, s), p, o, m)
-# define FB_BOOST_PP_FOR_242_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(243, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_243, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(243, s), p, o, m)
-# define FB_BOOST_PP_FOR_243_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(244, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_244, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(244, s), p, o, m)
-# define FB_BOOST_PP_FOR_244_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(245, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_245, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(245, s), p, o, m)
-# define FB_BOOST_PP_FOR_245_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(246, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_246, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(246, s), p, o, m)
-# define FB_BOOST_PP_FOR_246_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(247, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_247, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(247, s), p, o, m)
-# define FB_BOOST_PP_FOR_247_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(248, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_248, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(248, s), p, o, m)
-# define FB_BOOST_PP_FOR_248_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(249, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_249, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(249, s), p, o, m)
-# define FB_BOOST_PP_FOR_249_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(250, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_250, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(250, s), p, o, m)
-# define FB_BOOST_PP_FOR_250_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(251, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_251, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(251, s), p, o, m)
-# define FB_BOOST_PP_FOR_251_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(252, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_252, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(252, s), p, o, m)
-# define FB_BOOST_PP_FOR_252_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(253, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_253, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(253, s), p, o, m)
-# define FB_BOOST_PP_FOR_253_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(254, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_254, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(254, s), p, o, m)
-# define FB_BOOST_PP_FOR_254_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(255, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_255, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(255, s), p, o, m)
-# define FB_BOOST_PP_FOR_255_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(256, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_256, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(256, s), p, o, m)
-# define FB_BOOST_PP_FOR_256_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(257, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_257, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(257, s), p, o, m)
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/detail/edg/for.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/detail/edg/for.hpp
deleted file mode 100644
index cbf54963..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/detail/edg/for.hpp
+++ /dev/null
@@ -1,534 +0,0 @@
-# /* Copyright (C) 2001
-#  * Housemarque Oy
-#  * http://www.housemarque.com
-#  *
-#  * Distributed under the Boost Software License, Version 1.0. (See
-#  * accompanying file LICENSE_1_0.txt or copy at
-#  * http://www.boost.org/LICENSE_1_0.txt)
-#  */
-#
-# /* Revised by Paul Mensonides (2002) */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_REPETITION_DETAIL_EDG_FOR_HPP
-# define FB_BOOST_PREPROCESSOR_REPETITION_DETAIL_EDG_FOR_HPP
-#
-# include <firebird/impl/boost/preprocessor/control/if.hpp>
-# include <firebird/impl/boost/preprocessor/tuple/eat.hpp>
-#
-# define FB_BOOST_PP_FOR_1(s, p, o, m) FB_BOOST_PP_FOR_1_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_2(s, p, o, m) FB_BOOST_PP_FOR_2_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_3(s, p, o, m) FB_BOOST_PP_FOR_3_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_4(s, p, o, m) FB_BOOST_PP_FOR_4_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_5(s, p, o, m) FB_BOOST_PP_FOR_5_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_6(s, p, o, m) FB_BOOST_PP_FOR_6_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_7(s, p, o, m) FB_BOOST_PP_FOR_7_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_8(s, p, o, m) FB_BOOST_PP_FOR_8_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_9(s, p, o, m) FB_BOOST_PP_FOR_9_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_10(s, p, o, m) FB_BOOST_PP_FOR_10_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_11(s, p, o, m) FB_BOOST_PP_FOR_11_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_12(s, p, o, m) FB_BOOST_PP_FOR_12_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_13(s, p, o, m) FB_BOOST_PP_FOR_13_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_14(s, p, o, m) FB_BOOST_PP_FOR_14_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_15(s, p, o, m) FB_BOOST_PP_FOR_15_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_16(s, p, o, m) FB_BOOST_PP_FOR_16_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_17(s, p, o, m) FB_BOOST_PP_FOR_17_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_18(s, p, o, m) FB_BOOST_PP_FOR_18_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_19(s, p, o, m) FB_BOOST_PP_FOR_19_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_20(s, p, o, m) FB_BOOST_PP_FOR_20_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_21(s, p, o, m) FB_BOOST_PP_FOR_21_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_22(s, p, o, m) FB_BOOST_PP_FOR_22_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_23(s, p, o, m) FB_BOOST_PP_FOR_23_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_24(s, p, o, m) FB_BOOST_PP_FOR_24_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_25(s, p, o, m) FB_BOOST_PP_FOR_25_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_26(s, p, o, m) FB_BOOST_PP_FOR_26_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_27(s, p, o, m) FB_BOOST_PP_FOR_27_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_28(s, p, o, m) FB_BOOST_PP_FOR_28_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_29(s, p, o, m) FB_BOOST_PP_FOR_29_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_30(s, p, o, m) FB_BOOST_PP_FOR_30_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_31(s, p, o, m) FB_BOOST_PP_FOR_31_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_32(s, p, o, m) FB_BOOST_PP_FOR_32_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_33(s, p, o, m) FB_BOOST_PP_FOR_33_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_34(s, p, o, m) FB_BOOST_PP_FOR_34_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_35(s, p, o, m) FB_BOOST_PP_FOR_35_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_36(s, p, o, m) FB_BOOST_PP_FOR_36_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_37(s, p, o, m) FB_BOOST_PP_FOR_37_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_38(s, p, o, m) FB_BOOST_PP_FOR_38_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_39(s, p, o, m) FB_BOOST_PP_FOR_39_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_40(s, p, o, m) FB_BOOST_PP_FOR_40_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_41(s, p, o, m) FB_BOOST_PP_FOR_41_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_42(s, p, o, m) FB_BOOST_PP_FOR_42_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_43(s, p, o, m) FB_BOOST_PP_FOR_43_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_44(s, p, o, m) FB_BOOST_PP_FOR_44_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_45(s, p, o, m) FB_BOOST_PP_FOR_45_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_46(s, p, o, m) FB_BOOST_PP_FOR_46_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_47(s, p, o, m) FB_BOOST_PP_FOR_47_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_48(s, p, o, m) FB_BOOST_PP_FOR_48_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_49(s, p, o, m) FB_BOOST_PP_FOR_49_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_50(s, p, o, m) FB_BOOST_PP_FOR_50_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_51(s, p, o, m) FB_BOOST_PP_FOR_51_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_52(s, p, o, m) FB_BOOST_PP_FOR_52_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_53(s, p, o, m) FB_BOOST_PP_FOR_53_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_54(s, p, o, m) FB_BOOST_PP_FOR_54_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_55(s, p, o, m) FB_BOOST_PP_FOR_55_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_56(s, p, o, m) FB_BOOST_PP_FOR_56_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_57(s, p, o, m) FB_BOOST_PP_FOR_57_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_58(s, p, o, m) FB_BOOST_PP_FOR_58_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_59(s, p, o, m) FB_BOOST_PP_FOR_59_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_60(s, p, o, m) FB_BOOST_PP_FOR_60_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_61(s, p, o, m) FB_BOOST_PP_FOR_61_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_62(s, p, o, m) FB_BOOST_PP_FOR_62_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_63(s, p, o, m) FB_BOOST_PP_FOR_63_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_64(s, p, o, m) FB_BOOST_PP_FOR_64_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_65(s, p, o, m) FB_BOOST_PP_FOR_65_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_66(s, p, o, m) FB_BOOST_PP_FOR_66_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_67(s, p, o, m) FB_BOOST_PP_FOR_67_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_68(s, p, o, m) FB_BOOST_PP_FOR_68_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_69(s, p, o, m) FB_BOOST_PP_FOR_69_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_70(s, p, o, m) FB_BOOST_PP_FOR_70_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_71(s, p, o, m) FB_BOOST_PP_FOR_71_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_72(s, p, o, m) FB_BOOST_PP_FOR_72_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_73(s, p, o, m) FB_BOOST_PP_FOR_73_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_74(s, p, o, m) FB_BOOST_PP_FOR_74_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_75(s, p, o, m) FB_BOOST_PP_FOR_75_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_76(s, p, o, m) FB_BOOST_PP_FOR_76_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_77(s, p, o, m) FB_BOOST_PP_FOR_77_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_78(s, p, o, m) FB_BOOST_PP_FOR_78_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_79(s, p, o, m) FB_BOOST_PP_FOR_79_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_80(s, p, o, m) FB_BOOST_PP_FOR_80_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_81(s, p, o, m) FB_BOOST_PP_FOR_81_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_82(s, p, o, m) FB_BOOST_PP_FOR_82_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_83(s, p, o, m) FB_BOOST_PP_FOR_83_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_84(s, p, o, m) FB_BOOST_PP_FOR_84_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_85(s, p, o, m) FB_BOOST_PP_FOR_85_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_86(s, p, o, m) FB_BOOST_PP_FOR_86_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_87(s, p, o, m) FB_BOOST_PP_FOR_87_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_88(s, p, o, m) FB_BOOST_PP_FOR_88_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_89(s, p, o, m) FB_BOOST_PP_FOR_89_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_90(s, p, o, m) FB_BOOST_PP_FOR_90_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_91(s, p, o, m) FB_BOOST_PP_FOR_91_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_92(s, p, o, m) FB_BOOST_PP_FOR_92_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_93(s, p, o, m) FB_BOOST_PP_FOR_93_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_94(s, p, o, m) FB_BOOST_PP_FOR_94_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_95(s, p, o, m) FB_BOOST_PP_FOR_95_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_96(s, p, o, m) FB_BOOST_PP_FOR_96_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_97(s, p, o, m) FB_BOOST_PP_FOR_97_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_98(s, p, o, m) FB_BOOST_PP_FOR_98_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_99(s, p, o, m) FB_BOOST_PP_FOR_99_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_100(s, p, o, m) FB_BOOST_PP_FOR_100_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_101(s, p, o, m) FB_BOOST_PP_FOR_101_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_102(s, p, o, m) FB_BOOST_PP_FOR_102_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_103(s, p, o, m) FB_BOOST_PP_FOR_103_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_104(s, p, o, m) FB_BOOST_PP_FOR_104_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_105(s, p, o, m) FB_BOOST_PP_FOR_105_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_106(s, p, o, m) FB_BOOST_PP_FOR_106_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_107(s, p, o, m) FB_BOOST_PP_FOR_107_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_108(s, p, o, m) FB_BOOST_PP_FOR_108_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_109(s, p, o, m) FB_BOOST_PP_FOR_109_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_110(s, p, o, m) FB_BOOST_PP_FOR_110_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_111(s, p, o, m) FB_BOOST_PP_FOR_111_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_112(s, p, o, m) FB_BOOST_PP_FOR_112_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_113(s, p, o, m) FB_BOOST_PP_FOR_113_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_114(s, p, o, m) FB_BOOST_PP_FOR_114_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_115(s, p, o, m) FB_BOOST_PP_FOR_115_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_116(s, p, o, m) FB_BOOST_PP_FOR_116_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_117(s, p, o, m) FB_BOOST_PP_FOR_117_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_118(s, p, o, m) FB_BOOST_PP_FOR_118_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_119(s, p, o, m) FB_BOOST_PP_FOR_119_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_120(s, p, o, m) FB_BOOST_PP_FOR_120_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_121(s, p, o, m) FB_BOOST_PP_FOR_121_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_122(s, p, o, m) FB_BOOST_PP_FOR_122_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_123(s, p, o, m) FB_BOOST_PP_FOR_123_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_124(s, p, o, m) FB_BOOST_PP_FOR_124_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_125(s, p, o, m) FB_BOOST_PP_FOR_125_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_126(s, p, o, m) FB_BOOST_PP_FOR_126_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_127(s, p, o, m) FB_BOOST_PP_FOR_127_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_128(s, p, o, m) FB_BOOST_PP_FOR_128_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_129(s, p, o, m) FB_BOOST_PP_FOR_129_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_130(s, p, o, m) FB_BOOST_PP_FOR_130_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_131(s, p, o, m) FB_BOOST_PP_FOR_131_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_132(s, p, o, m) FB_BOOST_PP_FOR_132_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_133(s, p, o, m) FB_BOOST_PP_FOR_133_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_134(s, p, o, m) FB_BOOST_PP_FOR_134_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_135(s, p, o, m) FB_BOOST_PP_FOR_135_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_136(s, p, o, m) FB_BOOST_PP_FOR_136_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_137(s, p, o, m) FB_BOOST_PP_FOR_137_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_138(s, p, o, m) FB_BOOST_PP_FOR_138_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_139(s, p, o, m) FB_BOOST_PP_FOR_139_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_140(s, p, o, m) FB_BOOST_PP_FOR_140_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_141(s, p, o, m) FB_BOOST_PP_FOR_141_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_142(s, p, o, m) FB_BOOST_PP_FOR_142_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_143(s, p, o, m) FB_BOOST_PP_FOR_143_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_144(s, p, o, m) FB_BOOST_PP_FOR_144_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_145(s, p, o, m) FB_BOOST_PP_FOR_145_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_146(s, p, o, m) FB_BOOST_PP_FOR_146_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_147(s, p, o, m) FB_BOOST_PP_FOR_147_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_148(s, p, o, m) FB_BOOST_PP_FOR_148_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_149(s, p, o, m) FB_BOOST_PP_FOR_149_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_150(s, p, o, m) FB_BOOST_PP_FOR_150_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_151(s, p, o, m) FB_BOOST_PP_FOR_151_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_152(s, p, o, m) FB_BOOST_PP_FOR_152_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_153(s, p, o, m) FB_BOOST_PP_FOR_153_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_154(s, p, o, m) FB_BOOST_PP_FOR_154_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_155(s, p, o, m) FB_BOOST_PP_FOR_155_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_156(s, p, o, m) FB_BOOST_PP_FOR_156_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_157(s, p, o, m) FB_BOOST_PP_FOR_157_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_158(s, p, o, m) FB_BOOST_PP_FOR_158_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_159(s, p, o, m) FB_BOOST_PP_FOR_159_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_160(s, p, o, m) FB_BOOST_PP_FOR_160_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_161(s, p, o, m) FB_BOOST_PP_FOR_161_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_162(s, p, o, m) FB_BOOST_PP_FOR_162_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_163(s, p, o, m) FB_BOOST_PP_FOR_163_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_164(s, p, o, m) FB_BOOST_PP_FOR_164_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_165(s, p, o, m) FB_BOOST_PP_FOR_165_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_166(s, p, o, m) FB_BOOST_PP_FOR_166_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_167(s, p, o, m) FB_BOOST_PP_FOR_167_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_168(s, p, o, m) FB_BOOST_PP_FOR_168_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_169(s, p, o, m) FB_BOOST_PP_FOR_169_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_170(s, p, o, m) FB_BOOST_PP_FOR_170_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_171(s, p, o, m) FB_BOOST_PP_FOR_171_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_172(s, p, o, m) FB_BOOST_PP_FOR_172_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_173(s, p, o, m) FB_BOOST_PP_FOR_173_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_174(s, p, o, m) FB_BOOST_PP_FOR_174_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_175(s, p, o, m) FB_BOOST_PP_FOR_175_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_176(s, p, o, m) FB_BOOST_PP_FOR_176_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_177(s, p, o, m) FB_BOOST_PP_FOR_177_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_178(s, p, o, m) FB_BOOST_PP_FOR_178_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_179(s, p, o, m) FB_BOOST_PP_FOR_179_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_180(s, p, o, m) FB_BOOST_PP_FOR_180_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_181(s, p, o, m) FB_BOOST_PP_FOR_181_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_182(s, p, o, m) FB_BOOST_PP_FOR_182_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_183(s, p, o, m) FB_BOOST_PP_FOR_183_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_184(s, p, o, m) FB_BOOST_PP_FOR_184_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_185(s, p, o, m) FB_BOOST_PP_FOR_185_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_186(s, p, o, m) FB_BOOST_PP_FOR_186_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_187(s, p, o, m) FB_BOOST_PP_FOR_187_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_188(s, p, o, m) FB_BOOST_PP_FOR_188_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_189(s, p, o, m) FB_BOOST_PP_FOR_189_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_190(s, p, o, m) FB_BOOST_PP_FOR_190_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_191(s, p, o, m) FB_BOOST_PP_FOR_191_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_192(s, p, o, m) FB_BOOST_PP_FOR_192_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_193(s, p, o, m) FB_BOOST_PP_FOR_193_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_194(s, p, o, m) FB_BOOST_PP_FOR_194_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_195(s, p, o, m) FB_BOOST_PP_FOR_195_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_196(s, p, o, m) FB_BOOST_PP_FOR_196_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_197(s, p, o, m) FB_BOOST_PP_FOR_197_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_198(s, p, o, m) FB_BOOST_PP_FOR_198_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_199(s, p, o, m) FB_BOOST_PP_FOR_199_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_200(s, p, o, m) FB_BOOST_PP_FOR_200_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_201(s, p, o, m) FB_BOOST_PP_FOR_201_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_202(s, p, o, m) FB_BOOST_PP_FOR_202_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_203(s, p, o, m) FB_BOOST_PP_FOR_203_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_204(s, p, o, m) FB_BOOST_PP_FOR_204_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_205(s, p, o, m) FB_BOOST_PP_FOR_205_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_206(s, p, o, m) FB_BOOST_PP_FOR_206_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_207(s, p, o, m) FB_BOOST_PP_FOR_207_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_208(s, p, o, m) FB_BOOST_PP_FOR_208_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_209(s, p, o, m) FB_BOOST_PP_FOR_209_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_210(s, p, o, m) FB_BOOST_PP_FOR_210_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_211(s, p, o, m) FB_BOOST_PP_FOR_211_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_212(s, p, o, m) FB_BOOST_PP_FOR_212_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_213(s, p, o, m) FB_BOOST_PP_FOR_213_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_214(s, p, o, m) FB_BOOST_PP_FOR_214_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_215(s, p, o, m) FB_BOOST_PP_FOR_215_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_216(s, p, o, m) FB_BOOST_PP_FOR_216_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_217(s, p, o, m) FB_BOOST_PP_FOR_217_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_218(s, p, o, m) FB_BOOST_PP_FOR_218_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_219(s, p, o, m) FB_BOOST_PP_FOR_219_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_220(s, p, o, m) FB_BOOST_PP_FOR_220_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_221(s, p, o, m) FB_BOOST_PP_FOR_221_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_222(s, p, o, m) FB_BOOST_PP_FOR_222_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_223(s, p, o, m) FB_BOOST_PP_FOR_223_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_224(s, p, o, m) FB_BOOST_PP_FOR_224_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_225(s, p, o, m) FB_BOOST_PP_FOR_225_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_226(s, p, o, m) FB_BOOST_PP_FOR_226_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_227(s, p, o, m) FB_BOOST_PP_FOR_227_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_228(s, p, o, m) FB_BOOST_PP_FOR_228_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_229(s, p, o, m) FB_BOOST_PP_FOR_229_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_230(s, p, o, m) FB_BOOST_PP_FOR_230_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_231(s, p, o, m) FB_BOOST_PP_FOR_231_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_232(s, p, o, m) FB_BOOST_PP_FOR_232_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_233(s, p, o, m) FB_BOOST_PP_FOR_233_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_234(s, p, o, m) FB_BOOST_PP_FOR_234_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_235(s, p, o, m) FB_BOOST_PP_FOR_235_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_236(s, p, o, m) FB_BOOST_PP_FOR_236_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_237(s, p, o, m) FB_BOOST_PP_FOR_237_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_238(s, p, o, m) FB_BOOST_PP_FOR_238_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_239(s, p, o, m) FB_BOOST_PP_FOR_239_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_240(s, p, o, m) FB_BOOST_PP_FOR_240_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_241(s, p, o, m) FB_BOOST_PP_FOR_241_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_242(s, p, o, m) FB_BOOST_PP_FOR_242_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_243(s, p, o, m) FB_BOOST_PP_FOR_243_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_244(s, p, o, m) FB_BOOST_PP_FOR_244_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_245(s, p, o, m) FB_BOOST_PP_FOR_245_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_246(s, p, o, m) FB_BOOST_PP_FOR_246_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_247(s, p, o, m) FB_BOOST_PP_FOR_247_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_248(s, p, o, m) FB_BOOST_PP_FOR_248_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_249(s, p, o, m) FB_BOOST_PP_FOR_249_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_250(s, p, o, m) FB_BOOST_PP_FOR_250_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_251(s, p, o, m) FB_BOOST_PP_FOR_251_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_252(s, p, o, m) FB_BOOST_PP_FOR_252_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_253(s, p, o, m) FB_BOOST_PP_FOR_253_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_254(s, p, o, m) FB_BOOST_PP_FOR_254_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_255(s, p, o, m) FB_BOOST_PP_FOR_255_I(s, p, o, m)
-# define FB_BOOST_PP_FOR_256(s, p, o, m) FB_BOOST_PP_FOR_256_I(s, p, o, m)
-#
-# define FB_BOOST_PP_FOR_1_I(s, p, o, m) FB_BOOST_PP_IF(p(2, s), m, FB_BOOST_PP_TUPLE_EAT_2)(2, s) FB_BOOST_PP_IF(p(2, s), FB_BOOST_PP_FOR_2, FB_BOOST_PP_TUPLE_EAT_4)(o(2, s), p, o, m)
-# define FB_BOOST_PP_FOR_2_I(s, p, o, m) FB_BOOST_PP_IF(p(3, s), m, FB_BOOST_PP_TUPLE_EAT_2)(3, s) FB_BOOST_PP_IF(p(3, s), FB_BOOST_PP_FOR_3, FB_BOOST_PP_TUPLE_EAT_4)(o(3, s), p, o, m)
-# define FB_BOOST_PP_FOR_3_I(s, p, o, m) FB_BOOST_PP_IF(p(4, s), m, FB_BOOST_PP_TUPLE_EAT_2)(4, s) FB_BOOST_PP_IF(p(4, s), FB_BOOST_PP_FOR_4, FB_BOOST_PP_TUPLE_EAT_4)(o(4, s), p, o, m)
-# define FB_BOOST_PP_FOR_4_I(s, p, o, m) FB_BOOST_PP_IF(p(5, s), m, FB_BOOST_PP_TUPLE_EAT_2)(5, s) FB_BOOST_PP_IF(p(5, s), FB_BOOST_PP_FOR_5, FB_BOOST_PP_TUPLE_EAT_4)(o(5, s), p, o, m)
-# define FB_BOOST_PP_FOR_5_I(s, p, o, m) FB_BOOST_PP_IF(p(6, s), m, FB_BOOST_PP_TUPLE_EAT_2)(6, s) FB_BOOST_PP_IF(p(6, s), FB_BOOST_PP_FOR_6, FB_BOOST_PP_TUPLE_EAT_4)(o(6, s), p, o, m)
-# define FB_BOOST_PP_FOR_6_I(s, p, o, m) FB_BOOST_PP_IF(p(7, s), m, FB_BOOST_PP_TUPLE_EAT_2)(7, s) FB_BOOST_PP_IF(p(7, s), FB_BOOST_PP_FOR_7, FB_BOOST_PP_TUPLE_EAT_4)(o(7, s), p, o, m)
-# define FB_BOOST_PP_FOR_7_I(s, p, o, m) FB_BOOST_PP_IF(p(8, s), m, FB_BOOST_PP_TUPLE_EAT_2)(8, s) FB_BOOST_PP_IF(p(8, s), FB_BOOST_PP_FOR_8, FB_BOOST_PP_TUPLE_EAT_4)(o(8, s), p, o, m)
-# define FB_BOOST_PP_FOR_8_I(s, p, o, m) FB_BOOST_PP_IF(p(9, s), m, FB_BOOST_PP_TUPLE_EAT_2)(9, s) FB_BOOST_PP_IF(p(9, s), FB_BOOST_PP_FOR_9, FB_BOOST_PP_TUPLE_EAT_4)(o(9, s), p, o, m)
-# define FB_BOOST_PP_FOR_9_I(s, p, o, m) FB_BOOST_PP_IF(p(10, s), m, FB_BOOST_PP_TUPLE_EAT_2)(10, s) FB_BOOST_PP_IF(p(10, s), FB_BOOST_PP_FOR_10, FB_BOOST_PP_TUPLE_EAT_4)(o(10, s), p, o, m)
-# define FB_BOOST_PP_FOR_10_I(s, p, o, m) FB_BOOST_PP_IF(p(11, s), m, FB_BOOST_PP_TUPLE_EAT_2)(11, s) FB_BOOST_PP_IF(p(11, s), FB_BOOST_PP_FOR_11, FB_BOOST_PP_TUPLE_EAT_4)(o(11, s), p, o, m)
-# define FB_BOOST_PP_FOR_11_I(s, p, o, m) FB_BOOST_PP_IF(p(12, s), m, FB_BOOST_PP_TUPLE_EAT_2)(12, s) FB_BOOST_PP_IF(p(12, s), FB_BOOST_PP_FOR_12, FB_BOOST_PP_TUPLE_EAT_4)(o(12, s), p, o, m)
-# define FB_BOOST_PP_FOR_12_I(s, p, o, m) FB_BOOST_PP_IF(p(13, s), m, FB_BOOST_PP_TUPLE_EAT_2)(13, s) FB_BOOST_PP_IF(p(13, s), FB_BOOST_PP_FOR_13, FB_BOOST_PP_TUPLE_EAT_4)(o(13, s), p, o, m)
-# define FB_BOOST_PP_FOR_13_I(s, p, o, m) FB_BOOST_PP_IF(p(14, s), m, FB_BOOST_PP_TUPLE_EAT_2)(14, s) FB_BOOST_PP_IF(p(14, s), FB_BOOST_PP_FOR_14, FB_BOOST_PP_TUPLE_EAT_4)(o(14, s), p, o, m)
-# define FB_BOOST_PP_FOR_14_I(s, p, o, m) FB_BOOST_PP_IF(p(15, s), m, FB_BOOST_PP_TUPLE_EAT_2)(15, s) FB_BOOST_PP_IF(p(15, s), FB_BOOST_PP_FOR_15, FB_BOOST_PP_TUPLE_EAT_4)(o(15, s), p, o, m)
-# define FB_BOOST_PP_FOR_15_I(s, p, o, m) FB_BOOST_PP_IF(p(16, s), m, FB_BOOST_PP_TUPLE_EAT_2)(16, s) FB_BOOST_PP_IF(p(16, s), FB_BOOST_PP_FOR_16, FB_BOOST_PP_TUPLE_EAT_4)(o(16, s), p, o, m)
-# define FB_BOOST_PP_FOR_16_I(s, p, o, m) FB_BOOST_PP_IF(p(17, s), m, FB_BOOST_PP_TUPLE_EAT_2)(17, s) FB_BOOST_PP_IF(p(17, s), FB_BOOST_PP_FOR_17, FB_BOOST_PP_TUPLE_EAT_4)(o(17, s), p, o, m)
-# define FB_BOOST_PP_FOR_17_I(s, p, o, m) FB_BOOST_PP_IF(p(18, s), m, FB_BOOST_PP_TUPLE_EAT_2)(18, s) FB_BOOST_PP_IF(p(18, s), FB_BOOST_PP_FOR_18, FB_BOOST_PP_TUPLE_EAT_4)(o(18, s), p, o, m)
-# define FB_BOOST_PP_FOR_18_I(s, p, o, m) FB_BOOST_PP_IF(p(19, s), m, FB_BOOST_PP_TUPLE_EAT_2)(19, s) FB_BOOST_PP_IF(p(19, s), FB_BOOST_PP_FOR_19, FB_BOOST_PP_TUPLE_EAT_4)(o(19, s), p, o, m)
-# define FB_BOOST_PP_FOR_19_I(s, p, o, m) FB_BOOST_PP_IF(p(20, s), m, FB_BOOST_PP_TUPLE_EAT_2)(20, s) FB_BOOST_PP_IF(p(20, s), FB_BOOST_PP_FOR_20, FB_BOOST_PP_TUPLE_EAT_4)(o(20, s), p, o, m)
-# define FB_BOOST_PP_FOR_20_I(s, p, o, m) FB_BOOST_PP_IF(p(21, s), m, FB_BOOST_PP_TUPLE_EAT_2)(21, s) FB_BOOST_PP_IF(p(21, s), FB_BOOST_PP_FOR_21, FB_BOOST_PP_TUPLE_EAT_4)(o(21, s), p, o, m)
-# define FB_BOOST_PP_FOR_21_I(s, p, o, m) FB_BOOST_PP_IF(p(22, s), m, FB_BOOST_PP_TUPLE_EAT_2)(22, s) FB_BOOST_PP_IF(p(22, s), FB_BOOST_PP_FOR_22, FB_BOOST_PP_TUPLE_EAT_4)(o(22, s), p, o, m)
-# define FB_BOOST_PP_FOR_22_I(s, p, o, m) FB_BOOST_PP_IF(p(23, s), m, FB_BOOST_PP_TUPLE_EAT_2)(23, s) FB_BOOST_PP_IF(p(23, s), FB_BOOST_PP_FOR_23, FB_BOOST_PP_TUPLE_EAT_4)(o(23, s), p, o, m)
-# define FB_BOOST_PP_FOR_23_I(s, p, o, m) FB_BOOST_PP_IF(p(24, s), m, FB_BOOST_PP_TUPLE_EAT_2)(24, s) FB_BOOST_PP_IF(p(24, s), FB_BOOST_PP_FOR_24, FB_BOOST_PP_TUPLE_EAT_4)(o(24, s), p, o, m)
-# define FB_BOOST_PP_FOR_24_I(s, p, o, m) FB_BOOST_PP_IF(p(25, s), m, FB_BOOST_PP_TUPLE_EAT_2)(25, s) FB_BOOST_PP_IF(p(25, s), FB_BOOST_PP_FOR_25, FB_BOOST_PP_TUPLE_EAT_4)(o(25, s), p, o, m)
-# define FB_BOOST_PP_FOR_25_I(s, p, o, m) FB_BOOST_PP_IF(p(26, s), m, FB_BOOST_PP_TUPLE_EAT_2)(26, s) FB_BOOST_PP_IF(p(26, s), FB_BOOST_PP_FOR_26, FB_BOOST_PP_TUPLE_EAT_4)(o(26, s), p, o, m)
-# define FB_BOOST_PP_FOR_26_I(s, p, o, m) FB_BOOST_PP_IF(p(27, s), m, FB_BOOST_PP_TUPLE_EAT_2)(27, s) FB_BOOST_PP_IF(p(27, s), FB_BOOST_PP_FOR_27, FB_BOOST_PP_TUPLE_EAT_4)(o(27, s), p, o, m)
-# define FB_BOOST_PP_FOR_27_I(s, p, o, m) FB_BOOST_PP_IF(p(28, s), m, FB_BOOST_PP_TUPLE_EAT_2)(28, s) FB_BOOST_PP_IF(p(28, s), FB_BOOST_PP_FOR_28, FB_BOOST_PP_TUPLE_EAT_4)(o(28, s), p, o, m)
-# define FB_BOOST_PP_FOR_28_I(s, p, o, m) FB_BOOST_PP_IF(p(29, s), m, FB_BOOST_PP_TUPLE_EAT_2)(29, s) FB_BOOST_PP_IF(p(29, s), FB_BOOST_PP_FOR_29, FB_BOOST_PP_TUPLE_EAT_4)(o(29, s), p, o, m)
-# define FB_BOOST_PP_FOR_29_I(s, p, o, m) FB_BOOST_PP_IF(p(30, s), m, FB_BOOST_PP_TUPLE_EAT_2)(30, s) FB_BOOST_PP_IF(p(30, s), FB_BOOST_PP_FOR_30, FB_BOOST_PP_TUPLE_EAT_4)(o(30, s), p, o, m)
-# define FB_BOOST_PP_FOR_30_I(s, p, o, m) FB_BOOST_PP_IF(p(31, s), m, FB_BOOST_PP_TUPLE_EAT_2)(31, s) FB_BOOST_PP_IF(p(31, s), FB_BOOST_PP_FOR_31, FB_BOOST_PP_TUPLE_EAT_4)(o(31, s), p, o, m)
-# define FB_BOOST_PP_FOR_31_I(s, p, o, m) FB_BOOST_PP_IF(p(32, s), m, FB_BOOST_PP_TUPLE_EAT_2)(32, s) FB_BOOST_PP_IF(p(32, s), FB_BOOST_PP_FOR_32, FB_BOOST_PP_TUPLE_EAT_4)(o(32, s), p, o, m)
-# define FB_BOOST_PP_FOR_32_I(s, p, o, m) FB_BOOST_PP_IF(p(33, s), m, FB_BOOST_PP_TUPLE_EAT_2)(33, s) FB_BOOST_PP_IF(p(33, s), FB_BOOST_PP_FOR_33, FB_BOOST_PP_TUPLE_EAT_4)(o(33, s), p, o, m)
-# define FB_BOOST_PP_FOR_33_I(s, p, o, m) FB_BOOST_PP_IF(p(34, s), m, FB_BOOST_PP_TUPLE_EAT_2)(34, s) FB_BOOST_PP_IF(p(34, s), FB_BOOST_PP_FOR_34, FB_BOOST_PP_TUPLE_EAT_4)(o(34, s), p, o, m)
-# define FB_BOOST_PP_FOR_34_I(s, p, o, m) FB_BOOST_PP_IF(p(35, s), m, FB_BOOST_PP_TUPLE_EAT_2)(35, s) FB_BOOST_PP_IF(p(35, s), FB_BOOST_PP_FOR_35, FB_BOOST_PP_TUPLE_EAT_4)(o(35, s), p, o, m)
-# define FB_BOOST_PP_FOR_35_I(s, p, o, m) FB_BOOST_PP_IF(p(36, s), m, FB_BOOST_PP_TUPLE_EAT_2)(36, s) FB_BOOST_PP_IF(p(36, s), FB_BOOST_PP_FOR_36, FB_BOOST_PP_TUPLE_EAT_4)(o(36, s), p, o, m)
-# define FB_BOOST_PP_FOR_36_I(s, p, o, m) FB_BOOST_PP_IF(p(37, s), m, FB_BOOST_PP_TUPLE_EAT_2)(37, s) FB_BOOST_PP_IF(p(37, s), FB_BOOST_PP_FOR_37, FB_BOOST_PP_TUPLE_EAT_4)(o(37, s), p, o, m)
-# define FB_BOOST_PP_FOR_37_I(s, p, o, m) FB_BOOST_PP_IF(p(38, s), m, FB_BOOST_PP_TUPLE_EAT_2)(38, s) FB_BOOST_PP_IF(p(38, s), FB_BOOST_PP_FOR_38, FB_BOOST_PP_TUPLE_EAT_4)(o(38, s), p, o, m)
-# define FB_BOOST_PP_FOR_38_I(s, p, o, m) FB_BOOST_PP_IF(p(39, s), m, FB_BOOST_PP_TUPLE_EAT_2)(39, s) FB_BOOST_PP_IF(p(39, s), FB_BOOST_PP_FOR_39, FB_BOOST_PP_TUPLE_EAT_4)(o(39, s), p, o, m)
-# define FB_BOOST_PP_FOR_39_I(s, p, o, m) FB_BOOST_PP_IF(p(40, s), m, FB_BOOST_PP_TUPLE_EAT_2)(40, s) FB_BOOST_PP_IF(p(40, s), FB_BOOST_PP_FOR_40, FB_BOOST_PP_TUPLE_EAT_4)(o(40, s), p, o, m)
-# define FB_BOOST_PP_FOR_40_I(s, p, o, m) FB_BOOST_PP_IF(p(41, s), m, FB_BOOST_PP_TUPLE_EAT_2)(41, s) FB_BOOST_PP_IF(p(41, s), FB_BOOST_PP_FOR_41, FB_BOOST_PP_TUPLE_EAT_4)(o(41, s), p, o, m)
-# define FB_BOOST_PP_FOR_41_I(s, p, o, m) FB_BOOST_PP_IF(p(42, s), m, FB_BOOST_PP_TUPLE_EAT_2)(42, s) FB_BOOST_PP_IF(p(42, s), FB_BOOST_PP_FOR_42, FB_BOOST_PP_TUPLE_EAT_4)(o(42, s), p, o, m)
-# define FB_BOOST_PP_FOR_42_I(s, p, o, m) FB_BOOST_PP_IF(p(43, s), m, FB_BOOST_PP_TUPLE_EAT_2)(43, s) FB_BOOST_PP_IF(p(43, s), FB_BOOST_PP_FOR_43, FB_BOOST_PP_TUPLE_EAT_4)(o(43, s), p, o, m)
-# define FB_BOOST_PP_FOR_43_I(s, p, o, m) FB_BOOST_PP_IF(p(44, s), m, FB_BOOST_PP_TUPLE_EAT_2)(44, s) FB_BOOST_PP_IF(p(44, s), FB_BOOST_PP_FOR_44, FB_BOOST_PP_TUPLE_EAT_4)(o(44, s), p, o, m)
-# define FB_BOOST_PP_FOR_44_I(s, p, o, m) FB_BOOST_PP_IF(p(45, s), m, FB_BOOST_PP_TUPLE_EAT_2)(45, s) FB_BOOST_PP_IF(p(45, s), FB_BOOST_PP_FOR_45, FB_BOOST_PP_TUPLE_EAT_4)(o(45, s), p, o, m)
-# define FB_BOOST_PP_FOR_45_I(s, p, o, m) FB_BOOST_PP_IF(p(46, s), m, FB_BOOST_PP_TUPLE_EAT_2)(46, s) FB_BOOST_PP_IF(p(46, s), FB_BOOST_PP_FOR_46, FB_BOOST_PP_TUPLE_EAT_4)(o(46, s), p, o, m)
-# define FB_BOOST_PP_FOR_46_I(s, p, o, m) FB_BOOST_PP_IF(p(47, s), m, FB_BOOST_PP_TUPLE_EAT_2)(47, s) FB_BOOST_PP_IF(p(47, s), FB_BOOST_PP_FOR_47, FB_BOOST_PP_TUPLE_EAT_4)(o(47, s), p, o, m)
-# define FB_BOOST_PP_FOR_47_I(s, p, o, m) FB_BOOST_PP_IF(p(48, s), m, FB_BOOST_PP_TUPLE_EAT_2)(48, s) FB_BOOST_PP_IF(p(48, s), FB_BOOST_PP_FOR_48, FB_BOOST_PP_TUPLE_EAT_4)(o(48, s), p, o, m)
-# define FB_BOOST_PP_FOR_48_I(s, p, o, m) FB_BOOST_PP_IF(p(49, s), m, FB_BOOST_PP_TUPLE_EAT_2)(49, s) FB_BOOST_PP_IF(p(49, s), FB_BOOST_PP_FOR_49, FB_BOOST_PP_TUPLE_EAT_4)(o(49, s), p, o, m)
-# define FB_BOOST_PP_FOR_49_I(s, p, o, m) FB_BOOST_PP_IF(p(50, s), m, FB_BOOST_PP_TUPLE_EAT_2)(50, s) FB_BOOST_PP_IF(p(50, s), FB_BOOST_PP_FOR_50, FB_BOOST_PP_TUPLE_EAT_4)(o(50, s), p, o, m)
-# define FB_BOOST_PP_FOR_50_I(s, p, o, m) FB_BOOST_PP_IF(p(51, s), m, FB_BOOST_PP_TUPLE_EAT_2)(51, s) FB_BOOST_PP_IF(p(51, s), FB_BOOST_PP_FOR_51, FB_BOOST_PP_TUPLE_EAT_4)(o(51, s), p, o, m)
-# define FB_BOOST_PP_FOR_51_I(s, p, o, m) FB_BOOST_PP_IF(p(52, s), m, FB_BOOST_PP_TUPLE_EAT_2)(52, s) FB_BOOST_PP_IF(p(52, s), FB_BOOST_PP_FOR_52, FB_BOOST_PP_TUPLE_EAT_4)(o(52, s), p, o, m)
-# define FB_BOOST_PP_FOR_52_I(s, p, o, m) FB_BOOST_PP_IF(p(53, s), m, FB_BOOST_PP_TUPLE_EAT_2)(53, s) FB_BOOST_PP_IF(p(53, s), FB_BOOST_PP_FOR_53, FB_BOOST_PP_TUPLE_EAT_4)(o(53, s), p, o, m)
-# define FB_BOOST_PP_FOR_53_I(s, p, o, m) FB_BOOST_PP_IF(p(54, s), m, FB_BOOST_PP_TUPLE_EAT_2)(54, s) FB_BOOST_PP_IF(p(54, s), FB_BOOST_PP_FOR_54, FB_BOOST_PP_TUPLE_EAT_4)(o(54, s), p, o, m)
-# define FB_BOOST_PP_FOR_54_I(s, p, o, m) FB_BOOST_PP_IF(p(55, s), m, FB_BOOST_PP_TUPLE_EAT_2)(55, s) FB_BOOST_PP_IF(p(55, s), FB_BOOST_PP_FOR_55, FB_BOOST_PP_TUPLE_EAT_4)(o(55, s), p, o, m)
-# define FB_BOOST_PP_FOR_55_I(s, p, o, m) FB_BOOST_PP_IF(p(56, s), m, FB_BOOST_PP_TUPLE_EAT_2)(56, s) FB_BOOST_PP_IF(p(56, s), FB_BOOST_PP_FOR_56, FB_BOOST_PP_TUPLE_EAT_4)(o(56, s), p, o, m)
-# define FB_BOOST_PP_FOR_56_I(s, p, o, m) FB_BOOST_PP_IF(p(57, s), m, FB_BOOST_PP_TUPLE_EAT_2)(57, s) FB_BOOST_PP_IF(p(57, s), FB_BOOST_PP_FOR_57, FB_BOOST_PP_TUPLE_EAT_4)(o(57, s), p, o, m)
-# define FB_BOOST_PP_FOR_57_I(s, p, o, m) FB_BOOST_PP_IF(p(58, s), m, FB_BOOST_PP_TUPLE_EAT_2)(58, s) FB_BOOST_PP_IF(p(58, s), FB_BOOST_PP_FOR_58, FB_BOOST_PP_TUPLE_EAT_4)(o(58, s), p, o, m)
-# define FB_BOOST_PP_FOR_58_I(s, p, o, m) FB_BOOST_PP_IF(p(59, s), m, FB_BOOST_PP_TUPLE_EAT_2)(59, s) FB_BOOST_PP_IF(p(59, s), FB_BOOST_PP_FOR_59, FB_BOOST_PP_TUPLE_EAT_4)(o(59, s), p, o, m)
-# define FB_BOOST_PP_FOR_59_I(s, p, o, m) FB_BOOST_PP_IF(p(60, s), m, FB_BOOST_PP_TUPLE_EAT_2)(60, s) FB_BOOST_PP_IF(p(60, s), FB_BOOST_PP_FOR_60, FB_BOOST_PP_TUPLE_EAT_4)(o(60, s), p, o, m)
-# define FB_BOOST_PP_FOR_60_I(s, p, o, m) FB_BOOST_PP_IF(p(61, s), m, FB_BOOST_PP_TUPLE_EAT_2)(61, s) FB_BOOST_PP_IF(p(61, s), FB_BOOST_PP_FOR_61, FB_BOOST_PP_TUPLE_EAT_4)(o(61, s), p, o, m)
-# define FB_BOOST_PP_FOR_61_I(s, p, o, m) FB_BOOST_PP_IF(p(62, s), m, FB_BOOST_PP_TUPLE_EAT_2)(62, s) FB_BOOST_PP_IF(p(62, s), FB_BOOST_PP_FOR_62, FB_BOOST_PP_TUPLE_EAT_4)(o(62, s), p, o, m)
-# define FB_BOOST_PP_FOR_62_I(s, p, o, m) FB_BOOST_PP_IF(p(63, s), m, FB_BOOST_PP_TUPLE_EAT_2)(63, s) FB_BOOST_PP_IF(p(63, s), FB_BOOST_PP_FOR_63, FB_BOOST_PP_TUPLE_EAT_4)(o(63, s), p, o, m)
-# define FB_BOOST_PP_FOR_63_I(s, p, o, m) FB_BOOST_PP_IF(p(64, s), m, FB_BOOST_PP_TUPLE_EAT_2)(64, s) FB_BOOST_PP_IF(p(64, s), FB_BOOST_PP_FOR_64, FB_BOOST_PP_TUPLE_EAT_4)(o(64, s), p, o, m)
-# define FB_BOOST_PP_FOR_64_I(s, p, o, m) FB_BOOST_PP_IF(p(65, s), m, FB_BOOST_PP_TUPLE_EAT_2)(65, s) FB_BOOST_PP_IF(p(65, s), FB_BOOST_PP_FOR_65, FB_BOOST_PP_TUPLE_EAT_4)(o(65, s), p, o, m)
-# define FB_BOOST_PP_FOR_65_I(s, p, o, m) FB_BOOST_PP_IF(p(66, s), m, FB_BOOST_PP_TUPLE_EAT_2)(66, s) FB_BOOST_PP_IF(p(66, s), FB_BOOST_PP_FOR_66, FB_BOOST_PP_TUPLE_EAT_4)(o(66, s), p, o, m)
-# define FB_BOOST_PP_FOR_66_I(s, p, o, m) FB_BOOST_PP_IF(p(67, s), m, FB_BOOST_PP_TUPLE_EAT_2)(67, s) FB_BOOST_PP_IF(p(67, s), FB_BOOST_PP_FOR_67, FB_BOOST_PP_TUPLE_EAT_4)(o(67, s), p, o, m)
-# define FB_BOOST_PP_FOR_67_I(s, p, o, m) FB_BOOST_PP_IF(p(68, s), m, FB_BOOST_PP_TUPLE_EAT_2)(68, s) FB_BOOST_PP_IF(p(68, s), FB_BOOST_PP_FOR_68, FB_BOOST_PP_TUPLE_EAT_4)(o(68, s), p, o, m)
-# define FB_BOOST_PP_FOR_68_I(s, p, o, m) FB_BOOST_PP_IF(p(69, s), m, FB_BOOST_PP_TUPLE_EAT_2)(69, s) FB_BOOST_PP_IF(p(69, s), FB_BOOST_PP_FOR_69, FB_BOOST_PP_TUPLE_EAT_4)(o(69, s), p, o, m)
-# define FB_BOOST_PP_FOR_69_I(s, p, o, m) FB_BOOST_PP_IF(p(70, s), m, FB_BOOST_PP_TUPLE_EAT_2)(70, s) FB_BOOST_PP_IF(p(70, s), FB_BOOST_PP_FOR_70, FB_BOOST_PP_TUPLE_EAT_4)(o(70, s), p, o, m)
-# define FB_BOOST_PP_FOR_70_I(s, p, o, m) FB_BOOST_PP_IF(p(71, s), m, FB_BOOST_PP_TUPLE_EAT_2)(71, s) FB_BOOST_PP_IF(p(71, s), FB_BOOST_PP_FOR_71, FB_BOOST_PP_TUPLE_EAT_4)(o(71, s), p, o, m)
-# define FB_BOOST_PP_FOR_71_I(s, p, o, m) FB_BOOST_PP_IF(p(72, s), m, FB_BOOST_PP_TUPLE_EAT_2)(72, s) FB_BOOST_PP_IF(p(72, s), FB_BOOST_PP_FOR_72, FB_BOOST_PP_TUPLE_EAT_4)(o(72, s), p, o, m)
-# define FB_BOOST_PP_FOR_72_I(s, p, o, m) FB_BOOST_PP_IF(p(73, s), m, FB_BOOST_PP_TUPLE_EAT_2)(73, s) FB_BOOST_PP_IF(p(73, s), FB_BOOST_PP_FOR_73, FB_BOOST_PP_TUPLE_EAT_4)(o(73, s), p, o, m)
-# define FB_BOOST_PP_FOR_73_I(s, p, o, m) FB_BOOST_PP_IF(p(74, s), m, FB_BOOST_PP_TUPLE_EAT_2)(74, s) FB_BOOST_PP_IF(p(74, s), FB_BOOST_PP_FOR_74, FB_BOOST_PP_TUPLE_EAT_4)(o(74, s), p, o, m)
-# define FB_BOOST_PP_FOR_74_I(s, p, o, m) FB_BOOST_PP_IF(p(75, s), m, FB_BOOST_PP_TUPLE_EAT_2)(75, s) FB_BOOST_PP_IF(p(75, s), FB_BOOST_PP_FOR_75, FB_BOOST_PP_TUPLE_EAT_4)(o(75, s), p, o, m)
-# define FB_BOOST_PP_FOR_75_I(s, p, o, m) FB_BOOST_PP_IF(p(76, s), m, FB_BOOST_PP_TUPLE_EAT_2)(76, s) FB_BOOST_PP_IF(p(76, s), FB_BOOST_PP_FOR_76, FB_BOOST_PP_TUPLE_EAT_4)(o(76, s), p, o, m)
-# define FB_BOOST_PP_FOR_76_I(s, p, o, m) FB_BOOST_PP_IF(p(77, s), m, FB_BOOST_PP_TUPLE_EAT_2)(77, s) FB_BOOST_PP_IF(p(77, s), FB_BOOST_PP_FOR_77, FB_BOOST_PP_TUPLE_EAT_4)(o(77, s), p, o, m)
-# define FB_BOOST_PP_FOR_77_I(s, p, o, m) FB_BOOST_PP_IF(p(78, s), m, FB_BOOST_PP_TUPLE_EAT_2)(78, s) FB_BOOST_PP_IF(p(78, s), FB_BOOST_PP_FOR_78, FB_BOOST_PP_TUPLE_EAT_4)(o(78, s), p, o, m)
-# define FB_BOOST_PP_FOR_78_I(s, p, o, m) FB_BOOST_PP_IF(p(79, s), m, FB_BOOST_PP_TUPLE_EAT_2)(79, s) FB_BOOST_PP_IF(p(79, s), FB_BOOST_PP_FOR_79, FB_BOOST_PP_TUPLE_EAT_4)(o(79, s), p, o, m)
-# define FB_BOOST_PP_FOR_79_I(s, p, o, m) FB_BOOST_PP_IF(p(80, s), m, FB_BOOST_PP_TUPLE_EAT_2)(80, s) FB_BOOST_PP_IF(p(80, s), FB_BOOST_PP_FOR_80, FB_BOOST_PP_TUPLE_EAT_4)(o(80, s), p, o, m)
-# define FB_BOOST_PP_FOR_80_I(s, p, o, m) FB_BOOST_PP_IF(p(81, s), m, FB_BOOST_PP_TUPLE_EAT_2)(81, s) FB_BOOST_PP_IF(p(81, s), FB_BOOST_PP_FOR_81, FB_BOOST_PP_TUPLE_EAT_4)(o(81, s), p, o, m)
-# define FB_BOOST_PP_FOR_81_I(s, p, o, m) FB_BOOST_PP_IF(p(82, s), m, FB_BOOST_PP_TUPLE_EAT_2)(82, s) FB_BOOST_PP_IF(p(82, s), FB_BOOST_PP_FOR_82, FB_BOOST_PP_TUPLE_EAT_4)(o(82, s), p, o, m)
-# define FB_BOOST_PP_FOR_82_I(s, p, o, m) FB_BOOST_PP_IF(p(83, s), m, FB_BOOST_PP_TUPLE_EAT_2)(83, s) FB_BOOST_PP_IF(p(83, s), FB_BOOST_PP_FOR_83, FB_BOOST_PP_TUPLE_EAT_4)(o(83, s), p, o, m)
-# define FB_BOOST_PP_FOR_83_I(s, p, o, m) FB_BOOST_PP_IF(p(84, s), m, FB_BOOST_PP_TUPLE_EAT_2)(84, s) FB_BOOST_PP_IF(p(84, s), FB_BOOST_PP_FOR_84, FB_BOOST_PP_TUPLE_EAT_4)(o(84, s), p, o, m)
-# define FB_BOOST_PP_FOR_84_I(s, p, o, m) FB_BOOST_PP_IF(p(85, s), m, FB_BOOST_PP_TUPLE_EAT_2)(85, s) FB_BOOST_PP_IF(p(85, s), FB_BOOST_PP_FOR_85, FB_BOOST_PP_TUPLE_EAT_4)(o(85, s), p, o, m)
-# define FB_BOOST_PP_FOR_85_I(s, p, o, m) FB_BOOST_PP_IF(p(86, s), m, FB_BOOST_PP_TUPLE_EAT_2)(86, s) FB_BOOST_PP_IF(p(86, s), FB_BOOST_PP_FOR_86, FB_BOOST_PP_TUPLE_EAT_4)(o(86, s), p, o, m)
-# define FB_BOOST_PP_FOR_86_I(s, p, o, m) FB_BOOST_PP_IF(p(87, s), m, FB_BOOST_PP_TUPLE_EAT_2)(87, s) FB_BOOST_PP_IF(p(87, s), FB_BOOST_PP_FOR_87, FB_BOOST_PP_TUPLE_EAT_4)(o(87, s), p, o, m)
-# define FB_BOOST_PP_FOR_87_I(s, p, o, m) FB_BOOST_PP_IF(p(88, s), m, FB_BOOST_PP_TUPLE_EAT_2)(88, s) FB_BOOST_PP_IF(p(88, s), FB_BOOST_PP_FOR_88, FB_BOOST_PP_TUPLE_EAT_4)(o(88, s), p, o, m)
-# define FB_BOOST_PP_FOR_88_I(s, p, o, m) FB_BOOST_PP_IF(p(89, s), m, FB_BOOST_PP_TUPLE_EAT_2)(89, s) FB_BOOST_PP_IF(p(89, s), FB_BOOST_PP_FOR_89, FB_BOOST_PP_TUPLE_EAT_4)(o(89, s), p, o, m)
-# define FB_BOOST_PP_FOR_89_I(s, p, o, m) FB_BOOST_PP_IF(p(90, s), m, FB_BOOST_PP_TUPLE_EAT_2)(90, s) FB_BOOST_PP_IF(p(90, s), FB_BOOST_PP_FOR_90, FB_BOOST_PP_TUPLE_EAT_4)(o(90, s), p, o, m)
-# define FB_BOOST_PP_FOR_90_I(s, p, o, m) FB_BOOST_PP_IF(p(91, s), m, FB_BOOST_PP_TUPLE_EAT_2)(91, s) FB_BOOST_PP_IF(p(91, s), FB_BOOST_PP_FOR_91, FB_BOOST_PP_TUPLE_EAT_4)(o(91, s), p, o, m)
-# define FB_BOOST_PP_FOR_91_I(s, p, o, m) FB_BOOST_PP_IF(p(92, s), m, FB_BOOST_PP_TUPLE_EAT_2)(92, s) FB_BOOST_PP_IF(p(92, s), FB_BOOST_PP_FOR_92, FB_BOOST_PP_TUPLE_EAT_4)(o(92, s), p, o, m)
-# define FB_BOOST_PP_FOR_92_I(s, p, o, m) FB_BOOST_PP_IF(p(93, s), m, FB_BOOST_PP_TUPLE_EAT_2)(93, s) FB_BOOST_PP_IF(p(93, s), FB_BOOST_PP_FOR_93, FB_BOOST_PP_TUPLE_EAT_4)(o(93, s), p, o, m)
-# define FB_BOOST_PP_FOR_93_I(s, p, o, m) FB_BOOST_PP_IF(p(94, s), m, FB_BOOST_PP_TUPLE_EAT_2)(94, s) FB_BOOST_PP_IF(p(94, s), FB_BOOST_PP_FOR_94, FB_BOOST_PP_TUPLE_EAT_4)(o(94, s), p, o, m)
-# define FB_BOOST_PP_FOR_94_I(s, p, o, m) FB_BOOST_PP_IF(p(95, s), m, FB_BOOST_PP_TUPLE_EAT_2)(95, s) FB_BOOST_PP_IF(p(95, s), FB_BOOST_PP_FOR_95, FB_BOOST_PP_TUPLE_EAT_4)(o(95, s), p, o, m)
-# define FB_BOOST_PP_FOR_95_I(s, p, o, m) FB_BOOST_PP_IF(p(96, s), m, FB_BOOST_PP_TUPLE_EAT_2)(96, s) FB_BOOST_PP_IF(p(96, s), FB_BOOST_PP_FOR_96, FB_BOOST_PP_TUPLE_EAT_4)(o(96, s), p, o, m)
-# define FB_BOOST_PP_FOR_96_I(s, p, o, m) FB_BOOST_PP_IF(p(97, s), m, FB_BOOST_PP_TUPLE_EAT_2)(97, s) FB_BOOST_PP_IF(p(97, s), FB_BOOST_PP_FOR_97, FB_BOOST_PP_TUPLE_EAT_4)(o(97, s), p, o, m)
-# define FB_BOOST_PP_FOR_97_I(s, p, o, m) FB_BOOST_PP_IF(p(98, s), m, FB_BOOST_PP_TUPLE_EAT_2)(98, s) FB_BOOST_PP_IF(p(98, s), FB_BOOST_PP_FOR_98, FB_BOOST_PP_TUPLE_EAT_4)(o(98, s), p, o, m)
-# define FB_BOOST_PP_FOR_98_I(s, p, o, m) FB_BOOST_PP_IF(p(99, s), m, FB_BOOST_PP_TUPLE_EAT_2)(99, s) FB_BOOST_PP_IF(p(99, s), FB_BOOST_PP_FOR_99, FB_BOOST_PP_TUPLE_EAT_4)(o(99, s), p, o, m)
-# define FB_BOOST_PP_FOR_99_I(s, p, o, m) FB_BOOST_PP_IF(p(100, s), m, FB_BOOST_PP_TUPLE_EAT_2)(100, s) FB_BOOST_PP_IF(p(100, s), FB_BOOST_PP_FOR_100, FB_BOOST_PP_TUPLE_EAT_4)(o(100, s), p, o, m)
-# define FB_BOOST_PP_FOR_100_I(s, p, o, m) FB_BOOST_PP_IF(p(101, s), m, FB_BOOST_PP_TUPLE_EAT_2)(101, s) FB_BOOST_PP_IF(p(101, s), FB_BOOST_PP_FOR_101, FB_BOOST_PP_TUPLE_EAT_4)(o(101, s), p, o, m)
-# define FB_BOOST_PP_FOR_101_I(s, p, o, m) FB_BOOST_PP_IF(p(102, s), m, FB_BOOST_PP_TUPLE_EAT_2)(102, s) FB_BOOST_PP_IF(p(102, s), FB_BOOST_PP_FOR_102, FB_BOOST_PP_TUPLE_EAT_4)(o(102, s), p, o, m)
-# define FB_BOOST_PP_FOR_102_I(s, p, o, m) FB_BOOST_PP_IF(p(103, s), m, FB_BOOST_PP_TUPLE_EAT_2)(103, s) FB_BOOST_PP_IF(p(103, s), FB_BOOST_PP_FOR_103, FB_BOOST_PP_TUPLE_EAT_4)(o(103, s), p, o, m)
-# define FB_BOOST_PP_FOR_103_I(s, p, o, m) FB_BOOST_PP_IF(p(104, s), m, FB_BOOST_PP_TUPLE_EAT_2)(104, s) FB_BOOST_PP_IF(p(104, s), FB_BOOST_PP_FOR_104, FB_BOOST_PP_TUPLE_EAT_4)(o(104, s), p, o, m)
-# define FB_BOOST_PP_FOR_104_I(s, p, o, m) FB_BOOST_PP_IF(p(105, s), m, FB_BOOST_PP_TUPLE_EAT_2)(105, s) FB_BOOST_PP_IF(p(105, s), FB_BOOST_PP_FOR_105, FB_BOOST_PP_TUPLE_EAT_4)(o(105, s), p, o, m)
-# define FB_BOOST_PP_FOR_105_I(s, p, o, m) FB_BOOST_PP_IF(p(106, s), m, FB_BOOST_PP_TUPLE_EAT_2)(106, s) FB_BOOST_PP_IF(p(106, s), FB_BOOST_PP_FOR_106, FB_BOOST_PP_TUPLE_EAT_4)(o(106, s), p, o, m)
-# define FB_BOOST_PP_FOR_106_I(s, p, o, m) FB_BOOST_PP_IF(p(107, s), m, FB_BOOST_PP_TUPLE_EAT_2)(107, s) FB_BOOST_PP_IF(p(107, s), FB_BOOST_PP_FOR_107, FB_BOOST_PP_TUPLE_EAT_4)(o(107, s), p, o, m)
-# define FB_BOOST_PP_FOR_107_I(s, p, o, m) FB_BOOST_PP_IF(p(108, s), m, FB_BOOST_PP_TUPLE_EAT_2)(108, s) FB_BOOST_PP_IF(p(108, s), FB_BOOST_PP_FOR_108, FB_BOOST_PP_TUPLE_EAT_4)(o(108, s), p, o, m)
-# define FB_BOOST_PP_FOR_108_I(s, p, o, m) FB_BOOST_PP_IF(p(109, s), m, FB_BOOST_PP_TUPLE_EAT_2)(109, s) FB_BOOST_PP_IF(p(109, s), FB_BOOST_PP_FOR_109, FB_BOOST_PP_TUPLE_EAT_4)(o(109, s), p, o, m)
-# define FB_BOOST_PP_FOR_109_I(s, p, o, m) FB_BOOST_PP_IF(p(110, s), m, FB_BOOST_PP_TUPLE_EAT_2)(110, s) FB_BOOST_PP_IF(p(110, s), FB_BOOST_PP_FOR_110, FB_BOOST_PP_TUPLE_EAT_4)(o(110, s), p, o, m)
-# define FB_BOOST_PP_FOR_110_I(s, p, o, m) FB_BOOST_PP_IF(p(111, s), m, FB_BOOST_PP_TUPLE_EAT_2)(111, s) FB_BOOST_PP_IF(p(111, s), FB_BOOST_PP_FOR_111, FB_BOOST_PP_TUPLE_EAT_4)(o(111, s), p, o, m)
-# define FB_BOOST_PP_FOR_111_I(s, p, o, m) FB_BOOST_PP_IF(p(112, s), m, FB_BOOST_PP_TUPLE_EAT_2)(112, s) FB_BOOST_PP_IF(p(112, s), FB_BOOST_PP_FOR_112, FB_BOOST_PP_TUPLE_EAT_4)(o(112, s), p, o, m)
-# define FB_BOOST_PP_FOR_112_I(s, p, o, m) FB_BOOST_PP_IF(p(113, s), m, FB_BOOST_PP_TUPLE_EAT_2)(113, s) FB_BOOST_PP_IF(p(113, s), FB_BOOST_PP_FOR_113, FB_BOOST_PP_TUPLE_EAT_4)(o(113, s), p, o, m)
-# define FB_BOOST_PP_FOR_113_I(s, p, o, m) FB_BOOST_PP_IF(p(114, s), m, FB_BOOST_PP_TUPLE_EAT_2)(114, s) FB_BOOST_PP_IF(p(114, s), FB_BOOST_PP_FOR_114, FB_BOOST_PP_TUPLE_EAT_4)(o(114, s), p, o, m)
-# define FB_BOOST_PP_FOR_114_I(s, p, o, m) FB_BOOST_PP_IF(p(115, s), m, FB_BOOST_PP_TUPLE_EAT_2)(115, s) FB_BOOST_PP_IF(p(115, s), FB_BOOST_PP_FOR_115, FB_BOOST_PP_TUPLE_EAT_4)(o(115, s), p, o, m)
-# define FB_BOOST_PP_FOR_115_I(s, p, o, m) FB_BOOST_PP_IF(p(116, s), m, FB_BOOST_PP_TUPLE_EAT_2)(116, s) FB_BOOST_PP_IF(p(116, s), FB_BOOST_PP_FOR_116, FB_BOOST_PP_TUPLE_EAT_4)(o(116, s), p, o, m)
-# define FB_BOOST_PP_FOR_116_I(s, p, o, m) FB_BOOST_PP_IF(p(117, s), m, FB_BOOST_PP_TUPLE_EAT_2)(117, s) FB_BOOST_PP_IF(p(117, s), FB_BOOST_PP_FOR_117, FB_BOOST_PP_TUPLE_EAT_4)(o(117, s), p, o, m)
-# define FB_BOOST_PP_FOR_117_I(s, p, o, m) FB_BOOST_PP_IF(p(118, s), m, FB_BOOST_PP_TUPLE_EAT_2)(118, s) FB_BOOST_PP_IF(p(118, s), FB_BOOST_PP_FOR_118, FB_BOOST_PP_TUPLE_EAT_4)(o(118, s), p, o, m)
-# define FB_BOOST_PP_FOR_118_I(s, p, o, m) FB_BOOST_PP_IF(p(119, s), m, FB_BOOST_PP_TUPLE_EAT_2)(119, s) FB_BOOST_PP_IF(p(119, s), FB_BOOST_PP_FOR_119, FB_BOOST_PP_TUPLE_EAT_4)(o(119, s), p, o, m)
-# define FB_BOOST_PP_FOR_119_I(s, p, o, m) FB_BOOST_PP_IF(p(120, s), m, FB_BOOST_PP_TUPLE_EAT_2)(120, s) FB_BOOST_PP_IF(p(120, s), FB_BOOST_PP_FOR_120, FB_BOOST_PP_TUPLE_EAT_4)(o(120, s), p, o, m)
-# define FB_BOOST_PP_FOR_120_I(s, p, o, m) FB_BOOST_PP_IF(p(121, s), m, FB_BOOST_PP_TUPLE_EAT_2)(121, s) FB_BOOST_PP_IF(p(121, s), FB_BOOST_PP_FOR_121, FB_BOOST_PP_TUPLE_EAT_4)(o(121, s), p, o, m)
-# define FB_BOOST_PP_FOR_121_I(s, p, o, m) FB_BOOST_PP_IF(p(122, s), m, FB_BOOST_PP_TUPLE_EAT_2)(122, s) FB_BOOST_PP_IF(p(122, s), FB_BOOST_PP_FOR_122, FB_BOOST_PP_TUPLE_EAT_4)(o(122, s), p, o, m)
-# define FB_BOOST_PP_FOR_122_I(s, p, o, m) FB_BOOST_PP_IF(p(123, s), m, FB_BOOST_PP_TUPLE_EAT_2)(123, s) FB_BOOST_PP_IF(p(123, s), FB_BOOST_PP_FOR_123, FB_BOOST_PP_TUPLE_EAT_4)(o(123, s), p, o, m)
-# define FB_BOOST_PP_FOR_123_I(s, p, o, m) FB_BOOST_PP_IF(p(124, s), m, FB_BOOST_PP_TUPLE_EAT_2)(124, s) FB_BOOST_PP_IF(p(124, s), FB_BOOST_PP_FOR_124, FB_BOOST_PP_TUPLE_EAT_4)(o(124, s), p, o, m)
-# define FB_BOOST_PP_FOR_124_I(s, p, o, m) FB_BOOST_PP_IF(p(125, s), m, FB_BOOST_PP_TUPLE_EAT_2)(125, s) FB_BOOST_PP_IF(p(125, s), FB_BOOST_PP_FOR_125, FB_BOOST_PP_TUPLE_EAT_4)(o(125, s), p, o, m)
-# define FB_BOOST_PP_FOR_125_I(s, p, o, m) FB_BOOST_PP_IF(p(126, s), m, FB_BOOST_PP_TUPLE_EAT_2)(126, s) FB_BOOST_PP_IF(p(126, s), FB_BOOST_PP_FOR_126, FB_BOOST_PP_TUPLE_EAT_4)(o(126, s), p, o, m)
-# define FB_BOOST_PP_FOR_126_I(s, p, o, m) FB_BOOST_PP_IF(p(127, s), m, FB_BOOST_PP_TUPLE_EAT_2)(127, s) FB_BOOST_PP_IF(p(127, s), FB_BOOST_PP_FOR_127, FB_BOOST_PP_TUPLE_EAT_4)(o(127, s), p, o, m)
-# define FB_BOOST_PP_FOR_127_I(s, p, o, m) FB_BOOST_PP_IF(p(128, s), m, FB_BOOST_PP_TUPLE_EAT_2)(128, s) FB_BOOST_PP_IF(p(128, s), FB_BOOST_PP_FOR_128, FB_BOOST_PP_TUPLE_EAT_4)(o(128, s), p, o, m)
-# define FB_BOOST_PP_FOR_128_I(s, p, o, m) FB_BOOST_PP_IF(p(129, s), m, FB_BOOST_PP_TUPLE_EAT_2)(129, s) FB_BOOST_PP_IF(p(129, s), FB_BOOST_PP_FOR_129, FB_BOOST_PP_TUPLE_EAT_4)(o(129, s), p, o, m)
-# define FB_BOOST_PP_FOR_129_I(s, p, o, m) FB_BOOST_PP_IF(p(130, s), m, FB_BOOST_PP_TUPLE_EAT_2)(130, s) FB_BOOST_PP_IF(p(130, s), FB_BOOST_PP_FOR_130, FB_BOOST_PP_TUPLE_EAT_4)(o(130, s), p, o, m)
-# define FB_BOOST_PP_FOR_130_I(s, p, o, m) FB_BOOST_PP_IF(p(131, s), m, FB_BOOST_PP_TUPLE_EAT_2)(131, s) FB_BOOST_PP_IF(p(131, s), FB_BOOST_PP_FOR_131, FB_BOOST_PP_TUPLE_EAT_4)(o(131, s), p, o, m)
-# define FB_BOOST_PP_FOR_131_I(s, p, o, m) FB_BOOST_PP_IF(p(132, s), m, FB_BOOST_PP_TUPLE_EAT_2)(132, s) FB_BOOST_PP_IF(p(132, s), FB_BOOST_PP_FOR_132, FB_BOOST_PP_TUPLE_EAT_4)(o(132, s), p, o, m)
-# define FB_BOOST_PP_FOR_132_I(s, p, o, m) FB_BOOST_PP_IF(p(133, s), m, FB_BOOST_PP_TUPLE_EAT_2)(133, s) FB_BOOST_PP_IF(p(133, s), FB_BOOST_PP_FOR_133, FB_BOOST_PP_TUPLE_EAT_4)(o(133, s), p, o, m)
-# define FB_BOOST_PP_FOR_133_I(s, p, o, m) FB_BOOST_PP_IF(p(134, s), m, FB_BOOST_PP_TUPLE_EAT_2)(134, s) FB_BOOST_PP_IF(p(134, s), FB_BOOST_PP_FOR_134, FB_BOOST_PP_TUPLE_EAT_4)(o(134, s), p, o, m)
-# define FB_BOOST_PP_FOR_134_I(s, p, o, m) FB_BOOST_PP_IF(p(135, s), m, FB_BOOST_PP_TUPLE_EAT_2)(135, s) FB_BOOST_PP_IF(p(135, s), FB_BOOST_PP_FOR_135, FB_BOOST_PP_TUPLE_EAT_4)(o(135, s), p, o, m)
-# define FB_BOOST_PP_FOR_135_I(s, p, o, m) FB_BOOST_PP_IF(p(136, s), m, FB_BOOST_PP_TUPLE_EAT_2)(136, s) FB_BOOST_PP_IF(p(136, s), FB_BOOST_PP_FOR_136, FB_BOOST_PP_TUPLE_EAT_4)(o(136, s), p, o, m)
-# define FB_BOOST_PP_FOR_136_I(s, p, o, m) FB_BOOST_PP_IF(p(137, s), m, FB_BOOST_PP_TUPLE_EAT_2)(137, s) FB_BOOST_PP_IF(p(137, s), FB_BOOST_PP_FOR_137, FB_BOOST_PP_TUPLE_EAT_4)(o(137, s), p, o, m)
-# define FB_BOOST_PP_FOR_137_I(s, p, o, m) FB_BOOST_PP_IF(p(138, s), m, FB_BOOST_PP_TUPLE_EAT_2)(138, s) FB_BOOST_PP_IF(p(138, s), FB_BOOST_PP_FOR_138, FB_BOOST_PP_TUPLE_EAT_4)(o(138, s), p, o, m)
-# define FB_BOOST_PP_FOR_138_I(s, p, o, m) FB_BOOST_PP_IF(p(139, s), m, FB_BOOST_PP_TUPLE_EAT_2)(139, s) FB_BOOST_PP_IF(p(139, s), FB_BOOST_PP_FOR_139, FB_BOOST_PP_TUPLE_EAT_4)(o(139, s), p, o, m)
-# define FB_BOOST_PP_FOR_139_I(s, p, o, m) FB_BOOST_PP_IF(p(140, s), m, FB_BOOST_PP_TUPLE_EAT_2)(140, s) FB_BOOST_PP_IF(p(140, s), FB_BOOST_PP_FOR_140, FB_BOOST_PP_TUPLE_EAT_4)(o(140, s), p, o, m)
-# define FB_BOOST_PP_FOR_140_I(s, p, o, m) FB_BOOST_PP_IF(p(141, s), m, FB_BOOST_PP_TUPLE_EAT_2)(141, s) FB_BOOST_PP_IF(p(141, s), FB_BOOST_PP_FOR_141, FB_BOOST_PP_TUPLE_EAT_4)(o(141, s), p, o, m)
-# define FB_BOOST_PP_FOR_141_I(s, p, o, m) FB_BOOST_PP_IF(p(142, s), m, FB_BOOST_PP_TUPLE_EAT_2)(142, s) FB_BOOST_PP_IF(p(142, s), FB_BOOST_PP_FOR_142, FB_BOOST_PP_TUPLE_EAT_4)(o(142, s), p, o, m)
-# define FB_BOOST_PP_FOR_142_I(s, p, o, m) FB_BOOST_PP_IF(p(143, s), m, FB_BOOST_PP_TUPLE_EAT_2)(143, s) FB_BOOST_PP_IF(p(143, s), FB_BOOST_PP_FOR_143, FB_BOOST_PP_TUPLE_EAT_4)(o(143, s), p, o, m)
-# define FB_BOOST_PP_FOR_143_I(s, p, o, m) FB_BOOST_PP_IF(p(144, s), m, FB_BOOST_PP_TUPLE_EAT_2)(144, s) FB_BOOST_PP_IF(p(144, s), FB_BOOST_PP_FOR_144, FB_BOOST_PP_TUPLE_EAT_4)(o(144, s), p, o, m)
-# define FB_BOOST_PP_FOR_144_I(s, p, o, m) FB_BOOST_PP_IF(p(145, s), m, FB_BOOST_PP_TUPLE_EAT_2)(145, s) FB_BOOST_PP_IF(p(145, s), FB_BOOST_PP_FOR_145, FB_BOOST_PP_TUPLE_EAT_4)(o(145, s), p, o, m)
-# define FB_BOOST_PP_FOR_145_I(s, p, o, m) FB_BOOST_PP_IF(p(146, s), m, FB_BOOST_PP_TUPLE_EAT_2)(146, s) FB_BOOST_PP_IF(p(146, s), FB_BOOST_PP_FOR_146, FB_BOOST_PP_TUPLE_EAT_4)(o(146, s), p, o, m)
-# define FB_BOOST_PP_FOR_146_I(s, p, o, m) FB_BOOST_PP_IF(p(147, s), m, FB_BOOST_PP_TUPLE_EAT_2)(147, s) FB_BOOST_PP_IF(p(147, s), FB_BOOST_PP_FOR_147, FB_BOOST_PP_TUPLE_EAT_4)(o(147, s), p, o, m)
-# define FB_BOOST_PP_FOR_147_I(s, p, o, m) FB_BOOST_PP_IF(p(148, s), m, FB_BOOST_PP_TUPLE_EAT_2)(148, s) FB_BOOST_PP_IF(p(148, s), FB_BOOST_PP_FOR_148, FB_BOOST_PP_TUPLE_EAT_4)(o(148, s), p, o, m)
-# define FB_BOOST_PP_FOR_148_I(s, p, o, m) FB_BOOST_PP_IF(p(149, s), m, FB_BOOST_PP_TUPLE_EAT_2)(149, s) FB_BOOST_PP_IF(p(149, s), FB_BOOST_PP_FOR_149, FB_BOOST_PP_TUPLE_EAT_4)(o(149, s), p, o, m)
-# define FB_BOOST_PP_FOR_149_I(s, p, o, m) FB_BOOST_PP_IF(p(150, s), m, FB_BOOST_PP_TUPLE_EAT_2)(150, s) FB_BOOST_PP_IF(p(150, s), FB_BOOST_PP_FOR_150, FB_BOOST_PP_TUPLE_EAT_4)(o(150, s), p, o, m)
-# define FB_BOOST_PP_FOR_150_I(s, p, o, m) FB_BOOST_PP_IF(p(151, s), m, FB_BOOST_PP_TUPLE_EAT_2)(151, s) FB_BOOST_PP_IF(p(151, s), FB_BOOST_PP_FOR_151, FB_BOOST_PP_TUPLE_EAT_4)(o(151, s), p, o, m)
-# define FB_BOOST_PP_FOR_151_I(s, p, o, m) FB_BOOST_PP_IF(p(152, s), m, FB_BOOST_PP_TUPLE_EAT_2)(152, s) FB_BOOST_PP_IF(p(152, s), FB_BOOST_PP_FOR_152, FB_BOOST_PP_TUPLE_EAT_4)(o(152, s), p, o, m)
-# define FB_BOOST_PP_FOR_152_I(s, p, o, m) FB_BOOST_PP_IF(p(153, s), m, FB_BOOST_PP_TUPLE_EAT_2)(153, s) FB_BOOST_PP_IF(p(153, s), FB_BOOST_PP_FOR_153, FB_BOOST_PP_TUPLE_EAT_4)(o(153, s), p, o, m)
-# define FB_BOOST_PP_FOR_153_I(s, p, o, m) FB_BOOST_PP_IF(p(154, s), m, FB_BOOST_PP_TUPLE_EAT_2)(154, s) FB_BOOST_PP_IF(p(154, s), FB_BOOST_PP_FOR_154, FB_BOOST_PP_TUPLE_EAT_4)(o(154, s), p, o, m)
-# define FB_BOOST_PP_FOR_154_I(s, p, o, m) FB_BOOST_PP_IF(p(155, s), m, FB_BOOST_PP_TUPLE_EAT_2)(155, s) FB_BOOST_PP_IF(p(155, s), FB_BOOST_PP_FOR_155, FB_BOOST_PP_TUPLE_EAT_4)(o(155, s), p, o, m)
-# define FB_BOOST_PP_FOR_155_I(s, p, o, m) FB_BOOST_PP_IF(p(156, s), m, FB_BOOST_PP_TUPLE_EAT_2)(156, s) FB_BOOST_PP_IF(p(156, s), FB_BOOST_PP_FOR_156, FB_BOOST_PP_TUPLE_EAT_4)(o(156, s), p, o, m)
-# define FB_BOOST_PP_FOR_156_I(s, p, o, m) FB_BOOST_PP_IF(p(157, s), m, FB_BOOST_PP_TUPLE_EAT_2)(157, s) FB_BOOST_PP_IF(p(157, s), FB_BOOST_PP_FOR_157, FB_BOOST_PP_TUPLE_EAT_4)(o(157, s), p, o, m)
-# define FB_BOOST_PP_FOR_157_I(s, p, o, m) FB_BOOST_PP_IF(p(158, s), m, FB_BOOST_PP_TUPLE_EAT_2)(158, s) FB_BOOST_PP_IF(p(158, s), FB_BOOST_PP_FOR_158, FB_BOOST_PP_TUPLE_EAT_4)(o(158, s), p, o, m)
-# define FB_BOOST_PP_FOR_158_I(s, p, o, m) FB_BOOST_PP_IF(p(159, s), m, FB_BOOST_PP_TUPLE_EAT_2)(159, s) FB_BOOST_PP_IF(p(159, s), FB_BOOST_PP_FOR_159, FB_BOOST_PP_TUPLE_EAT_4)(o(159, s), p, o, m)
-# define FB_BOOST_PP_FOR_159_I(s, p, o, m) FB_BOOST_PP_IF(p(160, s), m, FB_BOOST_PP_TUPLE_EAT_2)(160, s) FB_BOOST_PP_IF(p(160, s), FB_BOOST_PP_FOR_160, FB_BOOST_PP_TUPLE_EAT_4)(o(160, s), p, o, m)
-# define FB_BOOST_PP_FOR_160_I(s, p, o, m) FB_BOOST_PP_IF(p(161, s), m, FB_BOOST_PP_TUPLE_EAT_2)(161, s) FB_BOOST_PP_IF(p(161, s), FB_BOOST_PP_FOR_161, FB_BOOST_PP_TUPLE_EAT_4)(o(161, s), p, o, m)
-# define FB_BOOST_PP_FOR_161_I(s, p, o, m) FB_BOOST_PP_IF(p(162, s), m, FB_BOOST_PP_TUPLE_EAT_2)(162, s) FB_BOOST_PP_IF(p(162, s), FB_BOOST_PP_FOR_162, FB_BOOST_PP_TUPLE_EAT_4)(o(162, s), p, o, m)
-# define FB_BOOST_PP_FOR_162_I(s, p, o, m) FB_BOOST_PP_IF(p(163, s), m, FB_BOOST_PP_TUPLE_EAT_2)(163, s) FB_BOOST_PP_IF(p(163, s), FB_BOOST_PP_FOR_163, FB_BOOST_PP_TUPLE_EAT_4)(o(163, s), p, o, m)
-# define FB_BOOST_PP_FOR_163_I(s, p, o, m) FB_BOOST_PP_IF(p(164, s), m, FB_BOOST_PP_TUPLE_EAT_2)(164, s) FB_BOOST_PP_IF(p(164, s), FB_BOOST_PP_FOR_164, FB_BOOST_PP_TUPLE_EAT_4)(o(164, s), p, o, m)
-# define FB_BOOST_PP_FOR_164_I(s, p, o, m) FB_BOOST_PP_IF(p(165, s), m, FB_BOOST_PP_TUPLE_EAT_2)(165, s) FB_BOOST_PP_IF(p(165, s), FB_BOOST_PP_FOR_165, FB_BOOST_PP_TUPLE_EAT_4)(o(165, s), p, o, m)
-# define FB_BOOST_PP_FOR_165_I(s, p, o, m) FB_BOOST_PP_IF(p(166, s), m, FB_BOOST_PP_TUPLE_EAT_2)(166, s) FB_BOOST_PP_IF(p(166, s), FB_BOOST_PP_FOR_166, FB_BOOST_PP_TUPLE_EAT_4)(o(166, s), p, o, m)
-# define FB_BOOST_PP_FOR_166_I(s, p, o, m) FB_BOOST_PP_IF(p(167, s), m, FB_BOOST_PP_TUPLE_EAT_2)(167, s) FB_BOOST_PP_IF(p(167, s), FB_BOOST_PP_FOR_167, FB_BOOST_PP_TUPLE_EAT_4)(o(167, s), p, o, m)
-# define FB_BOOST_PP_FOR_167_I(s, p, o, m) FB_BOOST_PP_IF(p(168, s), m, FB_BOOST_PP_TUPLE_EAT_2)(168, s) FB_BOOST_PP_IF(p(168, s), FB_BOOST_PP_FOR_168, FB_BOOST_PP_TUPLE_EAT_4)(o(168, s), p, o, m)
-# define FB_BOOST_PP_FOR_168_I(s, p, o, m) FB_BOOST_PP_IF(p(169, s), m, FB_BOOST_PP_TUPLE_EAT_2)(169, s) FB_BOOST_PP_IF(p(169, s), FB_BOOST_PP_FOR_169, FB_BOOST_PP_TUPLE_EAT_4)(o(169, s), p, o, m)
-# define FB_BOOST_PP_FOR_169_I(s, p, o, m) FB_BOOST_PP_IF(p(170, s), m, FB_BOOST_PP_TUPLE_EAT_2)(170, s) FB_BOOST_PP_IF(p(170, s), FB_BOOST_PP_FOR_170, FB_BOOST_PP_TUPLE_EAT_4)(o(170, s), p, o, m)
-# define FB_BOOST_PP_FOR_170_I(s, p, o, m) FB_BOOST_PP_IF(p(171, s), m, FB_BOOST_PP_TUPLE_EAT_2)(171, s) FB_BOOST_PP_IF(p(171, s), FB_BOOST_PP_FOR_171, FB_BOOST_PP_TUPLE_EAT_4)(o(171, s), p, o, m)
-# define FB_BOOST_PP_FOR_171_I(s, p, o, m) FB_BOOST_PP_IF(p(172, s), m, FB_BOOST_PP_TUPLE_EAT_2)(172, s) FB_BOOST_PP_IF(p(172, s), FB_BOOST_PP_FOR_172, FB_BOOST_PP_TUPLE_EAT_4)(o(172, s), p, o, m)
-# define FB_BOOST_PP_FOR_172_I(s, p, o, m) FB_BOOST_PP_IF(p(173, s), m, FB_BOOST_PP_TUPLE_EAT_2)(173, s) FB_BOOST_PP_IF(p(173, s), FB_BOOST_PP_FOR_173, FB_BOOST_PP_TUPLE_EAT_4)(o(173, s), p, o, m)
-# define FB_BOOST_PP_FOR_173_I(s, p, o, m) FB_BOOST_PP_IF(p(174, s), m, FB_BOOST_PP_TUPLE_EAT_2)(174, s) FB_BOOST_PP_IF(p(174, s), FB_BOOST_PP_FOR_174, FB_BOOST_PP_TUPLE_EAT_4)(o(174, s), p, o, m)
-# define FB_BOOST_PP_FOR_174_I(s, p, o, m) FB_BOOST_PP_IF(p(175, s), m, FB_BOOST_PP_TUPLE_EAT_2)(175, s) FB_BOOST_PP_IF(p(175, s), FB_BOOST_PP_FOR_175, FB_BOOST_PP_TUPLE_EAT_4)(o(175, s), p, o, m)
-# define FB_BOOST_PP_FOR_175_I(s, p, o, m) FB_BOOST_PP_IF(p(176, s), m, FB_BOOST_PP_TUPLE_EAT_2)(176, s) FB_BOOST_PP_IF(p(176, s), FB_BOOST_PP_FOR_176, FB_BOOST_PP_TUPLE_EAT_4)(o(176, s), p, o, m)
-# define FB_BOOST_PP_FOR_176_I(s, p, o, m) FB_BOOST_PP_IF(p(177, s), m, FB_BOOST_PP_TUPLE_EAT_2)(177, s) FB_BOOST_PP_IF(p(177, s), FB_BOOST_PP_FOR_177, FB_BOOST_PP_TUPLE_EAT_4)(o(177, s), p, o, m)
-# define FB_BOOST_PP_FOR_177_I(s, p, o, m) FB_BOOST_PP_IF(p(178, s), m, FB_BOOST_PP_TUPLE_EAT_2)(178, s) FB_BOOST_PP_IF(p(178, s), FB_BOOST_PP_FOR_178, FB_BOOST_PP_TUPLE_EAT_4)(o(178, s), p, o, m)
-# define FB_BOOST_PP_FOR_178_I(s, p, o, m) FB_BOOST_PP_IF(p(179, s), m, FB_BOOST_PP_TUPLE_EAT_2)(179, s) FB_BOOST_PP_IF(p(179, s), FB_BOOST_PP_FOR_179, FB_BOOST_PP_TUPLE_EAT_4)(o(179, s), p, o, m)
-# define FB_BOOST_PP_FOR_179_I(s, p, o, m) FB_BOOST_PP_IF(p(180, s), m, FB_BOOST_PP_TUPLE_EAT_2)(180, s) FB_BOOST_PP_IF(p(180, s), FB_BOOST_PP_FOR_180, FB_BOOST_PP_TUPLE_EAT_4)(o(180, s), p, o, m)
-# define FB_BOOST_PP_FOR_180_I(s, p, o, m) FB_BOOST_PP_IF(p(181, s), m, FB_BOOST_PP_TUPLE_EAT_2)(181, s) FB_BOOST_PP_IF(p(181, s), FB_BOOST_PP_FOR_181, FB_BOOST_PP_TUPLE_EAT_4)(o(181, s), p, o, m)
-# define FB_BOOST_PP_FOR_181_I(s, p, o, m) FB_BOOST_PP_IF(p(182, s), m, FB_BOOST_PP_TUPLE_EAT_2)(182, s) FB_BOOST_PP_IF(p(182, s), FB_BOOST_PP_FOR_182, FB_BOOST_PP_TUPLE_EAT_4)(o(182, s), p, o, m)
-# define FB_BOOST_PP_FOR_182_I(s, p, o, m) FB_BOOST_PP_IF(p(183, s), m, FB_BOOST_PP_TUPLE_EAT_2)(183, s) FB_BOOST_PP_IF(p(183, s), FB_BOOST_PP_FOR_183, FB_BOOST_PP_TUPLE_EAT_4)(o(183, s), p, o, m)
-# define FB_BOOST_PP_FOR_183_I(s, p, o, m) FB_BOOST_PP_IF(p(184, s), m, FB_BOOST_PP_TUPLE_EAT_2)(184, s) FB_BOOST_PP_IF(p(184, s), FB_BOOST_PP_FOR_184, FB_BOOST_PP_TUPLE_EAT_4)(o(184, s), p, o, m)
-# define FB_BOOST_PP_FOR_184_I(s, p, o, m) FB_BOOST_PP_IF(p(185, s), m, FB_BOOST_PP_TUPLE_EAT_2)(185, s) FB_BOOST_PP_IF(p(185, s), FB_BOOST_PP_FOR_185, FB_BOOST_PP_TUPLE_EAT_4)(o(185, s), p, o, m)
-# define FB_BOOST_PP_FOR_185_I(s, p, o, m) FB_BOOST_PP_IF(p(186, s), m, FB_BOOST_PP_TUPLE_EAT_2)(186, s) FB_BOOST_PP_IF(p(186, s), FB_BOOST_PP_FOR_186, FB_BOOST_PP_TUPLE_EAT_4)(o(186, s), p, o, m)
-# define FB_BOOST_PP_FOR_186_I(s, p, o, m) FB_BOOST_PP_IF(p(187, s), m, FB_BOOST_PP_TUPLE_EAT_2)(187, s) FB_BOOST_PP_IF(p(187, s), FB_BOOST_PP_FOR_187, FB_BOOST_PP_TUPLE_EAT_4)(o(187, s), p, o, m)
-# define FB_BOOST_PP_FOR_187_I(s, p, o, m) FB_BOOST_PP_IF(p(188, s), m, FB_BOOST_PP_TUPLE_EAT_2)(188, s) FB_BOOST_PP_IF(p(188, s), FB_BOOST_PP_FOR_188, FB_BOOST_PP_TUPLE_EAT_4)(o(188, s), p, o, m)
-# define FB_BOOST_PP_FOR_188_I(s, p, o, m) FB_BOOST_PP_IF(p(189, s), m, FB_BOOST_PP_TUPLE_EAT_2)(189, s) FB_BOOST_PP_IF(p(189, s), FB_BOOST_PP_FOR_189, FB_BOOST_PP_TUPLE_EAT_4)(o(189, s), p, o, m)
-# define FB_BOOST_PP_FOR_189_I(s, p, o, m) FB_BOOST_PP_IF(p(190, s), m, FB_BOOST_PP_TUPLE_EAT_2)(190, s) FB_BOOST_PP_IF(p(190, s), FB_BOOST_PP_FOR_190, FB_BOOST_PP_TUPLE_EAT_4)(o(190, s), p, o, m)
-# define FB_BOOST_PP_FOR_190_I(s, p, o, m) FB_BOOST_PP_IF(p(191, s), m, FB_BOOST_PP_TUPLE_EAT_2)(191, s) FB_BOOST_PP_IF(p(191, s), FB_BOOST_PP_FOR_191, FB_BOOST_PP_TUPLE_EAT_4)(o(191, s), p, o, m)
-# define FB_BOOST_PP_FOR_191_I(s, p, o, m) FB_BOOST_PP_IF(p(192, s), m, FB_BOOST_PP_TUPLE_EAT_2)(192, s) FB_BOOST_PP_IF(p(192, s), FB_BOOST_PP_FOR_192, FB_BOOST_PP_TUPLE_EAT_4)(o(192, s), p, o, m)
-# define FB_BOOST_PP_FOR_192_I(s, p, o, m) FB_BOOST_PP_IF(p(193, s), m, FB_BOOST_PP_TUPLE_EAT_2)(193, s) FB_BOOST_PP_IF(p(193, s), FB_BOOST_PP_FOR_193, FB_BOOST_PP_TUPLE_EAT_4)(o(193, s), p, o, m)
-# define FB_BOOST_PP_FOR_193_I(s, p, o, m) FB_BOOST_PP_IF(p(194, s), m, FB_BOOST_PP_TUPLE_EAT_2)(194, s) FB_BOOST_PP_IF(p(194, s), FB_BOOST_PP_FOR_194, FB_BOOST_PP_TUPLE_EAT_4)(o(194, s), p, o, m)
-# define FB_BOOST_PP_FOR_194_I(s, p, o, m) FB_BOOST_PP_IF(p(195, s), m, FB_BOOST_PP_TUPLE_EAT_2)(195, s) FB_BOOST_PP_IF(p(195, s), FB_BOOST_PP_FOR_195, FB_BOOST_PP_TUPLE_EAT_4)(o(195, s), p, o, m)
-# define FB_BOOST_PP_FOR_195_I(s, p, o, m) FB_BOOST_PP_IF(p(196, s), m, FB_BOOST_PP_TUPLE_EAT_2)(196, s) FB_BOOST_PP_IF(p(196, s), FB_BOOST_PP_FOR_196, FB_BOOST_PP_TUPLE_EAT_4)(o(196, s), p, o, m)
-# define FB_BOOST_PP_FOR_196_I(s, p, o, m) FB_BOOST_PP_IF(p(197, s), m, FB_BOOST_PP_TUPLE_EAT_2)(197, s) FB_BOOST_PP_IF(p(197, s), FB_BOOST_PP_FOR_197, FB_BOOST_PP_TUPLE_EAT_4)(o(197, s), p, o, m)
-# define FB_BOOST_PP_FOR_197_I(s, p, o, m) FB_BOOST_PP_IF(p(198, s), m, FB_BOOST_PP_TUPLE_EAT_2)(198, s) FB_BOOST_PP_IF(p(198, s), FB_BOOST_PP_FOR_198, FB_BOOST_PP_TUPLE_EAT_4)(o(198, s), p, o, m)
-# define FB_BOOST_PP_FOR_198_I(s, p, o, m) FB_BOOST_PP_IF(p(199, s), m, FB_BOOST_PP_TUPLE_EAT_2)(199, s) FB_BOOST_PP_IF(p(199, s), FB_BOOST_PP_FOR_199, FB_BOOST_PP_TUPLE_EAT_4)(o(199, s), p, o, m)
-# define FB_BOOST_PP_FOR_199_I(s, p, o, m) FB_BOOST_PP_IF(p(200, s), m, FB_BOOST_PP_TUPLE_EAT_2)(200, s) FB_BOOST_PP_IF(p(200, s), FB_BOOST_PP_FOR_200, FB_BOOST_PP_TUPLE_EAT_4)(o(200, s), p, o, m)
-# define FB_BOOST_PP_FOR_200_I(s, p, o, m) FB_BOOST_PP_IF(p(201, s), m, FB_BOOST_PP_TUPLE_EAT_2)(201, s) FB_BOOST_PP_IF(p(201, s), FB_BOOST_PP_FOR_201, FB_BOOST_PP_TUPLE_EAT_4)(o(201, s), p, o, m)
-# define FB_BOOST_PP_FOR_201_I(s, p, o, m) FB_BOOST_PP_IF(p(202, s), m, FB_BOOST_PP_TUPLE_EAT_2)(202, s) FB_BOOST_PP_IF(p(202, s), FB_BOOST_PP_FOR_202, FB_BOOST_PP_TUPLE_EAT_4)(o(202, s), p, o, m)
-# define FB_BOOST_PP_FOR_202_I(s, p, o, m) FB_BOOST_PP_IF(p(203, s), m, FB_BOOST_PP_TUPLE_EAT_2)(203, s) FB_BOOST_PP_IF(p(203, s), FB_BOOST_PP_FOR_203, FB_BOOST_PP_TUPLE_EAT_4)(o(203, s), p, o, m)
-# define FB_BOOST_PP_FOR_203_I(s, p, o, m) FB_BOOST_PP_IF(p(204, s), m, FB_BOOST_PP_TUPLE_EAT_2)(204, s) FB_BOOST_PP_IF(p(204, s), FB_BOOST_PP_FOR_204, FB_BOOST_PP_TUPLE_EAT_4)(o(204, s), p, o, m)
-# define FB_BOOST_PP_FOR_204_I(s, p, o, m) FB_BOOST_PP_IF(p(205, s), m, FB_BOOST_PP_TUPLE_EAT_2)(205, s) FB_BOOST_PP_IF(p(205, s), FB_BOOST_PP_FOR_205, FB_BOOST_PP_TUPLE_EAT_4)(o(205, s), p, o, m)
-# define FB_BOOST_PP_FOR_205_I(s, p, o, m) FB_BOOST_PP_IF(p(206, s), m, FB_BOOST_PP_TUPLE_EAT_2)(206, s) FB_BOOST_PP_IF(p(206, s), FB_BOOST_PP_FOR_206, FB_BOOST_PP_TUPLE_EAT_4)(o(206, s), p, o, m)
-# define FB_BOOST_PP_FOR_206_I(s, p, o, m) FB_BOOST_PP_IF(p(207, s), m, FB_BOOST_PP_TUPLE_EAT_2)(207, s) FB_BOOST_PP_IF(p(207, s), FB_BOOST_PP_FOR_207, FB_BOOST_PP_TUPLE_EAT_4)(o(207, s), p, o, m)
-# define FB_BOOST_PP_FOR_207_I(s, p, o, m) FB_BOOST_PP_IF(p(208, s), m, FB_BOOST_PP_TUPLE_EAT_2)(208, s) FB_BOOST_PP_IF(p(208, s), FB_BOOST_PP_FOR_208, FB_BOOST_PP_TUPLE_EAT_4)(o(208, s), p, o, m)
-# define FB_BOOST_PP_FOR_208_I(s, p, o, m) FB_BOOST_PP_IF(p(209, s), m, FB_BOOST_PP_TUPLE_EAT_2)(209, s) FB_BOOST_PP_IF(p(209, s), FB_BOOST_PP_FOR_209, FB_BOOST_PP_TUPLE_EAT_4)(o(209, s), p, o, m)
-# define FB_BOOST_PP_FOR_209_I(s, p, o, m) FB_BOOST_PP_IF(p(210, s), m, FB_BOOST_PP_TUPLE_EAT_2)(210, s) FB_BOOST_PP_IF(p(210, s), FB_BOOST_PP_FOR_210, FB_BOOST_PP_TUPLE_EAT_4)(o(210, s), p, o, m)
-# define FB_BOOST_PP_FOR_210_I(s, p, o, m) FB_BOOST_PP_IF(p(211, s), m, FB_BOOST_PP_TUPLE_EAT_2)(211, s) FB_BOOST_PP_IF(p(211, s), FB_BOOST_PP_FOR_211, FB_BOOST_PP_TUPLE_EAT_4)(o(211, s), p, o, m)
-# define FB_BOOST_PP_FOR_211_I(s, p, o, m) FB_BOOST_PP_IF(p(212, s), m, FB_BOOST_PP_TUPLE_EAT_2)(212, s) FB_BOOST_PP_IF(p(212, s), FB_BOOST_PP_FOR_212, FB_BOOST_PP_TUPLE_EAT_4)(o(212, s), p, o, m)
-# define FB_BOOST_PP_FOR_212_I(s, p, o, m) FB_BOOST_PP_IF(p(213, s), m, FB_BOOST_PP_TUPLE_EAT_2)(213, s) FB_BOOST_PP_IF(p(213, s), FB_BOOST_PP_FOR_213, FB_BOOST_PP_TUPLE_EAT_4)(o(213, s), p, o, m)
-# define FB_BOOST_PP_FOR_213_I(s, p, o, m) FB_BOOST_PP_IF(p(214, s), m, FB_BOOST_PP_TUPLE_EAT_2)(214, s) FB_BOOST_PP_IF(p(214, s), FB_BOOST_PP_FOR_214, FB_BOOST_PP_TUPLE_EAT_4)(o(214, s), p, o, m)
-# define FB_BOOST_PP_FOR_214_I(s, p, o, m) FB_BOOST_PP_IF(p(215, s), m, FB_BOOST_PP_TUPLE_EAT_2)(215, s) FB_BOOST_PP_IF(p(215, s), FB_BOOST_PP_FOR_215, FB_BOOST_PP_TUPLE_EAT_4)(o(215, s), p, o, m)
-# define FB_BOOST_PP_FOR_215_I(s, p, o, m) FB_BOOST_PP_IF(p(216, s), m, FB_BOOST_PP_TUPLE_EAT_2)(216, s) FB_BOOST_PP_IF(p(216, s), FB_BOOST_PP_FOR_216, FB_BOOST_PP_TUPLE_EAT_4)(o(216, s), p, o, m)
-# define FB_BOOST_PP_FOR_216_I(s, p, o, m) FB_BOOST_PP_IF(p(217, s), m, FB_BOOST_PP_TUPLE_EAT_2)(217, s) FB_BOOST_PP_IF(p(217, s), FB_BOOST_PP_FOR_217, FB_BOOST_PP_TUPLE_EAT_4)(o(217, s), p, o, m)
-# define FB_BOOST_PP_FOR_217_I(s, p, o, m) FB_BOOST_PP_IF(p(218, s), m, FB_BOOST_PP_TUPLE_EAT_2)(218, s) FB_BOOST_PP_IF(p(218, s), FB_BOOST_PP_FOR_218, FB_BOOST_PP_TUPLE_EAT_4)(o(218, s), p, o, m)
-# define FB_BOOST_PP_FOR_218_I(s, p, o, m) FB_BOOST_PP_IF(p(219, s), m, FB_BOOST_PP_TUPLE_EAT_2)(219, s) FB_BOOST_PP_IF(p(219, s), FB_BOOST_PP_FOR_219, FB_BOOST_PP_TUPLE_EAT_4)(o(219, s), p, o, m)
-# define FB_BOOST_PP_FOR_219_I(s, p, o, m) FB_BOOST_PP_IF(p(220, s), m, FB_BOOST_PP_TUPLE_EAT_2)(220, s) FB_BOOST_PP_IF(p(220, s), FB_BOOST_PP_FOR_220, FB_BOOST_PP_TUPLE_EAT_4)(o(220, s), p, o, m)
-# define FB_BOOST_PP_FOR_220_I(s, p, o, m) FB_BOOST_PP_IF(p(221, s), m, FB_BOOST_PP_TUPLE_EAT_2)(221, s) FB_BOOST_PP_IF(p(221, s), FB_BOOST_PP_FOR_221, FB_BOOST_PP_TUPLE_EAT_4)(o(221, s), p, o, m)
-# define FB_BOOST_PP_FOR_221_I(s, p, o, m) FB_BOOST_PP_IF(p(222, s), m, FB_BOOST_PP_TUPLE_EAT_2)(222, s) FB_BOOST_PP_IF(p(222, s), FB_BOOST_PP_FOR_222, FB_BOOST_PP_TUPLE_EAT_4)(o(222, s), p, o, m)
-# define FB_BOOST_PP_FOR_222_I(s, p, o, m) FB_BOOST_PP_IF(p(223, s), m, FB_BOOST_PP_TUPLE_EAT_2)(223, s) FB_BOOST_PP_IF(p(223, s), FB_BOOST_PP_FOR_223, FB_BOOST_PP_TUPLE_EAT_4)(o(223, s), p, o, m)
-# define FB_BOOST_PP_FOR_223_I(s, p, o, m) FB_BOOST_PP_IF(p(224, s), m, FB_BOOST_PP_TUPLE_EAT_2)(224, s) FB_BOOST_PP_IF(p(224, s), FB_BOOST_PP_FOR_224, FB_BOOST_PP_TUPLE_EAT_4)(o(224, s), p, o, m)
-# define FB_BOOST_PP_FOR_224_I(s, p, o, m) FB_BOOST_PP_IF(p(225, s), m, FB_BOOST_PP_TUPLE_EAT_2)(225, s) FB_BOOST_PP_IF(p(225, s), FB_BOOST_PP_FOR_225, FB_BOOST_PP_TUPLE_EAT_4)(o(225, s), p, o, m)
-# define FB_BOOST_PP_FOR_225_I(s, p, o, m) FB_BOOST_PP_IF(p(226, s), m, FB_BOOST_PP_TUPLE_EAT_2)(226, s) FB_BOOST_PP_IF(p(226, s), FB_BOOST_PP_FOR_226, FB_BOOST_PP_TUPLE_EAT_4)(o(226, s), p, o, m)
-# define FB_BOOST_PP_FOR_226_I(s, p, o, m) FB_BOOST_PP_IF(p(227, s), m, FB_BOOST_PP_TUPLE_EAT_2)(227, s) FB_BOOST_PP_IF(p(227, s), FB_BOOST_PP_FOR_227, FB_BOOST_PP_TUPLE_EAT_4)(o(227, s), p, o, m)
-# define FB_BOOST_PP_FOR_227_I(s, p, o, m) FB_BOOST_PP_IF(p(228, s), m, FB_BOOST_PP_TUPLE_EAT_2)(228, s) FB_BOOST_PP_IF(p(228, s), FB_BOOST_PP_FOR_228, FB_BOOST_PP_TUPLE_EAT_4)(o(228, s), p, o, m)
-# define FB_BOOST_PP_FOR_228_I(s, p, o, m) FB_BOOST_PP_IF(p(229, s), m, FB_BOOST_PP_TUPLE_EAT_2)(229, s) FB_BOOST_PP_IF(p(229, s), FB_BOOST_PP_FOR_229, FB_BOOST_PP_TUPLE_EAT_4)(o(229, s), p, o, m)
-# define FB_BOOST_PP_FOR_229_I(s, p, o, m) FB_BOOST_PP_IF(p(230, s), m, FB_BOOST_PP_TUPLE_EAT_2)(230, s) FB_BOOST_PP_IF(p(230, s), FB_BOOST_PP_FOR_230, FB_BOOST_PP_TUPLE_EAT_4)(o(230, s), p, o, m)
-# define FB_BOOST_PP_FOR_230_I(s, p, o, m) FB_BOOST_PP_IF(p(231, s), m, FB_BOOST_PP_TUPLE_EAT_2)(231, s) FB_BOOST_PP_IF(p(231, s), FB_BOOST_PP_FOR_231, FB_BOOST_PP_TUPLE_EAT_4)(o(231, s), p, o, m)
-# define FB_BOOST_PP_FOR_231_I(s, p, o, m) FB_BOOST_PP_IF(p(232, s), m, FB_BOOST_PP_TUPLE_EAT_2)(232, s) FB_BOOST_PP_IF(p(232, s), FB_BOOST_PP_FOR_232, FB_BOOST_PP_TUPLE_EAT_4)(o(232, s), p, o, m)
-# define FB_BOOST_PP_FOR_232_I(s, p, o, m) FB_BOOST_PP_IF(p(233, s), m, FB_BOOST_PP_TUPLE_EAT_2)(233, s) FB_BOOST_PP_IF(p(233, s), FB_BOOST_PP_FOR_233, FB_BOOST_PP_TUPLE_EAT_4)(o(233, s), p, o, m)
-# define FB_BOOST_PP_FOR_233_I(s, p, o, m) FB_BOOST_PP_IF(p(234, s), m, FB_BOOST_PP_TUPLE_EAT_2)(234, s) FB_BOOST_PP_IF(p(234, s), FB_BOOST_PP_FOR_234, FB_BOOST_PP_TUPLE_EAT_4)(o(234, s), p, o, m)
-# define FB_BOOST_PP_FOR_234_I(s, p, o, m) FB_BOOST_PP_IF(p(235, s), m, FB_BOOST_PP_TUPLE_EAT_2)(235, s) FB_BOOST_PP_IF(p(235, s), FB_BOOST_PP_FOR_235, FB_BOOST_PP_TUPLE_EAT_4)(o(235, s), p, o, m)
-# define FB_BOOST_PP_FOR_235_I(s, p, o, m) FB_BOOST_PP_IF(p(236, s), m, FB_BOOST_PP_TUPLE_EAT_2)(236, s) FB_BOOST_PP_IF(p(236, s), FB_BOOST_PP_FOR_236, FB_BOOST_PP_TUPLE_EAT_4)(o(236, s), p, o, m)
-# define FB_BOOST_PP_FOR_236_I(s, p, o, m) FB_BOOST_PP_IF(p(237, s), m, FB_BOOST_PP_TUPLE_EAT_2)(237, s) FB_BOOST_PP_IF(p(237, s), FB_BOOST_PP_FOR_237, FB_BOOST_PP_TUPLE_EAT_4)(o(237, s), p, o, m)
-# define FB_BOOST_PP_FOR_237_I(s, p, o, m) FB_BOOST_PP_IF(p(238, s), m, FB_BOOST_PP_TUPLE_EAT_2)(238, s) FB_BOOST_PP_IF(p(238, s), FB_BOOST_PP_FOR_238, FB_BOOST_PP_TUPLE_EAT_4)(o(238, s), p, o, m)
-# define FB_BOOST_PP_FOR_238_I(s, p, o, m) FB_BOOST_PP_IF(p(239, s), m, FB_BOOST_PP_TUPLE_EAT_2)(239, s) FB_BOOST_PP_IF(p(239, s), FB_BOOST_PP_FOR_239, FB_BOOST_PP_TUPLE_EAT_4)(o(239, s), p, o, m)
-# define FB_BOOST_PP_FOR_239_I(s, p, o, m) FB_BOOST_PP_IF(p(240, s), m, FB_BOOST_PP_TUPLE_EAT_2)(240, s) FB_BOOST_PP_IF(p(240, s), FB_BOOST_PP_FOR_240, FB_BOOST_PP_TUPLE_EAT_4)(o(240, s), p, o, m)
-# define FB_BOOST_PP_FOR_240_I(s, p, o, m) FB_BOOST_PP_IF(p(241, s), m, FB_BOOST_PP_TUPLE_EAT_2)(241, s) FB_BOOST_PP_IF(p(241, s), FB_BOOST_PP_FOR_241, FB_BOOST_PP_TUPLE_EAT_4)(o(241, s), p, o, m)
-# define FB_BOOST_PP_FOR_241_I(s, p, o, m) FB_BOOST_PP_IF(p(242, s), m, FB_BOOST_PP_TUPLE_EAT_2)(242, s) FB_BOOST_PP_IF(p(242, s), FB_BOOST_PP_FOR_242, FB_BOOST_PP_TUPLE_EAT_4)(o(242, s), p, o, m)
-# define FB_BOOST_PP_FOR_242_I(s, p, o, m) FB_BOOST_PP_IF(p(243, s), m, FB_BOOST_PP_TUPLE_EAT_2)(243, s) FB_BOOST_PP_IF(p(243, s), FB_BOOST_PP_FOR_243, FB_BOOST_PP_TUPLE_EAT_4)(o(243, s), p, o, m)
-# define FB_BOOST_PP_FOR_243_I(s, p, o, m) FB_BOOST_PP_IF(p(244, s), m, FB_BOOST_PP_TUPLE_EAT_2)(244, s) FB_BOOST_PP_IF(p(244, s), FB_BOOST_PP_FOR_244, FB_BOOST_PP_TUPLE_EAT_4)(o(244, s), p, o, m)
-# define FB_BOOST_PP_FOR_244_I(s, p, o, m) FB_BOOST_PP_IF(p(245, s), m, FB_BOOST_PP_TUPLE_EAT_2)(245, s) FB_BOOST_PP_IF(p(245, s), FB_BOOST_PP_FOR_245, FB_BOOST_PP_TUPLE_EAT_4)(o(245, s), p, o, m)
-# define FB_BOOST_PP_FOR_245_I(s, p, o, m) FB_BOOST_PP_IF(p(246, s), m, FB_BOOST_PP_TUPLE_EAT_2)(246, s) FB_BOOST_PP_IF(p(246, s), FB_BOOST_PP_FOR_246, FB_BOOST_PP_TUPLE_EAT_4)(o(246, s), p, o, m)
-# define FB_BOOST_PP_FOR_246_I(s, p, o, m) FB_BOOST_PP_IF(p(247, s), m, FB_BOOST_PP_TUPLE_EAT_2)(247, s) FB_BOOST_PP_IF(p(247, s), FB_BOOST_PP_FOR_247, FB_BOOST_PP_TUPLE_EAT_4)(o(247, s), p, o, m)
-# define FB_BOOST_PP_FOR_247_I(s, p, o, m) FB_BOOST_PP_IF(p(248, s), m, FB_BOOST_PP_TUPLE_EAT_2)(248, s) FB_BOOST_PP_IF(p(248, s), FB_BOOST_PP_FOR_248, FB_BOOST_PP_TUPLE_EAT_4)(o(248, s), p, o, m)
-# define FB_BOOST_PP_FOR_248_I(s, p, o, m) FB_BOOST_PP_IF(p(249, s), m, FB_BOOST_PP_TUPLE_EAT_2)(249, s) FB_BOOST_PP_IF(p(249, s), FB_BOOST_PP_FOR_249, FB_BOOST_PP_TUPLE_EAT_4)(o(249, s), p, o, m)
-# define FB_BOOST_PP_FOR_249_I(s, p, o, m) FB_BOOST_PP_IF(p(250, s), m, FB_BOOST_PP_TUPLE_EAT_2)(250, s) FB_BOOST_PP_IF(p(250, s), FB_BOOST_PP_FOR_250, FB_BOOST_PP_TUPLE_EAT_4)(o(250, s), p, o, m)
-# define FB_BOOST_PP_FOR_250_I(s, p, o, m) FB_BOOST_PP_IF(p(251, s), m, FB_BOOST_PP_TUPLE_EAT_2)(251, s) FB_BOOST_PP_IF(p(251, s), FB_BOOST_PP_FOR_251, FB_BOOST_PP_TUPLE_EAT_4)(o(251, s), p, o, m)
-# define FB_BOOST_PP_FOR_251_I(s, p, o, m) FB_BOOST_PP_IF(p(252, s), m, FB_BOOST_PP_TUPLE_EAT_2)(252, s) FB_BOOST_PP_IF(p(252, s), FB_BOOST_PP_FOR_252, FB_BOOST_PP_TUPLE_EAT_4)(o(252, s), p, o, m)
-# define FB_BOOST_PP_FOR_252_I(s, p, o, m) FB_BOOST_PP_IF(p(253, s), m, FB_BOOST_PP_TUPLE_EAT_2)(253, s) FB_BOOST_PP_IF(p(253, s), FB_BOOST_PP_FOR_253, FB_BOOST_PP_TUPLE_EAT_4)(o(253, s), p, o, m)
-# define FB_BOOST_PP_FOR_253_I(s, p, o, m) FB_BOOST_PP_IF(p(254, s), m, FB_BOOST_PP_TUPLE_EAT_2)(254, s) FB_BOOST_PP_IF(p(254, s), FB_BOOST_PP_FOR_254, FB_BOOST_PP_TUPLE_EAT_4)(o(254, s), p, o, m)
-# define FB_BOOST_PP_FOR_254_I(s, p, o, m) FB_BOOST_PP_IF(p(255, s), m, FB_BOOST_PP_TUPLE_EAT_2)(255, s) FB_BOOST_PP_IF(p(255, s), FB_BOOST_PP_FOR_255, FB_BOOST_PP_TUPLE_EAT_4)(o(255, s), p, o, m)
-# define FB_BOOST_PP_FOR_255_I(s, p, o, m) FB_BOOST_PP_IF(p(256, s), m, FB_BOOST_PP_TUPLE_EAT_2)(256, s) FB_BOOST_PP_IF(p(256, s), FB_BOOST_PP_FOR_256, FB_BOOST_PP_TUPLE_EAT_4)(o(256, s), p, o, m)
-# define FB_BOOST_PP_FOR_256_I(s, p, o, m) FB_BOOST_PP_IF(p(257, s), m, FB_BOOST_PP_TUPLE_EAT_2)(257, s) FB_BOOST_PP_IF(p(257, s), FB_BOOST_PP_FOR_257, FB_BOOST_PP_TUPLE_EAT_4)(o(257, s), p, o, m)
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/detail/for.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/detail/for.hpp
deleted file mode 100644
index cf7ffad5..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/detail/for.hpp
+++ /dev/null
@@ -1,536 +0,0 @@
-# /* Copyright (C) 2001
-#  * Housemarque Oy
-#  * http://www.housemarque.com
-#  *
-#  * Distributed under the Boost Software License, Version 1.0. (See
-#  * accompanying file LICENSE_1_0.txt or copy at
-#  * http://www.boost.org/LICENSE_1_0.txt)
-#  */
-#
-# /* Revised by Paul Mensonides (2002) */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_REPETITION_DETAIL_FOR_HPP
-# define FB_BOOST_PREPROCESSOR_REPETITION_DETAIL_FOR_HPP
-#
-# include <firebird/impl/boost/preprocessor/control/expr_iif.hpp>
-# include <firebird/impl/boost/preprocessor/control/iif.hpp>
-# include <firebird/impl/boost/preprocessor/logical/bool.hpp>
-# include <firebird/impl/boost/preprocessor/tuple/eat.hpp>
-#
-# define FB_BOOST_PP_FOR_1(s, p, o, m) FB_BOOST_PP_FOR_1_C(FB_BOOST_PP_BOOL(p(2, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_2(s, p, o, m) FB_BOOST_PP_FOR_2_C(FB_BOOST_PP_BOOL(p(3, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_3(s, p, o, m) FB_BOOST_PP_FOR_3_C(FB_BOOST_PP_BOOL(p(4, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_4(s, p, o, m) FB_BOOST_PP_FOR_4_C(FB_BOOST_PP_BOOL(p(5, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_5(s, p, o, m) FB_BOOST_PP_FOR_5_C(FB_BOOST_PP_BOOL(p(6, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_6(s, p, o, m) FB_BOOST_PP_FOR_6_C(FB_BOOST_PP_BOOL(p(7, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_7(s, p, o, m) FB_BOOST_PP_FOR_7_C(FB_BOOST_PP_BOOL(p(8, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_8(s, p, o, m) FB_BOOST_PP_FOR_8_C(FB_BOOST_PP_BOOL(p(9, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_9(s, p, o, m) FB_BOOST_PP_FOR_9_C(FB_BOOST_PP_BOOL(p(10, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_10(s, p, o, m) FB_BOOST_PP_FOR_10_C(FB_BOOST_PP_BOOL(p(11, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_11(s, p, o, m) FB_BOOST_PP_FOR_11_C(FB_BOOST_PP_BOOL(p(12, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_12(s, p, o, m) FB_BOOST_PP_FOR_12_C(FB_BOOST_PP_BOOL(p(13, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_13(s, p, o, m) FB_BOOST_PP_FOR_13_C(FB_BOOST_PP_BOOL(p(14, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_14(s, p, o, m) FB_BOOST_PP_FOR_14_C(FB_BOOST_PP_BOOL(p(15, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_15(s, p, o, m) FB_BOOST_PP_FOR_15_C(FB_BOOST_PP_BOOL(p(16, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_16(s, p, o, m) FB_BOOST_PP_FOR_16_C(FB_BOOST_PP_BOOL(p(17, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_17(s, p, o, m) FB_BOOST_PP_FOR_17_C(FB_BOOST_PP_BOOL(p(18, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_18(s, p, o, m) FB_BOOST_PP_FOR_18_C(FB_BOOST_PP_BOOL(p(19, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_19(s, p, o, m) FB_BOOST_PP_FOR_19_C(FB_BOOST_PP_BOOL(p(20, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_20(s, p, o, m) FB_BOOST_PP_FOR_20_C(FB_BOOST_PP_BOOL(p(21, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_21(s, p, o, m) FB_BOOST_PP_FOR_21_C(FB_BOOST_PP_BOOL(p(22, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_22(s, p, o, m) FB_BOOST_PP_FOR_22_C(FB_BOOST_PP_BOOL(p(23, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_23(s, p, o, m) FB_BOOST_PP_FOR_23_C(FB_BOOST_PP_BOOL(p(24, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_24(s, p, o, m) FB_BOOST_PP_FOR_24_C(FB_BOOST_PP_BOOL(p(25, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_25(s, p, o, m) FB_BOOST_PP_FOR_25_C(FB_BOOST_PP_BOOL(p(26, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_26(s, p, o, m) FB_BOOST_PP_FOR_26_C(FB_BOOST_PP_BOOL(p(27, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_27(s, p, o, m) FB_BOOST_PP_FOR_27_C(FB_BOOST_PP_BOOL(p(28, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_28(s, p, o, m) FB_BOOST_PP_FOR_28_C(FB_BOOST_PP_BOOL(p(29, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_29(s, p, o, m) FB_BOOST_PP_FOR_29_C(FB_BOOST_PP_BOOL(p(30, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_30(s, p, o, m) FB_BOOST_PP_FOR_30_C(FB_BOOST_PP_BOOL(p(31, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_31(s, p, o, m) FB_BOOST_PP_FOR_31_C(FB_BOOST_PP_BOOL(p(32, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_32(s, p, o, m) FB_BOOST_PP_FOR_32_C(FB_BOOST_PP_BOOL(p(33, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_33(s, p, o, m) FB_BOOST_PP_FOR_33_C(FB_BOOST_PP_BOOL(p(34, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_34(s, p, o, m) FB_BOOST_PP_FOR_34_C(FB_BOOST_PP_BOOL(p(35, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_35(s, p, o, m) FB_BOOST_PP_FOR_35_C(FB_BOOST_PP_BOOL(p(36, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_36(s, p, o, m) FB_BOOST_PP_FOR_36_C(FB_BOOST_PP_BOOL(p(37, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_37(s, p, o, m) FB_BOOST_PP_FOR_37_C(FB_BOOST_PP_BOOL(p(38, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_38(s, p, o, m) FB_BOOST_PP_FOR_38_C(FB_BOOST_PP_BOOL(p(39, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_39(s, p, o, m) FB_BOOST_PP_FOR_39_C(FB_BOOST_PP_BOOL(p(40, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_40(s, p, o, m) FB_BOOST_PP_FOR_40_C(FB_BOOST_PP_BOOL(p(41, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_41(s, p, o, m) FB_BOOST_PP_FOR_41_C(FB_BOOST_PP_BOOL(p(42, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_42(s, p, o, m) FB_BOOST_PP_FOR_42_C(FB_BOOST_PP_BOOL(p(43, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_43(s, p, o, m) FB_BOOST_PP_FOR_43_C(FB_BOOST_PP_BOOL(p(44, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_44(s, p, o, m) FB_BOOST_PP_FOR_44_C(FB_BOOST_PP_BOOL(p(45, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_45(s, p, o, m) FB_BOOST_PP_FOR_45_C(FB_BOOST_PP_BOOL(p(46, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_46(s, p, o, m) FB_BOOST_PP_FOR_46_C(FB_BOOST_PP_BOOL(p(47, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_47(s, p, o, m) FB_BOOST_PP_FOR_47_C(FB_BOOST_PP_BOOL(p(48, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_48(s, p, o, m) FB_BOOST_PP_FOR_48_C(FB_BOOST_PP_BOOL(p(49, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_49(s, p, o, m) FB_BOOST_PP_FOR_49_C(FB_BOOST_PP_BOOL(p(50, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_50(s, p, o, m) FB_BOOST_PP_FOR_50_C(FB_BOOST_PP_BOOL(p(51, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_51(s, p, o, m) FB_BOOST_PP_FOR_51_C(FB_BOOST_PP_BOOL(p(52, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_52(s, p, o, m) FB_BOOST_PP_FOR_52_C(FB_BOOST_PP_BOOL(p(53, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_53(s, p, o, m) FB_BOOST_PP_FOR_53_C(FB_BOOST_PP_BOOL(p(54, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_54(s, p, o, m) FB_BOOST_PP_FOR_54_C(FB_BOOST_PP_BOOL(p(55, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_55(s, p, o, m) FB_BOOST_PP_FOR_55_C(FB_BOOST_PP_BOOL(p(56, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_56(s, p, o, m) FB_BOOST_PP_FOR_56_C(FB_BOOST_PP_BOOL(p(57, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_57(s, p, o, m) FB_BOOST_PP_FOR_57_C(FB_BOOST_PP_BOOL(p(58, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_58(s, p, o, m) FB_BOOST_PP_FOR_58_C(FB_BOOST_PP_BOOL(p(59, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_59(s, p, o, m) FB_BOOST_PP_FOR_59_C(FB_BOOST_PP_BOOL(p(60, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_60(s, p, o, m) FB_BOOST_PP_FOR_60_C(FB_BOOST_PP_BOOL(p(61, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_61(s, p, o, m) FB_BOOST_PP_FOR_61_C(FB_BOOST_PP_BOOL(p(62, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_62(s, p, o, m) FB_BOOST_PP_FOR_62_C(FB_BOOST_PP_BOOL(p(63, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_63(s, p, o, m) FB_BOOST_PP_FOR_63_C(FB_BOOST_PP_BOOL(p(64, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_64(s, p, o, m) FB_BOOST_PP_FOR_64_C(FB_BOOST_PP_BOOL(p(65, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_65(s, p, o, m) FB_BOOST_PP_FOR_65_C(FB_BOOST_PP_BOOL(p(66, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_66(s, p, o, m) FB_BOOST_PP_FOR_66_C(FB_BOOST_PP_BOOL(p(67, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_67(s, p, o, m) FB_BOOST_PP_FOR_67_C(FB_BOOST_PP_BOOL(p(68, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_68(s, p, o, m) FB_BOOST_PP_FOR_68_C(FB_BOOST_PP_BOOL(p(69, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_69(s, p, o, m) FB_BOOST_PP_FOR_69_C(FB_BOOST_PP_BOOL(p(70, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_70(s, p, o, m) FB_BOOST_PP_FOR_70_C(FB_BOOST_PP_BOOL(p(71, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_71(s, p, o, m) FB_BOOST_PP_FOR_71_C(FB_BOOST_PP_BOOL(p(72, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_72(s, p, o, m) FB_BOOST_PP_FOR_72_C(FB_BOOST_PP_BOOL(p(73, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_73(s, p, o, m) FB_BOOST_PP_FOR_73_C(FB_BOOST_PP_BOOL(p(74, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_74(s, p, o, m) FB_BOOST_PP_FOR_74_C(FB_BOOST_PP_BOOL(p(75, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_75(s, p, o, m) FB_BOOST_PP_FOR_75_C(FB_BOOST_PP_BOOL(p(76, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_76(s, p, o, m) FB_BOOST_PP_FOR_76_C(FB_BOOST_PP_BOOL(p(77, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_77(s, p, o, m) FB_BOOST_PP_FOR_77_C(FB_BOOST_PP_BOOL(p(78, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_78(s, p, o, m) FB_BOOST_PP_FOR_78_C(FB_BOOST_PP_BOOL(p(79, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_79(s, p, o, m) FB_BOOST_PP_FOR_79_C(FB_BOOST_PP_BOOL(p(80, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_80(s, p, o, m) FB_BOOST_PP_FOR_80_C(FB_BOOST_PP_BOOL(p(81, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_81(s, p, o, m) FB_BOOST_PP_FOR_81_C(FB_BOOST_PP_BOOL(p(82, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_82(s, p, o, m) FB_BOOST_PP_FOR_82_C(FB_BOOST_PP_BOOL(p(83, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_83(s, p, o, m) FB_BOOST_PP_FOR_83_C(FB_BOOST_PP_BOOL(p(84, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_84(s, p, o, m) FB_BOOST_PP_FOR_84_C(FB_BOOST_PP_BOOL(p(85, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_85(s, p, o, m) FB_BOOST_PP_FOR_85_C(FB_BOOST_PP_BOOL(p(86, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_86(s, p, o, m) FB_BOOST_PP_FOR_86_C(FB_BOOST_PP_BOOL(p(87, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_87(s, p, o, m) FB_BOOST_PP_FOR_87_C(FB_BOOST_PP_BOOL(p(88, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_88(s, p, o, m) FB_BOOST_PP_FOR_88_C(FB_BOOST_PP_BOOL(p(89, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_89(s, p, o, m) FB_BOOST_PP_FOR_89_C(FB_BOOST_PP_BOOL(p(90, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_90(s, p, o, m) FB_BOOST_PP_FOR_90_C(FB_BOOST_PP_BOOL(p(91, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_91(s, p, o, m) FB_BOOST_PP_FOR_91_C(FB_BOOST_PP_BOOL(p(92, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_92(s, p, o, m) FB_BOOST_PP_FOR_92_C(FB_BOOST_PP_BOOL(p(93, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_93(s, p, o, m) FB_BOOST_PP_FOR_93_C(FB_BOOST_PP_BOOL(p(94, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_94(s, p, o, m) FB_BOOST_PP_FOR_94_C(FB_BOOST_PP_BOOL(p(95, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_95(s, p, o, m) FB_BOOST_PP_FOR_95_C(FB_BOOST_PP_BOOL(p(96, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_96(s, p, o, m) FB_BOOST_PP_FOR_96_C(FB_BOOST_PP_BOOL(p(97, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_97(s, p, o, m) FB_BOOST_PP_FOR_97_C(FB_BOOST_PP_BOOL(p(98, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_98(s, p, o, m) FB_BOOST_PP_FOR_98_C(FB_BOOST_PP_BOOL(p(99, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_99(s, p, o, m) FB_BOOST_PP_FOR_99_C(FB_BOOST_PP_BOOL(p(100, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_100(s, p, o, m) FB_BOOST_PP_FOR_100_C(FB_BOOST_PP_BOOL(p(101, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_101(s, p, o, m) FB_BOOST_PP_FOR_101_C(FB_BOOST_PP_BOOL(p(102, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_102(s, p, o, m) FB_BOOST_PP_FOR_102_C(FB_BOOST_PP_BOOL(p(103, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_103(s, p, o, m) FB_BOOST_PP_FOR_103_C(FB_BOOST_PP_BOOL(p(104, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_104(s, p, o, m) FB_BOOST_PP_FOR_104_C(FB_BOOST_PP_BOOL(p(105, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_105(s, p, o, m) FB_BOOST_PP_FOR_105_C(FB_BOOST_PP_BOOL(p(106, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_106(s, p, o, m) FB_BOOST_PP_FOR_106_C(FB_BOOST_PP_BOOL(p(107, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_107(s, p, o, m) FB_BOOST_PP_FOR_107_C(FB_BOOST_PP_BOOL(p(108, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_108(s, p, o, m) FB_BOOST_PP_FOR_108_C(FB_BOOST_PP_BOOL(p(109, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_109(s, p, o, m) FB_BOOST_PP_FOR_109_C(FB_BOOST_PP_BOOL(p(110, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_110(s, p, o, m) FB_BOOST_PP_FOR_110_C(FB_BOOST_PP_BOOL(p(111, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_111(s, p, o, m) FB_BOOST_PP_FOR_111_C(FB_BOOST_PP_BOOL(p(112, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_112(s, p, o, m) FB_BOOST_PP_FOR_112_C(FB_BOOST_PP_BOOL(p(113, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_113(s, p, o, m) FB_BOOST_PP_FOR_113_C(FB_BOOST_PP_BOOL(p(114, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_114(s, p, o, m) FB_BOOST_PP_FOR_114_C(FB_BOOST_PP_BOOL(p(115, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_115(s, p, o, m) FB_BOOST_PP_FOR_115_C(FB_BOOST_PP_BOOL(p(116, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_116(s, p, o, m) FB_BOOST_PP_FOR_116_C(FB_BOOST_PP_BOOL(p(117, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_117(s, p, o, m) FB_BOOST_PP_FOR_117_C(FB_BOOST_PP_BOOL(p(118, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_118(s, p, o, m) FB_BOOST_PP_FOR_118_C(FB_BOOST_PP_BOOL(p(119, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_119(s, p, o, m) FB_BOOST_PP_FOR_119_C(FB_BOOST_PP_BOOL(p(120, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_120(s, p, o, m) FB_BOOST_PP_FOR_120_C(FB_BOOST_PP_BOOL(p(121, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_121(s, p, o, m) FB_BOOST_PP_FOR_121_C(FB_BOOST_PP_BOOL(p(122, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_122(s, p, o, m) FB_BOOST_PP_FOR_122_C(FB_BOOST_PP_BOOL(p(123, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_123(s, p, o, m) FB_BOOST_PP_FOR_123_C(FB_BOOST_PP_BOOL(p(124, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_124(s, p, o, m) FB_BOOST_PP_FOR_124_C(FB_BOOST_PP_BOOL(p(125, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_125(s, p, o, m) FB_BOOST_PP_FOR_125_C(FB_BOOST_PP_BOOL(p(126, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_126(s, p, o, m) FB_BOOST_PP_FOR_126_C(FB_BOOST_PP_BOOL(p(127, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_127(s, p, o, m) FB_BOOST_PP_FOR_127_C(FB_BOOST_PP_BOOL(p(128, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_128(s, p, o, m) FB_BOOST_PP_FOR_128_C(FB_BOOST_PP_BOOL(p(129, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_129(s, p, o, m) FB_BOOST_PP_FOR_129_C(FB_BOOST_PP_BOOL(p(130, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_130(s, p, o, m) FB_BOOST_PP_FOR_130_C(FB_BOOST_PP_BOOL(p(131, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_131(s, p, o, m) FB_BOOST_PP_FOR_131_C(FB_BOOST_PP_BOOL(p(132, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_132(s, p, o, m) FB_BOOST_PP_FOR_132_C(FB_BOOST_PP_BOOL(p(133, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_133(s, p, o, m) FB_BOOST_PP_FOR_133_C(FB_BOOST_PP_BOOL(p(134, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_134(s, p, o, m) FB_BOOST_PP_FOR_134_C(FB_BOOST_PP_BOOL(p(135, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_135(s, p, o, m) FB_BOOST_PP_FOR_135_C(FB_BOOST_PP_BOOL(p(136, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_136(s, p, o, m) FB_BOOST_PP_FOR_136_C(FB_BOOST_PP_BOOL(p(137, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_137(s, p, o, m) FB_BOOST_PP_FOR_137_C(FB_BOOST_PP_BOOL(p(138, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_138(s, p, o, m) FB_BOOST_PP_FOR_138_C(FB_BOOST_PP_BOOL(p(139, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_139(s, p, o, m) FB_BOOST_PP_FOR_139_C(FB_BOOST_PP_BOOL(p(140, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_140(s, p, o, m) FB_BOOST_PP_FOR_140_C(FB_BOOST_PP_BOOL(p(141, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_141(s, p, o, m) FB_BOOST_PP_FOR_141_C(FB_BOOST_PP_BOOL(p(142, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_142(s, p, o, m) FB_BOOST_PP_FOR_142_C(FB_BOOST_PP_BOOL(p(143, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_143(s, p, o, m) FB_BOOST_PP_FOR_143_C(FB_BOOST_PP_BOOL(p(144, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_144(s, p, o, m) FB_BOOST_PP_FOR_144_C(FB_BOOST_PP_BOOL(p(145, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_145(s, p, o, m) FB_BOOST_PP_FOR_145_C(FB_BOOST_PP_BOOL(p(146, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_146(s, p, o, m) FB_BOOST_PP_FOR_146_C(FB_BOOST_PP_BOOL(p(147, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_147(s, p, o, m) FB_BOOST_PP_FOR_147_C(FB_BOOST_PP_BOOL(p(148, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_148(s, p, o, m) FB_BOOST_PP_FOR_148_C(FB_BOOST_PP_BOOL(p(149, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_149(s, p, o, m) FB_BOOST_PP_FOR_149_C(FB_BOOST_PP_BOOL(p(150, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_150(s, p, o, m) FB_BOOST_PP_FOR_150_C(FB_BOOST_PP_BOOL(p(151, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_151(s, p, o, m) FB_BOOST_PP_FOR_151_C(FB_BOOST_PP_BOOL(p(152, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_152(s, p, o, m) FB_BOOST_PP_FOR_152_C(FB_BOOST_PP_BOOL(p(153, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_153(s, p, o, m) FB_BOOST_PP_FOR_153_C(FB_BOOST_PP_BOOL(p(154, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_154(s, p, o, m) FB_BOOST_PP_FOR_154_C(FB_BOOST_PP_BOOL(p(155, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_155(s, p, o, m) FB_BOOST_PP_FOR_155_C(FB_BOOST_PP_BOOL(p(156, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_156(s, p, o, m) FB_BOOST_PP_FOR_156_C(FB_BOOST_PP_BOOL(p(157, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_157(s, p, o, m) FB_BOOST_PP_FOR_157_C(FB_BOOST_PP_BOOL(p(158, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_158(s, p, o, m) FB_BOOST_PP_FOR_158_C(FB_BOOST_PP_BOOL(p(159, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_159(s, p, o, m) FB_BOOST_PP_FOR_159_C(FB_BOOST_PP_BOOL(p(160, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_160(s, p, o, m) FB_BOOST_PP_FOR_160_C(FB_BOOST_PP_BOOL(p(161, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_161(s, p, o, m) FB_BOOST_PP_FOR_161_C(FB_BOOST_PP_BOOL(p(162, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_162(s, p, o, m) FB_BOOST_PP_FOR_162_C(FB_BOOST_PP_BOOL(p(163, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_163(s, p, o, m) FB_BOOST_PP_FOR_163_C(FB_BOOST_PP_BOOL(p(164, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_164(s, p, o, m) FB_BOOST_PP_FOR_164_C(FB_BOOST_PP_BOOL(p(165, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_165(s, p, o, m) FB_BOOST_PP_FOR_165_C(FB_BOOST_PP_BOOL(p(166, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_166(s, p, o, m) FB_BOOST_PP_FOR_166_C(FB_BOOST_PP_BOOL(p(167, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_167(s, p, o, m) FB_BOOST_PP_FOR_167_C(FB_BOOST_PP_BOOL(p(168, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_168(s, p, o, m) FB_BOOST_PP_FOR_168_C(FB_BOOST_PP_BOOL(p(169, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_169(s, p, o, m) FB_BOOST_PP_FOR_169_C(FB_BOOST_PP_BOOL(p(170, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_170(s, p, o, m) FB_BOOST_PP_FOR_170_C(FB_BOOST_PP_BOOL(p(171, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_171(s, p, o, m) FB_BOOST_PP_FOR_171_C(FB_BOOST_PP_BOOL(p(172, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_172(s, p, o, m) FB_BOOST_PP_FOR_172_C(FB_BOOST_PP_BOOL(p(173, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_173(s, p, o, m) FB_BOOST_PP_FOR_173_C(FB_BOOST_PP_BOOL(p(174, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_174(s, p, o, m) FB_BOOST_PP_FOR_174_C(FB_BOOST_PP_BOOL(p(175, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_175(s, p, o, m) FB_BOOST_PP_FOR_175_C(FB_BOOST_PP_BOOL(p(176, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_176(s, p, o, m) FB_BOOST_PP_FOR_176_C(FB_BOOST_PP_BOOL(p(177, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_177(s, p, o, m) FB_BOOST_PP_FOR_177_C(FB_BOOST_PP_BOOL(p(178, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_178(s, p, o, m) FB_BOOST_PP_FOR_178_C(FB_BOOST_PP_BOOL(p(179, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_179(s, p, o, m) FB_BOOST_PP_FOR_179_C(FB_BOOST_PP_BOOL(p(180, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_180(s, p, o, m) FB_BOOST_PP_FOR_180_C(FB_BOOST_PP_BOOL(p(181, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_181(s, p, o, m) FB_BOOST_PP_FOR_181_C(FB_BOOST_PP_BOOL(p(182, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_182(s, p, o, m) FB_BOOST_PP_FOR_182_C(FB_BOOST_PP_BOOL(p(183, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_183(s, p, o, m) FB_BOOST_PP_FOR_183_C(FB_BOOST_PP_BOOL(p(184, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_184(s, p, o, m) FB_BOOST_PP_FOR_184_C(FB_BOOST_PP_BOOL(p(185, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_185(s, p, o, m) FB_BOOST_PP_FOR_185_C(FB_BOOST_PP_BOOL(p(186, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_186(s, p, o, m) FB_BOOST_PP_FOR_186_C(FB_BOOST_PP_BOOL(p(187, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_187(s, p, o, m) FB_BOOST_PP_FOR_187_C(FB_BOOST_PP_BOOL(p(188, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_188(s, p, o, m) FB_BOOST_PP_FOR_188_C(FB_BOOST_PP_BOOL(p(189, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_189(s, p, o, m) FB_BOOST_PP_FOR_189_C(FB_BOOST_PP_BOOL(p(190, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_190(s, p, o, m) FB_BOOST_PP_FOR_190_C(FB_BOOST_PP_BOOL(p(191, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_191(s, p, o, m) FB_BOOST_PP_FOR_191_C(FB_BOOST_PP_BOOL(p(192, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_192(s, p, o, m) FB_BOOST_PP_FOR_192_C(FB_BOOST_PP_BOOL(p(193, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_193(s, p, o, m) FB_BOOST_PP_FOR_193_C(FB_BOOST_PP_BOOL(p(194, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_194(s, p, o, m) FB_BOOST_PP_FOR_194_C(FB_BOOST_PP_BOOL(p(195, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_195(s, p, o, m) FB_BOOST_PP_FOR_195_C(FB_BOOST_PP_BOOL(p(196, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_196(s, p, o, m) FB_BOOST_PP_FOR_196_C(FB_BOOST_PP_BOOL(p(197, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_197(s, p, o, m) FB_BOOST_PP_FOR_197_C(FB_BOOST_PP_BOOL(p(198, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_198(s, p, o, m) FB_BOOST_PP_FOR_198_C(FB_BOOST_PP_BOOL(p(199, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_199(s, p, o, m) FB_BOOST_PP_FOR_199_C(FB_BOOST_PP_BOOL(p(200, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_200(s, p, o, m) FB_BOOST_PP_FOR_200_C(FB_BOOST_PP_BOOL(p(201, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_201(s, p, o, m) FB_BOOST_PP_FOR_201_C(FB_BOOST_PP_BOOL(p(202, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_202(s, p, o, m) FB_BOOST_PP_FOR_202_C(FB_BOOST_PP_BOOL(p(203, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_203(s, p, o, m) FB_BOOST_PP_FOR_203_C(FB_BOOST_PP_BOOL(p(204, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_204(s, p, o, m) FB_BOOST_PP_FOR_204_C(FB_BOOST_PP_BOOL(p(205, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_205(s, p, o, m) FB_BOOST_PP_FOR_205_C(FB_BOOST_PP_BOOL(p(206, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_206(s, p, o, m) FB_BOOST_PP_FOR_206_C(FB_BOOST_PP_BOOL(p(207, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_207(s, p, o, m) FB_BOOST_PP_FOR_207_C(FB_BOOST_PP_BOOL(p(208, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_208(s, p, o, m) FB_BOOST_PP_FOR_208_C(FB_BOOST_PP_BOOL(p(209, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_209(s, p, o, m) FB_BOOST_PP_FOR_209_C(FB_BOOST_PP_BOOL(p(210, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_210(s, p, o, m) FB_BOOST_PP_FOR_210_C(FB_BOOST_PP_BOOL(p(211, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_211(s, p, o, m) FB_BOOST_PP_FOR_211_C(FB_BOOST_PP_BOOL(p(212, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_212(s, p, o, m) FB_BOOST_PP_FOR_212_C(FB_BOOST_PP_BOOL(p(213, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_213(s, p, o, m) FB_BOOST_PP_FOR_213_C(FB_BOOST_PP_BOOL(p(214, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_214(s, p, o, m) FB_BOOST_PP_FOR_214_C(FB_BOOST_PP_BOOL(p(215, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_215(s, p, o, m) FB_BOOST_PP_FOR_215_C(FB_BOOST_PP_BOOL(p(216, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_216(s, p, o, m) FB_BOOST_PP_FOR_216_C(FB_BOOST_PP_BOOL(p(217, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_217(s, p, o, m) FB_BOOST_PP_FOR_217_C(FB_BOOST_PP_BOOL(p(218, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_218(s, p, o, m) FB_BOOST_PP_FOR_218_C(FB_BOOST_PP_BOOL(p(219, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_219(s, p, o, m) FB_BOOST_PP_FOR_219_C(FB_BOOST_PP_BOOL(p(220, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_220(s, p, o, m) FB_BOOST_PP_FOR_220_C(FB_BOOST_PP_BOOL(p(221, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_221(s, p, o, m) FB_BOOST_PP_FOR_221_C(FB_BOOST_PP_BOOL(p(222, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_222(s, p, o, m) FB_BOOST_PP_FOR_222_C(FB_BOOST_PP_BOOL(p(223, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_223(s, p, o, m) FB_BOOST_PP_FOR_223_C(FB_BOOST_PP_BOOL(p(224, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_224(s, p, o, m) FB_BOOST_PP_FOR_224_C(FB_BOOST_PP_BOOL(p(225, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_225(s, p, o, m) FB_BOOST_PP_FOR_225_C(FB_BOOST_PP_BOOL(p(226, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_226(s, p, o, m) FB_BOOST_PP_FOR_226_C(FB_BOOST_PP_BOOL(p(227, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_227(s, p, o, m) FB_BOOST_PP_FOR_227_C(FB_BOOST_PP_BOOL(p(228, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_228(s, p, o, m) FB_BOOST_PP_FOR_228_C(FB_BOOST_PP_BOOL(p(229, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_229(s, p, o, m) FB_BOOST_PP_FOR_229_C(FB_BOOST_PP_BOOL(p(230, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_230(s, p, o, m) FB_BOOST_PP_FOR_230_C(FB_BOOST_PP_BOOL(p(231, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_231(s, p, o, m) FB_BOOST_PP_FOR_231_C(FB_BOOST_PP_BOOL(p(232, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_232(s, p, o, m) FB_BOOST_PP_FOR_232_C(FB_BOOST_PP_BOOL(p(233, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_233(s, p, o, m) FB_BOOST_PP_FOR_233_C(FB_BOOST_PP_BOOL(p(234, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_234(s, p, o, m) FB_BOOST_PP_FOR_234_C(FB_BOOST_PP_BOOL(p(235, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_235(s, p, o, m) FB_BOOST_PP_FOR_235_C(FB_BOOST_PP_BOOL(p(236, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_236(s, p, o, m) FB_BOOST_PP_FOR_236_C(FB_BOOST_PP_BOOL(p(237, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_237(s, p, o, m) FB_BOOST_PP_FOR_237_C(FB_BOOST_PP_BOOL(p(238, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_238(s, p, o, m) FB_BOOST_PP_FOR_238_C(FB_BOOST_PP_BOOL(p(239, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_239(s, p, o, m) FB_BOOST_PP_FOR_239_C(FB_BOOST_PP_BOOL(p(240, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_240(s, p, o, m) FB_BOOST_PP_FOR_240_C(FB_BOOST_PP_BOOL(p(241, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_241(s, p, o, m) FB_BOOST_PP_FOR_241_C(FB_BOOST_PP_BOOL(p(242, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_242(s, p, o, m) FB_BOOST_PP_FOR_242_C(FB_BOOST_PP_BOOL(p(243, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_243(s, p, o, m) FB_BOOST_PP_FOR_243_C(FB_BOOST_PP_BOOL(p(244, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_244(s, p, o, m) FB_BOOST_PP_FOR_244_C(FB_BOOST_PP_BOOL(p(245, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_245(s, p, o, m) FB_BOOST_PP_FOR_245_C(FB_BOOST_PP_BOOL(p(246, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_246(s, p, o, m) FB_BOOST_PP_FOR_246_C(FB_BOOST_PP_BOOL(p(247, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_247(s, p, o, m) FB_BOOST_PP_FOR_247_C(FB_BOOST_PP_BOOL(p(248, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_248(s, p, o, m) FB_BOOST_PP_FOR_248_C(FB_BOOST_PP_BOOL(p(249, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_249(s, p, o, m) FB_BOOST_PP_FOR_249_C(FB_BOOST_PP_BOOL(p(250, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_250(s, p, o, m) FB_BOOST_PP_FOR_250_C(FB_BOOST_PP_BOOL(p(251, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_251(s, p, o, m) FB_BOOST_PP_FOR_251_C(FB_BOOST_PP_BOOL(p(252, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_252(s, p, o, m) FB_BOOST_PP_FOR_252_C(FB_BOOST_PP_BOOL(p(253, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_253(s, p, o, m) FB_BOOST_PP_FOR_253_C(FB_BOOST_PP_BOOL(p(254, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_254(s, p, o, m) FB_BOOST_PP_FOR_254_C(FB_BOOST_PP_BOOL(p(255, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_255(s, p, o, m) FB_BOOST_PP_FOR_255_C(FB_BOOST_PP_BOOL(p(256, s)), s, p, o, m)
-# define FB_BOOST_PP_FOR_256(s, p, o, m) FB_BOOST_PP_FOR_256_C(FB_BOOST_PP_BOOL(p(257, s)), s, p, o, m)
-#
-# define FB_BOOST_PP_FOR_1_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(2, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_2, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(2, s), p, o, m)
-# define FB_BOOST_PP_FOR_2_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(3, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_3, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(3, s), p, o, m)
-# define FB_BOOST_PP_FOR_3_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(4, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_4, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(4, s), p, o, m)
-# define FB_BOOST_PP_FOR_4_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(5, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_5, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(5, s), p, o, m)
-# define FB_BOOST_PP_FOR_5_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(6, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_6, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(6, s), p, o, m)
-# define FB_BOOST_PP_FOR_6_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(7, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_7, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(7, s), p, o, m)
-# define FB_BOOST_PP_FOR_7_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(8, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_8, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(8, s), p, o, m)
-# define FB_BOOST_PP_FOR_8_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(9, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_9, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(9, s), p, o, m)
-# define FB_BOOST_PP_FOR_9_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(10, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_10, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(10, s), p, o, m)
-# define FB_BOOST_PP_FOR_10_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(11, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_11, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(11, s), p, o, m)
-# define FB_BOOST_PP_FOR_11_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(12, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_12, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(12, s), p, o, m)
-# define FB_BOOST_PP_FOR_12_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(13, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_13, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(13, s), p, o, m)
-# define FB_BOOST_PP_FOR_13_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(14, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_14, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(14, s), p, o, m)
-# define FB_BOOST_PP_FOR_14_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(15, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_15, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(15, s), p, o, m)
-# define FB_BOOST_PP_FOR_15_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(16, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_16, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(16, s), p, o, m)
-# define FB_BOOST_PP_FOR_16_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(17, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_17, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(17, s), p, o, m)
-# define FB_BOOST_PP_FOR_17_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(18, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_18, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(18, s), p, o, m)
-# define FB_BOOST_PP_FOR_18_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(19, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_19, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(19, s), p, o, m)
-# define FB_BOOST_PP_FOR_19_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(20, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_20, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(20, s), p, o, m)
-# define FB_BOOST_PP_FOR_20_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(21, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_21, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(21, s), p, o, m)
-# define FB_BOOST_PP_FOR_21_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(22, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_22, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(22, s), p, o, m)
-# define FB_BOOST_PP_FOR_22_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(23, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_23, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(23, s), p, o, m)
-# define FB_BOOST_PP_FOR_23_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(24, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_24, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(24, s), p, o, m)
-# define FB_BOOST_PP_FOR_24_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(25, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_25, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(25, s), p, o, m)
-# define FB_BOOST_PP_FOR_25_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(26, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_26, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(26, s), p, o, m)
-# define FB_BOOST_PP_FOR_26_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(27, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_27, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(27, s), p, o, m)
-# define FB_BOOST_PP_FOR_27_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(28, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_28, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(28, s), p, o, m)
-# define FB_BOOST_PP_FOR_28_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(29, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_29, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(29, s), p, o, m)
-# define FB_BOOST_PP_FOR_29_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(30, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_30, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(30, s), p, o, m)
-# define FB_BOOST_PP_FOR_30_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(31, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_31, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(31, s), p, o, m)
-# define FB_BOOST_PP_FOR_31_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(32, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_32, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(32, s), p, o, m)
-# define FB_BOOST_PP_FOR_32_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(33, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_33, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(33, s), p, o, m)
-# define FB_BOOST_PP_FOR_33_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(34, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_34, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(34, s), p, o, m)
-# define FB_BOOST_PP_FOR_34_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(35, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_35, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(35, s), p, o, m)
-# define FB_BOOST_PP_FOR_35_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(36, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_36, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(36, s), p, o, m)
-# define FB_BOOST_PP_FOR_36_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(37, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_37, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(37, s), p, o, m)
-# define FB_BOOST_PP_FOR_37_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(38, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_38, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(38, s), p, o, m)
-# define FB_BOOST_PP_FOR_38_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(39, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_39, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(39, s), p, o, m)
-# define FB_BOOST_PP_FOR_39_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(40, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_40, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(40, s), p, o, m)
-# define FB_BOOST_PP_FOR_40_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(41, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_41, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(41, s), p, o, m)
-# define FB_BOOST_PP_FOR_41_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(42, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_42, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(42, s), p, o, m)
-# define FB_BOOST_PP_FOR_42_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(43, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_43, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(43, s), p, o, m)
-# define FB_BOOST_PP_FOR_43_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(44, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_44, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(44, s), p, o, m)
-# define FB_BOOST_PP_FOR_44_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(45, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_45, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(45, s), p, o, m)
-# define FB_BOOST_PP_FOR_45_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(46, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_46, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(46, s), p, o, m)
-# define FB_BOOST_PP_FOR_46_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(47, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_47, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(47, s), p, o, m)
-# define FB_BOOST_PP_FOR_47_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(48, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_48, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(48, s), p, o, m)
-# define FB_BOOST_PP_FOR_48_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(49, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_49, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(49, s), p, o, m)
-# define FB_BOOST_PP_FOR_49_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(50, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_50, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(50, s), p, o, m)
-# define FB_BOOST_PP_FOR_50_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(51, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_51, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(51, s), p, o, m)
-# define FB_BOOST_PP_FOR_51_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(52, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_52, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(52, s), p, o, m)
-# define FB_BOOST_PP_FOR_52_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(53, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_53, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(53, s), p, o, m)
-# define FB_BOOST_PP_FOR_53_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(54, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_54, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(54, s), p, o, m)
-# define FB_BOOST_PP_FOR_54_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(55, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_55, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(55, s), p, o, m)
-# define FB_BOOST_PP_FOR_55_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(56, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_56, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(56, s), p, o, m)
-# define FB_BOOST_PP_FOR_56_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(57, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_57, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(57, s), p, o, m)
-# define FB_BOOST_PP_FOR_57_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(58, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_58, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(58, s), p, o, m)
-# define FB_BOOST_PP_FOR_58_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(59, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_59, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(59, s), p, o, m)
-# define FB_BOOST_PP_FOR_59_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(60, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_60, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(60, s), p, o, m)
-# define FB_BOOST_PP_FOR_60_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(61, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_61, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(61, s), p, o, m)
-# define FB_BOOST_PP_FOR_61_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(62, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_62, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(62, s), p, o, m)
-# define FB_BOOST_PP_FOR_62_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(63, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_63, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(63, s), p, o, m)
-# define FB_BOOST_PP_FOR_63_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(64, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_64, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(64, s), p, o, m)
-# define FB_BOOST_PP_FOR_64_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(65, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_65, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(65, s), p, o, m)
-# define FB_BOOST_PP_FOR_65_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(66, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_66, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(66, s), p, o, m)
-# define FB_BOOST_PP_FOR_66_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(67, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_67, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(67, s), p, o, m)
-# define FB_BOOST_PP_FOR_67_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(68, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_68, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(68, s), p, o, m)
-# define FB_BOOST_PP_FOR_68_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(69, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_69, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(69, s), p, o, m)
-# define FB_BOOST_PP_FOR_69_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(70, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_70, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(70, s), p, o, m)
-# define FB_BOOST_PP_FOR_70_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(71, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_71, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(71, s), p, o, m)
-# define FB_BOOST_PP_FOR_71_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(72, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_72, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(72, s), p, o, m)
-# define FB_BOOST_PP_FOR_72_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(73, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_73, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(73, s), p, o, m)
-# define FB_BOOST_PP_FOR_73_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(74, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_74, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(74, s), p, o, m)
-# define FB_BOOST_PP_FOR_74_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(75, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_75, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(75, s), p, o, m)
-# define FB_BOOST_PP_FOR_75_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(76, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_76, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(76, s), p, o, m)
-# define FB_BOOST_PP_FOR_76_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(77, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_77, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(77, s), p, o, m)
-# define FB_BOOST_PP_FOR_77_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(78, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_78, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(78, s), p, o, m)
-# define FB_BOOST_PP_FOR_78_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(79, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_79, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(79, s), p, o, m)
-# define FB_BOOST_PP_FOR_79_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(80, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_80, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(80, s), p, o, m)
-# define FB_BOOST_PP_FOR_80_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(81, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_81, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(81, s), p, o, m)
-# define FB_BOOST_PP_FOR_81_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(82, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_82, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(82, s), p, o, m)
-# define FB_BOOST_PP_FOR_82_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(83, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_83, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(83, s), p, o, m)
-# define FB_BOOST_PP_FOR_83_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(84, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_84, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(84, s), p, o, m)
-# define FB_BOOST_PP_FOR_84_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(85, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_85, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(85, s), p, o, m)
-# define FB_BOOST_PP_FOR_85_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(86, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_86, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(86, s), p, o, m)
-# define FB_BOOST_PP_FOR_86_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(87, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_87, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(87, s), p, o, m)
-# define FB_BOOST_PP_FOR_87_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(88, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_88, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(88, s), p, o, m)
-# define FB_BOOST_PP_FOR_88_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(89, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_89, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(89, s), p, o, m)
-# define FB_BOOST_PP_FOR_89_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(90, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_90, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(90, s), p, o, m)
-# define FB_BOOST_PP_FOR_90_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(91, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_91, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(91, s), p, o, m)
-# define FB_BOOST_PP_FOR_91_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(92, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_92, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(92, s), p, o, m)
-# define FB_BOOST_PP_FOR_92_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(93, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_93, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(93, s), p, o, m)
-# define FB_BOOST_PP_FOR_93_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(94, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_94, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(94, s), p, o, m)
-# define FB_BOOST_PP_FOR_94_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(95, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_95, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(95, s), p, o, m)
-# define FB_BOOST_PP_FOR_95_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(96, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_96, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(96, s), p, o, m)
-# define FB_BOOST_PP_FOR_96_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(97, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_97, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(97, s), p, o, m)
-# define FB_BOOST_PP_FOR_97_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(98, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_98, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(98, s), p, o, m)
-# define FB_BOOST_PP_FOR_98_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(99, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_99, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(99, s), p, o, m)
-# define FB_BOOST_PP_FOR_99_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(100, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_100, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(100, s), p, o, m)
-# define FB_BOOST_PP_FOR_100_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(101, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_101, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(101, s), p, o, m)
-# define FB_BOOST_PP_FOR_101_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(102, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_102, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(102, s), p, o, m)
-# define FB_BOOST_PP_FOR_102_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(103, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_103, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(103, s), p, o, m)
-# define FB_BOOST_PP_FOR_103_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(104, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_104, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(104, s), p, o, m)
-# define FB_BOOST_PP_FOR_104_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(105, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_105, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(105, s), p, o, m)
-# define FB_BOOST_PP_FOR_105_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(106, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_106, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(106, s), p, o, m)
-# define FB_BOOST_PP_FOR_106_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(107, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_107, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(107, s), p, o, m)
-# define FB_BOOST_PP_FOR_107_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(108, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_108, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(108, s), p, o, m)
-# define FB_BOOST_PP_FOR_108_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(109, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_109, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(109, s), p, o, m)
-# define FB_BOOST_PP_FOR_109_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(110, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_110, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(110, s), p, o, m)
-# define FB_BOOST_PP_FOR_110_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(111, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_111, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(111, s), p, o, m)
-# define FB_BOOST_PP_FOR_111_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(112, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_112, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(112, s), p, o, m)
-# define FB_BOOST_PP_FOR_112_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(113, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_113, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(113, s), p, o, m)
-# define FB_BOOST_PP_FOR_113_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(114, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_114, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(114, s), p, o, m)
-# define FB_BOOST_PP_FOR_114_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(115, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_115, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(115, s), p, o, m)
-# define FB_BOOST_PP_FOR_115_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(116, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_116, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(116, s), p, o, m)
-# define FB_BOOST_PP_FOR_116_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(117, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_117, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(117, s), p, o, m)
-# define FB_BOOST_PP_FOR_117_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(118, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_118, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(118, s), p, o, m)
-# define FB_BOOST_PP_FOR_118_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(119, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_119, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(119, s), p, o, m)
-# define FB_BOOST_PP_FOR_119_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(120, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_120, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(120, s), p, o, m)
-# define FB_BOOST_PP_FOR_120_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(121, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_121, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(121, s), p, o, m)
-# define FB_BOOST_PP_FOR_121_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(122, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_122, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(122, s), p, o, m)
-# define FB_BOOST_PP_FOR_122_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(123, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_123, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(123, s), p, o, m)
-# define FB_BOOST_PP_FOR_123_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(124, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_124, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(124, s), p, o, m)
-# define FB_BOOST_PP_FOR_124_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(125, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_125, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(125, s), p, o, m)
-# define FB_BOOST_PP_FOR_125_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(126, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_126, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(126, s), p, o, m)
-# define FB_BOOST_PP_FOR_126_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(127, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_127, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(127, s), p, o, m)
-# define FB_BOOST_PP_FOR_127_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(128, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_128, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(128, s), p, o, m)
-# define FB_BOOST_PP_FOR_128_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(129, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_129, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(129, s), p, o, m)
-# define FB_BOOST_PP_FOR_129_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(130, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_130, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(130, s), p, o, m)
-# define FB_BOOST_PP_FOR_130_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(131, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_131, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(131, s), p, o, m)
-# define FB_BOOST_PP_FOR_131_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(132, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_132, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(132, s), p, o, m)
-# define FB_BOOST_PP_FOR_132_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(133, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_133, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(133, s), p, o, m)
-# define FB_BOOST_PP_FOR_133_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(134, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_134, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(134, s), p, o, m)
-# define FB_BOOST_PP_FOR_134_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(135, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_135, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(135, s), p, o, m)
-# define FB_BOOST_PP_FOR_135_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(136, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_136, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(136, s), p, o, m)
-# define FB_BOOST_PP_FOR_136_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(137, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_137, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(137, s), p, o, m)
-# define FB_BOOST_PP_FOR_137_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(138, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_138, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(138, s), p, o, m)
-# define FB_BOOST_PP_FOR_138_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(139, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_139, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(139, s), p, o, m)
-# define FB_BOOST_PP_FOR_139_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(140, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_140, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(140, s), p, o, m)
-# define FB_BOOST_PP_FOR_140_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(141, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_141, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(141, s), p, o, m)
-# define FB_BOOST_PP_FOR_141_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(142, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_142, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(142, s), p, o, m)
-# define FB_BOOST_PP_FOR_142_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(143, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_143, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(143, s), p, o, m)
-# define FB_BOOST_PP_FOR_143_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(144, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_144, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(144, s), p, o, m)
-# define FB_BOOST_PP_FOR_144_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(145, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_145, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(145, s), p, o, m)
-# define FB_BOOST_PP_FOR_145_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(146, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_146, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(146, s), p, o, m)
-# define FB_BOOST_PP_FOR_146_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(147, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_147, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(147, s), p, o, m)
-# define FB_BOOST_PP_FOR_147_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(148, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_148, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(148, s), p, o, m)
-# define FB_BOOST_PP_FOR_148_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(149, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_149, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(149, s), p, o, m)
-# define FB_BOOST_PP_FOR_149_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(150, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_150, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(150, s), p, o, m)
-# define FB_BOOST_PP_FOR_150_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(151, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_151, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(151, s), p, o, m)
-# define FB_BOOST_PP_FOR_151_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(152, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_152, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(152, s), p, o, m)
-# define FB_BOOST_PP_FOR_152_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(153, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_153, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(153, s), p, o, m)
-# define FB_BOOST_PP_FOR_153_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(154, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_154, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(154, s), p, o, m)
-# define FB_BOOST_PP_FOR_154_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(155, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_155, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(155, s), p, o, m)
-# define FB_BOOST_PP_FOR_155_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(156, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_156, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(156, s), p, o, m)
-# define FB_BOOST_PP_FOR_156_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(157, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_157, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(157, s), p, o, m)
-# define FB_BOOST_PP_FOR_157_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(158, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_158, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(158, s), p, o, m)
-# define FB_BOOST_PP_FOR_158_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(159, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_159, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(159, s), p, o, m)
-# define FB_BOOST_PP_FOR_159_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(160, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_160, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(160, s), p, o, m)
-# define FB_BOOST_PP_FOR_160_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(161, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_161, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(161, s), p, o, m)
-# define FB_BOOST_PP_FOR_161_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(162, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_162, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(162, s), p, o, m)
-# define FB_BOOST_PP_FOR_162_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(163, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_163, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(163, s), p, o, m)
-# define FB_BOOST_PP_FOR_163_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(164, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_164, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(164, s), p, o, m)
-# define FB_BOOST_PP_FOR_164_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(165, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_165, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(165, s), p, o, m)
-# define FB_BOOST_PP_FOR_165_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(166, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_166, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(166, s), p, o, m)
-# define FB_BOOST_PP_FOR_166_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(167, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_167, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(167, s), p, o, m)
-# define FB_BOOST_PP_FOR_167_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(168, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_168, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(168, s), p, o, m)
-# define FB_BOOST_PP_FOR_168_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(169, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_169, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(169, s), p, o, m)
-# define FB_BOOST_PP_FOR_169_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(170, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_170, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(170, s), p, o, m)
-# define FB_BOOST_PP_FOR_170_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(171, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_171, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(171, s), p, o, m)
-# define FB_BOOST_PP_FOR_171_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(172, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_172, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(172, s), p, o, m)
-# define FB_BOOST_PP_FOR_172_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(173, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_173, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(173, s), p, o, m)
-# define FB_BOOST_PP_FOR_173_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(174, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_174, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(174, s), p, o, m)
-# define FB_BOOST_PP_FOR_174_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(175, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_175, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(175, s), p, o, m)
-# define FB_BOOST_PP_FOR_175_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(176, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_176, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(176, s), p, o, m)
-# define FB_BOOST_PP_FOR_176_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(177, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_177, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(177, s), p, o, m)
-# define FB_BOOST_PP_FOR_177_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(178, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_178, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(178, s), p, o, m)
-# define FB_BOOST_PP_FOR_178_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(179, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_179, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(179, s), p, o, m)
-# define FB_BOOST_PP_FOR_179_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(180, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_180, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(180, s), p, o, m)
-# define FB_BOOST_PP_FOR_180_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(181, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_181, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(181, s), p, o, m)
-# define FB_BOOST_PP_FOR_181_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(182, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_182, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(182, s), p, o, m)
-# define FB_BOOST_PP_FOR_182_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(183, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_183, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(183, s), p, o, m)
-# define FB_BOOST_PP_FOR_183_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(184, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_184, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(184, s), p, o, m)
-# define FB_BOOST_PP_FOR_184_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(185, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_185, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(185, s), p, o, m)
-# define FB_BOOST_PP_FOR_185_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(186, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_186, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(186, s), p, o, m)
-# define FB_BOOST_PP_FOR_186_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(187, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_187, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(187, s), p, o, m)
-# define FB_BOOST_PP_FOR_187_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(188, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_188, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(188, s), p, o, m)
-# define FB_BOOST_PP_FOR_188_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(189, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_189, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(189, s), p, o, m)
-# define FB_BOOST_PP_FOR_189_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(190, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_190, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(190, s), p, o, m)
-# define FB_BOOST_PP_FOR_190_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(191, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_191, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(191, s), p, o, m)
-# define FB_BOOST_PP_FOR_191_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(192, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_192, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(192, s), p, o, m)
-# define FB_BOOST_PP_FOR_192_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(193, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_193, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(193, s), p, o, m)
-# define FB_BOOST_PP_FOR_193_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(194, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_194, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(194, s), p, o, m)
-# define FB_BOOST_PP_FOR_194_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(195, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_195, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(195, s), p, o, m)
-# define FB_BOOST_PP_FOR_195_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(196, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_196, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(196, s), p, o, m)
-# define FB_BOOST_PP_FOR_196_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(197, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_197, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(197, s), p, o, m)
-# define FB_BOOST_PP_FOR_197_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(198, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_198, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(198, s), p, o, m)
-# define FB_BOOST_PP_FOR_198_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(199, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_199, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(199, s), p, o, m)
-# define FB_BOOST_PP_FOR_199_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(200, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_200, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(200, s), p, o, m)
-# define FB_BOOST_PP_FOR_200_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(201, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_201, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(201, s), p, o, m)
-# define FB_BOOST_PP_FOR_201_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(202, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_202, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(202, s), p, o, m)
-# define FB_BOOST_PP_FOR_202_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(203, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_203, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(203, s), p, o, m)
-# define FB_BOOST_PP_FOR_203_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(204, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_204, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(204, s), p, o, m)
-# define FB_BOOST_PP_FOR_204_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(205, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_205, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(205, s), p, o, m)
-# define FB_BOOST_PP_FOR_205_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(206, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_206, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(206, s), p, o, m)
-# define FB_BOOST_PP_FOR_206_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(207, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_207, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(207, s), p, o, m)
-# define FB_BOOST_PP_FOR_207_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(208, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_208, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(208, s), p, o, m)
-# define FB_BOOST_PP_FOR_208_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(209, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_209, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(209, s), p, o, m)
-# define FB_BOOST_PP_FOR_209_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(210, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_210, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(210, s), p, o, m)
-# define FB_BOOST_PP_FOR_210_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(211, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_211, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(211, s), p, o, m)
-# define FB_BOOST_PP_FOR_211_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(212, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_212, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(212, s), p, o, m)
-# define FB_BOOST_PP_FOR_212_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(213, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_213, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(213, s), p, o, m)
-# define FB_BOOST_PP_FOR_213_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(214, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_214, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(214, s), p, o, m)
-# define FB_BOOST_PP_FOR_214_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(215, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_215, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(215, s), p, o, m)
-# define FB_BOOST_PP_FOR_215_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(216, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_216, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(216, s), p, o, m)
-# define FB_BOOST_PP_FOR_216_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(217, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_217, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(217, s), p, o, m)
-# define FB_BOOST_PP_FOR_217_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(218, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_218, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(218, s), p, o, m)
-# define FB_BOOST_PP_FOR_218_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(219, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_219, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(219, s), p, o, m)
-# define FB_BOOST_PP_FOR_219_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(220, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_220, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(220, s), p, o, m)
-# define FB_BOOST_PP_FOR_220_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(221, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_221, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(221, s), p, o, m)
-# define FB_BOOST_PP_FOR_221_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(222, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_222, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(222, s), p, o, m)
-# define FB_BOOST_PP_FOR_222_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(223, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_223, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(223, s), p, o, m)
-# define FB_BOOST_PP_FOR_223_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(224, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_224, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(224, s), p, o, m)
-# define FB_BOOST_PP_FOR_224_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(225, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_225, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(225, s), p, o, m)
-# define FB_BOOST_PP_FOR_225_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(226, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_226, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(226, s), p, o, m)
-# define FB_BOOST_PP_FOR_226_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(227, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_227, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(227, s), p, o, m)
-# define FB_BOOST_PP_FOR_227_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(228, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_228, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(228, s), p, o, m)
-# define FB_BOOST_PP_FOR_228_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(229, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_229, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(229, s), p, o, m)
-# define FB_BOOST_PP_FOR_229_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(230, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_230, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(230, s), p, o, m)
-# define FB_BOOST_PP_FOR_230_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(231, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_231, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(231, s), p, o, m)
-# define FB_BOOST_PP_FOR_231_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(232, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_232, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(232, s), p, o, m)
-# define FB_BOOST_PP_FOR_232_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(233, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_233, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(233, s), p, o, m)
-# define FB_BOOST_PP_FOR_233_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(234, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_234, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(234, s), p, o, m)
-# define FB_BOOST_PP_FOR_234_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(235, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_235, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(235, s), p, o, m)
-# define FB_BOOST_PP_FOR_235_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(236, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_236, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(236, s), p, o, m)
-# define FB_BOOST_PP_FOR_236_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(237, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_237, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(237, s), p, o, m)
-# define FB_BOOST_PP_FOR_237_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(238, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_238, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(238, s), p, o, m)
-# define FB_BOOST_PP_FOR_238_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(239, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_239, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(239, s), p, o, m)
-# define FB_BOOST_PP_FOR_239_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(240, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_240, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(240, s), p, o, m)
-# define FB_BOOST_PP_FOR_240_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(241, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_241, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(241, s), p, o, m)
-# define FB_BOOST_PP_FOR_241_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(242, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_242, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(242, s), p, o, m)
-# define FB_BOOST_PP_FOR_242_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(243, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_243, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(243, s), p, o, m)
-# define FB_BOOST_PP_FOR_243_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(244, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_244, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(244, s), p, o, m)
-# define FB_BOOST_PP_FOR_244_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(245, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_245, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(245, s), p, o, m)
-# define FB_BOOST_PP_FOR_245_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(246, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_246, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(246, s), p, o, m)
-# define FB_BOOST_PP_FOR_246_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(247, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_247, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(247, s), p, o, m)
-# define FB_BOOST_PP_FOR_247_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(248, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_248, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(248, s), p, o, m)
-# define FB_BOOST_PP_FOR_248_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(249, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_249, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(249, s), p, o, m)
-# define FB_BOOST_PP_FOR_249_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(250, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_250, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(250, s), p, o, m)
-# define FB_BOOST_PP_FOR_250_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(251, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_251, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(251, s), p, o, m)
-# define FB_BOOST_PP_FOR_251_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(252, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_252, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(252, s), p, o, m)
-# define FB_BOOST_PP_FOR_252_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(253, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_253, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(253, s), p, o, m)
-# define FB_BOOST_PP_FOR_253_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(254, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_254, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(254, s), p, o, m)
-# define FB_BOOST_PP_FOR_254_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(255, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_255, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(255, s), p, o, m)
-# define FB_BOOST_PP_FOR_255_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(256, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_256, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(256, s), p, o, m)
-# define FB_BOOST_PP_FOR_256_C(c, s, p, o, m) FB_BOOST_PP_IIF(c, m, FB_BOOST_PP_TUPLE_EAT_2)(257, s) FB_BOOST_PP_IIF(c, FB_BOOST_PP_FOR_257, FB_BOOST_PP_TUPLE_EAT_4)(FB_BOOST_PP_EXPR_IIF(c, o)(257, s), p, o, m)
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/detail/msvc/for.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/detail/msvc/for.hpp
deleted file mode 100644
index 65f65459..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/detail/msvc/for.hpp
+++ /dev/null
@@ -1,277 +0,0 @@
-# /* Copyright (C) 2001
-#  * Housemarque Oy
-#  * http://www.housemarque.com
-#  *
-#  * Distributed under the Boost Software License, Version 1.0. (See
-#  * accompanying file LICENSE_1_0.txt or copy at
-#  * http://www.boost.org/LICENSE_1_0.txt)
-#  */
-#
-# /* Revised by Paul Mensonides (2002) */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_REPETITION_DETAIL_MSVC_FOR_HPP
-# define FB_BOOST_PREPROCESSOR_REPETITION_DETAIL_MSVC_FOR_HPP
-#
-# include <firebird/impl/boost/preprocessor/control/if.hpp>
-# include <firebird/impl/boost/preprocessor/tuple/eat.hpp>
-#
-# define FB_BOOST_PP_FOR_1(s, p, o, m) FB_BOOST_PP_IF(p(2, s), m, FB_BOOST_PP_TUPLE_EAT_2)(2, s) FB_BOOST_PP_IF(p(2, s), FB_BOOST_PP_FOR_2, FB_BOOST_PP_TUPLE_EAT_4)(o(2, s), p, o, m)
-# define FB_BOOST_PP_FOR_2(s, p, o, m) FB_BOOST_PP_IF(p(3, s), m, FB_BOOST_PP_TUPLE_EAT_2)(3, s) FB_BOOST_PP_IF(p(3, s), FB_BOOST_PP_FOR_3, FB_BOOST_PP_TUPLE_EAT_4)(o(3, s), p, o, m)
-# define FB_BOOST_PP_FOR_3(s, p, o, m) FB_BOOST_PP_IF(p(4, s), m, FB_BOOST_PP_TUPLE_EAT_2)(4, s) FB_BOOST_PP_IF(p(4, s), FB_BOOST_PP_FOR_4, FB_BOOST_PP_TUPLE_EAT_4)(o(4, s), p, o, m)
-# define FB_BOOST_PP_FOR_4(s, p, o, m) FB_BOOST_PP_IF(p(5, s), m, FB_BOOST_PP_TUPLE_EAT_2)(5, s) FB_BOOST_PP_IF(p(5, s), FB_BOOST_PP_FOR_5, FB_BOOST_PP_TUPLE_EAT_4)(o(5, s), p, o, m)
-# define FB_BOOST_PP_FOR_5(s, p, o, m) FB_BOOST_PP_IF(p(6, s), m, FB_BOOST_PP_TUPLE_EAT_2)(6, s) FB_BOOST_PP_IF(p(6, s), FB_BOOST_PP_FOR_6, FB_BOOST_PP_TUPLE_EAT_4)(o(6, s), p, o, m)
-# define FB_BOOST_PP_FOR_6(s, p, o, m) FB_BOOST_PP_IF(p(7, s), m, FB_BOOST_PP_TUPLE_EAT_2)(7, s) FB_BOOST_PP_IF(p(7, s), FB_BOOST_PP_FOR_7, FB_BOOST_PP_TUPLE_EAT_4)(o(7, s), p, o, m)
-# define FB_BOOST_PP_FOR_7(s, p, o, m) FB_BOOST_PP_IF(p(8, s), m, FB_BOOST_PP_TUPLE_EAT_2)(8, s) FB_BOOST_PP_IF(p(8, s), FB_BOOST_PP_FOR_8, FB_BOOST_PP_TUPLE_EAT_4)(o(8, s), p, o, m)
-# define FB_BOOST_PP_FOR_8(s, p, o, m) FB_BOOST_PP_IF(p(9, s), m, FB_BOOST_PP_TUPLE_EAT_2)(9, s) FB_BOOST_PP_IF(p(9, s), FB_BOOST_PP_FOR_9, FB_BOOST_PP_TUPLE_EAT_4)(o(9, s), p, o, m)
-# define FB_BOOST_PP_FOR_9(s, p, o, m) FB_BOOST_PP_IF(p(10, s), m, FB_BOOST_PP_TUPLE_EAT_2)(10, s) FB_BOOST_PP_IF(p(10, s), FB_BOOST_PP_FOR_10, FB_BOOST_PP_TUPLE_EAT_4)(o(10, s), p, o, m)
-# define FB_BOOST_PP_FOR_10(s, p, o, m) FB_BOOST_PP_IF(p(11, s), m, FB_BOOST_PP_TUPLE_EAT_2)(11, s) FB_BOOST_PP_IF(p(11, s), FB_BOOST_PP_FOR_11, FB_BOOST_PP_TUPLE_EAT_4)(o(11, s), p, o, m)
-# define FB_BOOST_PP_FOR_11(s, p, o, m) FB_BOOST_PP_IF(p(12, s), m, FB_BOOST_PP_TUPLE_EAT_2)(12, s) FB_BOOST_PP_IF(p(12, s), FB_BOOST_PP_FOR_12, FB_BOOST_PP_TUPLE_EAT_4)(o(12, s), p, o, m)
-# define FB_BOOST_PP_FOR_12(s, p, o, m) FB_BOOST_PP_IF(p(13, s), m, FB_BOOST_PP_TUPLE_EAT_2)(13, s) FB_BOOST_PP_IF(p(13, s), FB_BOOST_PP_FOR_13, FB_BOOST_PP_TUPLE_EAT_4)(o(13, s), p, o, m)
-# define FB_BOOST_PP_FOR_13(s, p, o, m) FB_BOOST_PP_IF(p(14, s), m, FB_BOOST_PP_TUPLE_EAT_2)(14, s) FB_BOOST_PP_IF(p(14, s), FB_BOOST_PP_FOR_14, FB_BOOST_PP_TUPLE_EAT_4)(o(14, s), p, o, m)
-# define FB_BOOST_PP_FOR_14(s, p, o, m) FB_BOOST_PP_IF(p(15, s), m, FB_BOOST_PP_TUPLE_EAT_2)(15, s) FB_BOOST_PP_IF(p(15, s), FB_BOOST_PP_FOR_15, FB_BOOST_PP_TUPLE_EAT_4)(o(15, s), p, o, m)
-# define FB_BOOST_PP_FOR_15(s, p, o, m) FB_BOOST_PP_IF(p(16, s), m, FB_BOOST_PP_TUPLE_EAT_2)(16, s) FB_BOOST_PP_IF(p(16, s), FB_BOOST_PP_FOR_16, FB_BOOST_PP_TUPLE_EAT_4)(o(16, s), p, o, m)
-# define FB_BOOST_PP_FOR_16(s, p, o, m) FB_BOOST_PP_IF(p(17, s), m, FB_BOOST_PP_TUPLE_EAT_2)(17, s) FB_BOOST_PP_IF(p(17, s), FB_BOOST_PP_FOR_17, FB_BOOST_PP_TUPLE_EAT_4)(o(17, s), p, o, m)
-# define FB_BOOST_PP_FOR_17(s, p, o, m) FB_BOOST_PP_IF(p(18, s), m, FB_BOOST_PP_TUPLE_EAT_2)(18, s) FB_BOOST_PP_IF(p(18, s), FB_BOOST_PP_FOR_18, FB_BOOST_PP_TUPLE_EAT_4)(o(18, s), p, o, m)
-# define FB_BOOST_PP_FOR_18(s, p, o, m) FB_BOOST_PP_IF(p(19, s), m, FB_BOOST_PP_TUPLE_EAT_2)(19, s) FB_BOOST_PP_IF(p(19, s), FB_BOOST_PP_FOR_19, FB_BOOST_PP_TUPLE_EAT_4)(o(19, s), p, o, m)
-# define FB_BOOST_PP_FOR_19(s, p, o, m) FB_BOOST_PP_IF(p(20, s), m, FB_BOOST_PP_TUPLE_EAT_2)(20, s) FB_BOOST_PP_IF(p(20, s), FB_BOOST_PP_FOR_20, FB_BOOST_PP_TUPLE_EAT_4)(o(20, s), p, o, m)
-# define FB_BOOST_PP_FOR_20(s, p, o, m) FB_BOOST_PP_IF(p(21, s), m, FB_BOOST_PP_TUPLE_EAT_2)(21, s) FB_BOOST_PP_IF(p(21, s), FB_BOOST_PP_FOR_21, FB_BOOST_PP_TUPLE_EAT_4)(o(21, s), p, o, m)
-# define FB_BOOST_PP_FOR_21(s, p, o, m) FB_BOOST_PP_IF(p(22, s), m, FB_BOOST_PP_TUPLE_EAT_2)(22, s) FB_BOOST_PP_IF(p(22, s), FB_BOOST_PP_FOR_22, FB_BOOST_PP_TUPLE_EAT_4)(o(22, s), p, o, m)
-# define FB_BOOST_PP_FOR_22(s, p, o, m) FB_BOOST_PP_IF(p(23, s), m, FB_BOOST_PP_TUPLE_EAT_2)(23, s) FB_BOOST_PP_IF(p(23, s), FB_BOOST_PP_FOR_23, FB_BOOST_PP_TUPLE_EAT_4)(o(23, s), p, o, m)
-# define FB_BOOST_PP_FOR_23(s, p, o, m) FB_BOOST_PP_IF(p(24, s), m, FB_BOOST_PP_TUPLE_EAT_2)(24, s) FB_BOOST_PP_IF(p(24, s), FB_BOOST_PP_FOR_24, FB_BOOST_PP_TUPLE_EAT_4)(o(24, s), p, o, m)
-# define FB_BOOST_PP_FOR_24(s, p, o, m) FB_BOOST_PP_IF(p(25, s), m, FB_BOOST_PP_TUPLE_EAT_2)(25, s) FB_BOOST_PP_IF(p(25, s), FB_BOOST_PP_FOR_25, FB_BOOST_PP_TUPLE_EAT_4)(o(25, s), p, o, m)
-# define FB_BOOST_PP_FOR_25(s, p, o, m) FB_BOOST_PP_IF(p(26, s), m, FB_BOOST_PP_TUPLE_EAT_2)(26, s) FB_BOOST_PP_IF(p(26, s), FB_BOOST_PP_FOR_26, FB_BOOST_PP_TUPLE_EAT_4)(o(26, s), p, o, m)
-# define FB_BOOST_PP_FOR_26(s, p, o, m) FB_BOOST_PP_IF(p(27, s), m, FB_BOOST_PP_TUPLE_EAT_2)(27, s) FB_BOOST_PP_IF(p(27, s), FB_BOOST_PP_FOR_27, FB_BOOST_PP_TUPLE_EAT_4)(o(27, s), p, o, m)
-# define FB_BOOST_PP_FOR_27(s, p, o, m) FB_BOOST_PP_IF(p(28, s), m, FB_BOOST_PP_TUPLE_EAT_2)(28, s) FB_BOOST_PP_IF(p(28, s), FB_BOOST_PP_FOR_28, FB_BOOST_PP_TUPLE_EAT_4)(o(28, s), p, o, m)
-# define FB_BOOST_PP_FOR_28(s, p, o, m) FB_BOOST_PP_IF(p(29, s), m, FB_BOOST_PP_TUPLE_EAT_2)(29, s) FB_BOOST_PP_IF(p(29, s), FB_BOOST_PP_FOR_29, FB_BOOST_PP_TUPLE_EAT_4)(o(29, s), p, o, m)
-# define FB_BOOST_PP_FOR_29(s, p, o, m) FB_BOOST_PP_IF(p(30, s), m, FB_BOOST_PP_TUPLE_EAT_2)(30, s) FB_BOOST_PP_IF(p(30, s), FB_BOOST_PP_FOR_30, FB_BOOST_PP_TUPLE_EAT_4)(o(30, s), p, o, m)
-# define FB_BOOST_PP_FOR_30(s, p, o, m) FB_BOOST_PP_IF(p(31, s), m, FB_BOOST_PP_TUPLE_EAT_2)(31, s) FB_BOOST_PP_IF(p(31, s), FB_BOOST_PP_FOR_31, FB_BOOST_PP_TUPLE_EAT_4)(o(31, s), p, o, m)
-# define FB_BOOST_PP_FOR_31(s, p, o, m) FB_BOOST_PP_IF(p(32, s), m, FB_BOOST_PP_TUPLE_EAT_2)(32, s) FB_BOOST_PP_IF(p(32, s), FB_BOOST_PP_FOR_32, FB_BOOST_PP_TUPLE_EAT_4)(o(32, s), p, o, m)
-# define FB_BOOST_PP_FOR_32(s, p, o, m) FB_BOOST_PP_IF(p(33, s), m, FB_BOOST_PP_TUPLE_EAT_2)(33, s) FB_BOOST_PP_IF(p(33, s), FB_BOOST_PP_FOR_33, FB_BOOST_PP_TUPLE_EAT_4)(o(33, s), p, o, m)
-# define FB_BOOST_PP_FOR_33(s, p, o, m) FB_BOOST_PP_IF(p(34, s), m, FB_BOOST_PP_TUPLE_EAT_2)(34, s) FB_BOOST_PP_IF(p(34, s), FB_BOOST_PP_FOR_34, FB_BOOST_PP_TUPLE_EAT_4)(o(34, s), p, o, m)
-# define FB_BOOST_PP_FOR_34(s, p, o, m) FB_BOOST_PP_IF(p(35, s), m, FB_BOOST_PP_TUPLE_EAT_2)(35, s) FB_BOOST_PP_IF(p(35, s), FB_BOOST_PP_FOR_35, FB_BOOST_PP_TUPLE_EAT_4)(o(35, s), p, o, m)
-# define FB_BOOST_PP_FOR_35(s, p, o, m) FB_BOOST_PP_IF(p(36, s), m, FB_BOOST_PP_TUPLE_EAT_2)(36, s) FB_BOOST_PP_IF(p(36, s), FB_BOOST_PP_FOR_36, FB_BOOST_PP_TUPLE_EAT_4)(o(36, s), p, o, m)
-# define FB_BOOST_PP_FOR_36(s, p, o, m) FB_BOOST_PP_IF(p(37, s), m, FB_BOOST_PP_TUPLE_EAT_2)(37, s) FB_BOOST_PP_IF(p(37, s), FB_BOOST_PP_FOR_37, FB_BOOST_PP_TUPLE_EAT_4)(o(37, s), p, o, m)
-# define FB_BOOST_PP_FOR_37(s, p, o, m) FB_BOOST_PP_IF(p(38, s), m, FB_BOOST_PP_TUPLE_EAT_2)(38, s) FB_BOOST_PP_IF(p(38, s), FB_BOOST_PP_FOR_38, FB_BOOST_PP_TUPLE_EAT_4)(o(38, s), p, o, m)
-# define FB_BOOST_PP_FOR_38(s, p, o, m) FB_BOOST_PP_IF(p(39, s), m, FB_BOOST_PP_TUPLE_EAT_2)(39, s) FB_BOOST_PP_IF(p(39, s), FB_BOOST_PP_FOR_39, FB_BOOST_PP_TUPLE_EAT_4)(o(39, s), p, o, m)
-# define FB_BOOST_PP_FOR_39(s, p, o, m) FB_BOOST_PP_IF(p(40, s), m, FB_BOOST_PP_TUPLE_EAT_2)(40, s) FB_BOOST_PP_IF(p(40, s), FB_BOOST_PP_FOR_40, FB_BOOST_PP_TUPLE_EAT_4)(o(40, s), p, o, m)
-# define FB_BOOST_PP_FOR_40(s, p, o, m) FB_BOOST_PP_IF(p(41, s), m, FB_BOOST_PP_TUPLE_EAT_2)(41, s) FB_BOOST_PP_IF(p(41, s), FB_BOOST_PP_FOR_41, FB_BOOST_PP_TUPLE_EAT_4)(o(41, s), p, o, m)
-# define FB_BOOST_PP_FOR_41(s, p, o, m) FB_BOOST_PP_IF(p(42, s), m, FB_BOOST_PP_TUPLE_EAT_2)(42, s) FB_BOOST_PP_IF(p(42, s), FB_BOOST_PP_FOR_42, FB_BOOST_PP_TUPLE_EAT_4)(o(42, s), p, o, m)
-# define FB_BOOST_PP_FOR_42(s, p, o, m) FB_BOOST_PP_IF(p(43, s), m, FB_BOOST_PP_TUPLE_EAT_2)(43, s) FB_BOOST_PP_IF(p(43, s), FB_BOOST_PP_FOR_43, FB_BOOST_PP_TUPLE_EAT_4)(o(43, s), p, o, m)
-# define FB_BOOST_PP_FOR_43(s, p, o, m) FB_BOOST_PP_IF(p(44, s), m, FB_BOOST_PP_TUPLE_EAT_2)(44, s) FB_BOOST_PP_IF(p(44, s), FB_BOOST_PP_FOR_44, FB_BOOST_PP_TUPLE_EAT_4)(o(44, s), p, o, m)
-# define FB_BOOST_PP_FOR_44(s, p, o, m) FB_BOOST_PP_IF(p(45, s), m, FB_BOOST_PP_TUPLE_EAT_2)(45, s) FB_BOOST_PP_IF(p(45, s), FB_BOOST_PP_FOR_45, FB_BOOST_PP_TUPLE_EAT_4)(o(45, s), p, o, m)
-# define FB_BOOST_PP_FOR_45(s, p, o, m) FB_BOOST_PP_IF(p(46, s), m, FB_BOOST_PP_TUPLE_EAT_2)(46, s) FB_BOOST_PP_IF(p(46, s), FB_BOOST_PP_FOR_46, FB_BOOST_PP_TUPLE_EAT_4)(o(46, s), p, o, m)
-# define FB_BOOST_PP_FOR_46(s, p, o, m) FB_BOOST_PP_IF(p(47, s), m, FB_BOOST_PP_TUPLE_EAT_2)(47, s) FB_BOOST_PP_IF(p(47, s), FB_BOOST_PP_FOR_47, FB_BOOST_PP_TUPLE_EAT_4)(o(47, s), p, o, m)
-# define FB_BOOST_PP_FOR_47(s, p, o, m) FB_BOOST_PP_IF(p(48, s), m, FB_BOOST_PP_TUPLE_EAT_2)(48, s) FB_BOOST_PP_IF(p(48, s), FB_BOOST_PP_FOR_48, FB_BOOST_PP_TUPLE_EAT_4)(o(48, s), p, o, m)
-# define FB_BOOST_PP_FOR_48(s, p, o, m) FB_BOOST_PP_IF(p(49, s), m, FB_BOOST_PP_TUPLE_EAT_2)(49, s) FB_BOOST_PP_IF(p(49, s), FB_BOOST_PP_FOR_49, FB_BOOST_PP_TUPLE_EAT_4)(o(49, s), p, o, m)
-# define FB_BOOST_PP_FOR_49(s, p, o, m) FB_BOOST_PP_IF(p(50, s), m, FB_BOOST_PP_TUPLE_EAT_2)(50, s) FB_BOOST_PP_IF(p(50, s), FB_BOOST_PP_FOR_50, FB_BOOST_PP_TUPLE_EAT_4)(o(50, s), p, o, m)
-# define FB_BOOST_PP_FOR_50(s, p, o, m) FB_BOOST_PP_IF(p(51, s), m, FB_BOOST_PP_TUPLE_EAT_2)(51, s) FB_BOOST_PP_IF(p(51, s), FB_BOOST_PP_FOR_51, FB_BOOST_PP_TUPLE_EAT_4)(o(51, s), p, o, m)
-# define FB_BOOST_PP_FOR_51(s, p, o, m) FB_BOOST_PP_IF(p(52, s), m, FB_BOOST_PP_TUPLE_EAT_2)(52, s) FB_BOOST_PP_IF(p(52, s), FB_BOOST_PP_FOR_52, FB_BOOST_PP_TUPLE_EAT_4)(o(52, s), p, o, m)
-# define FB_BOOST_PP_FOR_52(s, p, o, m) FB_BOOST_PP_IF(p(53, s), m, FB_BOOST_PP_TUPLE_EAT_2)(53, s) FB_BOOST_PP_IF(p(53, s), FB_BOOST_PP_FOR_53, FB_BOOST_PP_TUPLE_EAT_4)(o(53, s), p, o, m)
-# define FB_BOOST_PP_FOR_53(s, p, o, m) FB_BOOST_PP_IF(p(54, s), m, FB_BOOST_PP_TUPLE_EAT_2)(54, s) FB_BOOST_PP_IF(p(54, s), FB_BOOST_PP_FOR_54, FB_BOOST_PP_TUPLE_EAT_4)(o(54, s), p, o, m)
-# define FB_BOOST_PP_FOR_54(s, p, o, m) FB_BOOST_PP_IF(p(55, s), m, FB_BOOST_PP_TUPLE_EAT_2)(55, s) FB_BOOST_PP_IF(p(55, s), FB_BOOST_PP_FOR_55, FB_BOOST_PP_TUPLE_EAT_4)(o(55, s), p, o, m)
-# define FB_BOOST_PP_FOR_55(s, p, o, m) FB_BOOST_PP_IF(p(56, s), m, FB_BOOST_PP_TUPLE_EAT_2)(56, s) FB_BOOST_PP_IF(p(56, s), FB_BOOST_PP_FOR_56, FB_BOOST_PP_TUPLE_EAT_4)(o(56, s), p, o, m)
-# define FB_BOOST_PP_FOR_56(s, p, o, m) FB_BOOST_PP_IF(p(57, s), m, FB_BOOST_PP_TUPLE_EAT_2)(57, s) FB_BOOST_PP_IF(p(57, s), FB_BOOST_PP_FOR_57, FB_BOOST_PP_TUPLE_EAT_4)(o(57, s), p, o, m)
-# define FB_BOOST_PP_FOR_57(s, p, o, m) FB_BOOST_PP_IF(p(58, s), m, FB_BOOST_PP_TUPLE_EAT_2)(58, s) FB_BOOST_PP_IF(p(58, s), FB_BOOST_PP_FOR_58, FB_BOOST_PP_TUPLE_EAT_4)(o(58, s), p, o, m)
-# define FB_BOOST_PP_FOR_58(s, p, o, m) FB_BOOST_PP_IF(p(59, s), m, FB_BOOST_PP_TUPLE_EAT_2)(59, s) FB_BOOST_PP_IF(p(59, s), FB_BOOST_PP_FOR_59, FB_BOOST_PP_TUPLE_EAT_4)(o(59, s), p, o, m)
-# define FB_BOOST_PP_FOR_59(s, p, o, m) FB_BOOST_PP_IF(p(60, s), m, FB_BOOST_PP_TUPLE_EAT_2)(60, s) FB_BOOST_PP_IF(p(60, s), FB_BOOST_PP_FOR_60, FB_BOOST_PP_TUPLE_EAT_4)(o(60, s), p, o, m)
-# define FB_BOOST_PP_FOR_60(s, p, o, m) FB_BOOST_PP_IF(p(61, s), m, FB_BOOST_PP_TUPLE_EAT_2)(61, s) FB_BOOST_PP_IF(p(61, s), FB_BOOST_PP_FOR_61, FB_BOOST_PP_TUPLE_EAT_4)(o(61, s), p, o, m)
-# define FB_BOOST_PP_FOR_61(s, p, o, m) FB_BOOST_PP_IF(p(62, s), m, FB_BOOST_PP_TUPLE_EAT_2)(62, s) FB_BOOST_PP_IF(p(62, s), FB_BOOST_PP_FOR_62, FB_BOOST_PP_TUPLE_EAT_4)(o(62, s), p, o, m)
-# define FB_BOOST_PP_FOR_62(s, p, o, m) FB_BOOST_PP_IF(p(63, s), m, FB_BOOST_PP_TUPLE_EAT_2)(63, s) FB_BOOST_PP_IF(p(63, s), FB_BOOST_PP_FOR_63, FB_BOOST_PP_TUPLE_EAT_4)(o(63, s), p, o, m)
-# define FB_BOOST_PP_FOR_63(s, p, o, m) FB_BOOST_PP_IF(p(64, s), m, FB_BOOST_PP_TUPLE_EAT_2)(64, s) FB_BOOST_PP_IF(p(64, s), FB_BOOST_PP_FOR_64, FB_BOOST_PP_TUPLE_EAT_4)(o(64, s), p, o, m)
-# define FB_BOOST_PP_FOR_64(s, p, o, m) FB_BOOST_PP_IF(p(65, s), m, FB_BOOST_PP_TUPLE_EAT_2)(65, s) FB_BOOST_PP_IF(p(65, s), FB_BOOST_PP_FOR_65, FB_BOOST_PP_TUPLE_EAT_4)(o(65, s), p, o, m)
-# define FB_BOOST_PP_FOR_65(s, p, o, m) FB_BOOST_PP_IF(p(66, s), m, FB_BOOST_PP_TUPLE_EAT_2)(66, s) FB_BOOST_PP_IF(p(66, s), FB_BOOST_PP_FOR_66, FB_BOOST_PP_TUPLE_EAT_4)(o(66, s), p, o, m)
-# define FB_BOOST_PP_FOR_66(s, p, o, m) FB_BOOST_PP_IF(p(67, s), m, FB_BOOST_PP_TUPLE_EAT_2)(67, s) FB_BOOST_PP_IF(p(67, s), FB_BOOST_PP_FOR_67, FB_BOOST_PP_TUPLE_EAT_4)(o(67, s), p, o, m)
-# define FB_BOOST_PP_FOR_67(s, p, o, m) FB_BOOST_PP_IF(p(68, s), m, FB_BOOST_PP_TUPLE_EAT_2)(68, s) FB_BOOST_PP_IF(p(68, s), FB_BOOST_PP_FOR_68, FB_BOOST_PP_TUPLE_EAT_4)(o(68, s), p, o, m)
-# define FB_BOOST_PP_FOR_68(s, p, o, m) FB_BOOST_PP_IF(p(69, s), m, FB_BOOST_PP_TUPLE_EAT_2)(69, s) FB_BOOST_PP_IF(p(69, s), FB_BOOST_PP_FOR_69, FB_BOOST_PP_TUPLE_EAT_4)(o(69, s), p, o, m)
-# define FB_BOOST_PP_FOR_69(s, p, o, m) FB_BOOST_PP_IF(p(70, s), m, FB_BOOST_PP_TUPLE_EAT_2)(70, s) FB_BOOST_PP_IF(p(70, s), FB_BOOST_PP_FOR_70, FB_BOOST_PP_TUPLE_EAT_4)(o(70, s), p, o, m)
-# define FB_BOOST_PP_FOR_70(s, p, o, m) FB_BOOST_PP_IF(p(71, s), m, FB_BOOST_PP_TUPLE_EAT_2)(71, s) FB_BOOST_PP_IF(p(71, s), FB_BOOST_PP_FOR_71, FB_BOOST_PP_TUPLE_EAT_4)(o(71, s), p, o, m)
-# define FB_BOOST_PP_FOR_71(s, p, o, m) FB_BOOST_PP_IF(p(72, s), m, FB_BOOST_PP_TUPLE_EAT_2)(72, s) FB_BOOST_PP_IF(p(72, s), FB_BOOST_PP_FOR_72, FB_BOOST_PP_TUPLE_EAT_4)(o(72, s), p, o, m)
-# define FB_BOOST_PP_FOR_72(s, p, o, m) FB_BOOST_PP_IF(p(73, s), m, FB_BOOST_PP_TUPLE_EAT_2)(73, s) FB_BOOST_PP_IF(p(73, s), FB_BOOST_PP_FOR_73, FB_BOOST_PP_TUPLE_EAT_4)(o(73, s), p, o, m)
-# define FB_BOOST_PP_FOR_73(s, p, o, m) FB_BOOST_PP_IF(p(74, s), m, FB_BOOST_PP_TUPLE_EAT_2)(74, s) FB_BOOST_PP_IF(p(74, s), FB_BOOST_PP_FOR_74, FB_BOOST_PP_TUPLE_EAT_4)(o(74, s), p, o, m)
-# define FB_BOOST_PP_FOR_74(s, p, o, m) FB_BOOST_PP_IF(p(75, s), m, FB_BOOST_PP_TUPLE_EAT_2)(75, s) FB_BOOST_PP_IF(p(75, s), FB_BOOST_PP_FOR_75, FB_BOOST_PP_TUPLE_EAT_4)(o(75, s), p, o, m)
-# define FB_BOOST_PP_FOR_75(s, p, o, m) FB_BOOST_PP_IF(p(76, s), m, FB_BOOST_PP_TUPLE_EAT_2)(76, s) FB_BOOST_PP_IF(p(76, s), FB_BOOST_PP_FOR_76, FB_BOOST_PP_TUPLE_EAT_4)(o(76, s), p, o, m)
-# define FB_BOOST_PP_FOR_76(s, p, o, m) FB_BOOST_PP_IF(p(77, s), m, FB_BOOST_PP_TUPLE_EAT_2)(77, s) FB_BOOST_PP_IF(p(77, s), FB_BOOST_PP_FOR_77, FB_BOOST_PP_TUPLE_EAT_4)(o(77, s), p, o, m)
-# define FB_BOOST_PP_FOR_77(s, p, o, m) FB_BOOST_PP_IF(p(78, s), m, FB_BOOST_PP_TUPLE_EAT_2)(78, s) FB_BOOST_PP_IF(p(78, s), FB_BOOST_PP_FOR_78, FB_BOOST_PP_TUPLE_EAT_4)(o(78, s), p, o, m)
-# define FB_BOOST_PP_FOR_78(s, p, o, m) FB_BOOST_PP_IF(p(79, s), m, FB_BOOST_PP_TUPLE_EAT_2)(79, s) FB_BOOST_PP_IF(p(79, s), FB_BOOST_PP_FOR_79, FB_BOOST_PP_TUPLE_EAT_4)(o(79, s), p, o, m)
-# define FB_BOOST_PP_FOR_79(s, p, o, m) FB_BOOST_PP_IF(p(80, s), m, FB_BOOST_PP_TUPLE_EAT_2)(80, s) FB_BOOST_PP_IF(p(80, s), FB_BOOST_PP_FOR_80, FB_BOOST_PP_TUPLE_EAT_4)(o(80, s), p, o, m)
-# define FB_BOOST_PP_FOR_80(s, p, o, m) FB_BOOST_PP_IF(p(81, s), m, FB_BOOST_PP_TUPLE_EAT_2)(81, s) FB_BOOST_PP_IF(p(81, s), FB_BOOST_PP_FOR_81, FB_BOOST_PP_TUPLE_EAT_4)(o(81, s), p, o, m)
-# define FB_BOOST_PP_FOR_81(s, p, o, m) FB_BOOST_PP_IF(p(82, s), m, FB_BOOST_PP_TUPLE_EAT_2)(82, s) FB_BOOST_PP_IF(p(82, s), FB_BOOST_PP_FOR_82, FB_BOOST_PP_TUPLE_EAT_4)(o(82, s), p, o, m)
-# define FB_BOOST_PP_FOR_82(s, p, o, m) FB_BOOST_PP_IF(p(83, s), m, FB_BOOST_PP_TUPLE_EAT_2)(83, s) FB_BOOST_PP_IF(p(83, s), FB_BOOST_PP_FOR_83, FB_BOOST_PP_TUPLE_EAT_4)(o(83, s), p, o, m)
-# define FB_BOOST_PP_FOR_83(s, p, o, m) FB_BOOST_PP_IF(p(84, s), m, FB_BOOST_PP_TUPLE_EAT_2)(84, s) FB_BOOST_PP_IF(p(84, s), FB_BOOST_PP_FOR_84, FB_BOOST_PP_TUPLE_EAT_4)(o(84, s), p, o, m)
-# define FB_BOOST_PP_FOR_84(s, p, o, m) FB_BOOST_PP_IF(p(85, s), m, FB_BOOST_PP_TUPLE_EAT_2)(85, s) FB_BOOST_PP_IF(p(85, s), FB_BOOST_PP_FOR_85, FB_BOOST_PP_TUPLE_EAT_4)(o(85, s), p, o, m)
-# define FB_BOOST_PP_FOR_85(s, p, o, m) FB_BOOST_PP_IF(p(86, s), m, FB_BOOST_PP_TUPLE_EAT_2)(86, s) FB_BOOST_PP_IF(p(86, s), FB_BOOST_PP_FOR_86, FB_BOOST_PP_TUPLE_EAT_4)(o(86, s), p, o, m)
-# define FB_BOOST_PP_FOR_86(s, p, o, m) FB_BOOST_PP_IF(p(87, s), m, FB_BOOST_PP_TUPLE_EAT_2)(87, s) FB_BOOST_PP_IF(p(87, s), FB_BOOST_PP_FOR_87, FB_BOOST_PP_TUPLE_EAT_4)(o(87, s), p, o, m)
-# define FB_BOOST_PP_FOR_87(s, p, o, m) FB_BOOST_PP_IF(p(88, s), m, FB_BOOST_PP_TUPLE_EAT_2)(88, s) FB_BOOST_PP_IF(p(88, s), FB_BOOST_PP_FOR_88, FB_BOOST_PP_TUPLE_EAT_4)(o(88, s), p, o, m)
-# define FB_BOOST_PP_FOR_88(s, p, o, m) FB_BOOST_PP_IF(p(89, s), m, FB_BOOST_PP_TUPLE_EAT_2)(89, s) FB_BOOST_PP_IF(p(89, s), FB_BOOST_PP_FOR_89, FB_BOOST_PP_TUPLE_EAT_4)(o(89, s), p, o, m)
-# define FB_BOOST_PP_FOR_89(s, p, o, m) FB_BOOST_PP_IF(p(90, s), m, FB_BOOST_PP_TUPLE_EAT_2)(90, s) FB_BOOST_PP_IF(p(90, s), FB_BOOST_PP_FOR_90, FB_BOOST_PP_TUPLE_EAT_4)(o(90, s), p, o, m)
-# define FB_BOOST_PP_FOR_90(s, p, o, m) FB_BOOST_PP_IF(p(91, s), m, FB_BOOST_PP_TUPLE_EAT_2)(91, s) FB_BOOST_PP_IF(p(91, s), FB_BOOST_PP_FOR_91, FB_BOOST_PP_TUPLE_EAT_4)(o(91, s), p, o, m)
-# define FB_BOOST_PP_FOR_91(s, p, o, m) FB_BOOST_PP_IF(p(92, s), m, FB_BOOST_PP_TUPLE_EAT_2)(92, s) FB_BOOST_PP_IF(p(92, s), FB_BOOST_PP_FOR_92, FB_BOOST_PP_TUPLE_EAT_4)(o(92, s), p, o, m)
-# define FB_BOOST_PP_FOR_92(s, p, o, m) FB_BOOST_PP_IF(p(93, s), m, FB_BOOST_PP_TUPLE_EAT_2)(93, s) FB_BOOST_PP_IF(p(93, s), FB_BOOST_PP_FOR_93, FB_BOOST_PP_TUPLE_EAT_4)(o(93, s), p, o, m)
-# define FB_BOOST_PP_FOR_93(s, p, o, m) FB_BOOST_PP_IF(p(94, s), m, FB_BOOST_PP_TUPLE_EAT_2)(94, s) FB_BOOST_PP_IF(p(94, s), FB_BOOST_PP_FOR_94, FB_BOOST_PP_TUPLE_EAT_4)(o(94, s), p, o, m)
-# define FB_BOOST_PP_FOR_94(s, p, o, m) FB_BOOST_PP_IF(p(95, s), m, FB_BOOST_PP_TUPLE_EAT_2)(95, s) FB_BOOST_PP_IF(p(95, s), FB_BOOST_PP_FOR_95, FB_BOOST_PP_TUPLE_EAT_4)(o(95, s), p, o, m)
-# define FB_BOOST_PP_FOR_95(s, p, o, m) FB_BOOST_PP_IF(p(96, s), m, FB_BOOST_PP_TUPLE_EAT_2)(96, s) FB_BOOST_PP_IF(p(96, s), FB_BOOST_PP_FOR_96, FB_BOOST_PP_TUPLE_EAT_4)(o(96, s), p, o, m)
-# define FB_BOOST_PP_FOR_96(s, p, o, m) FB_BOOST_PP_IF(p(97, s), m, FB_BOOST_PP_TUPLE_EAT_2)(97, s) FB_BOOST_PP_IF(p(97, s), FB_BOOST_PP_FOR_97, FB_BOOST_PP_TUPLE_EAT_4)(o(97, s), p, o, m)
-# define FB_BOOST_PP_FOR_97(s, p, o, m) FB_BOOST_PP_IF(p(98, s), m, FB_BOOST_PP_TUPLE_EAT_2)(98, s) FB_BOOST_PP_IF(p(98, s), FB_BOOST_PP_FOR_98, FB_BOOST_PP_TUPLE_EAT_4)(o(98, s), p, o, m)
-# define FB_BOOST_PP_FOR_98(s, p, o, m) FB_BOOST_PP_IF(p(99, s), m, FB_BOOST_PP_TUPLE_EAT_2)(99, s) FB_BOOST_PP_IF(p(99, s), FB_BOOST_PP_FOR_99, FB_BOOST_PP_TUPLE_EAT_4)(o(99, s), p, o, m)
-# define FB_BOOST_PP_FOR_99(s, p, o, m) FB_BOOST_PP_IF(p(100, s), m, FB_BOOST_PP_TUPLE_EAT_2)(100, s) FB_BOOST_PP_IF(p(100, s), FB_BOOST_PP_FOR_100, FB_BOOST_PP_TUPLE_EAT_4)(o(100, s), p, o, m)
-# define FB_BOOST_PP_FOR_100(s, p, o, m) FB_BOOST_PP_IF(p(101, s), m, FB_BOOST_PP_TUPLE_EAT_2)(101, s) FB_BOOST_PP_IF(p(101, s), FB_BOOST_PP_FOR_101, FB_BOOST_PP_TUPLE_EAT_4)(o(101, s), p, o, m)
-# define FB_BOOST_PP_FOR_101(s, p, o, m) FB_BOOST_PP_IF(p(102, s), m, FB_BOOST_PP_TUPLE_EAT_2)(102, s) FB_BOOST_PP_IF(p(102, s), FB_BOOST_PP_FOR_102, FB_BOOST_PP_TUPLE_EAT_4)(o(102, s), p, o, m)
-# define FB_BOOST_PP_FOR_102(s, p, o, m) FB_BOOST_PP_IF(p(103, s), m, FB_BOOST_PP_TUPLE_EAT_2)(103, s) FB_BOOST_PP_IF(p(103, s), FB_BOOST_PP_FOR_103, FB_BOOST_PP_TUPLE_EAT_4)(o(103, s), p, o, m)
-# define FB_BOOST_PP_FOR_103(s, p, o, m) FB_BOOST_PP_IF(p(104, s), m, FB_BOOST_PP_TUPLE_EAT_2)(104, s) FB_BOOST_PP_IF(p(104, s), FB_BOOST_PP_FOR_104, FB_BOOST_PP_TUPLE_EAT_4)(o(104, s), p, o, m)
-# define FB_BOOST_PP_FOR_104(s, p, o, m) FB_BOOST_PP_IF(p(105, s), m, FB_BOOST_PP_TUPLE_EAT_2)(105, s) FB_BOOST_PP_IF(p(105, s), FB_BOOST_PP_FOR_105, FB_BOOST_PP_TUPLE_EAT_4)(o(105, s), p, o, m)
-# define FB_BOOST_PP_FOR_105(s, p, o, m) FB_BOOST_PP_IF(p(106, s), m, FB_BOOST_PP_TUPLE_EAT_2)(106, s) FB_BOOST_PP_IF(p(106, s), FB_BOOST_PP_FOR_106, FB_BOOST_PP_TUPLE_EAT_4)(o(106, s), p, o, m)
-# define FB_BOOST_PP_FOR_106(s, p, o, m) FB_BOOST_PP_IF(p(107, s), m, FB_BOOST_PP_TUPLE_EAT_2)(107, s) FB_BOOST_PP_IF(p(107, s), FB_BOOST_PP_FOR_107, FB_BOOST_PP_TUPLE_EAT_4)(o(107, s), p, o, m)
-# define FB_BOOST_PP_FOR_107(s, p, o, m) FB_BOOST_PP_IF(p(108, s), m, FB_BOOST_PP_TUPLE_EAT_2)(108, s) FB_BOOST_PP_IF(p(108, s), FB_BOOST_PP_FOR_108, FB_BOOST_PP_TUPLE_EAT_4)(o(108, s), p, o, m)
-# define FB_BOOST_PP_FOR_108(s, p, o, m) FB_BOOST_PP_IF(p(109, s), m, FB_BOOST_PP_TUPLE_EAT_2)(109, s) FB_BOOST_PP_IF(p(109, s), FB_BOOST_PP_FOR_109, FB_BOOST_PP_TUPLE_EAT_4)(o(109, s), p, o, m)
-# define FB_BOOST_PP_FOR_109(s, p, o, m) FB_BOOST_PP_IF(p(110, s), m, FB_BOOST_PP_TUPLE_EAT_2)(110, s) FB_BOOST_PP_IF(p(110, s), FB_BOOST_PP_FOR_110, FB_BOOST_PP_TUPLE_EAT_4)(o(110, s), p, o, m)
-# define FB_BOOST_PP_FOR_110(s, p, o, m) FB_BOOST_PP_IF(p(111, s), m, FB_BOOST_PP_TUPLE_EAT_2)(111, s) FB_BOOST_PP_IF(p(111, s), FB_BOOST_PP_FOR_111, FB_BOOST_PP_TUPLE_EAT_4)(o(111, s), p, o, m)
-# define FB_BOOST_PP_FOR_111(s, p, o, m) FB_BOOST_PP_IF(p(112, s), m, FB_BOOST_PP_TUPLE_EAT_2)(112, s) FB_BOOST_PP_IF(p(112, s), FB_BOOST_PP_FOR_112, FB_BOOST_PP_TUPLE_EAT_4)(o(112, s), p, o, m)
-# define FB_BOOST_PP_FOR_112(s, p, o, m) FB_BOOST_PP_IF(p(113, s), m, FB_BOOST_PP_TUPLE_EAT_2)(113, s) FB_BOOST_PP_IF(p(113, s), FB_BOOST_PP_FOR_113, FB_BOOST_PP_TUPLE_EAT_4)(o(113, s), p, o, m)
-# define FB_BOOST_PP_FOR_113(s, p, o, m) FB_BOOST_PP_IF(p(114, s), m, FB_BOOST_PP_TUPLE_EAT_2)(114, s) FB_BOOST_PP_IF(p(114, s), FB_BOOST_PP_FOR_114, FB_BOOST_PP_TUPLE_EAT_4)(o(114, s), p, o, m)
-# define FB_BOOST_PP_FOR_114(s, p, o, m) FB_BOOST_PP_IF(p(115, s), m, FB_BOOST_PP_TUPLE_EAT_2)(115, s) FB_BOOST_PP_IF(p(115, s), FB_BOOST_PP_FOR_115, FB_BOOST_PP_TUPLE_EAT_4)(o(115, s), p, o, m)
-# define FB_BOOST_PP_FOR_115(s, p, o, m) FB_BOOST_PP_IF(p(116, s), m, FB_BOOST_PP_TUPLE_EAT_2)(116, s) FB_BOOST_PP_IF(p(116, s), FB_BOOST_PP_FOR_116, FB_BOOST_PP_TUPLE_EAT_4)(o(116, s), p, o, m)
-# define FB_BOOST_PP_FOR_116(s, p, o, m) FB_BOOST_PP_IF(p(117, s), m, FB_BOOST_PP_TUPLE_EAT_2)(117, s) FB_BOOST_PP_IF(p(117, s), FB_BOOST_PP_FOR_117, FB_BOOST_PP_TUPLE_EAT_4)(o(117, s), p, o, m)
-# define FB_BOOST_PP_FOR_117(s, p, o, m) FB_BOOST_PP_IF(p(118, s), m, FB_BOOST_PP_TUPLE_EAT_2)(118, s) FB_BOOST_PP_IF(p(118, s), FB_BOOST_PP_FOR_118, FB_BOOST_PP_TUPLE_EAT_4)(o(118, s), p, o, m)
-# define FB_BOOST_PP_FOR_118(s, p, o, m) FB_BOOST_PP_IF(p(119, s), m, FB_BOOST_PP_TUPLE_EAT_2)(119, s) FB_BOOST_PP_IF(p(119, s), FB_BOOST_PP_FOR_119, FB_BOOST_PP_TUPLE_EAT_4)(o(119, s), p, o, m)
-# define FB_BOOST_PP_FOR_119(s, p, o, m) FB_BOOST_PP_IF(p(120, s), m, FB_BOOST_PP_TUPLE_EAT_2)(120, s) FB_BOOST_PP_IF(p(120, s), FB_BOOST_PP_FOR_120, FB_BOOST_PP_TUPLE_EAT_4)(o(120, s), p, o, m)
-# define FB_BOOST_PP_FOR_120(s, p, o, m) FB_BOOST_PP_IF(p(121, s), m, FB_BOOST_PP_TUPLE_EAT_2)(121, s) FB_BOOST_PP_IF(p(121, s), FB_BOOST_PP_FOR_121, FB_BOOST_PP_TUPLE_EAT_4)(o(121, s), p, o, m)
-# define FB_BOOST_PP_FOR_121(s, p, o, m) FB_BOOST_PP_IF(p(122, s), m, FB_BOOST_PP_TUPLE_EAT_2)(122, s) FB_BOOST_PP_IF(p(122, s), FB_BOOST_PP_FOR_122, FB_BOOST_PP_TUPLE_EAT_4)(o(122, s), p, o, m)
-# define FB_BOOST_PP_FOR_122(s, p, o, m) FB_BOOST_PP_IF(p(123, s), m, FB_BOOST_PP_TUPLE_EAT_2)(123, s) FB_BOOST_PP_IF(p(123, s), FB_BOOST_PP_FOR_123, FB_BOOST_PP_TUPLE_EAT_4)(o(123, s), p, o, m)
-# define FB_BOOST_PP_FOR_123(s, p, o, m) FB_BOOST_PP_IF(p(124, s), m, FB_BOOST_PP_TUPLE_EAT_2)(124, s) FB_BOOST_PP_IF(p(124, s), FB_BOOST_PP_FOR_124, FB_BOOST_PP_TUPLE_EAT_4)(o(124, s), p, o, m)
-# define FB_BOOST_PP_FOR_124(s, p, o, m) FB_BOOST_PP_IF(p(125, s), m, FB_BOOST_PP_TUPLE_EAT_2)(125, s) FB_BOOST_PP_IF(p(125, s), FB_BOOST_PP_FOR_125, FB_BOOST_PP_TUPLE_EAT_4)(o(125, s), p, o, m)
-# define FB_BOOST_PP_FOR_125(s, p, o, m) FB_BOOST_PP_IF(p(126, s), m, FB_BOOST_PP_TUPLE_EAT_2)(126, s) FB_BOOST_PP_IF(p(126, s), FB_BOOST_PP_FOR_126, FB_BOOST_PP_TUPLE_EAT_4)(o(126, s), p, o, m)
-# define FB_BOOST_PP_FOR_126(s, p, o, m) FB_BOOST_PP_IF(p(127, s), m, FB_BOOST_PP_TUPLE_EAT_2)(127, s) FB_BOOST_PP_IF(p(127, s), FB_BOOST_PP_FOR_127, FB_BOOST_PP_TUPLE_EAT_4)(o(127, s), p, o, m)
-# define FB_BOOST_PP_FOR_127(s, p, o, m) FB_BOOST_PP_IF(p(128, s), m, FB_BOOST_PP_TUPLE_EAT_2)(128, s) FB_BOOST_PP_IF(p(128, s), FB_BOOST_PP_FOR_128, FB_BOOST_PP_TUPLE_EAT_4)(o(128, s), p, o, m)
-# define FB_BOOST_PP_FOR_128(s, p, o, m) FB_BOOST_PP_IF(p(129, s), m, FB_BOOST_PP_TUPLE_EAT_2)(129, s) FB_BOOST_PP_IF(p(129, s), FB_BOOST_PP_FOR_129, FB_BOOST_PP_TUPLE_EAT_4)(o(129, s), p, o, m)
-# define FB_BOOST_PP_FOR_129(s, p, o, m) FB_BOOST_PP_IF(p(130, s), m, FB_BOOST_PP_TUPLE_EAT_2)(130, s) FB_BOOST_PP_IF(p(130, s), FB_BOOST_PP_FOR_130, FB_BOOST_PP_TUPLE_EAT_4)(o(130, s), p, o, m)
-# define FB_BOOST_PP_FOR_130(s, p, o, m) FB_BOOST_PP_IF(p(131, s), m, FB_BOOST_PP_TUPLE_EAT_2)(131, s) FB_BOOST_PP_IF(p(131, s), FB_BOOST_PP_FOR_131, FB_BOOST_PP_TUPLE_EAT_4)(o(131, s), p, o, m)
-# define FB_BOOST_PP_FOR_131(s, p, o, m) FB_BOOST_PP_IF(p(132, s), m, FB_BOOST_PP_TUPLE_EAT_2)(132, s) FB_BOOST_PP_IF(p(132, s), FB_BOOST_PP_FOR_132, FB_BOOST_PP_TUPLE_EAT_4)(o(132, s), p, o, m)
-# define FB_BOOST_PP_FOR_132(s, p, o, m) FB_BOOST_PP_IF(p(133, s), m, FB_BOOST_PP_TUPLE_EAT_2)(133, s) FB_BOOST_PP_IF(p(133, s), FB_BOOST_PP_FOR_133, FB_BOOST_PP_TUPLE_EAT_4)(o(133, s), p, o, m)
-# define FB_BOOST_PP_FOR_133(s, p, o, m) FB_BOOST_PP_IF(p(134, s), m, FB_BOOST_PP_TUPLE_EAT_2)(134, s) FB_BOOST_PP_IF(p(134, s), FB_BOOST_PP_FOR_134, FB_BOOST_PP_TUPLE_EAT_4)(o(134, s), p, o, m)
-# define FB_BOOST_PP_FOR_134(s, p, o, m) FB_BOOST_PP_IF(p(135, s), m, FB_BOOST_PP_TUPLE_EAT_2)(135, s) FB_BOOST_PP_IF(p(135, s), FB_BOOST_PP_FOR_135, FB_BOOST_PP_TUPLE_EAT_4)(o(135, s), p, o, m)
-# define FB_BOOST_PP_FOR_135(s, p, o, m) FB_BOOST_PP_IF(p(136, s), m, FB_BOOST_PP_TUPLE_EAT_2)(136, s) FB_BOOST_PP_IF(p(136, s), FB_BOOST_PP_FOR_136, FB_BOOST_PP_TUPLE_EAT_4)(o(136, s), p, o, m)
-# define FB_BOOST_PP_FOR_136(s, p, o, m) FB_BOOST_PP_IF(p(137, s), m, FB_BOOST_PP_TUPLE_EAT_2)(137, s) FB_BOOST_PP_IF(p(137, s), FB_BOOST_PP_FOR_137, FB_BOOST_PP_TUPLE_EAT_4)(o(137, s), p, o, m)
-# define FB_BOOST_PP_FOR_137(s, p, o, m) FB_BOOST_PP_IF(p(138, s), m, FB_BOOST_PP_TUPLE_EAT_2)(138, s) FB_BOOST_PP_IF(p(138, s), FB_BOOST_PP_FOR_138, FB_BOOST_PP_TUPLE_EAT_4)(o(138, s), p, o, m)
-# define FB_BOOST_PP_FOR_138(s, p, o, m) FB_BOOST_PP_IF(p(139, s), m, FB_BOOST_PP_TUPLE_EAT_2)(139, s) FB_BOOST_PP_IF(p(139, s), FB_BOOST_PP_FOR_139, FB_BOOST_PP_TUPLE_EAT_4)(o(139, s), p, o, m)
-# define FB_BOOST_PP_FOR_139(s, p, o, m) FB_BOOST_PP_IF(p(140, s), m, FB_BOOST_PP_TUPLE_EAT_2)(140, s) FB_BOOST_PP_IF(p(140, s), FB_BOOST_PP_FOR_140, FB_BOOST_PP_TUPLE_EAT_4)(o(140, s), p, o, m)
-# define FB_BOOST_PP_FOR_140(s, p, o, m) FB_BOOST_PP_IF(p(141, s), m, FB_BOOST_PP_TUPLE_EAT_2)(141, s) FB_BOOST_PP_IF(p(141, s), FB_BOOST_PP_FOR_141, FB_BOOST_PP_TUPLE_EAT_4)(o(141, s), p, o, m)
-# define FB_BOOST_PP_FOR_141(s, p, o, m) FB_BOOST_PP_IF(p(142, s), m, FB_BOOST_PP_TUPLE_EAT_2)(142, s) FB_BOOST_PP_IF(p(142, s), FB_BOOST_PP_FOR_142, FB_BOOST_PP_TUPLE_EAT_4)(o(142, s), p, o, m)
-# define FB_BOOST_PP_FOR_142(s, p, o, m) FB_BOOST_PP_IF(p(143, s), m, FB_BOOST_PP_TUPLE_EAT_2)(143, s) FB_BOOST_PP_IF(p(143, s), FB_BOOST_PP_FOR_143, FB_BOOST_PP_TUPLE_EAT_4)(o(143, s), p, o, m)
-# define FB_BOOST_PP_FOR_143(s, p, o, m) FB_BOOST_PP_IF(p(144, s), m, FB_BOOST_PP_TUPLE_EAT_2)(144, s) FB_BOOST_PP_IF(p(144, s), FB_BOOST_PP_FOR_144, FB_BOOST_PP_TUPLE_EAT_4)(o(144, s), p, o, m)
-# define FB_BOOST_PP_FOR_144(s, p, o, m) FB_BOOST_PP_IF(p(145, s), m, FB_BOOST_PP_TUPLE_EAT_2)(145, s) FB_BOOST_PP_IF(p(145, s), FB_BOOST_PP_FOR_145, FB_BOOST_PP_TUPLE_EAT_4)(o(145, s), p, o, m)
-# define FB_BOOST_PP_FOR_145(s, p, o, m) FB_BOOST_PP_IF(p(146, s), m, FB_BOOST_PP_TUPLE_EAT_2)(146, s) FB_BOOST_PP_IF(p(146, s), FB_BOOST_PP_FOR_146, FB_BOOST_PP_TUPLE_EAT_4)(o(146, s), p, o, m)
-# define FB_BOOST_PP_FOR_146(s, p, o, m) FB_BOOST_PP_IF(p(147, s), m, FB_BOOST_PP_TUPLE_EAT_2)(147, s) FB_BOOST_PP_IF(p(147, s), FB_BOOST_PP_FOR_147, FB_BOOST_PP_TUPLE_EAT_4)(o(147, s), p, o, m)
-# define FB_BOOST_PP_FOR_147(s, p, o, m) FB_BOOST_PP_IF(p(148, s), m, FB_BOOST_PP_TUPLE_EAT_2)(148, s) FB_BOOST_PP_IF(p(148, s), FB_BOOST_PP_FOR_148, FB_BOOST_PP_TUPLE_EAT_4)(o(148, s), p, o, m)
-# define FB_BOOST_PP_FOR_148(s, p, o, m) FB_BOOST_PP_IF(p(149, s), m, FB_BOOST_PP_TUPLE_EAT_2)(149, s) FB_BOOST_PP_IF(p(149, s), FB_BOOST_PP_FOR_149, FB_BOOST_PP_TUPLE_EAT_4)(o(149, s), p, o, m)
-# define FB_BOOST_PP_FOR_149(s, p, o, m) FB_BOOST_PP_IF(p(150, s), m, FB_BOOST_PP_TUPLE_EAT_2)(150, s) FB_BOOST_PP_IF(p(150, s), FB_BOOST_PP_FOR_150, FB_BOOST_PP_TUPLE_EAT_4)(o(150, s), p, o, m)
-# define FB_BOOST_PP_FOR_150(s, p, o, m) FB_BOOST_PP_IF(p(151, s), m, FB_BOOST_PP_TUPLE_EAT_2)(151, s) FB_BOOST_PP_IF(p(151, s), FB_BOOST_PP_FOR_151, FB_BOOST_PP_TUPLE_EAT_4)(o(151, s), p, o, m)
-# define FB_BOOST_PP_FOR_151(s, p, o, m) FB_BOOST_PP_IF(p(152, s), m, FB_BOOST_PP_TUPLE_EAT_2)(152, s) FB_BOOST_PP_IF(p(152, s), FB_BOOST_PP_FOR_152, FB_BOOST_PP_TUPLE_EAT_4)(o(152, s), p, o, m)
-# define FB_BOOST_PP_FOR_152(s, p, o, m) FB_BOOST_PP_IF(p(153, s), m, FB_BOOST_PP_TUPLE_EAT_2)(153, s) FB_BOOST_PP_IF(p(153, s), FB_BOOST_PP_FOR_153, FB_BOOST_PP_TUPLE_EAT_4)(o(153, s), p, o, m)
-# define FB_BOOST_PP_FOR_153(s, p, o, m) FB_BOOST_PP_IF(p(154, s), m, FB_BOOST_PP_TUPLE_EAT_2)(154, s) FB_BOOST_PP_IF(p(154, s), FB_BOOST_PP_FOR_154, FB_BOOST_PP_TUPLE_EAT_4)(o(154, s), p, o, m)
-# define FB_BOOST_PP_FOR_154(s, p, o, m) FB_BOOST_PP_IF(p(155, s), m, FB_BOOST_PP_TUPLE_EAT_2)(155, s) FB_BOOST_PP_IF(p(155, s), FB_BOOST_PP_FOR_155, FB_BOOST_PP_TUPLE_EAT_4)(o(155, s), p, o, m)
-# define FB_BOOST_PP_FOR_155(s, p, o, m) FB_BOOST_PP_IF(p(156, s), m, FB_BOOST_PP_TUPLE_EAT_2)(156, s) FB_BOOST_PP_IF(p(156, s), FB_BOOST_PP_FOR_156, FB_BOOST_PP_TUPLE_EAT_4)(o(156, s), p, o, m)
-# define FB_BOOST_PP_FOR_156(s, p, o, m) FB_BOOST_PP_IF(p(157, s), m, FB_BOOST_PP_TUPLE_EAT_2)(157, s) FB_BOOST_PP_IF(p(157, s), FB_BOOST_PP_FOR_157, FB_BOOST_PP_TUPLE_EAT_4)(o(157, s), p, o, m)
-# define FB_BOOST_PP_FOR_157(s, p, o, m) FB_BOOST_PP_IF(p(158, s), m, FB_BOOST_PP_TUPLE_EAT_2)(158, s) FB_BOOST_PP_IF(p(158, s), FB_BOOST_PP_FOR_158, FB_BOOST_PP_TUPLE_EAT_4)(o(158, s), p, o, m)
-# define FB_BOOST_PP_FOR_158(s, p, o, m) FB_BOOST_PP_IF(p(159, s), m, FB_BOOST_PP_TUPLE_EAT_2)(159, s) FB_BOOST_PP_IF(p(159, s), FB_BOOST_PP_FOR_159, FB_BOOST_PP_TUPLE_EAT_4)(o(159, s), p, o, m)
-# define FB_BOOST_PP_FOR_159(s, p, o, m) FB_BOOST_PP_IF(p(160, s), m, FB_BOOST_PP_TUPLE_EAT_2)(160, s) FB_BOOST_PP_IF(p(160, s), FB_BOOST_PP_FOR_160, FB_BOOST_PP_TUPLE_EAT_4)(o(160, s), p, o, m)
-# define FB_BOOST_PP_FOR_160(s, p, o, m) FB_BOOST_PP_IF(p(161, s), m, FB_BOOST_PP_TUPLE_EAT_2)(161, s) FB_BOOST_PP_IF(p(161, s), FB_BOOST_PP_FOR_161, FB_BOOST_PP_TUPLE_EAT_4)(o(161, s), p, o, m)
-# define FB_BOOST_PP_FOR_161(s, p, o, m) FB_BOOST_PP_IF(p(162, s), m, FB_BOOST_PP_TUPLE_EAT_2)(162, s) FB_BOOST_PP_IF(p(162, s), FB_BOOST_PP_FOR_162, FB_BOOST_PP_TUPLE_EAT_4)(o(162, s), p, o, m)
-# define FB_BOOST_PP_FOR_162(s, p, o, m) FB_BOOST_PP_IF(p(163, s), m, FB_BOOST_PP_TUPLE_EAT_2)(163, s) FB_BOOST_PP_IF(p(163, s), FB_BOOST_PP_FOR_163, FB_BOOST_PP_TUPLE_EAT_4)(o(163, s), p, o, m)
-# define FB_BOOST_PP_FOR_163(s, p, o, m) FB_BOOST_PP_IF(p(164, s), m, FB_BOOST_PP_TUPLE_EAT_2)(164, s) FB_BOOST_PP_IF(p(164, s), FB_BOOST_PP_FOR_164, FB_BOOST_PP_TUPLE_EAT_4)(o(164, s), p, o, m)
-# define FB_BOOST_PP_FOR_164(s, p, o, m) FB_BOOST_PP_IF(p(165, s), m, FB_BOOST_PP_TUPLE_EAT_2)(165, s) FB_BOOST_PP_IF(p(165, s), FB_BOOST_PP_FOR_165, FB_BOOST_PP_TUPLE_EAT_4)(o(165, s), p, o, m)
-# define FB_BOOST_PP_FOR_165(s, p, o, m) FB_BOOST_PP_IF(p(166, s), m, FB_BOOST_PP_TUPLE_EAT_2)(166, s) FB_BOOST_PP_IF(p(166, s), FB_BOOST_PP_FOR_166, FB_BOOST_PP_TUPLE_EAT_4)(o(166, s), p, o, m)
-# define FB_BOOST_PP_FOR_166(s, p, o, m) FB_BOOST_PP_IF(p(167, s), m, FB_BOOST_PP_TUPLE_EAT_2)(167, s) FB_BOOST_PP_IF(p(167, s), FB_BOOST_PP_FOR_167, FB_BOOST_PP_TUPLE_EAT_4)(o(167, s), p, o, m)
-# define FB_BOOST_PP_FOR_167(s, p, o, m) FB_BOOST_PP_IF(p(168, s), m, FB_BOOST_PP_TUPLE_EAT_2)(168, s) FB_BOOST_PP_IF(p(168, s), FB_BOOST_PP_FOR_168, FB_BOOST_PP_TUPLE_EAT_4)(o(168, s), p, o, m)
-# define FB_BOOST_PP_FOR_168(s, p, o, m) FB_BOOST_PP_IF(p(169, s), m, FB_BOOST_PP_TUPLE_EAT_2)(169, s) FB_BOOST_PP_IF(p(169, s), FB_BOOST_PP_FOR_169, FB_BOOST_PP_TUPLE_EAT_4)(o(169, s), p, o, m)
-# define FB_BOOST_PP_FOR_169(s, p, o, m) FB_BOOST_PP_IF(p(170, s), m, FB_BOOST_PP_TUPLE_EAT_2)(170, s) FB_BOOST_PP_IF(p(170, s), FB_BOOST_PP_FOR_170, FB_BOOST_PP_TUPLE_EAT_4)(o(170, s), p, o, m)
-# define FB_BOOST_PP_FOR_170(s, p, o, m) FB_BOOST_PP_IF(p(171, s), m, FB_BOOST_PP_TUPLE_EAT_2)(171, s) FB_BOOST_PP_IF(p(171, s), FB_BOOST_PP_FOR_171, FB_BOOST_PP_TUPLE_EAT_4)(o(171, s), p, o, m)
-# define FB_BOOST_PP_FOR_171(s, p, o, m) FB_BOOST_PP_IF(p(172, s), m, FB_BOOST_PP_TUPLE_EAT_2)(172, s) FB_BOOST_PP_IF(p(172, s), FB_BOOST_PP_FOR_172, FB_BOOST_PP_TUPLE_EAT_4)(o(172, s), p, o, m)
-# define FB_BOOST_PP_FOR_172(s, p, o, m) FB_BOOST_PP_IF(p(173, s), m, FB_BOOST_PP_TUPLE_EAT_2)(173, s) FB_BOOST_PP_IF(p(173, s), FB_BOOST_PP_FOR_173, FB_BOOST_PP_TUPLE_EAT_4)(o(173, s), p, o, m)
-# define FB_BOOST_PP_FOR_173(s, p, o, m) FB_BOOST_PP_IF(p(174, s), m, FB_BOOST_PP_TUPLE_EAT_2)(174, s) FB_BOOST_PP_IF(p(174, s), FB_BOOST_PP_FOR_174, FB_BOOST_PP_TUPLE_EAT_4)(o(174, s), p, o, m)
-# define FB_BOOST_PP_FOR_174(s, p, o, m) FB_BOOST_PP_IF(p(175, s), m, FB_BOOST_PP_TUPLE_EAT_2)(175, s) FB_BOOST_PP_IF(p(175, s), FB_BOOST_PP_FOR_175, FB_BOOST_PP_TUPLE_EAT_4)(o(175, s), p, o, m)
-# define FB_BOOST_PP_FOR_175(s, p, o, m) FB_BOOST_PP_IF(p(176, s), m, FB_BOOST_PP_TUPLE_EAT_2)(176, s) FB_BOOST_PP_IF(p(176, s), FB_BOOST_PP_FOR_176, FB_BOOST_PP_TUPLE_EAT_4)(o(176, s), p, o, m)
-# define FB_BOOST_PP_FOR_176(s, p, o, m) FB_BOOST_PP_IF(p(177, s), m, FB_BOOST_PP_TUPLE_EAT_2)(177, s) FB_BOOST_PP_IF(p(177, s), FB_BOOST_PP_FOR_177, FB_BOOST_PP_TUPLE_EAT_4)(o(177, s), p, o, m)
-# define FB_BOOST_PP_FOR_177(s, p, o, m) FB_BOOST_PP_IF(p(178, s), m, FB_BOOST_PP_TUPLE_EAT_2)(178, s) FB_BOOST_PP_IF(p(178, s), FB_BOOST_PP_FOR_178, FB_BOOST_PP_TUPLE_EAT_4)(o(178, s), p, o, m)
-# define FB_BOOST_PP_FOR_178(s, p, o, m) FB_BOOST_PP_IF(p(179, s), m, FB_BOOST_PP_TUPLE_EAT_2)(179, s) FB_BOOST_PP_IF(p(179, s), FB_BOOST_PP_FOR_179, FB_BOOST_PP_TUPLE_EAT_4)(o(179, s), p, o, m)
-# define FB_BOOST_PP_FOR_179(s, p, o, m) FB_BOOST_PP_IF(p(180, s), m, FB_BOOST_PP_TUPLE_EAT_2)(180, s) FB_BOOST_PP_IF(p(180, s), FB_BOOST_PP_FOR_180, FB_BOOST_PP_TUPLE_EAT_4)(o(180, s), p, o, m)
-# define FB_BOOST_PP_FOR_180(s, p, o, m) FB_BOOST_PP_IF(p(181, s), m, FB_BOOST_PP_TUPLE_EAT_2)(181, s) FB_BOOST_PP_IF(p(181, s), FB_BOOST_PP_FOR_181, FB_BOOST_PP_TUPLE_EAT_4)(o(181, s), p, o, m)
-# define FB_BOOST_PP_FOR_181(s, p, o, m) FB_BOOST_PP_IF(p(182, s), m, FB_BOOST_PP_TUPLE_EAT_2)(182, s) FB_BOOST_PP_IF(p(182, s), FB_BOOST_PP_FOR_182, FB_BOOST_PP_TUPLE_EAT_4)(o(182, s), p, o, m)
-# define FB_BOOST_PP_FOR_182(s, p, o, m) FB_BOOST_PP_IF(p(183, s), m, FB_BOOST_PP_TUPLE_EAT_2)(183, s) FB_BOOST_PP_IF(p(183, s), FB_BOOST_PP_FOR_183, FB_BOOST_PP_TUPLE_EAT_4)(o(183, s), p, o, m)
-# define FB_BOOST_PP_FOR_183(s, p, o, m) FB_BOOST_PP_IF(p(184, s), m, FB_BOOST_PP_TUPLE_EAT_2)(184, s) FB_BOOST_PP_IF(p(184, s), FB_BOOST_PP_FOR_184, FB_BOOST_PP_TUPLE_EAT_4)(o(184, s), p, o, m)
-# define FB_BOOST_PP_FOR_184(s, p, o, m) FB_BOOST_PP_IF(p(185, s), m, FB_BOOST_PP_TUPLE_EAT_2)(185, s) FB_BOOST_PP_IF(p(185, s), FB_BOOST_PP_FOR_185, FB_BOOST_PP_TUPLE_EAT_4)(o(185, s), p, o, m)
-# define FB_BOOST_PP_FOR_185(s, p, o, m) FB_BOOST_PP_IF(p(186, s), m, FB_BOOST_PP_TUPLE_EAT_2)(186, s) FB_BOOST_PP_IF(p(186, s), FB_BOOST_PP_FOR_186, FB_BOOST_PP_TUPLE_EAT_4)(o(186, s), p, o, m)
-# define FB_BOOST_PP_FOR_186(s, p, o, m) FB_BOOST_PP_IF(p(187, s), m, FB_BOOST_PP_TUPLE_EAT_2)(187, s) FB_BOOST_PP_IF(p(187, s), FB_BOOST_PP_FOR_187, FB_BOOST_PP_TUPLE_EAT_4)(o(187, s), p, o, m)
-# define FB_BOOST_PP_FOR_187(s, p, o, m) FB_BOOST_PP_IF(p(188, s), m, FB_BOOST_PP_TUPLE_EAT_2)(188, s) FB_BOOST_PP_IF(p(188, s), FB_BOOST_PP_FOR_188, FB_BOOST_PP_TUPLE_EAT_4)(o(188, s), p, o, m)
-# define FB_BOOST_PP_FOR_188(s, p, o, m) FB_BOOST_PP_IF(p(189, s), m, FB_BOOST_PP_TUPLE_EAT_2)(189, s) FB_BOOST_PP_IF(p(189, s), FB_BOOST_PP_FOR_189, FB_BOOST_PP_TUPLE_EAT_4)(o(189, s), p, o, m)
-# define FB_BOOST_PP_FOR_189(s, p, o, m) FB_BOOST_PP_IF(p(190, s), m, FB_BOOST_PP_TUPLE_EAT_2)(190, s) FB_BOOST_PP_IF(p(190, s), FB_BOOST_PP_FOR_190, FB_BOOST_PP_TUPLE_EAT_4)(o(190, s), p, o, m)
-# define FB_BOOST_PP_FOR_190(s, p, o, m) FB_BOOST_PP_IF(p(191, s), m, FB_BOOST_PP_TUPLE_EAT_2)(191, s) FB_BOOST_PP_IF(p(191, s), FB_BOOST_PP_FOR_191, FB_BOOST_PP_TUPLE_EAT_4)(o(191, s), p, o, m)
-# define FB_BOOST_PP_FOR_191(s, p, o, m) FB_BOOST_PP_IF(p(192, s), m, FB_BOOST_PP_TUPLE_EAT_2)(192, s) FB_BOOST_PP_IF(p(192, s), FB_BOOST_PP_FOR_192, FB_BOOST_PP_TUPLE_EAT_4)(o(192, s), p, o, m)
-# define FB_BOOST_PP_FOR_192(s, p, o, m) FB_BOOST_PP_IF(p(193, s), m, FB_BOOST_PP_TUPLE_EAT_2)(193, s) FB_BOOST_PP_IF(p(193, s), FB_BOOST_PP_FOR_193, FB_BOOST_PP_TUPLE_EAT_4)(o(193, s), p, o, m)
-# define FB_BOOST_PP_FOR_193(s, p, o, m) FB_BOOST_PP_IF(p(194, s), m, FB_BOOST_PP_TUPLE_EAT_2)(194, s) FB_BOOST_PP_IF(p(194, s), FB_BOOST_PP_FOR_194, FB_BOOST_PP_TUPLE_EAT_4)(o(194, s), p, o, m)
-# define FB_BOOST_PP_FOR_194(s, p, o, m) FB_BOOST_PP_IF(p(195, s), m, FB_BOOST_PP_TUPLE_EAT_2)(195, s) FB_BOOST_PP_IF(p(195, s), FB_BOOST_PP_FOR_195, FB_BOOST_PP_TUPLE_EAT_4)(o(195, s), p, o, m)
-# define FB_BOOST_PP_FOR_195(s, p, o, m) FB_BOOST_PP_IF(p(196, s), m, FB_BOOST_PP_TUPLE_EAT_2)(196, s) FB_BOOST_PP_IF(p(196, s), FB_BOOST_PP_FOR_196, FB_BOOST_PP_TUPLE_EAT_4)(o(196, s), p, o, m)
-# define FB_BOOST_PP_FOR_196(s, p, o, m) FB_BOOST_PP_IF(p(197, s), m, FB_BOOST_PP_TUPLE_EAT_2)(197, s) FB_BOOST_PP_IF(p(197, s), FB_BOOST_PP_FOR_197, FB_BOOST_PP_TUPLE_EAT_4)(o(197, s), p, o, m)
-# define FB_BOOST_PP_FOR_197(s, p, o, m) FB_BOOST_PP_IF(p(198, s), m, FB_BOOST_PP_TUPLE_EAT_2)(198, s) FB_BOOST_PP_IF(p(198, s), FB_BOOST_PP_FOR_198, FB_BOOST_PP_TUPLE_EAT_4)(o(198, s), p, o, m)
-# define FB_BOOST_PP_FOR_198(s, p, o, m) FB_BOOST_PP_IF(p(199, s), m, FB_BOOST_PP_TUPLE_EAT_2)(199, s) FB_BOOST_PP_IF(p(199, s), FB_BOOST_PP_FOR_199, FB_BOOST_PP_TUPLE_EAT_4)(o(199, s), p, o, m)
-# define FB_BOOST_PP_FOR_199(s, p, o, m) FB_BOOST_PP_IF(p(200, s), m, FB_BOOST_PP_TUPLE_EAT_2)(200, s) FB_BOOST_PP_IF(p(200, s), FB_BOOST_PP_FOR_200, FB_BOOST_PP_TUPLE_EAT_4)(o(200, s), p, o, m)
-# define FB_BOOST_PP_FOR_200(s, p, o, m) FB_BOOST_PP_IF(p(201, s), m, FB_BOOST_PP_TUPLE_EAT_2)(201, s) FB_BOOST_PP_IF(p(201, s), FB_BOOST_PP_FOR_201, FB_BOOST_PP_TUPLE_EAT_4)(o(201, s), p, o, m)
-# define FB_BOOST_PP_FOR_201(s, p, o, m) FB_BOOST_PP_IF(p(202, s), m, FB_BOOST_PP_TUPLE_EAT_2)(202, s) FB_BOOST_PP_IF(p(202, s), FB_BOOST_PP_FOR_202, FB_BOOST_PP_TUPLE_EAT_4)(o(202, s), p, o, m)
-# define FB_BOOST_PP_FOR_202(s, p, o, m) FB_BOOST_PP_IF(p(203, s), m, FB_BOOST_PP_TUPLE_EAT_2)(203, s) FB_BOOST_PP_IF(p(203, s), FB_BOOST_PP_FOR_203, FB_BOOST_PP_TUPLE_EAT_4)(o(203, s), p, o, m)
-# define FB_BOOST_PP_FOR_203(s, p, o, m) FB_BOOST_PP_IF(p(204, s), m, FB_BOOST_PP_TUPLE_EAT_2)(204, s) FB_BOOST_PP_IF(p(204, s), FB_BOOST_PP_FOR_204, FB_BOOST_PP_TUPLE_EAT_4)(o(204, s), p, o, m)
-# define FB_BOOST_PP_FOR_204(s, p, o, m) FB_BOOST_PP_IF(p(205, s), m, FB_BOOST_PP_TUPLE_EAT_2)(205, s) FB_BOOST_PP_IF(p(205, s), FB_BOOST_PP_FOR_205, FB_BOOST_PP_TUPLE_EAT_4)(o(205, s), p, o, m)
-# define FB_BOOST_PP_FOR_205(s, p, o, m) FB_BOOST_PP_IF(p(206, s), m, FB_BOOST_PP_TUPLE_EAT_2)(206, s) FB_BOOST_PP_IF(p(206, s), FB_BOOST_PP_FOR_206, FB_BOOST_PP_TUPLE_EAT_4)(o(206, s), p, o, m)
-# define FB_BOOST_PP_FOR_206(s, p, o, m) FB_BOOST_PP_IF(p(207, s), m, FB_BOOST_PP_TUPLE_EAT_2)(207, s) FB_BOOST_PP_IF(p(207, s), FB_BOOST_PP_FOR_207, FB_BOOST_PP_TUPLE_EAT_4)(o(207, s), p, o, m)
-# define FB_BOOST_PP_FOR_207(s, p, o, m) FB_BOOST_PP_IF(p(208, s), m, FB_BOOST_PP_TUPLE_EAT_2)(208, s) FB_BOOST_PP_IF(p(208, s), FB_BOOST_PP_FOR_208, FB_BOOST_PP_TUPLE_EAT_4)(o(208, s), p, o, m)
-# define FB_BOOST_PP_FOR_208(s, p, o, m) FB_BOOST_PP_IF(p(209, s), m, FB_BOOST_PP_TUPLE_EAT_2)(209, s) FB_BOOST_PP_IF(p(209, s), FB_BOOST_PP_FOR_209, FB_BOOST_PP_TUPLE_EAT_4)(o(209, s), p, o, m)
-# define FB_BOOST_PP_FOR_209(s, p, o, m) FB_BOOST_PP_IF(p(210, s), m, FB_BOOST_PP_TUPLE_EAT_2)(210, s) FB_BOOST_PP_IF(p(210, s), FB_BOOST_PP_FOR_210, FB_BOOST_PP_TUPLE_EAT_4)(o(210, s), p, o, m)
-# define FB_BOOST_PP_FOR_210(s, p, o, m) FB_BOOST_PP_IF(p(211, s), m, FB_BOOST_PP_TUPLE_EAT_2)(211, s) FB_BOOST_PP_IF(p(211, s), FB_BOOST_PP_FOR_211, FB_BOOST_PP_TUPLE_EAT_4)(o(211, s), p, o, m)
-# define FB_BOOST_PP_FOR_211(s, p, o, m) FB_BOOST_PP_IF(p(212, s), m, FB_BOOST_PP_TUPLE_EAT_2)(212, s) FB_BOOST_PP_IF(p(212, s), FB_BOOST_PP_FOR_212, FB_BOOST_PP_TUPLE_EAT_4)(o(212, s), p, o, m)
-# define FB_BOOST_PP_FOR_212(s, p, o, m) FB_BOOST_PP_IF(p(213, s), m, FB_BOOST_PP_TUPLE_EAT_2)(213, s) FB_BOOST_PP_IF(p(213, s), FB_BOOST_PP_FOR_213, FB_BOOST_PP_TUPLE_EAT_4)(o(213, s), p, o, m)
-# define FB_BOOST_PP_FOR_213(s, p, o, m) FB_BOOST_PP_IF(p(214, s), m, FB_BOOST_PP_TUPLE_EAT_2)(214, s) FB_BOOST_PP_IF(p(214, s), FB_BOOST_PP_FOR_214, FB_BOOST_PP_TUPLE_EAT_4)(o(214, s), p, o, m)
-# define FB_BOOST_PP_FOR_214(s, p, o, m) FB_BOOST_PP_IF(p(215, s), m, FB_BOOST_PP_TUPLE_EAT_2)(215, s) FB_BOOST_PP_IF(p(215, s), FB_BOOST_PP_FOR_215, FB_BOOST_PP_TUPLE_EAT_4)(o(215, s), p, o, m)
-# define FB_BOOST_PP_FOR_215(s, p, o, m) FB_BOOST_PP_IF(p(216, s), m, FB_BOOST_PP_TUPLE_EAT_2)(216, s) FB_BOOST_PP_IF(p(216, s), FB_BOOST_PP_FOR_216, FB_BOOST_PP_TUPLE_EAT_4)(o(216, s), p, o, m)
-# define FB_BOOST_PP_FOR_216(s, p, o, m) FB_BOOST_PP_IF(p(217, s), m, FB_BOOST_PP_TUPLE_EAT_2)(217, s) FB_BOOST_PP_IF(p(217, s), FB_BOOST_PP_FOR_217, FB_BOOST_PP_TUPLE_EAT_4)(o(217, s), p, o, m)
-# define FB_BOOST_PP_FOR_217(s, p, o, m) FB_BOOST_PP_IF(p(218, s), m, FB_BOOST_PP_TUPLE_EAT_2)(218, s) FB_BOOST_PP_IF(p(218, s), FB_BOOST_PP_FOR_218, FB_BOOST_PP_TUPLE_EAT_4)(o(218, s), p, o, m)
-# define FB_BOOST_PP_FOR_218(s, p, o, m) FB_BOOST_PP_IF(p(219, s), m, FB_BOOST_PP_TUPLE_EAT_2)(219, s) FB_BOOST_PP_IF(p(219, s), FB_BOOST_PP_FOR_219, FB_BOOST_PP_TUPLE_EAT_4)(o(219, s), p, o, m)
-# define FB_BOOST_PP_FOR_219(s, p, o, m) FB_BOOST_PP_IF(p(220, s), m, FB_BOOST_PP_TUPLE_EAT_2)(220, s) FB_BOOST_PP_IF(p(220, s), FB_BOOST_PP_FOR_220, FB_BOOST_PP_TUPLE_EAT_4)(o(220, s), p, o, m)
-# define FB_BOOST_PP_FOR_220(s, p, o, m) FB_BOOST_PP_IF(p(221, s), m, FB_BOOST_PP_TUPLE_EAT_2)(221, s) FB_BOOST_PP_IF(p(221, s), FB_BOOST_PP_FOR_221, FB_BOOST_PP_TUPLE_EAT_4)(o(221, s), p, o, m)
-# define FB_BOOST_PP_FOR_221(s, p, o, m) FB_BOOST_PP_IF(p(222, s), m, FB_BOOST_PP_TUPLE_EAT_2)(222, s) FB_BOOST_PP_IF(p(222, s), FB_BOOST_PP_FOR_222, FB_BOOST_PP_TUPLE_EAT_4)(o(222, s), p, o, m)
-# define FB_BOOST_PP_FOR_222(s, p, o, m) FB_BOOST_PP_IF(p(223, s), m, FB_BOOST_PP_TUPLE_EAT_2)(223, s) FB_BOOST_PP_IF(p(223, s), FB_BOOST_PP_FOR_223, FB_BOOST_PP_TUPLE_EAT_4)(o(223, s), p, o, m)
-# define FB_BOOST_PP_FOR_223(s, p, o, m) FB_BOOST_PP_IF(p(224, s), m, FB_BOOST_PP_TUPLE_EAT_2)(224, s) FB_BOOST_PP_IF(p(224, s), FB_BOOST_PP_FOR_224, FB_BOOST_PP_TUPLE_EAT_4)(o(224, s), p, o, m)
-# define FB_BOOST_PP_FOR_224(s, p, o, m) FB_BOOST_PP_IF(p(225, s), m, FB_BOOST_PP_TUPLE_EAT_2)(225, s) FB_BOOST_PP_IF(p(225, s), FB_BOOST_PP_FOR_225, FB_BOOST_PP_TUPLE_EAT_4)(o(225, s), p, o, m)
-# define FB_BOOST_PP_FOR_225(s, p, o, m) FB_BOOST_PP_IF(p(226, s), m, FB_BOOST_PP_TUPLE_EAT_2)(226, s) FB_BOOST_PP_IF(p(226, s), FB_BOOST_PP_FOR_226, FB_BOOST_PP_TUPLE_EAT_4)(o(226, s), p, o, m)
-# define FB_BOOST_PP_FOR_226(s, p, o, m) FB_BOOST_PP_IF(p(227, s), m, FB_BOOST_PP_TUPLE_EAT_2)(227, s) FB_BOOST_PP_IF(p(227, s), FB_BOOST_PP_FOR_227, FB_BOOST_PP_TUPLE_EAT_4)(o(227, s), p, o, m)
-# define FB_BOOST_PP_FOR_227(s, p, o, m) FB_BOOST_PP_IF(p(228, s), m, FB_BOOST_PP_TUPLE_EAT_2)(228, s) FB_BOOST_PP_IF(p(228, s), FB_BOOST_PP_FOR_228, FB_BOOST_PP_TUPLE_EAT_4)(o(228, s), p, o, m)
-# define FB_BOOST_PP_FOR_228(s, p, o, m) FB_BOOST_PP_IF(p(229, s), m, FB_BOOST_PP_TUPLE_EAT_2)(229, s) FB_BOOST_PP_IF(p(229, s), FB_BOOST_PP_FOR_229, FB_BOOST_PP_TUPLE_EAT_4)(o(229, s), p, o, m)
-# define FB_BOOST_PP_FOR_229(s, p, o, m) FB_BOOST_PP_IF(p(230, s), m, FB_BOOST_PP_TUPLE_EAT_2)(230, s) FB_BOOST_PP_IF(p(230, s), FB_BOOST_PP_FOR_230, FB_BOOST_PP_TUPLE_EAT_4)(o(230, s), p, o, m)
-# define FB_BOOST_PP_FOR_230(s, p, o, m) FB_BOOST_PP_IF(p(231, s), m, FB_BOOST_PP_TUPLE_EAT_2)(231, s) FB_BOOST_PP_IF(p(231, s), FB_BOOST_PP_FOR_231, FB_BOOST_PP_TUPLE_EAT_4)(o(231, s), p, o, m)
-# define FB_BOOST_PP_FOR_231(s, p, o, m) FB_BOOST_PP_IF(p(232, s), m, FB_BOOST_PP_TUPLE_EAT_2)(232, s) FB_BOOST_PP_IF(p(232, s), FB_BOOST_PP_FOR_232, FB_BOOST_PP_TUPLE_EAT_4)(o(232, s), p, o, m)
-# define FB_BOOST_PP_FOR_232(s, p, o, m) FB_BOOST_PP_IF(p(233, s), m, FB_BOOST_PP_TUPLE_EAT_2)(233, s) FB_BOOST_PP_IF(p(233, s), FB_BOOST_PP_FOR_233, FB_BOOST_PP_TUPLE_EAT_4)(o(233, s), p, o, m)
-# define FB_BOOST_PP_FOR_233(s, p, o, m) FB_BOOST_PP_IF(p(234, s), m, FB_BOOST_PP_TUPLE_EAT_2)(234, s) FB_BOOST_PP_IF(p(234, s), FB_BOOST_PP_FOR_234, FB_BOOST_PP_TUPLE_EAT_4)(o(234, s), p, o, m)
-# define FB_BOOST_PP_FOR_234(s, p, o, m) FB_BOOST_PP_IF(p(235, s), m, FB_BOOST_PP_TUPLE_EAT_2)(235, s) FB_BOOST_PP_IF(p(235, s), FB_BOOST_PP_FOR_235, FB_BOOST_PP_TUPLE_EAT_4)(o(235, s), p, o, m)
-# define FB_BOOST_PP_FOR_235(s, p, o, m) FB_BOOST_PP_IF(p(236, s), m, FB_BOOST_PP_TUPLE_EAT_2)(236, s) FB_BOOST_PP_IF(p(236, s), FB_BOOST_PP_FOR_236, FB_BOOST_PP_TUPLE_EAT_4)(o(236, s), p, o, m)
-# define FB_BOOST_PP_FOR_236(s, p, o, m) FB_BOOST_PP_IF(p(237, s), m, FB_BOOST_PP_TUPLE_EAT_2)(237, s) FB_BOOST_PP_IF(p(237, s), FB_BOOST_PP_FOR_237, FB_BOOST_PP_TUPLE_EAT_4)(o(237, s), p, o, m)
-# define FB_BOOST_PP_FOR_237(s, p, o, m) FB_BOOST_PP_IF(p(238, s), m, FB_BOOST_PP_TUPLE_EAT_2)(238, s) FB_BOOST_PP_IF(p(238, s), FB_BOOST_PP_FOR_238, FB_BOOST_PP_TUPLE_EAT_4)(o(238, s), p, o, m)
-# define FB_BOOST_PP_FOR_238(s, p, o, m) FB_BOOST_PP_IF(p(239, s), m, FB_BOOST_PP_TUPLE_EAT_2)(239, s) FB_BOOST_PP_IF(p(239, s), FB_BOOST_PP_FOR_239, FB_BOOST_PP_TUPLE_EAT_4)(o(239, s), p, o, m)
-# define FB_BOOST_PP_FOR_239(s, p, o, m) FB_BOOST_PP_IF(p(240, s), m, FB_BOOST_PP_TUPLE_EAT_2)(240, s) FB_BOOST_PP_IF(p(240, s), FB_BOOST_PP_FOR_240, FB_BOOST_PP_TUPLE_EAT_4)(o(240, s), p, o, m)
-# define FB_BOOST_PP_FOR_240(s, p, o, m) FB_BOOST_PP_IF(p(241, s), m, FB_BOOST_PP_TUPLE_EAT_2)(241, s) FB_BOOST_PP_IF(p(241, s), FB_BOOST_PP_FOR_241, FB_BOOST_PP_TUPLE_EAT_4)(o(241, s), p, o, m)
-# define FB_BOOST_PP_FOR_241(s, p, o, m) FB_BOOST_PP_IF(p(242, s), m, FB_BOOST_PP_TUPLE_EAT_2)(242, s) FB_BOOST_PP_IF(p(242, s), FB_BOOST_PP_FOR_242, FB_BOOST_PP_TUPLE_EAT_4)(o(242, s), p, o, m)
-# define FB_BOOST_PP_FOR_242(s, p, o, m) FB_BOOST_PP_IF(p(243, s), m, FB_BOOST_PP_TUPLE_EAT_2)(243, s) FB_BOOST_PP_IF(p(243, s), FB_BOOST_PP_FOR_243, FB_BOOST_PP_TUPLE_EAT_4)(o(243, s), p, o, m)
-# define FB_BOOST_PP_FOR_243(s, p, o, m) FB_BOOST_PP_IF(p(244, s), m, FB_BOOST_PP_TUPLE_EAT_2)(244, s) FB_BOOST_PP_IF(p(244, s), FB_BOOST_PP_FOR_244, FB_BOOST_PP_TUPLE_EAT_4)(o(244, s), p, o, m)
-# define FB_BOOST_PP_FOR_244(s, p, o, m) FB_BOOST_PP_IF(p(245, s), m, FB_BOOST_PP_TUPLE_EAT_2)(245, s) FB_BOOST_PP_IF(p(245, s), FB_BOOST_PP_FOR_245, FB_BOOST_PP_TUPLE_EAT_4)(o(245, s), p, o, m)
-# define FB_BOOST_PP_FOR_245(s, p, o, m) FB_BOOST_PP_IF(p(246, s), m, FB_BOOST_PP_TUPLE_EAT_2)(246, s) FB_BOOST_PP_IF(p(246, s), FB_BOOST_PP_FOR_246, FB_BOOST_PP_TUPLE_EAT_4)(o(246, s), p, o, m)
-# define FB_BOOST_PP_FOR_246(s, p, o, m) FB_BOOST_PP_IF(p(247, s), m, FB_BOOST_PP_TUPLE_EAT_2)(247, s) FB_BOOST_PP_IF(p(247, s), FB_BOOST_PP_FOR_247, FB_BOOST_PP_TUPLE_EAT_4)(o(247, s), p, o, m)
-# define FB_BOOST_PP_FOR_247(s, p, o, m) FB_BOOST_PP_IF(p(248, s), m, FB_BOOST_PP_TUPLE_EAT_2)(248, s) FB_BOOST_PP_IF(p(248, s), FB_BOOST_PP_FOR_248, FB_BOOST_PP_TUPLE_EAT_4)(o(248, s), p, o, m)
-# define FB_BOOST_PP_FOR_248(s, p, o, m) FB_BOOST_PP_IF(p(249, s), m, FB_BOOST_PP_TUPLE_EAT_2)(249, s) FB_BOOST_PP_IF(p(249, s), FB_BOOST_PP_FOR_249, FB_BOOST_PP_TUPLE_EAT_4)(o(249, s), p, o, m)
-# define FB_BOOST_PP_FOR_249(s, p, o, m) FB_BOOST_PP_IF(p(250, s), m, FB_BOOST_PP_TUPLE_EAT_2)(250, s) FB_BOOST_PP_IF(p(250, s), FB_BOOST_PP_FOR_250, FB_BOOST_PP_TUPLE_EAT_4)(o(250, s), p, o, m)
-# define FB_BOOST_PP_FOR_250(s, p, o, m) FB_BOOST_PP_IF(p(251, s), m, FB_BOOST_PP_TUPLE_EAT_2)(251, s) FB_BOOST_PP_IF(p(251, s), FB_BOOST_PP_FOR_251, FB_BOOST_PP_TUPLE_EAT_4)(o(251, s), p, o, m)
-# define FB_BOOST_PP_FOR_251(s, p, o, m) FB_BOOST_PP_IF(p(252, s), m, FB_BOOST_PP_TUPLE_EAT_2)(252, s) FB_BOOST_PP_IF(p(252, s), FB_BOOST_PP_FOR_252, FB_BOOST_PP_TUPLE_EAT_4)(o(252, s), p, o, m)
-# define FB_BOOST_PP_FOR_252(s, p, o, m) FB_BOOST_PP_IF(p(253, s), m, FB_BOOST_PP_TUPLE_EAT_2)(253, s) FB_BOOST_PP_IF(p(253, s), FB_BOOST_PP_FOR_253, FB_BOOST_PP_TUPLE_EAT_4)(o(253, s), p, o, m)
-# define FB_BOOST_PP_FOR_253(s, p, o, m) FB_BOOST_PP_IF(p(254, s), m, FB_BOOST_PP_TUPLE_EAT_2)(254, s) FB_BOOST_PP_IF(p(254, s), FB_BOOST_PP_FOR_254, FB_BOOST_PP_TUPLE_EAT_4)(o(254, s), p, o, m)
-# define FB_BOOST_PP_FOR_254(s, p, o, m) FB_BOOST_PP_IF(p(255, s), m, FB_BOOST_PP_TUPLE_EAT_2)(255, s) FB_BOOST_PP_IF(p(255, s), FB_BOOST_PP_FOR_255, FB_BOOST_PP_TUPLE_EAT_4)(o(255, s), p, o, m)
-# define FB_BOOST_PP_FOR_255(s, p, o, m) FB_BOOST_PP_IF(p(256, s), m, FB_BOOST_PP_TUPLE_EAT_2)(256, s) FB_BOOST_PP_IF(p(256, s), FB_BOOST_PP_FOR_256, FB_BOOST_PP_TUPLE_EAT_4)(o(256, s), p, o, m)
-# define FB_BOOST_PP_FOR_256(s, p, o, m) FB_BOOST_PP_IF(p(257, s), m, FB_BOOST_PP_TUPLE_EAT_2)(257, s) FB_BOOST_PP_IF(p(257, s), FB_BOOST_PP_FOR_257, FB_BOOST_PP_TUPLE_EAT_4)(o(257, s), p, o, m)
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/for.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/for.hpp
deleted file mode 100644
index e8130033..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/repetition/for.hpp
+++ /dev/null
@@ -1,306 +0,0 @@
-# /* Copyright (C) 2001
-#  * Housemarque Oy
-#  * http://www.housemarque.com
-#  *
-#  * Distributed under the Boost Software License, Version 1.0. (See
-#  * accompanying file LICENSE_1_0.txt or copy at
-#  * http://www.boost.org/LICENSE_1_0.txt)
-#  */
-#
-# /* Revised by Paul Mensonides (2002) */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_REPETITION_FOR_HPP
-# define FB_BOOST_PREPROCESSOR_REPETITION_FOR_HPP
-#
-# include <firebird/impl/boost/preprocessor/cat.hpp>
-# include <firebird/impl/boost/preprocessor/debug/error.hpp>
-# include <firebird/impl/boost/preprocessor/detail/auto_rec.hpp>
-#
-# /* FB_BOOST_PP_FOR */
-#
-# if 0
-#    define FB_BOOST_PP_FOR(state, pred, op, macro)
-# endif
-#
-# define FB_BOOST_PP_FOR FB_BOOST_PP_CAT(FB_BOOST_PP_FOR_, FB_BOOST_PP_AUTO_REC(FB_BOOST_PP_FOR_P, 256))
-#
-# define FB_BOOST_PP_FOR_P(n) FB_BOOST_PP_CAT(FB_BOOST_PP_FOR_CHECK_, FB_BOOST_PP_FOR_ ## n(1, FB_BOOST_PP_FOR_SR_P, FB_BOOST_PP_FOR_SR_O, FB_BOOST_PP_FOR_SR_M))
-#
-# define FB_BOOST_PP_FOR_SR_P(r, s) s
-# define FB_BOOST_PP_FOR_SR_O(r, s) 0
-# define FB_BOOST_PP_FOR_SR_M(r, s) FB_BOOST_PP_NIL
-#
-# if FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_EDG()
-#    include <firebird/impl/boost/preprocessor/repetition/detail/edg/for.hpp>
-# elif FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MSVC()
-#    include <firebird/impl/boost/preprocessor/repetition/detail/msvc/for.hpp>
-# elif FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_DMC()
-#    include <firebird/impl/boost/preprocessor/repetition/detail/dmc/for.hpp>
-# else
-#    include <firebird/impl/boost/preprocessor/repetition/detail/for.hpp>
-# endif
-#
-# define FB_BOOST_PP_FOR_257(s, p, o, m) FB_BOOST_PP_ERROR(0x0002)
-#
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_NIL 1
-#
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_1(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_2(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_3(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_4(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_5(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_6(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_7(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_8(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_9(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_10(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_11(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_12(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_13(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_14(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_15(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_16(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_17(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_18(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_19(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_20(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_21(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_22(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_23(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_24(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_25(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_26(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_27(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_28(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_29(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_30(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_31(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_32(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_33(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_34(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_35(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_36(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_37(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_38(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_39(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_40(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_41(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_42(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_43(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_44(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_45(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_46(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_47(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_48(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_49(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_50(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_51(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_52(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_53(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_54(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_55(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_56(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_57(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_58(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_59(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_60(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_61(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_62(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_63(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_64(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_65(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_66(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_67(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_68(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_69(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_70(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_71(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_72(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_73(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_74(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_75(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_76(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_77(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_78(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_79(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_80(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_81(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_82(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_83(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_84(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_85(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_86(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_87(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_88(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_89(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_90(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_91(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_92(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_93(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_94(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_95(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_96(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_97(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_98(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_99(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_100(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_101(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_102(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_103(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_104(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_105(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_106(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_107(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_108(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_109(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_110(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_111(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_112(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_113(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_114(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_115(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_116(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_117(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_118(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_119(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_120(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_121(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_122(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_123(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_124(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_125(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_126(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_127(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_128(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_129(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_130(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_131(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_132(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_133(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_134(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_135(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_136(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_137(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_138(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_139(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_140(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_141(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_142(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_143(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_144(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_145(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_146(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_147(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_148(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_149(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_150(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_151(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_152(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_153(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_154(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_155(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_156(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_157(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_158(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_159(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_160(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_161(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_162(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_163(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_164(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_165(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_166(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_167(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_168(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_169(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_170(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_171(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_172(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_173(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_174(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_175(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_176(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_177(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_178(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_179(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_180(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_181(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_182(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_183(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_184(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_185(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_186(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_187(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_188(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_189(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_190(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_191(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_192(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_193(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_194(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_195(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_196(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_197(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_198(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_199(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_200(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_201(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_202(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_203(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_204(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_205(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_206(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_207(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_208(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_209(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_210(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_211(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_212(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_213(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_214(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_215(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_216(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_217(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_218(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_219(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_220(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_221(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_222(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_223(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_224(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_225(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_226(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_227(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_228(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_229(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_230(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_231(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_232(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_233(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_234(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_235(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_236(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_237(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_238(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_239(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_240(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_241(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_242(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_243(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_244(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_245(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_246(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_247(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_248(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_249(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_250(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_251(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_252(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_253(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_254(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_255(s, p, o, m) 0
-# define FB_BOOST_PP_FOR_CHECK_FB_BOOST_PP_FOR_256(s, p, o, m) 0
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/seq/elem.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/seq/elem.hpp
deleted file mode 100644
index 93de3a47..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/seq/elem.hpp
+++ /dev/null
@@ -1,304 +0,0 @@
-# /* **************************************************************************
-#  *                                                                          *
-#  *     (C) Copyright Paul Mensonides 2002.
-#  *     Distributed under the Boost Software License, Version 1.0. (See
-#  *     accompanying file LICENSE_1_0.txt or copy at
-#  *     http://www.boost.org/LICENSE_1_0.txt)
-#  *                                                                          *
-#  ************************************************************************** */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_SEQ_ELEM_HPP
-# define FB_BOOST_PREPROCESSOR_SEQ_ELEM_HPP
-#
-# include <firebird/impl/boost/preprocessor/cat.hpp>
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-# include <firebird/impl/boost/preprocessor/facilities/empty.hpp>
-#
-# /* FB_BOOST_PP_SEQ_ELEM */
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_SEQ_ELEM(i, seq) FB_BOOST_PP_SEQ_ELEM_I(i, seq)
-# else
-#    define FB_BOOST_PP_SEQ_ELEM(i, seq) FB_BOOST_PP_SEQ_ELEM_I((i, seq))
-# endif
-#
-# if FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MSVC()
-#    define FB_BOOST_PP_SEQ_ELEM_I(i, seq) FB_BOOST_PP_SEQ_ELEM_II((FB_BOOST_PP_SEQ_ELEM_ ## i seq))
-#    define FB_BOOST_PP_SEQ_ELEM_II(res) FB_BOOST_PP_SEQ_ELEM_IV(FB_BOOST_PP_SEQ_ELEM_III res)
-#    define FB_BOOST_PP_SEQ_ELEM_III(x, _) x FB_BOOST_PP_EMPTY()
-#    define FB_BOOST_PP_SEQ_ELEM_IV(x) x
-# elif FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_SEQ_ELEM_I(par) FB_BOOST_PP_SEQ_ELEM_II ## par
-#    define FB_BOOST_PP_SEQ_ELEM_II(i, seq) FB_BOOST_PP_SEQ_ELEM_III(FB_BOOST_PP_SEQ_ELEM_ ## i ## seq)
-#    define FB_BOOST_PP_SEQ_ELEM_III(im) FB_BOOST_PP_SEQ_ELEM_IV(im)
-#    define FB_BOOST_PP_SEQ_ELEM_IV(x, _) x
-# else
-#    if defined(__IBMC__) || defined(__IBMCPP__)
-#        define FB_BOOST_PP_SEQ_ELEM_I(i, seq) FB_BOOST_PP_SEQ_ELEM_II(FB_BOOST_PP_CAT(FB_BOOST_PP_SEQ_ELEM_ ## i, seq))
-#    else
-#        define FB_BOOST_PP_SEQ_ELEM_I(i, seq) FB_BOOST_PP_SEQ_ELEM_II(FB_BOOST_PP_SEQ_ELEM_ ## i seq)
-#    endif
-#    define FB_BOOST_PP_SEQ_ELEM_II(im) FB_BOOST_PP_SEQ_ELEM_III(im)
-#    define FB_BOOST_PP_SEQ_ELEM_III(x, _) x
-# endif
-#
-# define FB_BOOST_PP_SEQ_ELEM_0(x) x, FB_BOOST_PP_NIL
-# define FB_BOOST_PP_SEQ_ELEM_1(_) FB_BOOST_PP_SEQ_ELEM_0
-# define FB_BOOST_PP_SEQ_ELEM_2(_) FB_BOOST_PP_SEQ_ELEM_1
-# define FB_BOOST_PP_SEQ_ELEM_3(_) FB_BOOST_PP_SEQ_ELEM_2
-# define FB_BOOST_PP_SEQ_ELEM_4(_) FB_BOOST_PP_SEQ_ELEM_3
-# define FB_BOOST_PP_SEQ_ELEM_5(_) FB_BOOST_PP_SEQ_ELEM_4
-# define FB_BOOST_PP_SEQ_ELEM_6(_) FB_BOOST_PP_SEQ_ELEM_5
-# define FB_BOOST_PP_SEQ_ELEM_7(_) FB_BOOST_PP_SEQ_ELEM_6
-# define FB_BOOST_PP_SEQ_ELEM_8(_) FB_BOOST_PP_SEQ_ELEM_7
-# define FB_BOOST_PP_SEQ_ELEM_9(_) FB_BOOST_PP_SEQ_ELEM_8
-# define FB_BOOST_PP_SEQ_ELEM_10(_) FB_BOOST_PP_SEQ_ELEM_9
-# define FB_BOOST_PP_SEQ_ELEM_11(_) FB_BOOST_PP_SEQ_ELEM_10
-# define FB_BOOST_PP_SEQ_ELEM_12(_) FB_BOOST_PP_SEQ_ELEM_11
-# define FB_BOOST_PP_SEQ_ELEM_13(_) FB_BOOST_PP_SEQ_ELEM_12
-# define FB_BOOST_PP_SEQ_ELEM_14(_) FB_BOOST_PP_SEQ_ELEM_13
-# define FB_BOOST_PP_SEQ_ELEM_15(_) FB_BOOST_PP_SEQ_ELEM_14
-# define FB_BOOST_PP_SEQ_ELEM_16(_) FB_BOOST_PP_SEQ_ELEM_15
-# define FB_BOOST_PP_SEQ_ELEM_17(_) FB_BOOST_PP_SEQ_ELEM_16
-# define FB_BOOST_PP_SEQ_ELEM_18(_) FB_BOOST_PP_SEQ_ELEM_17
-# define FB_BOOST_PP_SEQ_ELEM_19(_) FB_BOOST_PP_SEQ_ELEM_18
-# define FB_BOOST_PP_SEQ_ELEM_20(_) FB_BOOST_PP_SEQ_ELEM_19
-# define FB_BOOST_PP_SEQ_ELEM_21(_) FB_BOOST_PP_SEQ_ELEM_20
-# define FB_BOOST_PP_SEQ_ELEM_22(_) FB_BOOST_PP_SEQ_ELEM_21
-# define FB_BOOST_PP_SEQ_ELEM_23(_) FB_BOOST_PP_SEQ_ELEM_22
-# define FB_BOOST_PP_SEQ_ELEM_24(_) FB_BOOST_PP_SEQ_ELEM_23
-# define FB_BOOST_PP_SEQ_ELEM_25(_) FB_BOOST_PP_SEQ_ELEM_24
-# define FB_BOOST_PP_SEQ_ELEM_26(_) FB_BOOST_PP_SEQ_ELEM_25
-# define FB_BOOST_PP_SEQ_ELEM_27(_) FB_BOOST_PP_SEQ_ELEM_26
-# define FB_BOOST_PP_SEQ_ELEM_28(_) FB_BOOST_PP_SEQ_ELEM_27
-# define FB_BOOST_PP_SEQ_ELEM_29(_) FB_BOOST_PP_SEQ_ELEM_28
-# define FB_BOOST_PP_SEQ_ELEM_30(_) FB_BOOST_PP_SEQ_ELEM_29
-# define FB_BOOST_PP_SEQ_ELEM_31(_) FB_BOOST_PP_SEQ_ELEM_30
-# define FB_BOOST_PP_SEQ_ELEM_32(_) FB_BOOST_PP_SEQ_ELEM_31
-# define FB_BOOST_PP_SEQ_ELEM_33(_) FB_BOOST_PP_SEQ_ELEM_32
-# define FB_BOOST_PP_SEQ_ELEM_34(_) FB_BOOST_PP_SEQ_ELEM_33
-# define FB_BOOST_PP_SEQ_ELEM_35(_) FB_BOOST_PP_SEQ_ELEM_34
-# define FB_BOOST_PP_SEQ_ELEM_36(_) FB_BOOST_PP_SEQ_ELEM_35
-# define FB_BOOST_PP_SEQ_ELEM_37(_) FB_BOOST_PP_SEQ_ELEM_36
-# define FB_BOOST_PP_SEQ_ELEM_38(_) FB_BOOST_PP_SEQ_ELEM_37
-# define FB_BOOST_PP_SEQ_ELEM_39(_) FB_BOOST_PP_SEQ_ELEM_38
-# define FB_BOOST_PP_SEQ_ELEM_40(_) FB_BOOST_PP_SEQ_ELEM_39
-# define FB_BOOST_PP_SEQ_ELEM_41(_) FB_BOOST_PP_SEQ_ELEM_40
-# define FB_BOOST_PP_SEQ_ELEM_42(_) FB_BOOST_PP_SEQ_ELEM_41
-# define FB_BOOST_PP_SEQ_ELEM_43(_) FB_BOOST_PP_SEQ_ELEM_42
-# define FB_BOOST_PP_SEQ_ELEM_44(_) FB_BOOST_PP_SEQ_ELEM_43
-# define FB_BOOST_PP_SEQ_ELEM_45(_) FB_BOOST_PP_SEQ_ELEM_44
-# define FB_BOOST_PP_SEQ_ELEM_46(_) FB_BOOST_PP_SEQ_ELEM_45
-# define FB_BOOST_PP_SEQ_ELEM_47(_) FB_BOOST_PP_SEQ_ELEM_46
-# define FB_BOOST_PP_SEQ_ELEM_48(_) FB_BOOST_PP_SEQ_ELEM_47
-# define FB_BOOST_PP_SEQ_ELEM_49(_) FB_BOOST_PP_SEQ_ELEM_48
-# define FB_BOOST_PP_SEQ_ELEM_50(_) FB_BOOST_PP_SEQ_ELEM_49
-# define FB_BOOST_PP_SEQ_ELEM_51(_) FB_BOOST_PP_SEQ_ELEM_50
-# define FB_BOOST_PP_SEQ_ELEM_52(_) FB_BOOST_PP_SEQ_ELEM_51
-# define FB_BOOST_PP_SEQ_ELEM_53(_) FB_BOOST_PP_SEQ_ELEM_52
-# define FB_BOOST_PP_SEQ_ELEM_54(_) FB_BOOST_PP_SEQ_ELEM_53
-# define FB_BOOST_PP_SEQ_ELEM_55(_) FB_BOOST_PP_SEQ_ELEM_54
-# define FB_BOOST_PP_SEQ_ELEM_56(_) FB_BOOST_PP_SEQ_ELEM_55
-# define FB_BOOST_PP_SEQ_ELEM_57(_) FB_BOOST_PP_SEQ_ELEM_56
-# define FB_BOOST_PP_SEQ_ELEM_58(_) FB_BOOST_PP_SEQ_ELEM_57
-# define FB_BOOST_PP_SEQ_ELEM_59(_) FB_BOOST_PP_SEQ_ELEM_58
-# define FB_BOOST_PP_SEQ_ELEM_60(_) FB_BOOST_PP_SEQ_ELEM_59
-# define FB_BOOST_PP_SEQ_ELEM_61(_) FB_BOOST_PP_SEQ_ELEM_60
-# define FB_BOOST_PP_SEQ_ELEM_62(_) FB_BOOST_PP_SEQ_ELEM_61
-# define FB_BOOST_PP_SEQ_ELEM_63(_) FB_BOOST_PP_SEQ_ELEM_62
-# define FB_BOOST_PP_SEQ_ELEM_64(_) FB_BOOST_PP_SEQ_ELEM_63
-# define FB_BOOST_PP_SEQ_ELEM_65(_) FB_BOOST_PP_SEQ_ELEM_64
-# define FB_BOOST_PP_SEQ_ELEM_66(_) FB_BOOST_PP_SEQ_ELEM_65
-# define FB_BOOST_PP_SEQ_ELEM_67(_) FB_BOOST_PP_SEQ_ELEM_66
-# define FB_BOOST_PP_SEQ_ELEM_68(_) FB_BOOST_PP_SEQ_ELEM_67
-# define FB_BOOST_PP_SEQ_ELEM_69(_) FB_BOOST_PP_SEQ_ELEM_68
-# define FB_BOOST_PP_SEQ_ELEM_70(_) FB_BOOST_PP_SEQ_ELEM_69
-# define FB_BOOST_PP_SEQ_ELEM_71(_) FB_BOOST_PP_SEQ_ELEM_70
-# define FB_BOOST_PP_SEQ_ELEM_72(_) FB_BOOST_PP_SEQ_ELEM_71
-# define FB_BOOST_PP_SEQ_ELEM_73(_) FB_BOOST_PP_SEQ_ELEM_72
-# define FB_BOOST_PP_SEQ_ELEM_74(_) FB_BOOST_PP_SEQ_ELEM_73
-# define FB_BOOST_PP_SEQ_ELEM_75(_) FB_BOOST_PP_SEQ_ELEM_74
-# define FB_BOOST_PP_SEQ_ELEM_76(_) FB_BOOST_PP_SEQ_ELEM_75
-# define FB_BOOST_PP_SEQ_ELEM_77(_) FB_BOOST_PP_SEQ_ELEM_76
-# define FB_BOOST_PP_SEQ_ELEM_78(_) FB_BOOST_PP_SEQ_ELEM_77
-# define FB_BOOST_PP_SEQ_ELEM_79(_) FB_BOOST_PP_SEQ_ELEM_78
-# define FB_BOOST_PP_SEQ_ELEM_80(_) FB_BOOST_PP_SEQ_ELEM_79
-# define FB_BOOST_PP_SEQ_ELEM_81(_) FB_BOOST_PP_SEQ_ELEM_80
-# define FB_BOOST_PP_SEQ_ELEM_82(_) FB_BOOST_PP_SEQ_ELEM_81
-# define FB_BOOST_PP_SEQ_ELEM_83(_) FB_BOOST_PP_SEQ_ELEM_82
-# define FB_BOOST_PP_SEQ_ELEM_84(_) FB_BOOST_PP_SEQ_ELEM_83
-# define FB_BOOST_PP_SEQ_ELEM_85(_) FB_BOOST_PP_SEQ_ELEM_84
-# define FB_BOOST_PP_SEQ_ELEM_86(_) FB_BOOST_PP_SEQ_ELEM_85
-# define FB_BOOST_PP_SEQ_ELEM_87(_) FB_BOOST_PP_SEQ_ELEM_86
-# define FB_BOOST_PP_SEQ_ELEM_88(_) FB_BOOST_PP_SEQ_ELEM_87
-# define FB_BOOST_PP_SEQ_ELEM_89(_) FB_BOOST_PP_SEQ_ELEM_88
-# define FB_BOOST_PP_SEQ_ELEM_90(_) FB_BOOST_PP_SEQ_ELEM_89
-# define FB_BOOST_PP_SEQ_ELEM_91(_) FB_BOOST_PP_SEQ_ELEM_90
-# define FB_BOOST_PP_SEQ_ELEM_92(_) FB_BOOST_PP_SEQ_ELEM_91
-# define FB_BOOST_PP_SEQ_ELEM_93(_) FB_BOOST_PP_SEQ_ELEM_92
-# define FB_BOOST_PP_SEQ_ELEM_94(_) FB_BOOST_PP_SEQ_ELEM_93
-# define FB_BOOST_PP_SEQ_ELEM_95(_) FB_BOOST_PP_SEQ_ELEM_94
-# define FB_BOOST_PP_SEQ_ELEM_96(_) FB_BOOST_PP_SEQ_ELEM_95
-# define FB_BOOST_PP_SEQ_ELEM_97(_) FB_BOOST_PP_SEQ_ELEM_96
-# define FB_BOOST_PP_SEQ_ELEM_98(_) FB_BOOST_PP_SEQ_ELEM_97
-# define FB_BOOST_PP_SEQ_ELEM_99(_) FB_BOOST_PP_SEQ_ELEM_98
-# define FB_BOOST_PP_SEQ_ELEM_100(_) FB_BOOST_PP_SEQ_ELEM_99
-# define FB_BOOST_PP_SEQ_ELEM_101(_) FB_BOOST_PP_SEQ_ELEM_100
-# define FB_BOOST_PP_SEQ_ELEM_102(_) FB_BOOST_PP_SEQ_ELEM_101
-# define FB_BOOST_PP_SEQ_ELEM_103(_) FB_BOOST_PP_SEQ_ELEM_102
-# define FB_BOOST_PP_SEQ_ELEM_104(_) FB_BOOST_PP_SEQ_ELEM_103
-# define FB_BOOST_PP_SEQ_ELEM_105(_) FB_BOOST_PP_SEQ_ELEM_104
-# define FB_BOOST_PP_SEQ_ELEM_106(_) FB_BOOST_PP_SEQ_ELEM_105
-# define FB_BOOST_PP_SEQ_ELEM_107(_) FB_BOOST_PP_SEQ_ELEM_106
-# define FB_BOOST_PP_SEQ_ELEM_108(_) FB_BOOST_PP_SEQ_ELEM_107
-# define FB_BOOST_PP_SEQ_ELEM_109(_) FB_BOOST_PP_SEQ_ELEM_108
-# define FB_BOOST_PP_SEQ_ELEM_110(_) FB_BOOST_PP_SEQ_ELEM_109
-# define FB_BOOST_PP_SEQ_ELEM_111(_) FB_BOOST_PP_SEQ_ELEM_110
-# define FB_BOOST_PP_SEQ_ELEM_112(_) FB_BOOST_PP_SEQ_ELEM_111
-# define FB_BOOST_PP_SEQ_ELEM_113(_) FB_BOOST_PP_SEQ_ELEM_112
-# define FB_BOOST_PP_SEQ_ELEM_114(_) FB_BOOST_PP_SEQ_ELEM_113
-# define FB_BOOST_PP_SEQ_ELEM_115(_) FB_BOOST_PP_SEQ_ELEM_114
-# define FB_BOOST_PP_SEQ_ELEM_116(_) FB_BOOST_PP_SEQ_ELEM_115
-# define FB_BOOST_PP_SEQ_ELEM_117(_) FB_BOOST_PP_SEQ_ELEM_116
-# define FB_BOOST_PP_SEQ_ELEM_118(_) FB_BOOST_PP_SEQ_ELEM_117
-# define FB_BOOST_PP_SEQ_ELEM_119(_) FB_BOOST_PP_SEQ_ELEM_118
-# define FB_BOOST_PP_SEQ_ELEM_120(_) FB_BOOST_PP_SEQ_ELEM_119
-# define FB_BOOST_PP_SEQ_ELEM_121(_) FB_BOOST_PP_SEQ_ELEM_120
-# define FB_BOOST_PP_SEQ_ELEM_122(_) FB_BOOST_PP_SEQ_ELEM_121
-# define FB_BOOST_PP_SEQ_ELEM_123(_) FB_BOOST_PP_SEQ_ELEM_122
-# define FB_BOOST_PP_SEQ_ELEM_124(_) FB_BOOST_PP_SEQ_ELEM_123
-# define FB_BOOST_PP_SEQ_ELEM_125(_) FB_BOOST_PP_SEQ_ELEM_124
-# define FB_BOOST_PP_SEQ_ELEM_126(_) FB_BOOST_PP_SEQ_ELEM_125
-# define FB_BOOST_PP_SEQ_ELEM_127(_) FB_BOOST_PP_SEQ_ELEM_126
-# define FB_BOOST_PP_SEQ_ELEM_128(_) FB_BOOST_PP_SEQ_ELEM_127
-# define FB_BOOST_PP_SEQ_ELEM_129(_) FB_BOOST_PP_SEQ_ELEM_128
-# define FB_BOOST_PP_SEQ_ELEM_130(_) FB_BOOST_PP_SEQ_ELEM_129
-# define FB_BOOST_PP_SEQ_ELEM_131(_) FB_BOOST_PP_SEQ_ELEM_130
-# define FB_BOOST_PP_SEQ_ELEM_132(_) FB_BOOST_PP_SEQ_ELEM_131
-# define FB_BOOST_PP_SEQ_ELEM_133(_) FB_BOOST_PP_SEQ_ELEM_132
-# define FB_BOOST_PP_SEQ_ELEM_134(_) FB_BOOST_PP_SEQ_ELEM_133
-# define FB_BOOST_PP_SEQ_ELEM_135(_) FB_BOOST_PP_SEQ_ELEM_134
-# define FB_BOOST_PP_SEQ_ELEM_136(_) FB_BOOST_PP_SEQ_ELEM_135
-# define FB_BOOST_PP_SEQ_ELEM_137(_) FB_BOOST_PP_SEQ_ELEM_136
-# define FB_BOOST_PP_SEQ_ELEM_138(_) FB_BOOST_PP_SEQ_ELEM_137
-# define FB_BOOST_PP_SEQ_ELEM_139(_) FB_BOOST_PP_SEQ_ELEM_138
-# define FB_BOOST_PP_SEQ_ELEM_140(_) FB_BOOST_PP_SEQ_ELEM_139
-# define FB_BOOST_PP_SEQ_ELEM_141(_) FB_BOOST_PP_SEQ_ELEM_140
-# define FB_BOOST_PP_SEQ_ELEM_142(_) FB_BOOST_PP_SEQ_ELEM_141
-# define FB_BOOST_PP_SEQ_ELEM_143(_) FB_BOOST_PP_SEQ_ELEM_142
-# define FB_BOOST_PP_SEQ_ELEM_144(_) FB_BOOST_PP_SEQ_ELEM_143
-# define FB_BOOST_PP_SEQ_ELEM_145(_) FB_BOOST_PP_SEQ_ELEM_144
-# define FB_BOOST_PP_SEQ_ELEM_146(_) FB_BOOST_PP_SEQ_ELEM_145
-# define FB_BOOST_PP_SEQ_ELEM_147(_) FB_BOOST_PP_SEQ_ELEM_146
-# define FB_BOOST_PP_SEQ_ELEM_148(_) FB_BOOST_PP_SEQ_ELEM_147
-# define FB_BOOST_PP_SEQ_ELEM_149(_) FB_BOOST_PP_SEQ_ELEM_148
-# define FB_BOOST_PP_SEQ_ELEM_150(_) FB_BOOST_PP_SEQ_ELEM_149
-# define FB_BOOST_PP_SEQ_ELEM_151(_) FB_BOOST_PP_SEQ_ELEM_150
-# define FB_BOOST_PP_SEQ_ELEM_152(_) FB_BOOST_PP_SEQ_ELEM_151
-# define FB_BOOST_PP_SEQ_ELEM_153(_) FB_BOOST_PP_SEQ_ELEM_152
-# define FB_BOOST_PP_SEQ_ELEM_154(_) FB_BOOST_PP_SEQ_ELEM_153
-# define FB_BOOST_PP_SEQ_ELEM_155(_) FB_BOOST_PP_SEQ_ELEM_154
-# define FB_BOOST_PP_SEQ_ELEM_156(_) FB_BOOST_PP_SEQ_ELEM_155
-# define FB_BOOST_PP_SEQ_ELEM_157(_) FB_BOOST_PP_SEQ_ELEM_156
-# define FB_BOOST_PP_SEQ_ELEM_158(_) FB_BOOST_PP_SEQ_ELEM_157
-# define FB_BOOST_PP_SEQ_ELEM_159(_) FB_BOOST_PP_SEQ_ELEM_158
-# define FB_BOOST_PP_SEQ_ELEM_160(_) FB_BOOST_PP_SEQ_ELEM_159
-# define FB_BOOST_PP_SEQ_ELEM_161(_) FB_BOOST_PP_SEQ_ELEM_160
-# define FB_BOOST_PP_SEQ_ELEM_162(_) FB_BOOST_PP_SEQ_ELEM_161
-# define FB_BOOST_PP_SEQ_ELEM_163(_) FB_BOOST_PP_SEQ_ELEM_162
-# define FB_BOOST_PP_SEQ_ELEM_164(_) FB_BOOST_PP_SEQ_ELEM_163
-# define FB_BOOST_PP_SEQ_ELEM_165(_) FB_BOOST_PP_SEQ_ELEM_164
-# define FB_BOOST_PP_SEQ_ELEM_166(_) FB_BOOST_PP_SEQ_ELEM_165
-# define FB_BOOST_PP_SEQ_ELEM_167(_) FB_BOOST_PP_SEQ_ELEM_166
-# define FB_BOOST_PP_SEQ_ELEM_168(_) FB_BOOST_PP_SEQ_ELEM_167
-# define FB_BOOST_PP_SEQ_ELEM_169(_) FB_BOOST_PP_SEQ_ELEM_168
-# define FB_BOOST_PP_SEQ_ELEM_170(_) FB_BOOST_PP_SEQ_ELEM_169
-# define FB_BOOST_PP_SEQ_ELEM_171(_) FB_BOOST_PP_SEQ_ELEM_170
-# define FB_BOOST_PP_SEQ_ELEM_172(_) FB_BOOST_PP_SEQ_ELEM_171
-# define FB_BOOST_PP_SEQ_ELEM_173(_) FB_BOOST_PP_SEQ_ELEM_172
-# define FB_BOOST_PP_SEQ_ELEM_174(_) FB_BOOST_PP_SEQ_ELEM_173
-# define FB_BOOST_PP_SEQ_ELEM_175(_) FB_BOOST_PP_SEQ_ELEM_174
-# define FB_BOOST_PP_SEQ_ELEM_176(_) FB_BOOST_PP_SEQ_ELEM_175
-# define FB_BOOST_PP_SEQ_ELEM_177(_) FB_BOOST_PP_SEQ_ELEM_176
-# define FB_BOOST_PP_SEQ_ELEM_178(_) FB_BOOST_PP_SEQ_ELEM_177
-# define FB_BOOST_PP_SEQ_ELEM_179(_) FB_BOOST_PP_SEQ_ELEM_178
-# define FB_BOOST_PP_SEQ_ELEM_180(_) FB_BOOST_PP_SEQ_ELEM_179
-# define FB_BOOST_PP_SEQ_ELEM_181(_) FB_BOOST_PP_SEQ_ELEM_180
-# define FB_BOOST_PP_SEQ_ELEM_182(_) FB_BOOST_PP_SEQ_ELEM_181
-# define FB_BOOST_PP_SEQ_ELEM_183(_) FB_BOOST_PP_SEQ_ELEM_182
-# define FB_BOOST_PP_SEQ_ELEM_184(_) FB_BOOST_PP_SEQ_ELEM_183
-# define FB_BOOST_PP_SEQ_ELEM_185(_) FB_BOOST_PP_SEQ_ELEM_184
-# define FB_BOOST_PP_SEQ_ELEM_186(_) FB_BOOST_PP_SEQ_ELEM_185
-# define FB_BOOST_PP_SEQ_ELEM_187(_) FB_BOOST_PP_SEQ_ELEM_186
-# define FB_BOOST_PP_SEQ_ELEM_188(_) FB_BOOST_PP_SEQ_ELEM_187
-# define FB_BOOST_PP_SEQ_ELEM_189(_) FB_BOOST_PP_SEQ_ELEM_188
-# define FB_BOOST_PP_SEQ_ELEM_190(_) FB_BOOST_PP_SEQ_ELEM_189
-# define FB_BOOST_PP_SEQ_ELEM_191(_) FB_BOOST_PP_SEQ_ELEM_190
-# define FB_BOOST_PP_SEQ_ELEM_192(_) FB_BOOST_PP_SEQ_ELEM_191
-# define FB_BOOST_PP_SEQ_ELEM_193(_) FB_BOOST_PP_SEQ_ELEM_192
-# define FB_BOOST_PP_SEQ_ELEM_194(_) FB_BOOST_PP_SEQ_ELEM_193
-# define FB_BOOST_PP_SEQ_ELEM_195(_) FB_BOOST_PP_SEQ_ELEM_194
-# define FB_BOOST_PP_SEQ_ELEM_196(_) FB_BOOST_PP_SEQ_ELEM_195
-# define FB_BOOST_PP_SEQ_ELEM_197(_) FB_BOOST_PP_SEQ_ELEM_196
-# define FB_BOOST_PP_SEQ_ELEM_198(_) FB_BOOST_PP_SEQ_ELEM_197
-# define FB_BOOST_PP_SEQ_ELEM_199(_) FB_BOOST_PP_SEQ_ELEM_198
-# define FB_BOOST_PP_SEQ_ELEM_200(_) FB_BOOST_PP_SEQ_ELEM_199
-# define FB_BOOST_PP_SEQ_ELEM_201(_) FB_BOOST_PP_SEQ_ELEM_200
-# define FB_BOOST_PP_SEQ_ELEM_202(_) FB_BOOST_PP_SEQ_ELEM_201
-# define FB_BOOST_PP_SEQ_ELEM_203(_) FB_BOOST_PP_SEQ_ELEM_202
-# define FB_BOOST_PP_SEQ_ELEM_204(_) FB_BOOST_PP_SEQ_ELEM_203
-# define FB_BOOST_PP_SEQ_ELEM_205(_) FB_BOOST_PP_SEQ_ELEM_204
-# define FB_BOOST_PP_SEQ_ELEM_206(_) FB_BOOST_PP_SEQ_ELEM_205
-# define FB_BOOST_PP_SEQ_ELEM_207(_) FB_BOOST_PP_SEQ_ELEM_206
-# define FB_BOOST_PP_SEQ_ELEM_208(_) FB_BOOST_PP_SEQ_ELEM_207
-# define FB_BOOST_PP_SEQ_ELEM_209(_) FB_BOOST_PP_SEQ_ELEM_208
-# define FB_BOOST_PP_SEQ_ELEM_210(_) FB_BOOST_PP_SEQ_ELEM_209
-# define FB_BOOST_PP_SEQ_ELEM_211(_) FB_BOOST_PP_SEQ_ELEM_210
-# define FB_BOOST_PP_SEQ_ELEM_212(_) FB_BOOST_PP_SEQ_ELEM_211
-# define FB_BOOST_PP_SEQ_ELEM_213(_) FB_BOOST_PP_SEQ_ELEM_212
-# define FB_BOOST_PP_SEQ_ELEM_214(_) FB_BOOST_PP_SEQ_ELEM_213
-# define FB_BOOST_PP_SEQ_ELEM_215(_) FB_BOOST_PP_SEQ_ELEM_214
-# define FB_BOOST_PP_SEQ_ELEM_216(_) FB_BOOST_PP_SEQ_ELEM_215
-# define FB_BOOST_PP_SEQ_ELEM_217(_) FB_BOOST_PP_SEQ_ELEM_216
-# define FB_BOOST_PP_SEQ_ELEM_218(_) FB_BOOST_PP_SEQ_ELEM_217
-# define FB_BOOST_PP_SEQ_ELEM_219(_) FB_BOOST_PP_SEQ_ELEM_218
-# define FB_BOOST_PP_SEQ_ELEM_220(_) FB_BOOST_PP_SEQ_ELEM_219
-# define FB_BOOST_PP_SEQ_ELEM_221(_) FB_BOOST_PP_SEQ_ELEM_220
-# define FB_BOOST_PP_SEQ_ELEM_222(_) FB_BOOST_PP_SEQ_ELEM_221
-# define FB_BOOST_PP_SEQ_ELEM_223(_) FB_BOOST_PP_SEQ_ELEM_222
-# define FB_BOOST_PP_SEQ_ELEM_224(_) FB_BOOST_PP_SEQ_ELEM_223
-# define FB_BOOST_PP_SEQ_ELEM_225(_) FB_BOOST_PP_SEQ_ELEM_224
-# define FB_BOOST_PP_SEQ_ELEM_226(_) FB_BOOST_PP_SEQ_ELEM_225
-# define FB_BOOST_PP_SEQ_ELEM_227(_) FB_BOOST_PP_SEQ_ELEM_226
-# define FB_BOOST_PP_SEQ_ELEM_228(_) FB_BOOST_PP_SEQ_ELEM_227
-# define FB_BOOST_PP_SEQ_ELEM_229(_) FB_BOOST_PP_SEQ_ELEM_228
-# define FB_BOOST_PP_SEQ_ELEM_230(_) FB_BOOST_PP_SEQ_ELEM_229
-# define FB_BOOST_PP_SEQ_ELEM_231(_) FB_BOOST_PP_SEQ_ELEM_230
-# define FB_BOOST_PP_SEQ_ELEM_232(_) FB_BOOST_PP_SEQ_ELEM_231
-# define FB_BOOST_PP_SEQ_ELEM_233(_) FB_BOOST_PP_SEQ_ELEM_232
-# define FB_BOOST_PP_SEQ_ELEM_234(_) FB_BOOST_PP_SEQ_ELEM_233
-# define FB_BOOST_PP_SEQ_ELEM_235(_) FB_BOOST_PP_SEQ_ELEM_234
-# define FB_BOOST_PP_SEQ_ELEM_236(_) FB_BOOST_PP_SEQ_ELEM_235
-# define FB_BOOST_PP_SEQ_ELEM_237(_) FB_BOOST_PP_SEQ_ELEM_236
-# define FB_BOOST_PP_SEQ_ELEM_238(_) FB_BOOST_PP_SEQ_ELEM_237
-# define FB_BOOST_PP_SEQ_ELEM_239(_) FB_BOOST_PP_SEQ_ELEM_238
-# define FB_BOOST_PP_SEQ_ELEM_240(_) FB_BOOST_PP_SEQ_ELEM_239
-# define FB_BOOST_PP_SEQ_ELEM_241(_) FB_BOOST_PP_SEQ_ELEM_240
-# define FB_BOOST_PP_SEQ_ELEM_242(_) FB_BOOST_PP_SEQ_ELEM_241
-# define FB_BOOST_PP_SEQ_ELEM_243(_) FB_BOOST_PP_SEQ_ELEM_242
-# define FB_BOOST_PP_SEQ_ELEM_244(_) FB_BOOST_PP_SEQ_ELEM_243
-# define FB_BOOST_PP_SEQ_ELEM_245(_) FB_BOOST_PP_SEQ_ELEM_244
-# define FB_BOOST_PP_SEQ_ELEM_246(_) FB_BOOST_PP_SEQ_ELEM_245
-# define FB_BOOST_PP_SEQ_ELEM_247(_) FB_BOOST_PP_SEQ_ELEM_246
-# define FB_BOOST_PP_SEQ_ELEM_248(_) FB_BOOST_PP_SEQ_ELEM_247
-# define FB_BOOST_PP_SEQ_ELEM_249(_) FB_BOOST_PP_SEQ_ELEM_248
-# define FB_BOOST_PP_SEQ_ELEM_250(_) FB_BOOST_PP_SEQ_ELEM_249
-# define FB_BOOST_PP_SEQ_ELEM_251(_) FB_BOOST_PP_SEQ_ELEM_250
-# define FB_BOOST_PP_SEQ_ELEM_252(_) FB_BOOST_PP_SEQ_ELEM_251
-# define FB_BOOST_PP_SEQ_ELEM_253(_) FB_BOOST_PP_SEQ_ELEM_252
-# define FB_BOOST_PP_SEQ_ELEM_254(_) FB_BOOST_PP_SEQ_ELEM_253
-# define FB_BOOST_PP_SEQ_ELEM_255(_) FB_BOOST_PP_SEQ_ELEM_254
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/seq/for_each_i.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/seq/for_each_i.hpp
deleted file mode 100644
index 98258a8a..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/seq/for_each_i.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-# /* **************************************************************************
-#  *                                                                          *
-#  *     (C) Copyright Paul Mensonides 2002.
-#  *     Distributed under the Boost Software License, Version 1.0. (See
-#  *     accompanying file LICENSE_1_0.txt or copy at
-#  *     http://www.boost.org/LICENSE_1_0.txt)
-#  *                                                                          *
-#  ************************************************************************** */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_SEQ_FOR_EACH_I_HPP
-# define FB_BOOST_PREPROCESSOR_SEQ_FOR_EACH_I_HPP
-#
-# include <firebird/impl/boost/preprocessor/arithmetic/dec.hpp>
-# include <firebird/impl/boost/preprocessor/arithmetic/inc.hpp>
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-# include <firebird/impl/boost/preprocessor/repetition/for.hpp>
-# include <firebird/impl/boost/preprocessor/seq/seq.hpp>
-# include <firebird/impl/boost/preprocessor/seq/size.hpp>
-# include <firebird/impl/boost/preprocessor/tuple/elem.hpp>
-# include <firebird/impl/boost/preprocessor/tuple/rem.hpp>
-#
-# /* FB_BOOST_PP_SEQ_FOR_EACH_I */
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_EDG()
-#    define FB_BOOST_PP_SEQ_FOR_EACH_I(macro, data, seq) FB_BOOST_PP_FOR((macro, data, seq (nil), 0), FB_BOOST_PP_SEQ_FOR_EACH_I_P, FB_BOOST_PP_SEQ_FOR_EACH_I_O, FB_BOOST_PP_SEQ_FOR_EACH_I_M)
-# else
-#    define FB_BOOST_PP_SEQ_FOR_EACH_I(macro, data, seq) FB_BOOST_PP_SEQ_FOR_EACH_I_I(macro, data, seq)
-#    define FB_BOOST_PP_SEQ_FOR_EACH_I_I(macro, data, seq) FB_BOOST_PP_FOR((macro, data, seq (nil), 0), FB_BOOST_PP_SEQ_FOR_EACH_I_P, FB_BOOST_PP_SEQ_FOR_EACH_I_O, FB_BOOST_PP_SEQ_FOR_EACH_I_M)
-# endif
-#
-# define FB_BOOST_PP_SEQ_FOR_EACH_I_P(r, x) FB_BOOST_PP_DEC(FB_BOOST_PP_SEQ_SIZE(FB_BOOST_PP_TUPLE_ELEM(4, 2, x)))
-#
-# if FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_STRICT()
-#    define FB_BOOST_PP_SEQ_FOR_EACH_I_O(r, x) FB_BOOST_PP_SEQ_FOR_EACH_I_O_I x
-# else
-#    define FB_BOOST_PP_SEQ_FOR_EACH_I_O(r, x) FB_BOOST_PP_SEQ_FOR_EACH_I_O_I(FB_BOOST_PP_TUPLE_ELEM(4, 0, x), FB_BOOST_PP_TUPLE_ELEM(4, 1, x), FB_BOOST_PP_TUPLE_ELEM(4, 2, x), FB_BOOST_PP_TUPLE_ELEM(4, 3, x))
-# endif
-#
-# define FB_BOOST_PP_SEQ_FOR_EACH_I_O_I(macro, data, seq, i) (macro, data, FB_BOOST_PP_SEQ_TAIL(seq), FB_BOOST_PP_INC(i))
-#
-# if FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_STRICT()
-#    define FB_BOOST_PP_SEQ_FOR_EACH_I_M(r, x) FB_BOOST_PP_SEQ_FOR_EACH_I_M_IM(r, FB_BOOST_PP_TUPLE_REM_4 x)
-#    define FB_BOOST_PP_SEQ_FOR_EACH_I_M_IM(r, im) FB_BOOST_PP_SEQ_FOR_EACH_I_M_I(r, im)
-# else
-#    define FB_BOOST_PP_SEQ_FOR_EACH_I_M(r, x) FB_BOOST_PP_SEQ_FOR_EACH_I_M_I(r, FB_BOOST_PP_TUPLE_ELEM(4, 0, x), FB_BOOST_PP_TUPLE_ELEM(4, 1, x), FB_BOOST_PP_TUPLE_ELEM(4, 2, x), FB_BOOST_PP_TUPLE_ELEM(4, 3, x))
-# endif
-#
-# define FB_BOOST_PP_SEQ_FOR_EACH_I_M_I(r, macro, data, seq, i) macro(r, data, i, FB_BOOST_PP_SEQ_HEAD(seq))
-#
-# /* FB_BOOST_PP_SEQ_FOR_EACH_I_R */
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_EDG()
-#    define FB_BOOST_PP_SEQ_FOR_EACH_I_R(r, macro, data, seq) FB_BOOST_PP_FOR_ ## r((macro, data, seq (nil), 0), FB_BOOST_PP_SEQ_FOR_EACH_I_P, FB_BOOST_PP_SEQ_FOR_EACH_I_O, FB_BOOST_PP_SEQ_FOR_EACH_I_M)
-# else
-#    define FB_BOOST_PP_SEQ_FOR_EACH_I_R(r, macro, data, seq) FB_BOOST_PP_SEQ_FOR_EACH_I_R_I(r, macro, data, seq)
-#    define FB_BOOST_PP_SEQ_FOR_EACH_I_R_I(r, macro, data, seq) FB_BOOST_PP_FOR_ ## r((macro, data, seq (nil), 0), FB_BOOST_PP_SEQ_FOR_EACH_I_P, FB_BOOST_PP_SEQ_FOR_EACH_I_O, FB_BOOST_PP_SEQ_FOR_EACH_I_M)
-# endif
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/seq/seq.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/seq/seq.hpp
deleted file mode 100644
index 2ef69be3..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/seq/seq.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-# /* **************************************************************************
-#  *                                                                          *
-#  *     (C) Copyright Paul Mensonides 2002.
-#  *     Distributed under the Boost Software License, Version 1.0. (See
-#  *     accompanying file LICENSE_1_0.txt or copy at
-#  *     http://www.boost.org/LICENSE_1_0.txt)
-#  *                                                                          *
-#  ************************************************************************** */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_SEQ_SEQ_HPP
-# define FB_BOOST_PREPROCESSOR_SEQ_SEQ_HPP
-#
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-# include <firebird/impl/boost/preprocessor/seq/elem.hpp>
-#
-# /* FB_BOOST_PP_SEQ_HEAD */
-#
-# define FB_BOOST_PP_SEQ_HEAD(seq) FB_BOOST_PP_SEQ_ELEM(0, seq)
-#
-# /* FB_BOOST_PP_SEQ_TAIL */
-#
-# if FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_SEQ_TAIL(seq) FB_BOOST_PP_SEQ_TAIL_1((seq))
-#    define FB_BOOST_PP_SEQ_TAIL_1(par) FB_BOOST_PP_SEQ_TAIL_2 ## par
-#    define FB_BOOST_PP_SEQ_TAIL_2(seq) FB_BOOST_PP_SEQ_TAIL_I ## seq
-# elif FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MSVC()
-#    define FB_BOOST_PP_SEQ_TAIL(seq) FB_BOOST_PP_SEQ_TAIL_ID(FB_BOOST_PP_SEQ_TAIL_I seq)
-#    define FB_BOOST_PP_SEQ_TAIL_ID(id) id
-# elif FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_EDG()
-#    define FB_BOOST_PP_SEQ_TAIL(seq) FB_BOOST_PP_SEQ_TAIL_D(seq)
-#    define FB_BOOST_PP_SEQ_TAIL_D(seq) FB_BOOST_PP_SEQ_TAIL_I seq
-# else
-#    define FB_BOOST_PP_SEQ_TAIL(seq) FB_BOOST_PP_SEQ_TAIL_I seq
-# endif
-#
-# define FB_BOOST_PP_SEQ_TAIL_I(x)
-#
-# /* FB_BOOST_PP_SEQ_NIL */
-#
-# define FB_BOOST_PP_SEQ_NIL(x) (x)
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/seq/size.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/seq/size.hpp
deleted file mode 100644
index 7466572d..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/seq/size.hpp
+++ /dev/null
@@ -1,548 +0,0 @@
-# /* **************************************************************************
-#  *                                                                          *
-#  *     (C) Copyright Paul Mensonides 2002.
-#  *     Distributed under the Boost Software License, Version 1.0. (See
-#  *     accompanying file LICENSE_1_0.txt or copy at
-#  *     http://www.boost.org/LICENSE_1_0.txt)
-#  *                                                                          *
-#  ************************************************************************** */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_SEQ_SIZE_HPP
-# define FB_BOOST_PREPROCESSOR_SEQ_SIZE_HPP
-#
-# include <firebird/impl/boost/preprocessor/cat.hpp>
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-# include <firebird/impl/boost/preprocessor/tuple/eat.hpp>
-#
-# if FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_SEQ_SIZE(seq) FB_BOOST_PP_SEQ_SIZE_I((seq))
-#    define FB_BOOST_PP_SEQ_SIZE_I(par) FB_BOOST_PP_SEQ_SIZE_II ## par
-#    define FB_BOOST_PP_SEQ_SIZE_II(seq) FB_BOOST_PP_CAT(FB_BOOST_PP_SEQ_SIZE_, FB_BOOST_PP_SEQ_SIZE_0 ## seq)
-# elif FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_EDG() || FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MSVC()
-#    define FB_BOOST_PP_SEQ_SIZE(seq) FB_BOOST_PP_SEQ_SIZE_I(seq)
-#    define FB_BOOST_PP_SEQ_SIZE_I(seq) FB_BOOST_PP_CAT(FB_BOOST_PP_SEQ_SIZE_, FB_BOOST_PP_SEQ_SIZE_0 seq)
-# elif defined(__IBMC__) || defined(__IBMCPP__)
-#    define FB_BOOST_PP_SEQ_SIZE(seq) FB_BOOST_PP_CAT(FB_BOOST_PP_SEQ_SIZE_, FB_BOOST_PP_CAT(FB_BOOST_PP_SEQ_SIZE_0, seq))
-# else
-#    define FB_BOOST_PP_SEQ_SIZE(seq) FB_BOOST_PP_CAT(FB_BOOST_PP_SEQ_SIZE_, FB_BOOST_PP_SEQ_SIZE_0 seq)
-# endif
-#
-# define FB_BOOST_PP_SEQ_SIZE_0(_) FB_BOOST_PP_SEQ_SIZE_1
-# define FB_BOOST_PP_SEQ_SIZE_1(_) FB_BOOST_PP_SEQ_SIZE_2
-# define FB_BOOST_PP_SEQ_SIZE_2(_) FB_BOOST_PP_SEQ_SIZE_3
-# define FB_BOOST_PP_SEQ_SIZE_3(_) FB_BOOST_PP_SEQ_SIZE_4
-# define FB_BOOST_PP_SEQ_SIZE_4(_) FB_BOOST_PP_SEQ_SIZE_5
-# define FB_BOOST_PP_SEQ_SIZE_5(_) FB_BOOST_PP_SEQ_SIZE_6
-# define FB_BOOST_PP_SEQ_SIZE_6(_) FB_BOOST_PP_SEQ_SIZE_7
-# define FB_BOOST_PP_SEQ_SIZE_7(_) FB_BOOST_PP_SEQ_SIZE_8
-# define FB_BOOST_PP_SEQ_SIZE_8(_) FB_BOOST_PP_SEQ_SIZE_9
-# define FB_BOOST_PP_SEQ_SIZE_9(_) FB_BOOST_PP_SEQ_SIZE_10
-# define FB_BOOST_PP_SEQ_SIZE_10(_) FB_BOOST_PP_SEQ_SIZE_11
-# define FB_BOOST_PP_SEQ_SIZE_11(_) FB_BOOST_PP_SEQ_SIZE_12
-# define FB_BOOST_PP_SEQ_SIZE_12(_) FB_BOOST_PP_SEQ_SIZE_13
-# define FB_BOOST_PP_SEQ_SIZE_13(_) FB_BOOST_PP_SEQ_SIZE_14
-# define FB_BOOST_PP_SEQ_SIZE_14(_) FB_BOOST_PP_SEQ_SIZE_15
-# define FB_BOOST_PP_SEQ_SIZE_15(_) FB_BOOST_PP_SEQ_SIZE_16
-# define FB_BOOST_PP_SEQ_SIZE_16(_) FB_BOOST_PP_SEQ_SIZE_17
-# define FB_BOOST_PP_SEQ_SIZE_17(_) FB_BOOST_PP_SEQ_SIZE_18
-# define FB_BOOST_PP_SEQ_SIZE_18(_) FB_BOOST_PP_SEQ_SIZE_19
-# define FB_BOOST_PP_SEQ_SIZE_19(_) FB_BOOST_PP_SEQ_SIZE_20
-# define FB_BOOST_PP_SEQ_SIZE_20(_) FB_BOOST_PP_SEQ_SIZE_21
-# define FB_BOOST_PP_SEQ_SIZE_21(_) FB_BOOST_PP_SEQ_SIZE_22
-# define FB_BOOST_PP_SEQ_SIZE_22(_) FB_BOOST_PP_SEQ_SIZE_23
-# define FB_BOOST_PP_SEQ_SIZE_23(_) FB_BOOST_PP_SEQ_SIZE_24
-# define FB_BOOST_PP_SEQ_SIZE_24(_) FB_BOOST_PP_SEQ_SIZE_25
-# define FB_BOOST_PP_SEQ_SIZE_25(_) FB_BOOST_PP_SEQ_SIZE_26
-# define FB_BOOST_PP_SEQ_SIZE_26(_) FB_BOOST_PP_SEQ_SIZE_27
-# define FB_BOOST_PP_SEQ_SIZE_27(_) FB_BOOST_PP_SEQ_SIZE_28
-# define FB_BOOST_PP_SEQ_SIZE_28(_) FB_BOOST_PP_SEQ_SIZE_29
-# define FB_BOOST_PP_SEQ_SIZE_29(_) FB_BOOST_PP_SEQ_SIZE_30
-# define FB_BOOST_PP_SEQ_SIZE_30(_) FB_BOOST_PP_SEQ_SIZE_31
-# define FB_BOOST_PP_SEQ_SIZE_31(_) FB_BOOST_PP_SEQ_SIZE_32
-# define FB_BOOST_PP_SEQ_SIZE_32(_) FB_BOOST_PP_SEQ_SIZE_33
-# define FB_BOOST_PP_SEQ_SIZE_33(_) FB_BOOST_PP_SEQ_SIZE_34
-# define FB_BOOST_PP_SEQ_SIZE_34(_) FB_BOOST_PP_SEQ_SIZE_35
-# define FB_BOOST_PP_SEQ_SIZE_35(_) FB_BOOST_PP_SEQ_SIZE_36
-# define FB_BOOST_PP_SEQ_SIZE_36(_) FB_BOOST_PP_SEQ_SIZE_37
-# define FB_BOOST_PP_SEQ_SIZE_37(_) FB_BOOST_PP_SEQ_SIZE_38
-# define FB_BOOST_PP_SEQ_SIZE_38(_) FB_BOOST_PP_SEQ_SIZE_39
-# define FB_BOOST_PP_SEQ_SIZE_39(_) FB_BOOST_PP_SEQ_SIZE_40
-# define FB_BOOST_PP_SEQ_SIZE_40(_) FB_BOOST_PP_SEQ_SIZE_41
-# define FB_BOOST_PP_SEQ_SIZE_41(_) FB_BOOST_PP_SEQ_SIZE_42
-# define FB_BOOST_PP_SEQ_SIZE_42(_) FB_BOOST_PP_SEQ_SIZE_43
-# define FB_BOOST_PP_SEQ_SIZE_43(_) FB_BOOST_PP_SEQ_SIZE_44
-# define FB_BOOST_PP_SEQ_SIZE_44(_) FB_BOOST_PP_SEQ_SIZE_45
-# define FB_BOOST_PP_SEQ_SIZE_45(_) FB_BOOST_PP_SEQ_SIZE_46
-# define FB_BOOST_PP_SEQ_SIZE_46(_) FB_BOOST_PP_SEQ_SIZE_47
-# define FB_BOOST_PP_SEQ_SIZE_47(_) FB_BOOST_PP_SEQ_SIZE_48
-# define FB_BOOST_PP_SEQ_SIZE_48(_) FB_BOOST_PP_SEQ_SIZE_49
-# define FB_BOOST_PP_SEQ_SIZE_49(_) FB_BOOST_PP_SEQ_SIZE_50
-# define FB_BOOST_PP_SEQ_SIZE_50(_) FB_BOOST_PP_SEQ_SIZE_51
-# define FB_BOOST_PP_SEQ_SIZE_51(_) FB_BOOST_PP_SEQ_SIZE_52
-# define FB_BOOST_PP_SEQ_SIZE_52(_) FB_BOOST_PP_SEQ_SIZE_53
-# define FB_BOOST_PP_SEQ_SIZE_53(_) FB_BOOST_PP_SEQ_SIZE_54
-# define FB_BOOST_PP_SEQ_SIZE_54(_) FB_BOOST_PP_SEQ_SIZE_55
-# define FB_BOOST_PP_SEQ_SIZE_55(_) FB_BOOST_PP_SEQ_SIZE_56
-# define FB_BOOST_PP_SEQ_SIZE_56(_) FB_BOOST_PP_SEQ_SIZE_57
-# define FB_BOOST_PP_SEQ_SIZE_57(_) FB_BOOST_PP_SEQ_SIZE_58
-# define FB_BOOST_PP_SEQ_SIZE_58(_) FB_BOOST_PP_SEQ_SIZE_59
-# define FB_BOOST_PP_SEQ_SIZE_59(_) FB_BOOST_PP_SEQ_SIZE_60
-# define FB_BOOST_PP_SEQ_SIZE_60(_) FB_BOOST_PP_SEQ_SIZE_61
-# define FB_BOOST_PP_SEQ_SIZE_61(_) FB_BOOST_PP_SEQ_SIZE_62
-# define FB_BOOST_PP_SEQ_SIZE_62(_) FB_BOOST_PP_SEQ_SIZE_63
-# define FB_BOOST_PP_SEQ_SIZE_63(_) FB_BOOST_PP_SEQ_SIZE_64
-# define FB_BOOST_PP_SEQ_SIZE_64(_) FB_BOOST_PP_SEQ_SIZE_65
-# define FB_BOOST_PP_SEQ_SIZE_65(_) FB_BOOST_PP_SEQ_SIZE_66
-# define FB_BOOST_PP_SEQ_SIZE_66(_) FB_BOOST_PP_SEQ_SIZE_67
-# define FB_BOOST_PP_SEQ_SIZE_67(_) FB_BOOST_PP_SEQ_SIZE_68
-# define FB_BOOST_PP_SEQ_SIZE_68(_) FB_BOOST_PP_SEQ_SIZE_69
-# define FB_BOOST_PP_SEQ_SIZE_69(_) FB_BOOST_PP_SEQ_SIZE_70
-# define FB_BOOST_PP_SEQ_SIZE_70(_) FB_BOOST_PP_SEQ_SIZE_71
-# define FB_BOOST_PP_SEQ_SIZE_71(_) FB_BOOST_PP_SEQ_SIZE_72
-# define FB_BOOST_PP_SEQ_SIZE_72(_) FB_BOOST_PP_SEQ_SIZE_73
-# define FB_BOOST_PP_SEQ_SIZE_73(_) FB_BOOST_PP_SEQ_SIZE_74
-# define FB_BOOST_PP_SEQ_SIZE_74(_) FB_BOOST_PP_SEQ_SIZE_75
-# define FB_BOOST_PP_SEQ_SIZE_75(_) FB_BOOST_PP_SEQ_SIZE_76
-# define FB_BOOST_PP_SEQ_SIZE_76(_) FB_BOOST_PP_SEQ_SIZE_77
-# define FB_BOOST_PP_SEQ_SIZE_77(_) FB_BOOST_PP_SEQ_SIZE_78
-# define FB_BOOST_PP_SEQ_SIZE_78(_) FB_BOOST_PP_SEQ_SIZE_79
-# define FB_BOOST_PP_SEQ_SIZE_79(_) FB_BOOST_PP_SEQ_SIZE_80
-# define FB_BOOST_PP_SEQ_SIZE_80(_) FB_BOOST_PP_SEQ_SIZE_81
-# define FB_BOOST_PP_SEQ_SIZE_81(_) FB_BOOST_PP_SEQ_SIZE_82
-# define FB_BOOST_PP_SEQ_SIZE_82(_) FB_BOOST_PP_SEQ_SIZE_83
-# define FB_BOOST_PP_SEQ_SIZE_83(_) FB_BOOST_PP_SEQ_SIZE_84
-# define FB_BOOST_PP_SEQ_SIZE_84(_) FB_BOOST_PP_SEQ_SIZE_85
-# define FB_BOOST_PP_SEQ_SIZE_85(_) FB_BOOST_PP_SEQ_SIZE_86
-# define FB_BOOST_PP_SEQ_SIZE_86(_) FB_BOOST_PP_SEQ_SIZE_87
-# define FB_BOOST_PP_SEQ_SIZE_87(_) FB_BOOST_PP_SEQ_SIZE_88
-# define FB_BOOST_PP_SEQ_SIZE_88(_) FB_BOOST_PP_SEQ_SIZE_89
-# define FB_BOOST_PP_SEQ_SIZE_89(_) FB_BOOST_PP_SEQ_SIZE_90
-# define FB_BOOST_PP_SEQ_SIZE_90(_) FB_BOOST_PP_SEQ_SIZE_91
-# define FB_BOOST_PP_SEQ_SIZE_91(_) FB_BOOST_PP_SEQ_SIZE_92
-# define FB_BOOST_PP_SEQ_SIZE_92(_) FB_BOOST_PP_SEQ_SIZE_93
-# define FB_BOOST_PP_SEQ_SIZE_93(_) FB_BOOST_PP_SEQ_SIZE_94
-# define FB_BOOST_PP_SEQ_SIZE_94(_) FB_BOOST_PP_SEQ_SIZE_95
-# define FB_BOOST_PP_SEQ_SIZE_95(_) FB_BOOST_PP_SEQ_SIZE_96
-# define FB_BOOST_PP_SEQ_SIZE_96(_) FB_BOOST_PP_SEQ_SIZE_97
-# define FB_BOOST_PP_SEQ_SIZE_97(_) FB_BOOST_PP_SEQ_SIZE_98
-# define FB_BOOST_PP_SEQ_SIZE_98(_) FB_BOOST_PP_SEQ_SIZE_99
-# define FB_BOOST_PP_SEQ_SIZE_99(_) FB_BOOST_PP_SEQ_SIZE_100
-# define FB_BOOST_PP_SEQ_SIZE_100(_) FB_BOOST_PP_SEQ_SIZE_101
-# define FB_BOOST_PP_SEQ_SIZE_101(_) FB_BOOST_PP_SEQ_SIZE_102
-# define FB_BOOST_PP_SEQ_SIZE_102(_) FB_BOOST_PP_SEQ_SIZE_103
-# define FB_BOOST_PP_SEQ_SIZE_103(_) FB_BOOST_PP_SEQ_SIZE_104
-# define FB_BOOST_PP_SEQ_SIZE_104(_) FB_BOOST_PP_SEQ_SIZE_105
-# define FB_BOOST_PP_SEQ_SIZE_105(_) FB_BOOST_PP_SEQ_SIZE_106
-# define FB_BOOST_PP_SEQ_SIZE_106(_) FB_BOOST_PP_SEQ_SIZE_107
-# define FB_BOOST_PP_SEQ_SIZE_107(_) FB_BOOST_PP_SEQ_SIZE_108
-# define FB_BOOST_PP_SEQ_SIZE_108(_) FB_BOOST_PP_SEQ_SIZE_109
-# define FB_BOOST_PP_SEQ_SIZE_109(_) FB_BOOST_PP_SEQ_SIZE_110
-# define FB_BOOST_PP_SEQ_SIZE_110(_) FB_BOOST_PP_SEQ_SIZE_111
-# define FB_BOOST_PP_SEQ_SIZE_111(_) FB_BOOST_PP_SEQ_SIZE_112
-# define FB_BOOST_PP_SEQ_SIZE_112(_) FB_BOOST_PP_SEQ_SIZE_113
-# define FB_BOOST_PP_SEQ_SIZE_113(_) FB_BOOST_PP_SEQ_SIZE_114
-# define FB_BOOST_PP_SEQ_SIZE_114(_) FB_BOOST_PP_SEQ_SIZE_115
-# define FB_BOOST_PP_SEQ_SIZE_115(_) FB_BOOST_PP_SEQ_SIZE_116
-# define FB_BOOST_PP_SEQ_SIZE_116(_) FB_BOOST_PP_SEQ_SIZE_117
-# define FB_BOOST_PP_SEQ_SIZE_117(_) FB_BOOST_PP_SEQ_SIZE_118
-# define FB_BOOST_PP_SEQ_SIZE_118(_) FB_BOOST_PP_SEQ_SIZE_119
-# define FB_BOOST_PP_SEQ_SIZE_119(_) FB_BOOST_PP_SEQ_SIZE_120
-# define FB_BOOST_PP_SEQ_SIZE_120(_) FB_BOOST_PP_SEQ_SIZE_121
-# define FB_BOOST_PP_SEQ_SIZE_121(_) FB_BOOST_PP_SEQ_SIZE_122
-# define FB_BOOST_PP_SEQ_SIZE_122(_) FB_BOOST_PP_SEQ_SIZE_123
-# define FB_BOOST_PP_SEQ_SIZE_123(_) FB_BOOST_PP_SEQ_SIZE_124
-# define FB_BOOST_PP_SEQ_SIZE_124(_) FB_BOOST_PP_SEQ_SIZE_125
-# define FB_BOOST_PP_SEQ_SIZE_125(_) FB_BOOST_PP_SEQ_SIZE_126
-# define FB_BOOST_PP_SEQ_SIZE_126(_) FB_BOOST_PP_SEQ_SIZE_127
-# define FB_BOOST_PP_SEQ_SIZE_127(_) FB_BOOST_PP_SEQ_SIZE_128
-# define FB_BOOST_PP_SEQ_SIZE_128(_) FB_BOOST_PP_SEQ_SIZE_129
-# define FB_BOOST_PP_SEQ_SIZE_129(_) FB_BOOST_PP_SEQ_SIZE_130
-# define FB_BOOST_PP_SEQ_SIZE_130(_) FB_BOOST_PP_SEQ_SIZE_131
-# define FB_BOOST_PP_SEQ_SIZE_131(_) FB_BOOST_PP_SEQ_SIZE_132
-# define FB_BOOST_PP_SEQ_SIZE_132(_) FB_BOOST_PP_SEQ_SIZE_133
-# define FB_BOOST_PP_SEQ_SIZE_133(_) FB_BOOST_PP_SEQ_SIZE_134
-# define FB_BOOST_PP_SEQ_SIZE_134(_) FB_BOOST_PP_SEQ_SIZE_135
-# define FB_BOOST_PP_SEQ_SIZE_135(_) FB_BOOST_PP_SEQ_SIZE_136
-# define FB_BOOST_PP_SEQ_SIZE_136(_) FB_BOOST_PP_SEQ_SIZE_137
-# define FB_BOOST_PP_SEQ_SIZE_137(_) FB_BOOST_PP_SEQ_SIZE_138
-# define FB_BOOST_PP_SEQ_SIZE_138(_) FB_BOOST_PP_SEQ_SIZE_139
-# define FB_BOOST_PP_SEQ_SIZE_139(_) FB_BOOST_PP_SEQ_SIZE_140
-# define FB_BOOST_PP_SEQ_SIZE_140(_) FB_BOOST_PP_SEQ_SIZE_141
-# define FB_BOOST_PP_SEQ_SIZE_141(_) FB_BOOST_PP_SEQ_SIZE_142
-# define FB_BOOST_PP_SEQ_SIZE_142(_) FB_BOOST_PP_SEQ_SIZE_143
-# define FB_BOOST_PP_SEQ_SIZE_143(_) FB_BOOST_PP_SEQ_SIZE_144
-# define FB_BOOST_PP_SEQ_SIZE_144(_) FB_BOOST_PP_SEQ_SIZE_145
-# define FB_BOOST_PP_SEQ_SIZE_145(_) FB_BOOST_PP_SEQ_SIZE_146
-# define FB_BOOST_PP_SEQ_SIZE_146(_) FB_BOOST_PP_SEQ_SIZE_147
-# define FB_BOOST_PP_SEQ_SIZE_147(_) FB_BOOST_PP_SEQ_SIZE_148
-# define FB_BOOST_PP_SEQ_SIZE_148(_) FB_BOOST_PP_SEQ_SIZE_149
-# define FB_BOOST_PP_SEQ_SIZE_149(_) FB_BOOST_PP_SEQ_SIZE_150
-# define FB_BOOST_PP_SEQ_SIZE_150(_) FB_BOOST_PP_SEQ_SIZE_151
-# define FB_BOOST_PP_SEQ_SIZE_151(_) FB_BOOST_PP_SEQ_SIZE_152
-# define FB_BOOST_PP_SEQ_SIZE_152(_) FB_BOOST_PP_SEQ_SIZE_153
-# define FB_BOOST_PP_SEQ_SIZE_153(_) FB_BOOST_PP_SEQ_SIZE_154
-# define FB_BOOST_PP_SEQ_SIZE_154(_) FB_BOOST_PP_SEQ_SIZE_155
-# define FB_BOOST_PP_SEQ_SIZE_155(_) FB_BOOST_PP_SEQ_SIZE_156
-# define FB_BOOST_PP_SEQ_SIZE_156(_) FB_BOOST_PP_SEQ_SIZE_157
-# define FB_BOOST_PP_SEQ_SIZE_157(_) FB_BOOST_PP_SEQ_SIZE_158
-# define FB_BOOST_PP_SEQ_SIZE_158(_) FB_BOOST_PP_SEQ_SIZE_159
-# define FB_BOOST_PP_SEQ_SIZE_159(_) FB_BOOST_PP_SEQ_SIZE_160
-# define FB_BOOST_PP_SEQ_SIZE_160(_) FB_BOOST_PP_SEQ_SIZE_161
-# define FB_BOOST_PP_SEQ_SIZE_161(_) FB_BOOST_PP_SEQ_SIZE_162
-# define FB_BOOST_PP_SEQ_SIZE_162(_) FB_BOOST_PP_SEQ_SIZE_163
-# define FB_BOOST_PP_SEQ_SIZE_163(_) FB_BOOST_PP_SEQ_SIZE_164
-# define FB_BOOST_PP_SEQ_SIZE_164(_) FB_BOOST_PP_SEQ_SIZE_165
-# define FB_BOOST_PP_SEQ_SIZE_165(_) FB_BOOST_PP_SEQ_SIZE_166
-# define FB_BOOST_PP_SEQ_SIZE_166(_) FB_BOOST_PP_SEQ_SIZE_167
-# define FB_BOOST_PP_SEQ_SIZE_167(_) FB_BOOST_PP_SEQ_SIZE_168
-# define FB_BOOST_PP_SEQ_SIZE_168(_) FB_BOOST_PP_SEQ_SIZE_169
-# define FB_BOOST_PP_SEQ_SIZE_169(_) FB_BOOST_PP_SEQ_SIZE_170
-# define FB_BOOST_PP_SEQ_SIZE_170(_) FB_BOOST_PP_SEQ_SIZE_171
-# define FB_BOOST_PP_SEQ_SIZE_171(_) FB_BOOST_PP_SEQ_SIZE_172
-# define FB_BOOST_PP_SEQ_SIZE_172(_) FB_BOOST_PP_SEQ_SIZE_173
-# define FB_BOOST_PP_SEQ_SIZE_173(_) FB_BOOST_PP_SEQ_SIZE_174
-# define FB_BOOST_PP_SEQ_SIZE_174(_) FB_BOOST_PP_SEQ_SIZE_175
-# define FB_BOOST_PP_SEQ_SIZE_175(_) FB_BOOST_PP_SEQ_SIZE_176
-# define FB_BOOST_PP_SEQ_SIZE_176(_) FB_BOOST_PP_SEQ_SIZE_177
-# define FB_BOOST_PP_SEQ_SIZE_177(_) FB_BOOST_PP_SEQ_SIZE_178
-# define FB_BOOST_PP_SEQ_SIZE_178(_) FB_BOOST_PP_SEQ_SIZE_179
-# define FB_BOOST_PP_SEQ_SIZE_179(_) FB_BOOST_PP_SEQ_SIZE_180
-# define FB_BOOST_PP_SEQ_SIZE_180(_) FB_BOOST_PP_SEQ_SIZE_181
-# define FB_BOOST_PP_SEQ_SIZE_181(_) FB_BOOST_PP_SEQ_SIZE_182
-# define FB_BOOST_PP_SEQ_SIZE_182(_) FB_BOOST_PP_SEQ_SIZE_183
-# define FB_BOOST_PP_SEQ_SIZE_183(_) FB_BOOST_PP_SEQ_SIZE_184
-# define FB_BOOST_PP_SEQ_SIZE_184(_) FB_BOOST_PP_SEQ_SIZE_185
-# define FB_BOOST_PP_SEQ_SIZE_185(_) FB_BOOST_PP_SEQ_SIZE_186
-# define FB_BOOST_PP_SEQ_SIZE_186(_) FB_BOOST_PP_SEQ_SIZE_187
-# define FB_BOOST_PP_SEQ_SIZE_187(_) FB_BOOST_PP_SEQ_SIZE_188
-# define FB_BOOST_PP_SEQ_SIZE_188(_) FB_BOOST_PP_SEQ_SIZE_189
-# define FB_BOOST_PP_SEQ_SIZE_189(_) FB_BOOST_PP_SEQ_SIZE_190
-# define FB_BOOST_PP_SEQ_SIZE_190(_) FB_BOOST_PP_SEQ_SIZE_191
-# define FB_BOOST_PP_SEQ_SIZE_191(_) FB_BOOST_PP_SEQ_SIZE_192
-# define FB_BOOST_PP_SEQ_SIZE_192(_) FB_BOOST_PP_SEQ_SIZE_193
-# define FB_BOOST_PP_SEQ_SIZE_193(_) FB_BOOST_PP_SEQ_SIZE_194
-# define FB_BOOST_PP_SEQ_SIZE_194(_) FB_BOOST_PP_SEQ_SIZE_195
-# define FB_BOOST_PP_SEQ_SIZE_195(_) FB_BOOST_PP_SEQ_SIZE_196
-# define FB_BOOST_PP_SEQ_SIZE_196(_) FB_BOOST_PP_SEQ_SIZE_197
-# define FB_BOOST_PP_SEQ_SIZE_197(_) FB_BOOST_PP_SEQ_SIZE_198
-# define FB_BOOST_PP_SEQ_SIZE_198(_) FB_BOOST_PP_SEQ_SIZE_199
-# define FB_BOOST_PP_SEQ_SIZE_199(_) FB_BOOST_PP_SEQ_SIZE_200
-# define FB_BOOST_PP_SEQ_SIZE_200(_) FB_BOOST_PP_SEQ_SIZE_201
-# define FB_BOOST_PP_SEQ_SIZE_201(_) FB_BOOST_PP_SEQ_SIZE_202
-# define FB_BOOST_PP_SEQ_SIZE_202(_) FB_BOOST_PP_SEQ_SIZE_203
-# define FB_BOOST_PP_SEQ_SIZE_203(_) FB_BOOST_PP_SEQ_SIZE_204
-# define FB_BOOST_PP_SEQ_SIZE_204(_) FB_BOOST_PP_SEQ_SIZE_205
-# define FB_BOOST_PP_SEQ_SIZE_205(_) FB_BOOST_PP_SEQ_SIZE_206
-# define FB_BOOST_PP_SEQ_SIZE_206(_) FB_BOOST_PP_SEQ_SIZE_207
-# define FB_BOOST_PP_SEQ_SIZE_207(_) FB_BOOST_PP_SEQ_SIZE_208
-# define FB_BOOST_PP_SEQ_SIZE_208(_) FB_BOOST_PP_SEQ_SIZE_209
-# define FB_BOOST_PP_SEQ_SIZE_209(_) FB_BOOST_PP_SEQ_SIZE_210
-# define FB_BOOST_PP_SEQ_SIZE_210(_) FB_BOOST_PP_SEQ_SIZE_211
-# define FB_BOOST_PP_SEQ_SIZE_211(_) FB_BOOST_PP_SEQ_SIZE_212
-# define FB_BOOST_PP_SEQ_SIZE_212(_) FB_BOOST_PP_SEQ_SIZE_213
-# define FB_BOOST_PP_SEQ_SIZE_213(_) FB_BOOST_PP_SEQ_SIZE_214
-# define FB_BOOST_PP_SEQ_SIZE_214(_) FB_BOOST_PP_SEQ_SIZE_215
-# define FB_BOOST_PP_SEQ_SIZE_215(_) FB_BOOST_PP_SEQ_SIZE_216
-# define FB_BOOST_PP_SEQ_SIZE_216(_) FB_BOOST_PP_SEQ_SIZE_217
-# define FB_BOOST_PP_SEQ_SIZE_217(_) FB_BOOST_PP_SEQ_SIZE_218
-# define FB_BOOST_PP_SEQ_SIZE_218(_) FB_BOOST_PP_SEQ_SIZE_219
-# define FB_BOOST_PP_SEQ_SIZE_219(_) FB_BOOST_PP_SEQ_SIZE_220
-# define FB_BOOST_PP_SEQ_SIZE_220(_) FB_BOOST_PP_SEQ_SIZE_221
-# define FB_BOOST_PP_SEQ_SIZE_221(_) FB_BOOST_PP_SEQ_SIZE_222
-# define FB_BOOST_PP_SEQ_SIZE_222(_) FB_BOOST_PP_SEQ_SIZE_223
-# define FB_BOOST_PP_SEQ_SIZE_223(_) FB_BOOST_PP_SEQ_SIZE_224
-# define FB_BOOST_PP_SEQ_SIZE_224(_) FB_BOOST_PP_SEQ_SIZE_225
-# define FB_BOOST_PP_SEQ_SIZE_225(_) FB_BOOST_PP_SEQ_SIZE_226
-# define FB_BOOST_PP_SEQ_SIZE_226(_) FB_BOOST_PP_SEQ_SIZE_227
-# define FB_BOOST_PP_SEQ_SIZE_227(_) FB_BOOST_PP_SEQ_SIZE_228
-# define FB_BOOST_PP_SEQ_SIZE_228(_) FB_BOOST_PP_SEQ_SIZE_229
-# define FB_BOOST_PP_SEQ_SIZE_229(_) FB_BOOST_PP_SEQ_SIZE_230
-# define FB_BOOST_PP_SEQ_SIZE_230(_) FB_BOOST_PP_SEQ_SIZE_231
-# define FB_BOOST_PP_SEQ_SIZE_231(_) FB_BOOST_PP_SEQ_SIZE_232
-# define FB_BOOST_PP_SEQ_SIZE_232(_) FB_BOOST_PP_SEQ_SIZE_233
-# define FB_BOOST_PP_SEQ_SIZE_233(_) FB_BOOST_PP_SEQ_SIZE_234
-# define FB_BOOST_PP_SEQ_SIZE_234(_) FB_BOOST_PP_SEQ_SIZE_235
-# define FB_BOOST_PP_SEQ_SIZE_235(_) FB_BOOST_PP_SEQ_SIZE_236
-# define FB_BOOST_PP_SEQ_SIZE_236(_) FB_BOOST_PP_SEQ_SIZE_237
-# define FB_BOOST_PP_SEQ_SIZE_237(_) FB_BOOST_PP_SEQ_SIZE_238
-# define FB_BOOST_PP_SEQ_SIZE_238(_) FB_BOOST_PP_SEQ_SIZE_239
-# define FB_BOOST_PP_SEQ_SIZE_239(_) FB_BOOST_PP_SEQ_SIZE_240
-# define FB_BOOST_PP_SEQ_SIZE_240(_) FB_BOOST_PP_SEQ_SIZE_241
-# define FB_BOOST_PP_SEQ_SIZE_241(_) FB_BOOST_PP_SEQ_SIZE_242
-# define FB_BOOST_PP_SEQ_SIZE_242(_) FB_BOOST_PP_SEQ_SIZE_243
-# define FB_BOOST_PP_SEQ_SIZE_243(_) FB_BOOST_PP_SEQ_SIZE_244
-# define FB_BOOST_PP_SEQ_SIZE_244(_) FB_BOOST_PP_SEQ_SIZE_245
-# define FB_BOOST_PP_SEQ_SIZE_245(_) FB_BOOST_PP_SEQ_SIZE_246
-# define FB_BOOST_PP_SEQ_SIZE_246(_) FB_BOOST_PP_SEQ_SIZE_247
-# define FB_BOOST_PP_SEQ_SIZE_247(_) FB_BOOST_PP_SEQ_SIZE_248
-# define FB_BOOST_PP_SEQ_SIZE_248(_) FB_BOOST_PP_SEQ_SIZE_249
-# define FB_BOOST_PP_SEQ_SIZE_249(_) FB_BOOST_PP_SEQ_SIZE_250
-# define FB_BOOST_PP_SEQ_SIZE_250(_) FB_BOOST_PP_SEQ_SIZE_251
-# define FB_BOOST_PP_SEQ_SIZE_251(_) FB_BOOST_PP_SEQ_SIZE_252
-# define FB_BOOST_PP_SEQ_SIZE_252(_) FB_BOOST_PP_SEQ_SIZE_253
-# define FB_BOOST_PP_SEQ_SIZE_253(_) FB_BOOST_PP_SEQ_SIZE_254
-# define FB_BOOST_PP_SEQ_SIZE_254(_) FB_BOOST_PP_SEQ_SIZE_255
-# define FB_BOOST_PP_SEQ_SIZE_255(_) FB_BOOST_PP_SEQ_SIZE_256
-# define FB_BOOST_PP_SEQ_SIZE_256(_) FB_BOOST_PP_SEQ_SIZE_257
-#
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_0 0
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_1 1
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_2 2
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_3 3
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_4 4
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_5 5
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_6 6
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_7 7
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_8 8
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_9 9
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_10 10
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_11 11
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_12 12
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_13 13
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_14 14
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_15 15
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_16 16
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_17 17
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_18 18
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_19 19
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_20 20
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_21 21
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_22 22
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_23 23
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_24 24
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_25 25
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_26 26
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_27 27
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_28 28
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_29 29
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_30 30
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_31 31
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_32 32
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_33 33
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_34 34
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_35 35
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_36 36
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_37 37
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_38 38
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_39 39
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_40 40
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_41 41
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_42 42
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_43 43
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_44 44
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_45 45
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_46 46
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_47 47
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_48 48
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_49 49
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_50 50
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_51 51
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_52 52
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_53 53
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_54 54
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_55 55
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_56 56
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_57 57
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_58 58
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_59 59
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_60 60
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_61 61
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_62 62
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_63 63
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_64 64
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_65 65
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_66 66
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_67 67
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_68 68
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_69 69
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_70 70
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_71 71
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_72 72
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_73 73
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_74 74
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_75 75
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_76 76
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_77 77
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_78 78
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_79 79
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_80 80
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_81 81
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_82 82
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_83 83
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_84 84
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_85 85
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_86 86
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_87 87
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_88 88
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_89 89
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_90 90
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_91 91
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_92 92
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_93 93
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_94 94
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_95 95
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_96 96
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_97 97
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_98 98
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_99 99
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_100 100
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_101 101
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_102 102
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_103 103
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_104 104
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_105 105
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_106 106
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_107 107
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_108 108
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_109 109
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_110 110
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_111 111
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_112 112
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_113 113
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_114 114
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_115 115
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_116 116
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_117 117
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_118 118
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_119 119
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_120 120
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_121 121
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_122 122
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_123 123
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_124 124
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_125 125
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_126 126
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_127 127
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_128 128
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_129 129
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_130 130
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_131 131
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_132 132
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_133 133
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_134 134
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_135 135
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_136 136
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_137 137
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_138 138
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_139 139
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_140 140
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_141 141
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_142 142
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_143 143
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_144 144
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_145 145
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_146 146
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_147 147
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_148 148
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_149 149
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_150 150
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_151 151
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_152 152
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_153 153
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_154 154
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_155 155
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_156 156
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_157 157
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_158 158
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_159 159
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_160 160
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_161 161
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_162 162
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_163 163
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_164 164
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_165 165
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_166 166
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_167 167
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_168 168
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_169 169
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_170 170
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_171 171
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_172 172
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_173 173
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_174 174
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_175 175
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_176 176
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_177 177
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_178 178
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_179 179
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_180 180
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_181 181
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_182 182
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_183 183
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_184 184
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_185 185
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_186 186
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_187 187
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_188 188
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_189 189
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_190 190
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_191 191
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_192 192
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_193 193
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_194 194
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_195 195
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_196 196
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_197 197
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_198 198
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_199 199
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_200 200
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_201 201
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_202 202
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_203 203
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_204 204
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_205 205
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_206 206
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_207 207
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_208 208
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_209 209
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_210 210
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_211 211
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_212 212
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_213 213
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_214 214
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_215 215
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_216 216
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_217 217
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_218 218
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_219 219
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_220 220
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_221 221
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_222 222
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_223 223
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_224 224
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_225 225
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_226 226
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_227 227
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_228 228
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_229 229
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_230 230
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_231 231
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_232 232
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_233 233
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_234 234
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_235 235
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_236 236
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_237 237
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_238 238
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_239 239
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_240 240
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_241 241
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_242 242
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_243 243
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_244 244
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_245 245
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_246 246
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_247 247
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_248 248
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_249 249
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_250 250
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_251 251
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_252 252
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_253 253
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_254 254
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_255 255
-# define FB_BOOST_PP_SEQ_SIZE_FB_BOOST_PP_SEQ_SIZE_256 256
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/tuple/eat.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/tuple/eat.hpp
deleted file mode 100644
index 264d89ce..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/tuple/eat.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-# /* Copyright (C) 2001
-#  * Housemarque Oy
-#  * http://www.housemarque.com
-#  *
-#  * Distributed under the Boost Software License, Version 1.0. (See
-#  * accompanying file LICENSE_1_0.txt or copy at
-#  * http://www.boost.org/LICENSE_1_0.txt)
-#  */
-#
-# /* Revised by Paul Mensonides (2002) */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_TUPLE_EAT_HPP
-# define FB_BOOST_PREPROCESSOR_TUPLE_EAT_HPP
-#
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-#
-# /* FB_BOOST_PP_TUPLE_EAT */
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_TUPLE_EAT(size) FB_BOOST_PP_TUPLE_EAT_I(size)
-# else
-#    define FB_BOOST_PP_TUPLE_EAT(size) FB_BOOST_PP_TUPLE_EAT_OO((size))
-#    define FB_BOOST_PP_TUPLE_EAT_OO(par) FB_BOOST_PP_TUPLE_EAT_I ## par
-# endif
-#
-# define FB_BOOST_PP_TUPLE_EAT_I(size) FB_BOOST_PP_TUPLE_EAT_ ## size
-#
-# define FB_BOOST_PP_TUPLE_EAT_0()
-# define FB_BOOST_PP_TUPLE_EAT_1(a)
-# define FB_BOOST_PP_TUPLE_EAT_2(a, b)
-# define FB_BOOST_PP_TUPLE_EAT_3(a, b, c)
-# define FB_BOOST_PP_TUPLE_EAT_4(a, b, c, d)
-# define FB_BOOST_PP_TUPLE_EAT_5(a, b, c, d, e)
-# define FB_BOOST_PP_TUPLE_EAT_6(a, b, c, d, e, f)
-# define FB_BOOST_PP_TUPLE_EAT_7(a, b, c, d, e, f, g)
-# define FB_BOOST_PP_TUPLE_EAT_8(a, b, c, d, e, f, g, h)
-# define FB_BOOST_PP_TUPLE_EAT_9(a, b, c, d, e, f, g, h, i)
-# define FB_BOOST_PP_TUPLE_EAT_10(a, b, c, d, e, f, g, h, i, j)
-# define FB_BOOST_PP_TUPLE_EAT_11(a, b, c, d, e, f, g, h, i, j, k)
-# define FB_BOOST_PP_TUPLE_EAT_12(a, b, c, d, e, f, g, h, i, j, k, l)
-# define FB_BOOST_PP_TUPLE_EAT_13(a, b, c, d, e, f, g, h, i, j, k, l, m)
-# define FB_BOOST_PP_TUPLE_EAT_14(a, b, c, d, e, f, g, h, i, j, k, l, m, n)
-# define FB_BOOST_PP_TUPLE_EAT_15(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o)
-# define FB_BOOST_PP_TUPLE_EAT_16(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p)
-# define FB_BOOST_PP_TUPLE_EAT_17(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q)
-# define FB_BOOST_PP_TUPLE_EAT_18(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r)
-# define FB_BOOST_PP_TUPLE_EAT_19(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s)
-# define FB_BOOST_PP_TUPLE_EAT_20(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t)
-# define FB_BOOST_PP_TUPLE_EAT_21(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u)
-# define FB_BOOST_PP_TUPLE_EAT_22(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v)
-# define FB_BOOST_PP_TUPLE_EAT_23(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w)
-# define FB_BOOST_PP_TUPLE_EAT_24(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x)
-# define FB_BOOST_PP_TUPLE_EAT_25(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y)
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/tuple/elem.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/tuple/elem.hpp
deleted file mode 100644
index 436fa494..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/tuple/elem.hpp
+++ /dev/null
@@ -1,385 +0,0 @@
-# /* Copyright (C) 2001
-#  * Housemarque Oy
-#  * http://www.housemarque.com
-#  *
-#  * Distributed under the Boost Software License, Version 1.0. (See
-#  * accompanying file LICENSE_1_0.txt or copy at
-#  * http://www.boost.org/LICENSE_1_0.txt)
-#  */
-#
-# /* Revised by Paul Mensonides (2002) */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_TUPLE_ELEM_HPP
-# define FB_BOOST_PREPROCESSOR_TUPLE_ELEM_HPP
-#
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_TUPLE_ELEM(size, index, tuple) FB_BOOST_PP_TUPLE_ELEM_I(size, index, tuple)
-# else
-#    define FB_BOOST_PP_TUPLE_ELEM(size, index, tuple) FB_BOOST_PP_TUPLE_ELEM_OO((size, index, tuple))
-#    define FB_BOOST_PP_TUPLE_ELEM_OO(par) FB_BOOST_PP_TUPLE_ELEM_I ## par
-# endif
-#
-# if FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_TUPLE_ELEM_I(s, i, t) FB_BOOST_PP_TUPLE_ELEM_ ## s ## _ ## i ## t
-# elif FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MSVC()
-#    define FB_BOOST_PP_TUPLE_ELEM_I(s, i, t) FB_BOOST_PP_TUPLE_ELEM_II(FB_BOOST_PP_TUPLE_ELEM_ ## s ## _ ## i t)
-#    define FB_BOOST_PP_TUPLE_ELEM_II(res) res
-# else
-#    define FB_BOOST_PP_TUPLE_ELEM_I(s, i, t) FB_BOOST_PP_TUPLE_ELEM_ ## s ## _ ## i t
-# endif
-#
-# define FB_BOOST_PP_TUPLE_ELEM_1_0(a) a
-#
-# define FB_BOOST_PP_TUPLE_ELEM_2_0(a, b) a
-# define FB_BOOST_PP_TUPLE_ELEM_2_1(a, b) b
-#
-# define FB_BOOST_PP_TUPLE_ELEM_3_0(a, b, c) a
-# define FB_BOOST_PP_TUPLE_ELEM_3_1(a, b, c) b
-# define FB_BOOST_PP_TUPLE_ELEM_3_2(a, b, c) c
-#
-# define FB_BOOST_PP_TUPLE_ELEM_4_0(a, b, c, d) a
-# define FB_BOOST_PP_TUPLE_ELEM_4_1(a, b, c, d) b
-# define FB_BOOST_PP_TUPLE_ELEM_4_2(a, b, c, d) c
-# define FB_BOOST_PP_TUPLE_ELEM_4_3(a, b, c, d) d
-#
-# define FB_BOOST_PP_TUPLE_ELEM_5_0(a, b, c, d, e) a
-# define FB_BOOST_PP_TUPLE_ELEM_5_1(a, b, c, d, e) b
-# define FB_BOOST_PP_TUPLE_ELEM_5_2(a, b, c, d, e) c
-# define FB_BOOST_PP_TUPLE_ELEM_5_3(a, b, c, d, e) d
-# define FB_BOOST_PP_TUPLE_ELEM_5_4(a, b, c, d, e) e
-#
-# define FB_BOOST_PP_TUPLE_ELEM_6_0(a, b, c, d, e, f) a
-# define FB_BOOST_PP_TUPLE_ELEM_6_1(a, b, c, d, e, f) b
-# define FB_BOOST_PP_TUPLE_ELEM_6_2(a, b, c, d, e, f) c
-# define FB_BOOST_PP_TUPLE_ELEM_6_3(a, b, c, d, e, f) d
-# define FB_BOOST_PP_TUPLE_ELEM_6_4(a, b, c, d, e, f) e
-# define FB_BOOST_PP_TUPLE_ELEM_6_5(a, b, c, d, e, f) f
-#
-# define FB_BOOST_PP_TUPLE_ELEM_7_0(a, b, c, d, e, f, g) a
-# define FB_BOOST_PP_TUPLE_ELEM_7_1(a, b, c, d, e, f, g) b
-# define FB_BOOST_PP_TUPLE_ELEM_7_2(a, b, c, d, e, f, g) c
-# define FB_BOOST_PP_TUPLE_ELEM_7_3(a, b, c, d, e, f, g) d
-# define FB_BOOST_PP_TUPLE_ELEM_7_4(a, b, c, d, e, f, g) e
-# define FB_BOOST_PP_TUPLE_ELEM_7_5(a, b, c, d, e, f, g) f
-# define FB_BOOST_PP_TUPLE_ELEM_7_6(a, b, c, d, e, f, g) g
-#
-# define FB_BOOST_PP_TUPLE_ELEM_8_0(a, b, c, d, e, f, g, h) a
-# define FB_BOOST_PP_TUPLE_ELEM_8_1(a, b, c, d, e, f, g, h) b
-# define FB_BOOST_PP_TUPLE_ELEM_8_2(a, b, c, d, e, f, g, h) c
-# define FB_BOOST_PP_TUPLE_ELEM_8_3(a, b, c, d, e, f, g, h) d
-# define FB_BOOST_PP_TUPLE_ELEM_8_4(a, b, c, d, e, f, g, h) e
-# define FB_BOOST_PP_TUPLE_ELEM_8_5(a, b, c, d, e, f, g, h) f
-# define FB_BOOST_PP_TUPLE_ELEM_8_6(a, b, c, d, e, f, g, h) g
-# define FB_BOOST_PP_TUPLE_ELEM_8_7(a, b, c, d, e, f, g, h) h
-#
-# define FB_BOOST_PP_TUPLE_ELEM_9_0(a, b, c, d, e, f, g, h, i) a
-# define FB_BOOST_PP_TUPLE_ELEM_9_1(a, b, c, d, e, f, g, h, i) b
-# define FB_BOOST_PP_TUPLE_ELEM_9_2(a, b, c, d, e, f, g, h, i) c
-# define FB_BOOST_PP_TUPLE_ELEM_9_3(a, b, c, d, e, f, g, h, i) d
-# define FB_BOOST_PP_TUPLE_ELEM_9_4(a, b, c, d, e, f, g, h, i) e
-# define FB_BOOST_PP_TUPLE_ELEM_9_5(a, b, c, d, e, f, g, h, i) f
-# define FB_BOOST_PP_TUPLE_ELEM_9_6(a, b, c, d, e, f, g, h, i) g
-# define FB_BOOST_PP_TUPLE_ELEM_9_7(a, b, c, d, e, f, g, h, i) h
-# define FB_BOOST_PP_TUPLE_ELEM_9_8(a, b, c, d, e, f, g, h, i) i
-#
-# define FB_BOOST_PP_TUPLE_ELEM_10_0(a, b, c, d, e, f, g, h, i, j) a
-# define FB_BOOST_PP_TUPLE_ELEM_10_1(a, b, c, d, e, f, g, h, i, j) b
-# define FB_BOOST_PP_TUPLE_ELEM_10_2(a, b, c, d, e, f, g, h, i, j) c
-# define FB_BOOST_PP_TUPLE_ELEM_10_3(a, b, c, d, e, f, g, h, i, j) d
-# define FB_BOOST_PP_TUPLE_ELEM_10_4(a, b, c, d, e, f, g, h, i, j) e
-# define FB_BOOST_PP_TUPLE_ELEM_10_5(a, b, c, d, e, f, g, h, i, j) f
-# define FB_BOOST_PP_TUPLE_ELEM_10_6(a, b, c, d, e, f, g, h, i, j) g
-# define FB_BOOST_PP_TUPLE_ELEM_10_7(a, b, c, d, e, f, g, h, i, j) h
-# define FB_BOOST_PP_TUPLE_ELEM_10_8(a, b, c, d, e, f, g, h, i, j) i
-# define FB_BOOST_PP_TUPLE_ELEM_10_9(a, b, c, d, e, f, g, h, i, j) j
-#
-# define FB_BOOST_PP_TUPLE_ELEM_11_0(a, b, c, d, e, f, g, h, i, j, k) a
-# define FB_BOOST_PP_TUPLE_ELEM_11_1(a, b, c, d, e, f, g, h, i, j, k) b
-# define FB_BOOST_PP_TUPLE_ELEM_11_2(a, b, c, d, e, f, g, h, i, j, k) c
-# define FB_BOOST_PP_TUPLE_ELEM_11_3(a, b, c, d, e, f, g, h, i, j, k) d
-# define FB_BOOST_PP_TUPLE_ELEM_11_4(a, b, c, d, e, f, g, h, i, j, k) e
-# define FB_BOOST_PP_TUPLE_ELEM_11_5(a, b, c, d, e, f, g, h, i, j, k) f
-# define FB_BOOST_PP_TUPLE_ELEM_11_6(a, b, c, d, e, f, g, h, i, j, k) g
-# define FB_BOOST_PP_TUPLE_ELEM_11_7(a, b, c, d, e, f, g, h, i, j, k) h
-# define FB_BOOST_PP_TUPLE_ELEM_11_8(a, b, c, d, e, f, g, h, i, j, k) i
-# define FB_BOOST_PP_TUPLE_ELEM_11_9(a, b, c, d, e, f, g, h, i, j, k) j
-# define FB_BOOST_PP_TUPLE_ELEM_11_10(a, b, c, d, e, f, g, h, i, j, k) k
-#
-# define FB_BOOST_PP_TUPLE_ELEM_12_0(a, b, c, d, e, f, g, h, i, j, k, l) a
-# define FB_BOOST_PP_TUPLE_ELEM_12_1(a, b, c, d, e, f, g, h, i, j, k, l) b
-# define FB_BOOST_PP_TUPLE_ELEM_12_2(a, b, c, d, e, f, g, h, i, j, k, l) c
-# define FB_BOOST_PP_TUPLE_ELEM_12_3(a, b, c, d, e, f, g, h, i, j, k, l) d
-# define FB_BOOST_PP_TUPLE_ELEM_12_4(a, b, c, d, e, f, g, h, i, j, k, l) e
-# define FB_BOOST_PP_TUPLE_ELEM_12_5(a, b, c, d, e, f, g, h, i, j, k, l) f
-# define FB_BOOST_PP_TUPLE_ELEM_12_6(a, b, c, d, e, f, g, h, i, j, k, l) g
-# define FB_BOOST_PP_TUPLE_ELEM_12_7(a, b, c, d, e, f, g, h, i, j, k, l) h
-# define FB_BOOST_PP_TUPLE_ELEM_12_8(a, b, c, d, e, f, g, h, i, j, k, l) i
-# define FB_BOOST_PP_TUPLE_ELEM_12_9(a, b, c, d, e, f, g, h, i, j, k, l) j
-# define FB_BOOST_PP_TUPLE_ELEM_12_10(a, b, c, d, e, f, g, h, i, j, k, l) k
-# define FB_BOOST_PP_TUPLE_ELEM_12_11(a, b, c, d, e, f, g, h, i, j, k, l) l
-#
-# define FB_BOOST_PP_TUPLE_ELEM_13_0(a, b, c, d, e, f, g, h, i, j, k, l, m) a
-# define FB_BOOST_PP_TUPLE_ELEM_13_1(a, b, c, d, e, f, g, h, i, j, k, l, m) b
-# define FB_BOOST_PP_TUPLE_ELEM_13_2(a, b, c, d, e, f, g, h, i, j, k, l, m) c
-# define FB_BOOST_PP_TUPLE_ELEM_13_3(a, b, c, d, e, f, g, h, i, j, k, l, m) d
-# define FB_BOOST_PP_TUPLE_ELEM_13_4(a, b, c, d, e, f, g, h, i, j, k, l, m) e
-# define FB_BOOST_PP_TUPLE_ELEM_13_5(a, b, c, d, e, f, g, h, i, j, k, l, m) f
-# define FB_BOOST_PP_TUPLE_ELEM_13_6(a, b, c, d, e, f, g, h, i, j, k, l, m) g
-# define FB_BOOST_PP_TUPLE_ELEM_13_7(a, b, c, d, e, f, g, h, i, j, k, l, m) h
-# define FB_BOOST_PP_TUPLE_ELEM_13_8(a, b, c, d, e, f, g, h, i, j, k, l, m) i
-# define FB_BOOST_PP_TUPLE_ELEM_13_9(a, b, c, d, e, f, g, h, i, j, k, l, m) j
-# define FB_BOOST_PP_TUPLE_ELEM_13_10(a, b, c, d, e, f, g, h, i, j, k, l, m) k
-# define FB_BOOST_PP_TUPLE_ELEM_13_11(a, b, c, d, e, f, g, h, i, j, k, l, m) l
-# define FB_BOOST_PP_TUPLE_ELEM_13_12(a, b, c, d, e, f, g, h, i, j, k, l, m) m
-#
-# define FB_BOOST_PP_TUPLE_ELEM_14_0(a, b, c, d, e, f, g, h, i, j, k, l, m, n) a
-# define FB_BOOST_PP_TUPLE_ELEM_14_1(a, b, c, d, e, f, g, h, i, j, k, l, m, n) b
-# define FB_BOOST_PP_TUPLE_ELEM_14_2(a, b, c, d, e, f, g, h, i, j, k, l, m, n) c
-# define FB_BOOST_PP_TUPLE_ELEM_14_3(a, b, c, d, e, f, g, h, i, j, k, l, m, n) d
-# define FB_BOOST_PP_TUPLE_ELEM_14_4(a, b, c, d, e, f, g, h, i, j, k, l, m, n) e
-# define FB_BOOST_PP_TUPLE_ELEM_14_5(a, b, c, d, e, f, g, h, i, j, k, l, m, n) f
-# define FB_BOOST_PP_TUPLE_ELEM_14_6(a, b, c, d, e, f, g, h, i, j, k, l, m, n) g
-# define FB_BOOST_PP_TUPLE_ELEM_14_7(a, b, c, d, e, f, g, h, i, j, k, l, m, n) h
-# define FB_BOOST_PP_TUPLE_ELEM_14_8(a, b, c, d, e, f, g, h, i, j, k, l, m, n) i
-# define FB_BOOST_PP_TUPLE_ELEM_14_9(a, b, c, d, e, f, g, h, i, j, k, l, m, n) j
-# define FB_BOOST_PP_TUPLE_ELEM_14_10(a, b, c, d, e, f, g, h, i, j, k, l, m, n) k
-# define FB_BOOST_PP_TUPLE_ELEM_14_11(a, b, c, d, e, f, g, h, i, j, k, l, m, n) l
-# define FB_BOOST_PP_TUPLE_ELEM_14_12(a, b, c, d, e, f, g, h, i, j, k, l, m, n) m
-# define FB_BOOST_PP_TUPLE_ELEM_14_13(a, b, c, d, e, f, g, h, i, j, k, l, m, n) n
-#
-# define FB_BOOST_PP_TUPLE_ELEM_15_0(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) a
-# define FB_BOOST_PP_TUPLE_ELEM_15_1(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) b
-# define FB_BOOST_PP_TUPLE_ELEM_15_2(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) c
-# define FB_BOOST_PP_TUPLE_ELEM_15_3(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) d
-# define FB_BOOST_PP_TUPLE_ELEM_15_4(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) e
-# define FB_BOOST_PP_TUPLE_ELEM_15_5(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) f
-# define FB_BOOST_PP_TUPLE_ELEM_15_6(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) g
-# define FB_BOOST_PP_TUPLE_ELEM_15_7(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) h
-# define FB_BOOST_PP_TUPLE_ELEM_15_8(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) i
-# define FB_BOOST_PP_TUPLE_ELEM_15_9(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) j
-# define FB_BOOST_PP_TUPLE_ELEM_15_10(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) k
-# define FB_BOOST_PP_TUPLE_ELEM_15_11(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) l
-# define FB_BOOST_PP_TUPLE_ELEM_15_12(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) m
-# define FB_BOOST_PP_TUPLE_ELEM_15_13(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) n
-# define FB_BOOST_PP_TUPLE_ELEM_15_14(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) o
-#
-# define FB_BOOST_PP_TUPLE_ELEM_16_0(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) a
-# define FB_BOOST_PP_TUPLE_ELEM_16_1(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) b
-# define FB_BOOST_PP_TUPLE_ELEM_16_2(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) c
-# define FB_BOOST_PP_TUPLE_ELEM_16_3(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) d
-# define FB_BOOST_PP_TUPLE_ELEM_16_4(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) e
-# define FB_BOOST_PP_TUPLE_ELEM_16_5(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) f
-# define FB_BOOST_PP_TUPLE_ELEM_16_6(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) g
-# define FB_BOOST_PP_TUPLE_ELEM_16_7(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) h
-# define FB_BOOST_PP_TUPLE_ELEM_16_8(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) i
-# define FB_BOOST_PP_TUPLE_ELEM_16_9(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) j
-# define FB_BOOST_PP_TUPLE_ELEM_16_10(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) k
-# define FB_BOOST_PP_TUPLE_ELEM_16_11(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) l
-# define FB_BOOST_PP_TUPLE_ELEM_16_12(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) m
-# define FB_BOOST_PP_TUPLE_ELEM_16_13(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) n
-# define FB_BOOST_PP_TUPLE_ELEM_16_14(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) o
-# define FB_BOOST_PP_TUPLE_ELEM_16_15(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) p
-#
-# define FB_BOOST_PP_TUPLE_ELEM_17_0(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) a
-# define FB_BOOST_PP_TUPLE_ELEM_17_1(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) b
-# define FB_BOOST_PP_TUPLE_ELEM_17_2(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) c
-# define FB_BOOST_PP_TUPLE_ELEM_17_3(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) d
-# define FB_BOOST_PP_TUPLE_ELEM_17_4(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) e
-# define FB_BOOST_PP_TUPLE_ELEM_17_5(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) f
-# define FB_BOOST_PP_TUPLE_ELEM_17_6(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) g
-# define FB_BOOST_PP_TUPLE_ELEM_17_7(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) h
-# define FB_BOOST_PP_TUPLE_ELEM_17_8(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) i
-# define FB_BOOST_PP_TUPLE_ELEM_17_9(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) j
-# define FB_BOOST_PP_TUPLE_ELEM_17_10(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) k
-# define FB_BOOST_PP_TUPLE_ELEM_17_11(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) l
-# define FB_BOOST_PP_TUPLE_ELEM_17_12(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) m
-# define FB_BOOST_PP_TUPLE_ELEM_17_13(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) n
-# define FB_BOOST_PP_TUPLE_ELEM_17_14(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) o
-# define FB_BOOST_PP_TUPLE_ELEM_17_15(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) p
-# define FB_BOOST_PP_TUPLE_ELEM_17_16(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) q
-#
-# define FB_BOOST_PP_TUPLE_ELEM_18_0(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) a
-# define FB_BOOST_PP_TUPLE_ELEM_18_1(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) b
-# define FB_BOOST_PP_TUPLE_ELEM_18_2(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) c
-# define FB_BOOST_PP_TUPLE_ELEM_18_3(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) d
-# define FB_BOOST_PP_TUPLE_ELEM_18_4(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) e
-# define FB_BOOST_PP_TUPLE_ELEM_18_5(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) f
-# define FB_BOOST_PP_TUPLE_ELEM_18_6(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) g
-# define FB_BOOST_PP_TUPLE_ELEM_18_7(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) h
-# define FB_BOOST_PP_TUPLE_ELEM_18_8(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) i
-# define FB_BOOST_PP_TUPLE_ELEM_18_9(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) j
-# define FB_BOOST_PP_TUPLE_ELEM_18_10(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) k
-# define FB_BOOST_PP_TUPLE_ELEM_18_11(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) l
-# define FB_BOOST_PP_TUPLE_ELEM_18_12(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) m
-# define FB_BOOST_PP_TUPLE_ELEM_18_13(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) n
-# define FB_BOOST_PP_TUPLE_ELEM_18_14(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) o
-# define FB_BOOST_PP_TUPLE_ELEM_18_15(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) p
-# define FB_BOOST_PP_TUPLE_ELEM_18_16(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) q
-# define FB_BOOST_PP_TUPLE_ELEM_18_17(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) r
-#
-# define FB_BOOST_PP_TUPLE_ELEM_19_0(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) a
-# define FB_BOOST_PP_TUPLE_ELEM_19_1(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) b
-# define FB_BOOST_PP_TUPLE_ELEM_19_2(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) c
-# define FB_BOOST_PP_TUPLE_ELEM_19_3(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) d
-# define FB_BOOST_PP_TUPLE_ELEM_19_4(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) e
-# define FB_BOOST_PP_TUPLE_ELEM_19_5(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) f
-# define FB_BOOST_PP_TUPLE_ELEM_19_6(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) g
-# define FB_BOOST_PP_TUPLE_ELEM_19_7(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) h
-# define FB_BOOST_PP_TUPLE_ELEM_19_8(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) i
-# define FB_BOOST_PP_TUPLE_ELEM_19_9(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) j
-# define FB_BOOST_PP_TUPLE_ELEM_19_10(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) k
-# define FB_BOOST_PP_TUPLE_ELEM_19_11(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) l
-# define FB_BOOST_PP_TUPLE_ELEM_19_12(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) m
-# define FB_BOOST_PP_TUPLE_ELEM_19_13(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) n
-# define FB_BOOST_PP_TUPLE_ELEM_19_14(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) o
-# define FB_BOOST_PP_TUPLE_ELEM_19_15(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) p
-# define FB_BOOST_PP_TUPLE_ELEM_19_16(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) q
-# define FB_BOOST_PP_TUPLE_ELEM_19_17(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) r
-# define FB_BOOST_PP_TUPLE_ELEM_19_18(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) s
-#
-# define FB_BOOST_PP_TUPLE_ELEM_20_0(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) a
-# define FB_BOOST_PP_TUPLE_ELEM_20_1(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) b
-# define FB_BOOST_PP_TUPLE_ELEM_20_2(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) c
-# define FB_BOOST_PP_TUPLE_ELEM_20_3(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) d
-# define FB_BOOST_PP_TUPLE_ELEM_20_4(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) e
-# define FB_BOOST_PP_TUPLE_ELEM_20_5(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) f
-# define FB_BOOST_PP_TUPLE_ELEM_20_6(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) g
-# define FB_BOOST_PP_TUPLE_ELEM_20_7(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) h
-# define FB_BOOST_PP_TUPLE_ELEM_20_8(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) i
-# define FB_BOOST_PP_TUPLE_ELEM_20_9(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) j
-# define FB_BOOST_PP_TUPLE_ELEM_20_10(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) k
-# define FB_BOOST_PP_TUPLE_ELEM_20_11(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) l
-# define FB_BOOST_PP_TUPLE_ELEM_20_12(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) m
-# define FB_BOOST_PP_TUPLE_ELEM_20_13(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) n
-# define FB_BOOST_PP_TUPLE_ELEM_20_14(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) o
-# define FB_BOOST_PP_TUPLE_ELEM_20_15(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) p
-# define FB_BOOST_PP_TUPLE_ELEM_20_16(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) q
-# define FB_BOOST_PP_TUPLE_ELEM_20_17(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) r
-# define FB_BOOST_PP_TUPLE_ELEM_20_18(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) s
-# define FB_BOOST_PP_TUPLE_ELEM_20_19(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) t
-#
-# define FB_BOOST_PP_TUPLE_ELEM_21_0(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) a
-# define FB_BOOST_PP_TUPLE_ELEM_21_1(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) b
-# define FB_BOOST_PP_TUPLE_ELEM_21_2(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) c
-# define FB_BOOST_PP_TUPLE_ELEM_21_3(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) d
-# define FB_BOOST_PP_TUPLE_ELEM_21_4(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) e
-# define FB_BOOST_PP_TUPLE_ELEM_21_5(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) f
-# define FB_BOOST_PP_TUPLE_ELEM_21_6(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) g
-# define FB_BOOST_PP_TUPLE_ELEM_21_7(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) h
-# define FB_BOOST_PP_TUPLE_ELEM_21_8(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) i
-# define FB_BOOST_PP_TUPLE_ELEM_21_9(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) j
-# define FB_BOOST_PP_TUPLE_ELEM_21_10(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) k
-# define FB_BOOST_PP_TUPLE_ELEM_21_11(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) l
-# define FB_BOOST_PP_TUPLE_ELEM_21_12(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) m
-# define FB_BOOST_PP_TUPLE_ELEM_21_13(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) n
-# define FB_BOOST_PP_TUPLE_ELEM_21_14(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) o
-# define FB_BOOST_PP_TUPLE_ELEM_21_15(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) p
-# define FB_BOOST_PP_TUPLE_ELEM_21_16(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) q
-# define FB_BOOST_PP_TUPLE_ELEM_21_17(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) r
-# define FB_BOOST_PP_TUPLE_ELEM_21_18(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) s
-# define FB_BOOST_PP_TUPLE_ELEM_21_19(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) t
-# define FB_BOOST_PP_TUPLE_ELEM_21_20(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) u
-#
-# define FB_BOOST_PP_TUPLE_ELEM_22_0(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) a
-# define FB_BOOST_PP_TUPLE_ELEM_22_1(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) b
-# define FB_BOOST_PP_TUPLE_ELEM_22_2(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) c
-# define FB_BOOST_PP_TUPLE_ELEM_22_3(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) d
-# define FB_BOOST_PP_TUPLE_ELEM_22_4(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) e
-# define FB_BOOST_PP_TUPLE_ELEM_22_5(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) f
-# define FB_BOOST_PP_TUPLE_ELEM_22_6(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) g
-# define FB_BOOST_PP_TUPLE_ELEM_22_7(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) h
-# define FB_BOOST_PP_TUPLE_ELEM_22_8(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) i
-# define FB_BOOST_PP_TUPLE_ELEM_22_9(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) j
-# define FB_BOOST_PP_TUPLE_ELEM_22_10(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) k
-# define FB_BOOST_PP_TUPLE_ELEM_22_11(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) l
-# define FB_BOOST_PP_TUPLE_ELEM_22_12(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) m
-# define FB_BOOST_PP_TUPLE_ELEM_22_13(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) n
-# define FB_BOOST_PP_TUPLE_ELEM_22_14(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) o
-# define FB_BOOST_PP_TUPLE_ELEM_22_15(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) p
-# define FB_BOOST_PP_TUPLE_ELEM_22_16(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) q
-# define FB_BOOST_PP_TUPLE_ELEM_22_17(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) r
-# define FB_BOOST_PP_TUPLE_ELEM_22_18(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) s
-# define FB_BOOST_PP_TUPLE_ELEM_22_19(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) t
-# define FB_BOOST_PP_TUPLE_ELEM_22_20(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) u
-# define FB_BOOST_PP_TUPLE_ELEM_22_21(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) v
-#
-# define FB_BOOST_PP_TUPLE_ELEM_23_0(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) a
-# define FB_BOOST_PP_TUPLE_ELEM_23_1(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) b
-# define FB_BOOST_PP_TUPLE_ELEM_23_2(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) c
-# define FB_BOOST_PP_TUPLE_ELEM_23_3(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) d
-# define FB_BOOST_PP_TUPLE_ELEM_23_4(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) e
-# define FB_BOOST_PP_TUPLE_ELEM_23_5(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) f
-# define FB_BOOST_PP_TUPLE_ELEM_23_6(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) g
-# define FB_BOOST_PP_TUPLE_ELEM_23_7(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) h
-# define FB_BOOST_PP_TUPLE_ELEM_23_8(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) i
-# define FB_BOOST_PP_TUPLE_ELEM_23_9(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) j
-# define FB_BOOST_PP_TUPLE_ELEM_23_10(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) k
-# define FB_BOOST_PP_TUPLE_ELEM_23_11(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) l
-# define FB_BOOST_PP_TUPLE_ELEM_23_12(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) m
-# define FB_BOOST_PP_TUPLE_ELEM_23_13(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) n
-# define FB_BOOST_PP_TUPLE_ELEM_23_14(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) o
-# define FB_BOOST_PP_TUPLE_ELEM_23_15(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) p
-# define FB_BOOST_PP_TUPLE_ELEM_23_16(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) q
-# define FB_BOOST_PP_TUPLE_ELEM_23_17(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) r
-# define FB_BOOST_PP_TUPLE_ELEM_23_18(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) s
-# define FB_BOOST_PP_TUPLE_ELEM_23_19(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) t
-# define FB_BOOST_PP_TUPLE_ELEM_23_20(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) u
-# define FB_BOOST_PP_TUPLE_ELEM_23_21(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) v
-# define FB_BOOST_PP_TUPLE_ELEM_23_22(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) w
-#
-# define FB_BOOST_PP_TUPLE_ELEM_24_0(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) a
-# define FB_BOOST_PP_TUPLE_ELEM_24_1(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) b
-# define FB_BOOST_PP_TUPLE_ELEM_24_2(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) c
-# define FB_BOOST_PP_TUPLE_ELEM_24_3(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) d
-# define FB_BOOST_PP_TUPLE_ELEM_24_4(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) e
-# define FB_BOOST_PP_TUPLE_ELEM_24_5(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) f
-# define FB_BOOST_PP_TUPLE_ELEM_24_6(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) g
-# define FB_BOOST_PP_TUPLE_ELEM_24_7(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) h
-# define FB_BOOST_PP_TUPLE_ELEM_24_8(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) i
-# define FB_BOOST_PP_TUPLE_ELEM_24_9(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) j
-# define FB_BOOST_PP_TUPLE_ELEM_24_10(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) k
-# define FB_BOOST_PP_TUPLE_ELEM_24_11(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) l
-# define FB_BOOST_PP_TUPLE_ELEM_24_12(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) m
-# define FB_BOOST_PP_TUPLE_ELEM_24_13(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) n
-# define FB_BOOST_PP_TUPLE_ELEM_24_14(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) o
-# define FB_BOOST_PP_TUPLE_ELEM_24_15(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) p
-# define FB_BOOST_PP_TUPLE_ELEM_24_16(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) q
-# define FB_BOOST_PP_TUPLE_ELEM_24_17(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) r
-# define FB_BOOST_PP_TUPLE_ELEM_24_18(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) s
-# define FB_BOOST_PP_TUPLE_ELEM_24_19(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) t
-# define FB_BOOST_PP_TUPLE_ELEM_24_20(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) u
-# define FB_BOOST_PP_TUPLE_ELEM_24_21(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) v
-# define FB_BOOST_PP_TUPLE_ELEM_24_22(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) w
-# define FB_BOOST_PP_TUPLE_ELEM_24_23(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) x
-#
-# define FB_BOOST_PP_TUPLE_ELEM_25_0(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) a
-# define FB_BOOST_PP_TUPLE_ELEM_25_1(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) b
-# define FB_BOOST_PP_TUPLE_ELEM_25_2(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) c
-# define FB_BOOST_PP_TUPLE_ELEM_25_3(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) d
-# define FB_BOOST_PP_TUPLE_ELEM_25_4(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) e
-# define FB_BOOST_PP_TUPLE_ELEM_25_5(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) f
-# define FB_BOOST_PP_TUPLE_ELEM_25_6(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) g
-# define FB_BOOST_PP_TUPLE_ELEM_25_7(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) h
-# define FB_BOOST_PP_TUPLE_ELEM_25_8(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) i
-# define FB_BOOST_PP_TUPLE_ELEM_25_9(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) j
-# define FB_BOOST_PP_TUPLE_ELEM_25_10(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) k
-# define FB_BOOST_PP_TUPLE_ELEM_25_11(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) l
-# define FB_BOOST_PP_TUPLE_ELEM_25_12(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) m
-# define FB_BOOST_PP_TUPLE_ELEM_25_13(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) n
-# define FB_BOOST_PP_TUPLE_ELEM_25_14(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) o
-# define FB_BOOST_PP_TUPLE_ELEM_25_15(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) p
-# define FB_BOOST_PP_TUPLE_ELEM_25_16(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) q
-# define FB_BOOST_PP_TUPLE_ELEM_25_17(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) r
-# define FB_BOOST_PP_TUPLE_ELEM_25_18(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) s
-# define FB_BOOST_PP_TUPLE_ELEM_25_19(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) t
-# define FB_BOOST_PP_TUPLE_ELEM_25_20(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) u
-# define FB_BOOST_PP_TUPLE_ELEM_25_21(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) v
-# define FB_BOOST_PP_TUPLE_ELEM_25_22(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) w
-# define FB_BOOST_PP_TUPLE_ELEM_25_23(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) x
-# define FB_BOOST_PP_TUPLE_ELEM_25_24(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) y
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/boost/preprocessor/tuple/rem.hpp b/FBClient.Headers/firebird/impl/boost/preprocessor/tuple/rem.hpp
deleted file mode 100644
index e353d1c5..00000000
--- a/FBClient.Headers/firebird/impl/boost/preprocessor/tuple/rem.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-# /* **************************************************************************
-#  *                                                                          *
-#  *     (C) Copyright Paul Mensonides 2002.
-#  *     Distributed under the Boost Software License, Version 1.0. (See
-#  *     accompanying file LICENSE_1_0.txt or copy at
-#  *     http://www.boost.org/LICENSE_1_0.txt)
-#  *                                                                          *
-#  ************************************************************************** */
-#
-# /* See http://www.boost.org for most recent version. */
-#
-# ifndef FB_BOOST_PREPROCESSOR_TUPLE_REM_HPP
-# define FB_BOOST_PREPROCESSOR_TUPLE_REM_HPP
-#
-# include <firebird/impl/boost/preprocessor/config/config.hpp>
-#
-# /* FB_BOOST_PP_TUPLE_REM */
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_TUPLE_REM(size) FB_BOOST_PP_TUPLE_REM_I(size)
-# else
-#    define FB_BOOST_PP_TUPLE_REM(size) FB_BOOST_PP_TUPLE_REM_OO((size))
-#    define FB_BOOST_PP_TUPLE_REM_OO(par) FB_BOOST_PP_TUPLE_REM_I ## par
-# endif
-#
-# define FB_BOOST_PP_TUPLE_REM_I(size) FB_BOOST_PP_TUPLE_REM_ ## size
-#
-# define FB_BOOST_PP_TUPLE_REM_0()
-# define FB_BOOST_PP_TUPLE_REM_1(a) a
-# define FB_BOOST_PP_TUPLE_REM_2(a, b) a, b
-# define FB_BOOST_PP_TUPLE_REM_3(a, b, c) a, b, c
-# define FB_BOOST_PP_TUPLE_REM_4(a, b, c, d) a, b, c, d
-# define FB_BOOST_PP_TUPLE_REM_5(a, b, c, d, e) a, b, c, d, e
-# define FB_BOOST_PP_TUPLE_REM_6(a, b, c, d, e, f) a, b, c, d, e, f
-# define FB_BOOST_PP_TUPLE_REM_7(a, b, c, d, e, f, g) a, b, c, d, e, f, g
-# define FB_BOOST_PP_TUPLE_REM_8(a, b, c, d, e, f, g, h) a, b, c, d, e, f, g, h
-# define FB_BOOST_PP_TUPLE_REM_9(a, b, c, d, e, f, g, h, i) a, b, c, d, e, f, g, h, i
-# define FB_BOOST_PP_TUPLE_REM_10(a, b, c, d, e, f, g, h, i, j) a, b, c, d, e, f, g, h, i, j
-# define FB_BOOST_PP_TUPLE_REM_11(a, b, c, d, e, f, g, h, i, j, k) a, b, c, d, e, f, g, h, i, j, k
-# define FB_BOOST_PP_TUPLE_REM_12(a, b, c, d, e, f, g, h, i, j, k, l) a, b, c, d, e, f, g, h, i, j, k, l
-# define FB_BOOST_PP_TUPLE_REM_13(a, b, c, d, e, f, g, h, i, j, k, l, m) a, b, c, d, e, f, g, h, i, j, k, l, m
-# define FB_BOOST_PP_TUPLE_REM_14(a, b, c, d, e, f, g, h, i, j, k, l, m, n) a, b, c, d, e, f, g, h, i, j, k, l, m, n
-# define FB_BOOST_PP_TUPLE_REM_15(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) a, b, c, d, e, f, g, h, i, j, k, l, m, n, o
-# define FB_BOOST_PP_TUPLE_REM_16(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p
-# define FB_BOOST_PP_TUPLE_REM_17(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q
-# define FB_BOOST_PP_TUPLE_REM_18(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r) a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r
-# define FB_BOOST_PP_TUPLE_REM_19(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s
-# define FB_BOOST_PP_TUPLE_REM_20(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t
-# define FB_BOOST_PP_TUPLE_REM_21(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u
-# define FB_BOOST_PP_TUPLE_REM_22(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v
-# define FB_BOOST_PP_TUPLE_REM_23(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w
-# define FB_BOOST_PP_TUPLE_REM_24(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x
-# define FB_BOOST_PP_TUPLE_REM_25(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y
-#
-# /* FB_BOOST_PP_TUPLE_REM_CTOR */
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_EDG()
-#    define FB_BOOST_PP_TUPLE_REM_CTOR(size, tuple) FB_BOOST_PP_TUPLE_REM_CTOR_I(FB_BOOST_PP_TUPLE_REM(size), tuple)
-# else
-#    define FB_BOOST_PP_TUPLE_REM_CTOR(size, tuple) FB_BOOST_PP_TUPLE_REM_CTOR_D(size, tuple)
-#    define FB_BOOST_PP_TUPLE_REM_CTOR_D(size, tuple) FB_BOOST_PP_TUPLE_REM_CTOR_I(FB_BOOST_PP_TUPLE_REM(size), tuple)
-# endif
-#
-# if ~FB_BOOST_PP_CONFIG_FLAGS() & FB_BOOST_PP_CONFIG_MWCC()
-#    define FB_BOOST_PP_TUPLE_REM_CTOR_I(ext, tuple) ext tuple
-# else
-#    define FB_BOOST_PP_TUPLE_REM_CTOR_I(ext, tuple) FB_BOOST_PP_TUPLE_REM_CTOR_OO((ext, tuple))
-#    define FB_BOOST_PP_TUPLE_REM_CTOR_OO(par) FB_BOOST_PP_TUPLE_REM_CTOR_II ## par
-#    define FB_BOOST_PP_TUPLE_REM_CTOR_II(ext, tuple) ext ## tuple
-# endif
-#
-# endif
diff --git a/FBClient.Headers/firebird/impl/consts_pub.h b/FBClient.Headers/firebird/impl/consts_pub.h
deleted file mode 100644
index d7f70049..00000000
--- a/FBClient.Headers/firebird/impl/consts_pub.h
+++ /dev/null
@@ -1,791 +0,0 @@
-/*
- *	MODULE:		consts_pub.h
- *	DESCRIPTION:	Public constants' definitions
- *
- * The contents of this file are subject to the Interbase Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy
- * of the License at http://www.Inprise.com/IPL.html
- *
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
- * or implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code was created by Inprise Corporation
- * and its predecessors. Portions created by Inprise Corporation are
- * Copyright (C) Inprise Corporation.
- *
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- *
- * 18.08.2006 Dimitry Sibiryakov: Extracted it from ibase.h
- *
- */
-
-#ifndef FIREBIRD_IMPL_CONSTS_PUB_H
-#define FIREBIRD_IMPL_CONSTS_PUB_H
-
-/**********************************/
-/* Database parameter block stuff */
-/**********************************/
-
-#define isc_dpb_version1                  1
-#define isc_dpb_version2                  2
-
-#define isc_dpb_cdd_pathname              1
-#define isc_dpb_allocation                2
-#define isc_dpb_journal                   3
-#define isc_dpb_page_size                 4
-#define isc_dpb_num_buffers               5
-#define isc_dpb_buffer_length             6
-#define isc_dpb_debug                     7
-#define isc_dpb_garbage_collect           8
-#define isc_dpb_verify                    9
-#define isc_dpb_sweep                     10
-#define isc_dpb_enable_journal            11
-#define isc_dpb_disable_journal           12
-#define isc_dpb_dbkey_scope               13
-#define isc_dpb_number_of_users           14
-#define isc_dpb_trace                     15
-#define isc_dpb_no_garbage_collect        16
-#define isc_dpb_damaged                   17
-#define isc_dpb_license                   18
-#define isc_dpb_sys_user_name             19
-#define isc_dpb_encrypt_key               20
-#define isc_dpb_activate_shadow           21
-#define isc_dpb_sweep_interval            22
-#define isc_dpb_delete_shadow             23
-#define isc_dpb_force_write               24
-#define isc_dpb_begin_log                 25
-#define isc_dpb_quit_log                  26
-#define isc_dpb_no_reserve                27
-#define isc_dpb_user_name                 28
-#define isc_dpb_password                  29
-#define isc_dpb_password_enc              30
-#define isc_dpb_sys_user_name_enc         31
-#define isc_dpb_interp                    32
-#define isc_dpb_online_dump               33
-#define isc_dpb_old_file_size             34
-#define isc_dpb_old_num_files             35
-#define isc_dpb_old_file                  36
-#define isc_dpb_old_start_page            37
-#define isc_dpb_old_start_seqno           38
-#define isc_dpb_old_start_file            39
-#define isc_dpb_drop_walfile              40
-#define isc_dpb_old_dump_id               41
-#define isc_dpb_wal_backup_dir            42
-#define isc_dpb_wal_chkptlen              43
-#define isc_dpb_wal_numbufs               44
-#define isc_dpb_wal_bufsize               45
-#define isc_dpb_wal_grp_cmt_wait          46
-#define isc_dpb_lc_messages               47
-#define isc_dpb_lc_ctype                  48
-#define isc_dpb_cache_manager             49
-#define isc_dpb_shutdown                  50
-#define isc_dpb_online                    51
-#define isc_dpb_shutdown_delay            52
-#define isc_dpb_reserved                  53
-#define isc_dpb_overwrite                 54
-#define isc_dpb_sec_attach                55
-#define isc_dpb_disable_wal               56
-#define isc_dpb_connect_timeout           57
-#define isc_dpb_dummy_packet_interval     58
-#define isc_dpb_gbak_attach               59
-#define isc_dpb_sql_role_name             60
-#define isc_dpb_set_page_buffers          61
-#define isc_dpb_working_directory         62
-#define isc_dpb_sql_dialect               63
-#define isc_dpb_set_db_readonly           64
-#define isc_dpb_set_db_sql_dialect        65
-#define isc_dpb_gfix_attach               66
-#define isc_dpb_gstat_attach              67
-#define isc_dpb_set_db_charset            68
-#define isc_dpb_gsec_attach               69		/* deprecated */
-#define isc_dpb_address_path              70
-#define isc_dpb_process_id                71
-#define isc_dpb_no_db_triggers            72
-#define isc_dpb_trusted_auth			  73
-#define isc_dpb_process_name              74
-#define isc_dpb_trusted_role			  75
-#define isc_dpb_org_filename			  76
-#define isc_dpb_utf8_filename			  77
-#define isc_dpb_ext_call_depth			  78
-#define isc_dpb_auth_block				  79
-#define isc_dpb_client_version			  80
-#define isc_dpb_remote_protocol			  81
-#define isc_dpb_host_name				  82
-#define isc_dpb_os_user					  83
-#define isc_dpb_specific_auth_data		  84
-#define isc_dpb_auth_plugin_list		  85
-#define isc_dpb_auth_plugin_name		  86
-#define isc_dpb_config					  87
-#define isc_dpb_nolinger				  88
-#define isc_dpb_reset_icu				  89
-#define isc_dpb_map_attach                90
-#define isc_dpb_session_time_zone         91
-#define isc_dpb_set_db_replica            92
-#define isc_dpb_set_bind                  93
-#define isc_dpb_decfloat_round            94
-#define isc_dpb_decfloat_traps            95
-#define isc_dpb_clear_map				  96
-#define isc_dpb_upgrade_db				  97
-#define isc_dpb_parallel_workers		 100
-#define isc_dpb_worker_attach			 101
-
-
-/**************************************************/
-/* clumplet tags used inside isc_dpb_address_path */
-/*						 and isc_spb_address_path */
-/**************************************************/
-
-/* Format of this clumplet is the following:
-
- <address-path-clumplet> ::=
-	isc_dpb_address_path <byte-clumplet-length> <address-stack>
-
- <address-stack> ::=
-	<address-descriptor> |
-	<address-stack> <address-descriptor>
-
- <address-descriptor> ::=
-	isc_dpb_address <byte-clumplet-length> <address-elements>
-
- <address-elements> ::=
-	<address-element> |
-	<address-elements> <address-element>
-
- <address-element> ::=
-	isc_dpb_addr_protocol <byte-clumplet-length> <protocol-string> |
-	isc_dpb_addr_endpoint <byte-clumplet-length> <remote-endpoint-string> |
-	isc_dpb_addr_flags <byte-clumplet-length> <flags-int> |
-	isc_dpb_addr_crypt <byte-clumplet-length> <plugin-string>
-
- <protocol-string> ::=
-	"TCPv4" |
-	"TCPv6" |
-	"XNET"
-	....
-
- <plugin-string> ::=
-	"Arc4" |
-	"ChaCha" |
-	....
-
- <remote-endpoint-string> ::=
-	<IPv4-address> | // such as "172.20.1.1"
-	<IPv6-address> | // such as "2001:0:13FF:09FF::1"
-	<xnet-process-id> | // such as "17864"
-	...
-
- <flags-int> ::=
- 	bitmask of possible flags
-*/
-
-#define isc_dpb_address 1
-
-#define isc_dpb_addr_protocol 1
-#define isc_dpb_addr_endpoint 2
-#define isc_dpb_addr_flags 3
-#define isc_dpb_addr_crypt 4
-
-/* possible addr flags */
-#define isc_dpb_addr_flag_conn_compressed	0x01
-#define isc_dpb_addr_flag_conn_encrypted	0x02
-
-/*********************************/
-/* isc_dpb_verify specific flags */
-/*********************************/
-
-#define isc_dpb_pages                     1
-#define isc_dpb_records                   2
-#define isc_dpb_indices                   4
-#define isc_dpb_transactions              8
-#define isc_dpb_no_update                 16
-#define isc_dpb_repair                    32
-#define isc_dpb_ignore                    64
-
-/***********************************/
-/* isc_dpb_shutdown specific flags */
-/***********************************/
-
-#define isc_dpb_shut_cache               0x1
-#define isc_dpb_shut_attachment          0x2
-#define isc_dpb_shut_transaction         0x4
-#define isc_dpb_shut_force               0x8
-#define isc_dpb_shut_mode_mask          0x70
-
-#define isc_dpb_shut_default             0x0
-#define isc_dpb_shut_normal             0x10
-#define isc_dpb_shut_multi              0x20
-#define isc_dpb_shut_single             0x30
-#define isc_dpb_shut_full               0x40
-
-/*****************************************/
-/* isc_dpb_set_db_replica specific flags */
-/*****************************************/
-
-#define isc_dpb_replica_none             0
-#define isc_dpb_replica_read_only        1
-#define isc_dpb_replica_read_write       2
-
-/**************************************/
-/* Bit assignments in RDB$SYSTEM_FLAG */
-/**************************************/
-
-#define RDB_system                         1
-#define RDB_id_assigned                    2
-/* 2 is for QLI. See jrd/constants.h for more Firebird-specific values. */
-
-
-/*************************************/
-/* Transaction parameter block stuff */
-/*************************************/
-
-#define isc_tpb_version1                  1
-#define isc_tpb_version3                  3
-#define isc_tpb_consistency               1
-#define isc_tpb_concurrency               2
-#define isc_tpb_shared                    3
-#define isc_tpb_protected                 4
-#define isc_tpb_exclusive                 5
-#define isc_tpb_wait                      6
-#define isc_tpb_nowait                    7
-#define isc_tpb_read                      8
-#define isc_tpb_write                     9
-#define isc_tpb_lock_read                 10
-#define isc_tpb_lock_write                11
-#define isc_tpb_verb_time                 12
-#define isc_tpb_commit_time               13
-#define isc_tpb_ignore_limbo              14
-#define isc_tpb_read_committed	          15
-#define isc_tpb_autocommit                16
-#define isc_tpb_rec_version               17
-#define isc_tpb_no_rec_version            18
-#define isc_tpb_restart_requests          19
-#define isc_tpb_no_auto_undo              20
-#define isc_tpb_lock_timeout              21
-#define isc_tpb_read_consistency          22
-#define isc_tpb_at_snapshot_number        23
-
-
-/************************/
-/* Blob Parameter Block */
-/************************/
-
-#define isc_bpb_version1                  1
-#define isc_bpb_source_type               1
-#define isc_bpb_target_type               2
-#define isc_bpb_type                      3
-#define isc_bpb_source_interp             4
-#define isc_bpb_target_interp             5
-#define isc_bpb_filter_parameter          6
-#define isc_bpb_storage                   7
-
-#define isc_bpb_type_segmented            0x0
-#define isc_bpb_type_stream               0x1
-#define isc_bpb_storage_main              0x0
-#define isc_bpb_storage_temp              0x2
-
-
-/*********************************/
-/* Service parameter block stuff */
-/*********************************/
-
-#define isc_spb_version1                  1
-#define isc_spb_current_version           2
-#define isc_spb_version                   isc_spb_current_version
-#define isc_spb_version3                  3
-#define isc_spb_user_name                 isc_dpb_user_name
-#define isc_spb_sys_user_name             isc_dpb_sys_user_name
-#define isc_spb_sys_user_name_enc         isc_dpb_sys_user_name_enc
-#define isc_spb_password                  isc_dpb_password
-#define isc_spb_password_enc              isc_dpb_password_enc
-#define isc_spb_command_line              105
-#define isc_spb_dbname                    106
-#define isc_spb_verbose                   107
-#define isc_spb_options                   108
-#define isc_spb_address_path              109
-#define isc_spb_process_id                110
-#define isc_spb_trusted_auth			  111
-#define isc_spb_process_name              112
-#define isc_spb_trusted_role              113
-#define isc_spb_verbint                   114
-#define isc_spb_auth_block                115
-#define isc_spb_auth_plugin_name          116
-#define isc_spb_auth_plugin_list          117
-#define isc_spb_utf8_filename			  118
-#define isc_spb_client_version            119
-#define isc_spb_remote_protocol           120
-#define isc_spb_host_name                 121
-#define isc_spb_os_user                   122
-#define isc_spb_config					  123
-#define isc_spb_expected_db				  124
-
-#define isc_spb_connect_timeout           isc_dpb_connect_timeout
-#define isc_spb_dummy_packet_interval     isc_dpb_dummy_packet_interval
-#define isc_spb_sql_role_name             isc_dpb_sql_role_name
-
-// This will not be used in protocol 13, therefore may be reused
-#define isc_spb_specific_auth_data		  isc_spb_trusted_auth
-
-/*****************************
- * Service action items      *
- *****************************/
-
-#define isc_action_svc_backup          1	/* Starts database backup process on the server */
-#define isc_action_svc_restore         2	/* Starts database restore process on the server */
-#define isc_action_svc_repair          3	/* Starts database repair process on the server */
-#define isc_action_svc_add_user        4	/* Adds a new user to the security database */
-#define isc_action_svc_delete_user     5	/* Deletes a user record from the security database */
-#define isc_action_svc_modify_user     6	/* Modifies a user record in the security database */
-#define isc_action_svc_display_user    7	/* Displays a user record from the security database */
-#define isc_action_svc_properties      8	/* Sets database properties */
-#define isc_action_svc_add_license     9	/* Adds a license to the license file */
-#define isc_action_svc_remove_license 10	/* Removes a license from the license file */
-#define isc_action_svc_db_stats	      11	/* Retrieves database statistics */
-#define isc_action_svc_get_ib_log     12	/* Retrieves the InterBase log file from the server */
-#define isc_action_svc_get_fb_log     12	/* Retrieves the Firebird log file from the server */
-#define isc_action_svc_nbak           20	/* Incremental nbackup */
-#define isc_action_svc_nrest          21	/* Incremental database restore */
-#define isc_action_svc_trace_start    22	// Start trace session
-#define isc_action_svc_trace_stop     23	// Stop trace session
-#define isc_action_svc_trace_suspend  24	// Suspend trace session
-#define isc_action_svc_trace_resume   25	// Resume trace session
-#define isc_action_svc_trace_list     26	// List existing sessions
-#define isc_action_svc_set_mapping    27	// Set auto admins mapping in security database
-#define isc_action_svc_drop_mapping   28	// Drop auto admins mapping in security database
-#define isc_action_svc_display_user_adm 29	// Displays user(s) from security database with admin info
-#define isc_action_svc_validate		  30	// Starts database online validation
-#define isc_action_svc_nfix           31	// Fixup database after file system copy
-#define isc_action_svc_last			  32	// keep it last !
-
-/*****************************
- * Service information items *
- *****************************/
-
-#define isc_info_svc_svr_db_info		50	/* Retrieves the number of attachments and databases */
-#define isc_info_svc_get_license		51	/* Retrieves all license keys and IDs from the license file */
-#define isc_info_svc_get_license_mask	52	/* Retrieves a bitmask representing licensed options on the server */
-#define isc_info_svc_get_config			53	/* Retrieves the parameters and values for IB_CONFIG */
-#define isc_info_svc_version			54	/* Retrieves the version of the services manager */
-#define isc_info_svc_server_version		55	/* Retrieves the version of the Firebird server */
-#define isc_info_svc_implementation		56	/* Retrieves the implementation of the Firebird server */
-#define isc_info_svc_capabilities		57	/* Retrieves a bitmask representing the server's capabilities */
-#define isc_info_svc_user_dbpath		58	/* Retrieves the path to the security database in use by the server */
-#define isc_info_svc_get_env			59	/* Retrieves the setting of $FIREBIRD */
-#define isc_info_svc_get_env_lock		60	/* Retrieves the setting of $FIREBIRD_LOCK */
-#define isc_info_svc_get_env_msg		61	/* Retrieves the setting of $FIREBIRD_MSG */
-#define isc_info_svc_line				62	/* Retrieves 1 line of service output per call */
-#define isc_info_svc_to_eof				63	/* Retrieves as much of the server output as will fit in the supplied buffer */
-#define isc_info_svc_timeout			64	/* Sets / signifies a timeout value for reading service information */
-#define isc_info_svc_get_licensed_users	65	/* Retrieves the number of users licensed for accessing the server */
-#define isc_info_svc_limbo_trans		66	/* Retrieve the limbo transactions */
-#define isc_info_svc_running			67	/* Checks to see if a service is running on an attachment */
-#define isc_info_svc_get_users			68	/* Returns the user information from isc_action_svc_display_users */
-#define isc_info_svc_auth_block			69	/* Sets authentication block for service query() call */
-#define isc_info_svc_stdin				78	/* Returns maximum size of data, needed as stdin for service */
-
-
-/******************************************************
- * Parameters for isc_action_{add|del|mod|disp)_user  *
- ******************************************************/
-
-#define isc_spb_sec_userid            5
-#define isc_spb_sec_groupid           6
-#define isc_spb_sec_username          7
-#define isc_spb_sec_password          8
-#define isc_spb_sec_groupname         9
-#define isc_spb_sec_firstname         10
-#define isc_spb_sec_middlename        11
-#define isc_spb_sec_lastname          12
-#define isc_spb_sec_admin             13
-
-/*******************************************************
- * Parameters for isc_action_svc_(add|remove)_license, *
- * isc_info_svc_get_license                            *
- *******************************************************/
-
-#define isc_spb_lic_key               5
-#define isc_spb_lic_id                6
-#define isc_spb_lic_desc              7
-
-
-/*****************************************
- * Parameters for isc_action_svc_backup  *
- *****************************************/
-
-#define isc_spb_bkp_file                 5
-#define isc_spb_bkp_factor               6
-#define isc_spb_bkp_length               7
-#define isc_spb_bkp_skip_data            8
-#define isc_spb_bkp_stat                 15
-#define isc_spb_bkp_keyholder			 16
-#define isc_spb_bkp_keyname				 17
-#define isc_spb_bkp_crypt				 18
-#define isc_spb_bkp_include_data         19
-#define isc_spb_bkp_parallel_workers	 21
-#define isc_spb_bkp_ignore_checksums     0x01
-#define isc_spb_bkp_ignore_limbo         0x02
-#define isc_spb_bkp_metadata_only        0x04
-#define isc_spb_bkp_no_garbage_collect   0x08
-#define isc_spb_bkp_old_descriptions     0x10
-#define isc_spb_bkp_non_transportable    0x20
-#define isc_spb_bkp_convert              0x40
-#define isc_spb_bkp_expand				 0x80
-#define isc_spb_bkp_no_triggers			 0x8000
-#define isc_spb_bkp_zip					 0x010000
-#define isc_spb_bkp_direct_io			 0x020000
-
-/********************************************
- * Parameters for isc_action_svc_properties *
- ********************************************/
-
-#define isc_spb_prp_page_buffers		5
-#define isc_spb_prp_sweep_interval		6
-#define isc_spb_prp_shutdown_db			7
-#define isc_spb_prp_deny_new_attachments	9
-#define isc_spb_prp_deny_new_transactions	10
-#define isc_spb_prp_reserve_space		11
-#define isc_spb_prp_write_mode			12
-#define isc_spb_prp_access_mode			13
-#define isc_spb_prp_set_sql_dialect		14
-#define isc_spb_prp_activate			0x0100
-#define isc_spb_prp_db_online			0x0200
-#define isc_spb_prp_nolinger			0x0400
-#define isc_spb_prp_force_shutdown			41
-#define isc_spb_prp_attachments_shutdown	42
-#define isc_spb_prp_transactions_shutdown	43
-#define isc_spb_prp_shutdown_mode		44
-#define isc_spb_prp_online_mode			45
-#define isc_spb_prp_replica_mode		46
-
-/********************************************
- * Parameters for isc_spb_prp_shutdown_mode *
- *            and isc_spb_prp_online_mode   *
- ********************************************/
-#define isc_spb_prp_sm_normal		0
-#define isc_spb_prp_sm_multi		1
-#define isc_spb_prp_sm_single		2
-#define isc_spb_prp_sm_full			3
-
-/********************************************
- * Parameters for isc_spb_prp_reserve_space *
- ********************************************/
-
-#define isc_spb_prp_res_use_full	35
-#define isc_spb_prp_res				36
-
-/******************************************
- * Parameters for isc_spb_prp_write_mode  *
- ******************************************/
-
-#define isc_spb_prp_wm_async		37
-#define isc_spb_prp_wm_sync			38
-
-/******************************************
- * Parameters for isc_spb_prp_access_mode *
- ******************************************/
-
-#define isc_spb_prp_am_readonly		39
-#define isc_spb_prp_am_readwrite	40
-
-/*******************************************
- * Parameters for isc_spb_prp_replica_mode *
- *******************************************/
-
-#define isc_spb_prp_rm_none			0
-#define isc_spb_prp_rm_readonly		1
-#define isc_spb_prp_rm_readwrite	2
-
-/*****************************************
- * Parameters for isc_action_svc_repair  *
- *****************************************/
-
-#define isc_spb_rpr_commit_trans		15
-#define isc_spb_rpr_rollback_trans		34
-#define isc_spb_rpr_recover_two_phase	17
-#define isc_spb_tra_id					18
-#define isc_spb_single_tra_id			19
-#define isc_spb_multi_tra_id			20
-#define isc_spb_tra_state				21
-#define isc_spb_tra_state_limbo			22
-#define isc_spb_tra_state_commit		23
-#define isc_spb_tra_state_rollback		24
-#define isc_spb_tra_state_unknown		25
-#define isc_spb_tra_host_site			26
-#define isc_spb_tra_remote_site			27
-#define isc_spb_tra_db_path				28
-#define isc_spb_tra_advise				29
-#define isc_spb_tra_advise_commit		30
-#define isc_spb_tra_advise_rollback		31
-#define isc_spb_tra_advise_unknown		33
-#define isc_spb_tra_id_64				46
-#define isc_spb_single_tra_id_64		47
-#define isc_spb_multi_tra_id_64			48
-#define isc_spb_rpr_commit_trans_64		49
-#define isc_spb_rpr_rollback_trans_64	50
-#define isc_spb_rpr_recover_two_phase_64	51
-#define isc_spb_rpr_par_workers			52
-
-#define isc_spb_rpr_validate_db			0x01
-#define isc_spb_rpr_sweep_db			0x02
-#define isc_spb_rpr_mend_db				0x04
-#define isc_spb_rpr_list_limbo_trans	0x08
-#define isc_spb_rpr_check_db			0x10
-#define isc_spb_rpr_ignore_checksum		0x20
-#define isc_spb_rpr_kill_shadows		0x40
-#define isc_spb_rpr_full				0x80
-#define isc_spb_rpr_icu				  0x0800
-#define isc_spb_rpr_upgrade_db		  0x1000
-
-/*****************************************
- * Parameters for isc_action_svc_restore *
- *****************************************/
-
-#define isc_spb_res_skip_data			isc_spb_bkp_skip_data
-#define isc_spb_res_include_data		isc_spb_bkp_include_data
-#define isc_spb_res_buffers				9
-#define isc_spb_res_page_size			10
-#define isc_spb_res_length				11
-#define isc_spb_res_access_mode			12
-#define isc_spb_res_fix_fss_data		13
-#define isc_spb_res_fix_fss_metadata	14
-#define isc_spb_res_keyholder			isc_spb_bkp_keyholder
-#define isc_spb_res_keyname				isc_spb_bkp_keyname
-#define isc_spb_res_crypt				isc_spb_bkp_crypt
-#define isc_spb_res_stat				isc_spb_bkp_stat
-#define isc_spb_res_parallel_workers	isc_spb_bkp_parallel_workers
-#define isc_spb_res_metadata_only		isc_spb_bkp_metadata_only
-#define isc_spb_res_deactivate_idx		0x0100
-#define isc_spb_res_no_shadow			0x0200
-#define isc_spb_res_no_validity			0x0400
-#define isc_spb_res_one_at_a_time		0x0800
-#define isc_spb_res_replace				0x1000
-#define isc_spb_res_create				0x2000
-#define isc_spb_res_use_all_space		0x4000
-#define isc_spb_res_direct_io			isc_spb_bkp_direct_io
-#define isc_spb_res_replica_mode		20
-
-/*****************************************
- * Parameters for isc_action_svc_validate *
- *****************************************/
-
-#define isc_spb_val_tab_incl		1	// include filter based on regular expression
-#define isc_spb_val_tab_excl		2	// exclude filter based on regular expression
-#define isc_spb_val_idx_incl		3	// regexp of indices to validate
-#define isc_spb_val_idx_excl		4	// regexp of indices to NOT validate
-#define isc_spb_val_lock_timeout	5	// how long to wait for table lock
-
-/******************************************
- * Parameters for isc_spb_res_access_mode  *
- ******************************************/
-
-#define isc_spb_res_am_readonly			isc_spb_prp_am_readonly
-#define isc_spb_res_am_readwrite		isc_spb_prp_am_readwrite
-
-/*******************************************
- * Parameters for isc_spb_res_replica_mode *
- *******************************************/
-
-#define isc_spb_res_rm_none				isc_spb_prp_rm_none
-#define isc_spb_res_rm_readonly			isc_spb_prp_rm_readonly
-#define isc_spb_res_rm_readwrite		isc_spb_prp_rm_readwrite
-
-/*******************************************
- * Parameters for isc_info_svc_svr_db_info *
- *******************************************/
-
-#define isc_spb_num_att			5
-#define isc_spb_num_db			6
-
-/*****************************************
- * Parameters for isc_info_svc_db_stats  *
- *****************************************/
-
-#define isc_spb_sts_table			64
-
-#define isc_spb_sts_data_pages		0x01
-#define isc_spb_sts_db_log			0x02
-#define isc_spb_sts_hdr_pages		0x04
-#define isc_spb_sts_idx_pages		0x08
-#define isc_spb_sts_sys_relations	0x10
-#define isc_spb_sts_record_versions	0x20
-//#define isc_spb_sts_table			0x40
-#define isc_spb_sts_nocreation		0x80
-#define isc_spb_sts_encryption	   0x100
-
-/***********************************/
-/* Server configuration key values */
-/***********************************/
-
-/* Not available in Firebird 1.5 */
-
-/***************************************
- * Parameters for isc_action_svc_nbak  *
- ***************************************/
-
-#define isc_spb_nbk_level			5
-#define isc_spb_nbk_file			6
-#define isc_spb_nbk_direct			7
-#define isc_spb_nbk_guid			8
-#define isc_spb_nbk_clean_history	9
-#define isc_spb_nbk_keep_days		10
-#define isc_spb_nbk_keep_rows		11
-#define isc_spb_nbk_no_triggers		0x01
-#define isc_spb_nbk_inplace			0x02
-#define isc_spb_nbk_sequence		0x04
-
-/***************************************
- * Parameters for isc_action_svc_trace *
- ***************************************/
-
-#define isc_spb_trc_id				1
-#define isc_spb_trc_name			2
-#define isc_spb_trc_cfg				3
-
-/******************************************/
-/* Array slice description language (SDL) */
-/******************************************/
-
-#define isc_sdl_version1                  1
-#define isc_sdl_eoc                       255
-#define isc_sdl_relation                  2
-#define isc_sdl_rid                       3
-#define isc_sdl_field                     4
-#define isc_sdl_fid                       5
-#define isc_sdl_struct                    6
-#define isc_sdl_variable                  7
-#define isc_sdl_scalar                    8
-#define isc_sdl_tiny_integer              9
-#define isc_sdl_short_integer             10
-#define isc_sdl_long_integer              11
-//#define isc_sdl_literal                   12
-#define isc_sdl_add                       13
-#define isc_sdl_subtract                  14
-#define isc_sdl_multiply                  15
-#define isc_sdl_divide                    16
-#define isc_sdl_negate                    17 // only used in pretty.cpp; nobody generates it
-//#define isc_sdl_eql                       18
-//#define isc_sdl_neq                       19
-//#define isc_sdl_gtr                       20
-//#define isc_sdl_geq                       21
-//#define isc_sdl_lss                       22
-//#define isc_sdl_leq                       23
-//#define isc_sdl_and                       24
-//#define isc_sdl_or                        25
-//#define isc_sdl_not                       26
-//#define isc_sdl_while                     27
-//#define isc_sdl_assignment                28
-//#define isc_sdl_label                     29
-//#define isc_sdl_leave                     30
-#define isc_sdl_begin                     31 // only used in pretty.cpp; nobody generates it
-#define isc_sdl_end                       32
-#define isc_sdl_do3                       33
-#define isc_sdl_do2                       34
-#define isc_sdl_do1                       35
-#define isc_sdl_element                   36
-
-/********************************************/
-/* International text interpretation values */
-/********************************************/
-
-//#define isc_interp_eng_ascii              0
-//#define isc_interp_jpn_sjis               5
-//#define isc_interp_jpn_euc                6
-
-/*****************/
-/* Blob Subtypes */
-/*****************/
-
-/* types less than zero are reserved for customer use */
-
-#define isc_blob_untyped                  0
-
-/* internal subtypes */
-
-#define isc_blob_text                     1
-#define isc_blob_blr                      2
-#define isc_blob_acl                      3
-#define isc_blob_ranges                   4
-#define isc_blob_summary                  5
-#define isc_blob_format                   6
-#define isc_blob_tra                      7
-#define isc_blob_extfile                  8
-#define isc_blob_debug_info               9
-#define isc_blob_max_predefined_subtype   10
-
-/* the range 20-30 is reserved for dBASE and Paradox types */
-
-//#define isc_blob_formatted_memo           20
-//#define isc_blob_paradox_ole              21
-//#define isc_blob_graphic                  22
-//#define isc_blob_dbase_ole                23
-//#define isc_blob_typed_binary             24
-
-/*****************/
-/* Text Subtypes */
-/*****************/
-
-#define fb_text_subtype_text	0
-#define fb_text_subtype_binary	1
-
-/* Deprecated definitions maintained for compatibility only */
-
-//#define isc_info_db_SQL_dialect           62
-//#define isc_dpb_SQL_dialect               63
-//#define isc_dpb_set_db_SQL_dialect        65
-
-/***********************************/
-/* Masks for fb_shutdown_callback  */
-/***********************************/
-
-#define fb_shut_confirmation			  1
-#define fb_shut_preproviders			  2
-#define fb_shut_postproviders			  4
-#define fb_shut_finish					  8
-#define fb_shut_exit					 16
-
-/****************************************/
-/* Shutdown reasons, used by engine     */
-/* Users should provide positive values */
-/****************************************/
-
-#define fb_shutrsn_svc_stopped			  -1
-#define fb_shutrsn_no_connection		  -2
-#define fb_shutrsn_app_stopped			  -3
-//#define fb_shutrsn_device_removed		  -4
-#define fb_shutrsn_signal				  -5
-#define fb_shutrsn_services				  -6
-#define fb_shutrsn_exit_called			  -7
-#define fb_shutrsn_emergency			  -8
-
-/****************************************/
-/* Cancel types for fb_cancel_operation */
-/****************************************/
-
-#define fb_cancel_disable				  1
-#define fb_cancel_enable				  2
-#define fb_cancel_raise					  3
-#define fb_cancel_abort					  4
-
-/********************************************/
-/* Debug information items					*/
-/********************************************/
-
-#define fb_dbg_version				1
-#define fb_dbg_end					255
-#define fb_dbg_map_src2blr			2
-#define fb_dbg_map_varname			3
-#define fb_dbg_map_argument			4
-#define fb_dbg_subproc				5
-#define fb_dbg_subfunc				6
-#define fb_dbg_map_curname			7 /* declared cursor */
-#define fb_dbg_map_for_curname		8 /* FOR cursor */
-//// TODO: LocalTable name.
-
-// sub code for fb_dbg_map_argument
-#define fb_dbg_arg_input			0
-#define fb_dbg_arg_output			1
-
-#endif // ifndef FIREBIRD_IMPL_CONSTS_PUB_H
diff --git a/FBClient.Headers/firebird/impl/dsc_pub.h b/FBClient.Headers/firebird/impl/dsc_pub.h
deleted file mode 100644
index 39e8ff9e..00000000
--- a/FBClient.Headers/firebird/impl/dsc_pub.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *	PROGRAM:	JRD access method
- *	MODULE:		dsc.h
- *	DESCRIPTION:	Definitions associated with descriptors
- *
- * The contents of this file are subject to the Interbase Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy
- * of the License at http://www.Inprise.com/IPL.html
- *
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
- * or implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code was created by Inprise Corporation
- * and its predecessors. Portions created by Inprise Corporation are
- * Copyright (C) Inprise Corporation.
- *
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- * 2002.04.16  Paul Beach - HP10 Define changed from -4 to (-4) to make it
- *             compatible with the HP Compiler
- */
-
-#ifndef FIREBIRD_IMPL_DSC_PUB_H
-#define FIREBIRD_IMPL_DSC_PUB_H
-
-
-/*
- * The following flags are used in an internal structure dsc (dsc.h) or in the external one paramdsc (ibase.h)
- */
-
-/* values for dsc_flags
- * Note: DSC_null is only reliably set for local variables (blr_variable)
- */
-#define DSC_null		1
-#define DSC_no_subtype	2	/* dsc has no sub type specified */
-#define DSC_nullable  	4	/* not stored. instead, is derived
-							   from metadata primarily to flag
-							   SQLDA (in DSQL)               */
-
-#define dtype_unknown	0
-#define dtype_text		1
-#define dtype_cstring	2
-#define dtype_varying	3
-
-#define dtype_packed	6
-#define dtype_byte		7
-#define dtype_short		8
-#define dtype_long		9
-#define dtype_quad		10
-#define dtype_real		11
-#define dtype_double	12
-#define dtype_d_float	13
-#define dtype_sql_date	14
-#define dtype_sql_time	15
-#define dtype_timestamp	16
-#define dtype_blob		17
-#define dtype_array		18
-#define dtype_int64		19
-#define dtype_dbkey		20
-#define dtype_boolean	21
-#define dtype_dec64		22
-#define dtype_dec128	23
-#define dtype_int128	24
-#define dtype_sql_time_tz	25
-#define dtype_timestamp_tz	26
-#define dtype_ex_time_tz	27
-#define dtype_ex_timestamp_tz	28
-#define DTYPE_TYPE_MAX	29
-
-#define ISC_TIME_SECONDS_PRECISION		10000
-#define ISC_TIME_SECONDS_PRECISION_SCALE	(-4)
-
-#endif /* FIREBIRD_IMPL_DSC_PUB_H */
diff --git a/FBClient.Headers/firebird/impl/iberror_c.h b/FBClient.Headers/firebird/impl/iberror_c.h
deleted file mode 100644
index 5c5756f9..00000000
--- a/FBClient.Headers/firebird/impl/iberror_c.h
+++ /dev/null
@@ -1,1480 +0,0 @@
-/*
- * The contents of this file are subject to the Interbase Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy
- * of the License at http://www.Inprise.com/IPL.html
- * 
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
- * or implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * *** WARNING *** - This file is automatically generated
- */
-
-#define isc_arith_except 335544321L
-#define isc_bad_dbkey 335544322L
-#define isc_bad_db_format 335544323L
-#define isc_bad_db_handle 335544324L
-#define isc_bad_dpb_content 335544325L
-#define isc_bad_dpb_form 335544326L
-#define isc_bad_req_handle 335544327L
-#define isc_bad_segstr_handle 335544328L
-#define isc_bad_segstr_id 335544329L
-#define isc_bad_tpb_content 335544330L
-#define isc_bad_tpb_form 335544331L
-#define isc_bad_trans_handle 335544332L
-#define isc_bug_check 335544333L
-#define isc_convert_error 335544334L
-#define isc_db_corrupt 335544335L
-#define isc_deadlock 335544336L
-#define isc_excess_trans 335544337L
-#define isc_from_no_match 335544338L
-#define isc_infinap 335544339L
-#define isc_infona 335544340L
-#define isc_infunk 335544341L
-#define isc_integ_fail 335544342L
-#define isc_invalid_blr 335544343L
-#define isc_io_error 335544344L
-#define isc_lock_conflict 335544345L
-#define isc_metadata_corrupt 335544346L
-#define isc_not_valid 335544347L
-#define isc_no_cur_rec 335544348L
-#define isc_no_dup 335544349L
-#define isc_no_finish 335544350L
-#define isc_no_meta_update 335544351L
-#define isc_no_priv 335544352L
-#define isc_no_recon 335544353L
-#define isc_no_record 335544354L
-#define isc_no_segstr_close 335544355L
-#define isc_obsolete_metadata 335544356L
-#define isc_open_trans 335544357L
-#define isc_port_len 335544358L
-#define isc_read_only_field 335544359L
-#define isc_read_only_rel 335544360L
-#define isc_read_only_trans 335544361L
-#define isc_read_only_view 335544362L
-#define isc_req_no_trans 335544363L
-#define isc_req_sync 335544364L
-#define isc_req_wrong_db 335544365L
-#define isc_segment 335544366L
-#define isc_segstr_eof 335544367L
-#define isc_segstr_no_op 335544368L
-#define isc_segstr_no_read 335544369L
-#define isc_segstr_no_trans 335544370L
-#define isc_segstr_no_write 335544371L
-#define isc_segstr_wrong_db 335544372L
-#define isc_sys_request 335544373L
-#define isc_stream_eof 335544374L
-#define isc_unavailable 335544375L
-#define isc_unres_rel 335544376L
-#define isc_uns_ext 335544377L
-#define isc_wish_list 335544378L
-#define isc_wrong_ods 335544379L
-#define isc_wronumarg 335544380L
-#define isc_imp_exc 335544381L
-#define isc_random 335544382L
-#define isc_fatal_conflict 335544383L
-#define isc_badblk 335544384L
-#define isc_invpoolcl 335544385L
-#define isc_nopoolids 335544386L
-#define isc_relbadblk 335544387L
-#define isc_blktoobig 335544388L
-#define isc_bufexh 335544389L
-#define isc_syntaxerr 335544390L
-#define isc_bufinuse 335544391L
-#define isc_bdbincon 335544392L
-#define isc_reqinuse 335544393L
-#define isc_badodsver 335544394L
-#define isc_relnotdef 335544395L
-#define isc_fldnotdef 335544396L
-#define isc_dirtypage 335544397L
-#define isc_waifortra 335544398L
-#define isc_doubleloc 335544399L
-#define isc_nodnotfnd 335544400L
-#define isc_dupnodfnd 335544401L
-#define isc_locnotmar 335544402L
-#define isc_badpagtyp 335544403L
-#define isc_corrupt 335544404L
-#define isc_badpage 335544405L
-#define isc_badindex 335544406L
-#define isc_dbbnotzer 335544407L
-#define isc_tranotzer 335544408L
-#define isc_trareqmis 335544409L
-#define isc_badhndcnt 335544410L
-#define isc_wrotpbver 335544411L
-#define isc_wroblrver 335544412L
-#define isc_wrodpbver 335544413L
-#define isc_blobnotsup 335544414L
-#define isc_badrelation 335544415L
-#define isc_nodetach 335544416L
-#define isc_notremote 335544417L
-#define isc_trainlim 335544418L
-#define isc_notinlim 335544419L
-#define isc_traoutsta 335544420L
-#define isc_connect_reject 335544421L
-#define isc_dbfile 335544422L
-#define isc_orphan 335544423L
-#define isc_no_lock_mgr 335544424L
-#define isc_ctxinuse 335544425L
-#define isc_ctxnotdef 335544426L
-#define isc_datnotsup 335544427L
-#define isc_badmsgnum 335544428L
-#define isc_badparnum 335544429L
-#define isc_virmemexh 335544430L
-#define isc_blocking_signal 335544431L
-#define isc_lockmanerr 335544432L
-#define isc_journerr 335544433L
-#define isc_keytoobig 335544434L
-#define isc_nullsegkey 335544435L
-#define isc_sqlerr 335544436L
-#define isc_wrodynver 335544437L
-#define isc_funnotdef 335544438L
-#define isc_funmismat 335544439L
-#define isc_bad_msg_vec 335544440L
-#define isc_bad_detach 335544441L
-#define isc_noargacc_read 335544442L
-#define isc_noargacc_write 335544443L
-#define isc_read_only 335544444L
-#define isc_ext_err 335544445L
-#define isc_non_updatable 335544446L
-#define isc_no_rollback 335544447L
-#define isc_bad_sec_info 335544448L
-#define isc_invalid_sec_info 335544449L
-#define isc_misc_interpreted 335544450L
-#define isc_update_conflict 335544451L
-#define isc_unlicensed 335544452L
-#define isc_obj_in_use 335544453L
-#define isc_nofilter 335544454L
-#define isc_shadow_accessed 335544455L
-#define isc_invalid_sdl 335544456L
-#define isc_out_of_bounds 335544457L
-#define isc_invalid_dimension 335544458L
-#define isc_rec_in_limbo 335544459L
-#define isc_shadow_missing 335544460L
-#define isc_cant_validate 335544461L
-#define isc_cant_start_journal 335544462L
-#define isc_gennotdef 335544463L
-#define isc_cant_start_logging 335544464L
-#define isc_bad_segstr_type 335544465L
-#define isc_foreign_key 335544466L
-#define isc_high_minor 335544467L
-#define isc_tra_state 335544468L
-#define isc_trans_invalid 335544469L
-#define isc_buf_invalid 335544470L
-#define isc_indexnotdefined 335544471L
-#define isc_login 335544472L
-#define isc_invalid_bookmark 335544473L
-#define isc_bad_lock_level 335544474L
-#define isc_relation_lock 335544475L
-#define isc_record_lock 335544476L
-#define isc_max_idx 335544477L
-#define isc_jrn_enable 335544478L
-#define isc_old_failure 335544479L
-#define isc_old_in_progress 335544480L
-#define isc_old_no_space 335544481L
-#define isc_no_wal_no_jrn 335544482L
-#define isc_num_old_files 335544483L
-#define isc_wal_file_open 335544484L
-#define isc_bad_stmt_handle 335544485L
-#define isc_wal_failure 335544486L
-#define isc_walw_err 335544487L
-#define isc_logh_small 335544488L
-#define isc_logh_inv_version 335544489L
-#define isc_logh_open_flag 335544490L
-#define isc_logh_open_flag2 335544491L
-#define isc_logh_diff_dbname 335544492L
-#define isc_logf_unexpected_eof 335544493L
-#define isc_logr_incomplete 335544494L
-#define isc_logr_header_small 335544495L
-#define isc_logb_small 335544496L
-#define isc_wal_illegal_attach 335544497L
-#define isc_wal_invalid_wpb 335544498L
-#define isc_wal_err_rollover 335544499L
-#define isc_no_wal 335544500L
-#define isc_drop_wal 335544501L
-#define isc_stream_not_defined 335544502L
-#define isc_wal_subsys_error 335544503L
-#define isc_wal_subsys_corrupt 335544504L
-#define isc_no_archive 335544505L
-#define isc_shutinprog 335544506L
-#define isc_range_in_use 335544507L
-#define isc_range_not_found 335544508L
-#define isc_charset_not_found 335544509L
-#define isc_lock_timeout 335544510L
-#define isc_prcnotdef 335544511L
-#define isc_prcmismat 335544512L
-#define isc_wal_bugcheck 335544513L
-#define isc_wal_cant_expand 335544514L
-#define isc_codnotdef 335544515L
-#define isc_xcpnotdef 335544516L
-#define isc_except 335544517L
-#define isc_cache_restart 335544518L
-#define isc_bad_lock_handle 335544519L
-#define isc_jrn_present 335544520L
-#define isc_wal_err_rollover2 335544521L
-#define isc_wal_err_logwrite 335544522L
-#define isc_wal_err_jrn_comm 335544523L
-#define isc_wal_err_expansion 335544524L
-#define isc_wal_err_setup 335544525L
-#define isc_wal_err_ww_sync 335544526L
-#define isc_wal_err_ww_start 335544527L
-#define isc_shutdown 335544528L
-#define isc_existing_priv_mod 335544529L
-#define isc_primary_key_ref 335544530L
-#define isc_primary_key_notnull 335544531L
-#define isc_ref_cnstrnt_notfound 335544532L
-#define isc_foreign_key_notfound 335544533L
-#define isc_ref_cnstrnt_update 335544534L
-#define isc_check_cnstrnt_update 335544535L
-#define isc_check_cnstrnt_del 335544536L
-#define isc_integ_index_seg_del 335544537L
-#define isc_integ_index_seg_mod 335544538L
-#define isc_integ_index_del 335544539L
-#define isc_integ_index_mod 335544540L
-#define isc_check_trig_del 335544541L
-#define isc_check_trig_update 335544542L
-#define isc_cnstrnt_fld_del 335544543L
-#define isc_cnstrnt_fld_rename 335544544L
-#define isc_rel_cnstrnt_update 335544545L
-#define isc_constaint_on_view 335544546L
-#define isc_invld_cnstrnt_type 335544547L
-#define isc_primary_key_exists 335544548L
-#define isc_systrig_update 335544549L
-#define isc_not_rel_owner 335544550L
-#define isc_grant_obj_notfound 335544551L
-#define isc_grant_fld_notfound 335544552L
-#define isc_grant_nopriv 335544553L
-#define isc_nonsql_security_rel 335544554L
-#define isc_nonsql_security_fld 335544555L
-#define isc_wal_cache_err 335544556L
-#define isc_shutfail 335544557L
-#define isc_check_constraint 335544558L
-#define isc_bad_svc_handle 335544559L
-#define isc_shutwarn 335544560L
-#define isc_wrospbver 335544561L
-#define isc_bad_spb_form 335544562L
-#define isc_svcnotdef 335544563L
-#define isc_no_jrn 335544564L
-#define isc_transliteration_failed 335544565L
-#define isc_start_cm_for_wal 335544566L
-#define isc_wal_ovflow_log_required 335544567L
-#define isc_text_subtype 335544568L
-#define isc_dsql_error 335544569L
-#define isc_dsql_command_err 335544570L
-#define isc_dsql_constant_err 335544571L
-#define isc_dsql_cursor_err 335544572L
-#define isc_dsql_datatype_err 335544573L
-#define isc_dsql_decl_err 335544574L
-#define isc_dsql_cursor_update_err 335544575L
-#define isc_dsql_cursor_open_err 335544576L
-#define isc_dsql_cursor_close_err 335544577L
-#define isc_dsql_field_err 335544578L
-#define isc_dsql_internal_err 335544579L
-#define isc_dsql_relation_err 335544580L
-#define isc_dsql_procedure_err 335544581L
-#define isc_dsql_request_err 335544582L
-#define isc_dsql_sqlda_err 335544583L
-#define isc_dsql_var_count_err 335544584L
-#define isc_dsql_stmt_handle 335544585L
-#define isc_dsql_function_err 335544586L
-#define isc_dsql_blob_err 335544587L
-#define isc_collation_not_found 335544588L
-#define isc_collation_not_for_charset 335544589L
-#define isc_dsql_dup_option 335544590L
-#define isc_dsql_tran_err 335544591L
-#define isc_dsql_invalid_array 335544592L
-#define isc_dsql_max_arr_dim_exceeded 335544593L
-#define isc_dsql_arr_range_error 335544594L
-#define isc_dsql_trigger_err 335544595L
-#define isc_dsql_subselect_err 335544596L
-#define isc_dsql_crdb_prepare_err 335544597L
-#define isc_specify_field_err 335544598L
-#define isc_num_field_err 335544599L
-#define isc_col_name_err 335544600L
-#define isc_where_err 335544601L
-#define isc_table_view_err 335544602L
-#define isc_distinct_err 335544603L
-#define isc_key_field_count_err 335544604L
-#define isc_subquery_err 335544605L
-#define isc_expression_eval_err 335544606L
-#define isc_node_err 335544607L
-#define isc_command_end_err 335544608L
-#define isc_index_name 335544609L
-#define isc_exception_name 335544610L
-#define isc_field_name 335544611L
-#define isc_token_err 335544612L
-#define isc_union_err 335544613L
-#define isc_dsql_construct_err 335544614L
-#define isc_field_aggregate_err 335544615L
-#define isc_field_ref_err 335544616L
-#define isc_order_by_err 335544617L
-#define isc_return_mode_err 335544618L
-#define isc_extern_func_err 335544619L
-#define isc_alias_conflict_err 335544620L
-#define isc_procedure_conflict_error 335544621L
-#define isc_relation_conflict_err 335544622L
-#define isc_dsql_domain_err 335544623L
-#define isc_idx_seg_err 335544624L
-#define isc_node_name_err 335544625L
-#define isc_table_name 335544626L
-#define isc_proc_name 335544627L
-#define isc_idx_create_err 335544628L
-#define isc_wal_shadow_err 335544629L
-#define isc_dependency 335544630L
-#define isc_idx_key_err 335544631L
-#define isc_dsql_file_length_err 335544632L
-#define isc_dsql_shadow_number_err 335544633L
-#define isc_dsql_token_unk_err 335544634L
-#define isc_dsql_no_relation_alias 335544635L
-#define isc_indexname 335544636L
-#define isc_no_stream_plan 335544637L
-#define isc_stream_twice 335544638L
-#define isc_stream_not_found 335544639L
-#define isc_collation_requires_text 335544640L
-#define isc_dsql_domain_not_found 335544641L
-#define isc_index_unused 335544642L
-#define isc_dsql_self_join 335544643L
-#define isc_stream_bof 335544644L
-#define isc_stream_crack 335544645L
-#define isc_db_or_file_exists 335544646L
-#define isc_invalid_operator 335544647L
-#define isc_conn_lost 335544648L
-#define isc_bad_checksum 335544649L
-#define isc_page_type_err 335544650L
-#define isc_ext_readonly_err 335544651L
-#define isc_sing_select_err 335544652L
-#define isc_psw_attach 335544653L
-#define isc_psw_start_trans 335544654L
-#define isc_invalid_direction 335544655L
-#define isc_dsql_var_conflict 335544656L
-#define isc_dsql_no_blob_array 335544657L
-#define isc_dsql_base_table 335544658L
-#define isc_duplicate_base_table 335544659L
-#define isc_view_alias 335544660L
-#define isc_index_root_page_full 335544661L
-#define isc_dsql_blob_type_unknown 335544662L
-#define isc_req_max_clones_exceeded 335544663L
-#define isc_dsql_duplicate_spec 335544664L
-#define isc_unique_key_violation 335544665L
-#define isc_srvr_version_too_old 335544666L
-#define isc_drdb_completed_with_errs 335544667L
-#define isc_dsql_procedure_use_err 335544668L
-#define isc_dsql_count_mismatch 335544669L
-#define isc_blob_idx_err 335544670L
-#define isc_array_idx_err 335544671L
-#define isc_key_field_err 335544672L
-#define isc_no_delete 335544673L
-#define isc_del_last_field 335544674L
-#define isc_sort_err 335544675L
-#define isc_sort_mem_err 335544676L
-#define isc_version_err 335544677L
-#define isc_inval_key_posn 335544678L
-#define isc_no_segments_err 335544679L
-#define isc_crrp_data_err 335544680L
-#define isc_rec_size_err 335544681L
-#define isc_dsql_field_ref 335544682L
-#define isc_req_depth_exceeded 335544683L
-#define isc_no_field_access 335544684L
-#define isc_no_dbkey 335544685L
-#define isc_jrn_format_err 335544686L
-#define isc_jrn_file_full 335544687L
-#define isc_dsql_open_cursor_request 335544688L
-#define isc_ib_error 335544689L
-#define isc_cache_redef 335544690L
-#define isc_cache_too_small 335544691L
-#define isc_log_redef 335544692L
-#define isc_log_too_small 335544693L
-#define isc_partition_too_small 335544694L
-#define isc_partition_not_supp 335544695L
-#define isc_log_length_spec 335544696L
-#define isc_precision_err 335544697L
-#define isc_scale_nogt 335544698L
-#define isc_expec_short 335544699L
-#define isc_expec_long 335544700L
-#define isc_expec_ushort 335544701L
-#define isc_escape_invalid 335544702L
-#define isc_svcnoexe 335544703L
-#define isc_net_lookup_err 335544704L
-#define isc_service_unknown 335544705L
-#define isc_host_unknown 335544706L
-#define isc_grant_nopriv_on_base 335544707L
-#define isc_dyn_fld_ambiguous 335544708L
-#define isc_dsql_agg_ref_err 335544709L
-#define isc_complex_view 335544710L
-#define isc_unprepared_stmt 335544711L
-#define isc_expec_positive 335544712L
-#define isc_dsql_sqlda_value_err 335544713L
-#define isc_invalid_array_id 335544714L
-#define isc_extfile_uns_op 335544715L
-#define isc_svc_in_use 335544716L
-#define isc_err_stack_limit 335544717L
-#define isc_invalid_key 335544718L
-#define isc_net_init_error 335544719L
-#define isc_loadlib_failure 335544720L
-#define isc_network_error 335544721L
-#define isc_net_connect_err 335544722L
-#define isc_net_connect_listen_err 335544723L
-#define isc_net_event_connect_err 335544724L
-#define isc_net_event_listen_err 335544725L
-#define isc_net_read_err 335544726L
-#define isc_net_write_err 335544727L
-#define isc_integ_index_deactivate 335544728L
-#define isc_integ_deactivate_primary 335544729L
-#define isc_cse_not_supported 335544730L
-#define isc_tra_must_sweep 335544731L
-#define isc_unsupported_network_drive 335544732L
-#define isc_io_create_err 335544733L
-#define isc_io_open_err 335544734L
-#define isc_io_close_err 335544735L
-#define isc_io_read_err 335544736L
-#define isc_io_write_err 335544737L
-#define isc_io_delete_err 335544738L
-#define isc_io_access_err 335544739L
-#define isc_udf_exception 335544740L
-#define isc_lost_db_connection 335544741L
-#define isc_no_write_user_priv 335544742L
-#define isc_token_too_long 335544743L
-#define isc_max_att_exceeded 335544744L
-#define isc_login_same_as_role_name 335544745L
-#define isc_reftable_requires_pk 335544746L
-#define isc_usrname_too_long 335544747L
-#define isc_password_too_long 335544748L
-#define isc_usrname_required 335544749L
-#define isc_password_required 335544750L
-#define isc_bad_protocol 335544751L
-#define isc_dup_usrname_found 335544752L
-#define isc_usrname_not_found 335544753L
-#define isc_error_adding_sec_record 335544754L
-#define isc_error_modifying_sec_record 335544755L
-#define isc_error_deleting_sec_record 335544756L
-#define isc_error_updating_sec_db 335544757L
-#define isc_sort_rec_size_err 335544758L
-#define isc_bad_default_value 335544759L
-#define isc_invalid_clause 335544760L
-#define isc_too_many_handles 335544761L
-#define isc_optimizer_blk_exc 335544762L
-#define isc_invalid_string_constant 335544763L
-#define isc_transitional_date 335544764L
-#define isc_read_only_database 335544765L
-#define isc_must_be_dialect_2_and_up 335544766L
-#define isc_blob_filter_exception 335544767L
-#define isc_exception_access_violation 335544768L
-#define isc_exception_datatype_missalignment 335544769L
-#define isc_exception_array_bounds_exceeded 335544770L
-#define isc_exception_float_denormal_operand 335544771L
-#define isc_exception_float_divide_by_zero 335544772L
-#define isc_exception_float_inexact_result 335544773L
-#define isc_exception_float_invalid_operand 335544774L
-#define isc_exception_float_overflow 335544775L
-#define isc_exception_float_stack_check 335544776L
-#define isc_exception_float_underflow 335544777L
-#define isc_exception_integer_divide_by_zero 335544778L
-#define isc_exception_integer_overflow 335544779L
-#define isc_exception_unknown 335544780L
-#define isc_exception_stack_overflow 335544781L
-#define isc_exception_sigsegv 335544782L
-#define isc_exception_sigill 335544783L
-#define isc_exception_sigbus 335544784L
-#define isc_exception_sigfpe 335544785L
-#define isc_ext_file_delete 335544786L
-#define isc_ext_file_modify 335544787L
-#define isc_adm_task_denied 335544788L
-#define isc_extract_input_mismatch 335544789L
-#define isc_insufficient_svc_privileges 335544790L
-#define isc_file_in_use 335544791L
-#define isc_service_att_err 335544792L
-#define isc_ddl_not_allowed_by_db_sql_dial 335544793L
-#define isc_cancelled 335544794L
-#define isc_unexp_spb_form 335544795L
-#define isc_sql_dialect_datatype_unsupport 335544796L
-#define isc_svcnouser 335544797L
-#define isc_depend_on_uncommitted_rel 335544798L
-#define isc_svc_name_missing 335544799L
-#define isc_too_many_contexts 335544800L
-#define isc_datype_notsup 335544801L
-#define isc_dialect_reset_warning 335544802L
-#define isc_dialect_not_changed 335544803L
-#define isc_database_create_failed 335544804L
-#define isc_inv_dialect_specified 335544805L
-#define isc_valid_db_dialects 335544806L
-#define isc_sqlwarn 335544807L
-#define isc_dtype_renamed 335544808L
-#define isc_extern_func_dir_error 335544809L
-#define isc_date_range_exceeded 335544810L
-#define isc_inv_client_dialect_specified 335544811L
-#define isc_valid_client_dialects 335544812L
-#define isc_optimizer_between_err 335544813L
-#define isc_service_not_supported 335544814L
-#define isc_generator_name 335544815L
-#define isc_udf_name 335544816L
-#define isc_bad_limit_param 335544817L
-#define isc_bad_skip_param 335544818L
-#define isc_io_32bit_exceeded_err 335544819L
-#define isc_invalid_savepoint 335544820L
-#define isc_dsql_column_pos_err 335544821L
-#define isc_dsql_agg_where_err 335544822L
-#define isc_dsql_agg_group_err 335544823L
-#define isc_dsql_agg_column_err 335544824L
-#define isc_dsql_agg_having_err 335544825L
-#define isc_dsql_agg_nested_err 335544826L
-#define isc_exec_sql_invalid_arg 335544827L
-#define isc_exec_sql_invalid_req 335544828L
-#define isc_exec_sql_invalid_var 335544829L
-#define isc_exec_sql_max_call_exceeded 335544830L
-#define isc_conf_access_denied 335544831L
-#define isc_wrong_backup_state 335544832L
-#define isc_wal_backup_err 335544833L
-#define isc_cursor_not_open 335544834L
-#define isc_bad_shutdown_mode 335544835L
-#define isc_concat_overflow 335544836L
-#define isc_bad_substring_offset 335544837L
-#define isc_foreign_key_target_doesnt_exist 335544838L
-#define isc_foreign_key_references_present 335544839L
-#define isc_no_update 335544840L
-#define isc_cursor_already_open 335544841L
-#define isc_stack_trace 335544842L
-#define isc_ctx_var_not_found 335544843L
-#define isc_ctx_namespace_invalid 335544844L
-#define isc_ctx_too_big 335544845L
-#define isc_ctx_bad_argument 335544846L
-#define isc_identifier_too_long 335544847L
-#define isc_except2 335544848L
-#define isc_malformed_string 335544849L
-#define isc_prc_out_param_mismatch 335544850L
-#define isc_command_end_err2 335544851L
-#define isc_partner_idx_incompat_type 335544852L
-#define isc_bad_substring_length 335544853L
-#define isc_charset_not_installed 335544854L
-#define isc_collation_not_installed 335544855L
-#define isc_att_shutdown 335544856L
-#define isc_blobtoobig 335544857L
-#define isc_must_have_phys_field 335544858L
-#define isc_invalid_time_precision 335544859L
-#define isc_blob_convert_error 335544860L
-#define isc_array_convert_error 335544861L
-#define isc_record_lock_not_supp 335544862L
-#define isc_partner_idx_not_found 335544863L
-#define isc_tra_num_exc 335544864L
-#define isc_field_disappeared 335544865L
-#define isc_met_wrong_gtt_scope 335544866L
-#define isc_subtype_for_internal_use 335544867L
-#define isc_illegal_prc_type 335544868L
-#define isc_invalid_sort_datatype 335544869L
-#define isc_collation_name 335544870L
-#define isc_domain_name 335544871L
-#define isc_domnotdef 335544872L
-#define isc_array_max_dimensions 335544873L
-#define isc_max_db_per_trans_allowed 335544874L
-#define isc_bad_debug_format 335544875L
-#define isc_bad_proc_BLR 335544876L
-#define isc_key_too_big 335544877L
-#define isc_concurrent_transaction 335544878L
-#define isc_not_valid_for_var 335544879L
-#define isc_not_valid_for 335544880L
-#define isc_need_difference 335544881L
-#define isc_long_login 335544882L
-#define isc_fldnotdef2 335544883L
-#define isc_invalid_similar_pattern 335544884L
-#define isc_bad_teb_form 335544885L
-#define isc_tpb_multiple_txn_isolation 335544886L
-#define isc_tpb_reserv_before_table 335544887L
-#define isc_tpb_multiple_spec 335544888L
-#define isc_tpb_option_without_rc 335544889L
-#define isc_tpb_conflicting_options 335544890L
-#define isc_tpb_reserv_missing_tlen 335544891L
-#define isc_tpb_reserv_long_tlen 335544892L
-#define isc_tpb_reserv_missing_tname 335544893L
-#define isc_tpb_reserv_corrup_tlen 335544894L
-#define isc_tpb_reserv_null_tlen 335544895L
-#define isc_tpb_reserv_relnotfound 335544896L
-#define isc_tpb_reserv_baserelnotfound 335544897L
-#define isc_tpb_missing_len 335544898L
-#define isc_tpb_missing_value 335544899L
-#define isc_tpb_corrupt_len 335544900L
-#define isc_tpb_null_len 335544901L
-#define isc_tpb_overflow_len 335544902L
-#define isc_tpb_invalid_value 335544903L
-#define isc_tpb_reserv_stronger_wng 335544904L
-#define isc_tpb_reserv_stronger 335544905L
-#define isc_tpb_reserv_max_recursion 335544906L
-#define isc_tpb_reserv_virtualtbl 335544907L
-#define isc_tpb_reserv_systbl 335544908L
-#define isc_tpb_reserv_temptbl 335544909L
-#define isc_tpb_readtxn_after_writelock 335544910L
-#define isc_tpb_writelock_after_readtxn 335544911L
-#define isc_time_range_exceeded 335544912L
-#define isc_datetime_range_exceeded 335544913L
-#define isc_string_truncation 335544914L
-#define isc_blob_truncation 335544915L
-#define isc_numeric_out_of_range 335544916L
-#define isc_shutdown_timeout 335544917L
-#define isc_att_handle_busy 335544918L
-#define isc_bad_udf_freeit 335544919L
-#define isc_eds_provider_not_found 335544920L
-#define isc_eds_connection 335544921L
-#define isc_eds_preprocess 335544922L
-#define isc_eds_stmt_expected 335544923L
-#define isc_eds_prm_name_expected 335544924L
-#define isc_eds_unclosed_comment 335544925L
-#define isc_eds_statement 335544926L
-#define isc_eds_input_prm_mismatch 335544927L
-#define isc_eds_output_prm_mismatch 335544928L
-#define isc_eds_input_prm_not_set 335544929L
-#define isc_too_big_blr 335544930L
-#define isc_montabexh 335544931L
-#define isc_modnotfound 335544932L
-#define isc_nothing_to_cancel 335544933L
-#define isc_ibutil_not_loaded 335544934L
-#define isc_circular_computed 335544935L
-#define isc_psw_db_error 335544936L
-#define isc_invalid_type_datetime_op 335544937L
-#define isc_onlycan_add_timetodate 335544938L
-#define isc_onlycan_add_datetotime 335544939L
-#define isc_onlycansub_tstampfromtstamp 335544940L
-#define isc_onlyoneop_mustbe_tstamp 335544941L
-#define isc_invalid_extractpart_time 335544942L
-#define isc_invalid_extractpart_date 335544943L
-#define isc_invalidarg_extract 335544944L
-#define isc_sysf_argmustbe_exact 335544945L
-#define isc_sysf_argmustbe_exact_or_fp 335544946L
-#define isc_sysf_argviolates_uuidtype 335544947L
-#define isc_sysf_argviolates_uuidlen 335544948L
-#define isc_sysf_argviolates_uuidfmt 335544949L
-#define isc_sysf_argviolates_guidigits 335544950L
-#define isc_sysf_invalid_addpart_time 335544951L
-#define isc_sysf_invalid_add_datetime 335544952L
-#define isc_sysf_invalid_addpart_dtime 335544953L
-#define isc_sysf_invalid_add_dtime_rc 335544954L
-#define isc_sysf_invalid_diff_dtime 335544955L
-#define isc_sysf_invalid_timediff 335544956L
-#define isc_sysf_invalid_tstamptimediff 335544957L
-#define isc_sysf_invalid_datetimediff 335544958L
-#define isc_sysf_invalid_diffpart 335544959L
-#define isc_sysf_argmustbe_positive 335544960L
-#define isc_sysf_basemustbe_positive 335544961L
-#define isc_sysf_argnmustbe_nonneg 335544962L
-#define isc_sysf_argnmustbe_positive 335544963L
-#define isc_sysf_invalid_zeropowneg 335544964L
-#define isc_sysf_invalid_negpowfp 335544965L
-#define isc_sysf_invalid_scale 335544966L
-#define isc_sysf_argmustbe_nonneg 335544967L
-#define isc_sysf_binuuid_mustbe_str 335544968L
-#define isc_sysf_binuuid_wrongsize 335544969L
-#define isc_missing_required_spb 335544970L
-#define isc_net_server_shutdown 335544971L
-#define isc_bad_conn_str 335544972L
-#define isc_bad_epb_form 335544973L
-#define isc_no_threads 335544974L
-#define isc_net_event_connect_timeout 335544975L
-#define isc_sysf_argmustbe_nonzero 335544976L
-#define isc_sysf_argmustbe_range_inc1_1 335544977L
-#define isc_sysf_argmustbe_gteq_one 335544978L
-#define isc_sysf_argmustbe_range_exc1_1 335544979L
-#define isc_internal_rejected_params 335544980L
-#define isc_sysf_fp_overflow 335544981L
-#define isc_udf_fp_overflow 335544982L
-#define isc_udf_fp_nan 335544983L
-#define isc_instance_conflict 335544984L
-#define isc_out_of_temp_space 335544985L
-#define isc_eds_expl_tran_ctrl 335544986L
-#define isc_no_trusted_spb 335544987L
-#define isc_package_name 335544988L
-#define isc_cannot_make_not_null 335544989L
-#define isc_feature_removed 335544990L
-#define isc_view_name 335544991L
-#define isc_lock_dir_access 335544992L
-#define isc_invalid_fetch_option 335544993L
-#define isc_bad_fun_BLR 335544994L
-#define isc_func_pack_not_implemented 335544995L
-#define isc_proc_pack_not_implemented 335544996L
-#define isc_eem_func_not_returned 335544997L
-#define isc_eem_proc_not_returned 335544998L
-#define isc_eem_trig_not_returned 335544999L
-#define isc_eem_bad_plugin_ver 335545000L
-#define isc_eem_engine_notfound 335545001L
-#define isc_attachment_in_use 335545002L
-#define isc_transaction_in_use 335545003L
-#define isc_pman_cannot_load_plugin 335545004L
-#define isc_pman_module_notfound 335545005L
-#define isc_pman_entrypoint_notfound 335545006L
-#define isc_pman_module_bad 335545007L
-#define isc_pman_plugin_notfound 335545008L
-#define isc_sysf_invalid_trig_namespace 335545009L
-#define isc_unexpected_null 335545010L
-#define isc_type_notcompat_blob 335545011L
-#define isc_invalid_date_val 335545012L
-#define isc_invalid_time_val 335545013L
-#define isc_invalid_timestamp_val 335545014L
-#define isc_invalid_index_val 335545015L
-#define isc_formatted_exception 335545016L
-#define isc_async_active 335545017L
-#define isc_private_function 335545018L
-#define isc_private_procedure 335545019L
-#define isc_request_outdated 335545020L
-#define isc_bad_events_handle 335545021L
-#define isc_cannot_copy_stmt 335545022L
-#define isc_invalid_boolean_usage 335545023L
-#define isc_sysf_argscant_both_be_zero 335545024L
-#define isc_spb_no_id 335545025L
-#define isc_ee_blr_mismatch_null 335545026L
-#define isc_ee_blr_mismatch_length 335545027L
-#define isc_ss_out_of_bounds 335545028L
-#define isc_missing_data_structures 335545029L
-#define isc_protect_sys_tab 335545030L
-#define isc_libtommath_generic 335545031L
-#define isc_wroblrver2 335545032L
-#define isc_trunc_limits 335545033L
-#define isc_info_access 335545034L
-#define isc_svc_no_stdin 335545035L
-#define isc_svc_start_failed 335545036L
-#define isc_svc_no_switches 335545037L
-#define isc_svc_bad_size 335545038L
-#define isc_no_crypt_plugin 335545039L
-#define isc_cp_name_too_long 335545040L
-#define isc_cp_process_active 335545041L
-#define isc_cp_already_crypted 335545042L
-#define isc_decrypt_error 335545043L
-#define isc_no_providers 335545044L
-#define isc_null_spb 335545045L
-#define isc_max_args_exceeded 335545046L
-#define isc_ee_blr_mismatch_names_count 335545047L
-#define isc_ee_blr_mismatch_name_not_found 335545048L
-#define isc_bad_result_set 335545049L
-#define isc_wrong_message_length 335545050L
-#define isc_no_output_format 335545051L
-#define isc_item_finish 335545052L
-#define isc_miss_config 335545053L
-#define isc_conf_line 335545054L
-#define isc_conf_include 335545055L
-#define isc_include_depth 335545056L
-#define isc_include_miss 335545057L
-#define isc_protect_ownership 335545058L
-#define isc_badvarnum 335545059L
-#define isc_sec_context 335545060L
-#define isc_multi_segment 335545061L
-#define isc_login_changed 335545062L
-#define isc_auth_handshake_limit 335545063L
-#define isc_wirecrypt_incompatible 335545064L
-#define isc_miss_wirecrypt 335545065L
-#define isc_wirecrypt_key 335545066L
-#define isc_wirecrypt_plugin 335545067L
-#define isc_secdb_name 335545068L
-#define isc_auth_data 335545069L
-#define isc_auth_datalength 335545070L
-#define isc_info_unprepared_stmt 335545071L
-#define isc_idx_key_value 335545072L
-#define isc_forupdate_virtualtbl 335545073L
-#define isc_forupdate_systbl 335545074L
-#define isc_forupdate_temptbl 335545075L
-#define isc_cant_modify_sysobj 335545076L
-#define isc_server_misconfigured 335545077L
-#define isc_alter_role 335545078L
-#define isc_map_already_exists 335545079L
-#define isc_map_not_exists 335545080L
-#define isc_map_load 335545081L
-#define isc_map_aster 335545082L
-#define isc_map_multi 335545083L
-#define isc_map_undefined 335545084L
-#define isc_baddpb_damaged_mode 335545085L
-#define isc_baddpb_buffers_range 335545086L
-#define isc_baddpb_temp_buffers 335545087L
-#define isc_map_nodb 335545088L
-#define isc_map_notable 335545089L
-#define isc_miss_trusted_role 335545090L
-#define isc_set_invalid_role 335545091L
-#define isc_cursor_not_positioned 335545092L
-#define isc_dup_attribute 335545093L
-#define isc_dyn_no_priv 335545094L
-#define isc_dsql_cant_grant_option 335545095L
-#define isc_read_conflict 335545096L
-#define isc_crdb_load 335545097L
-#define isc_crdb_nodb 335545098L
-#define isc_crdb_notable 335545099L
-#define isc_interface_version_too_old 335545100L
-#define isc_fun_param_mismatch 335545101L
-#define isc_savepoint_backout_err 335545102L
-#define isc_domain_primary_key_notnull 335545103L
-#define isc_invalid_attachment_charset 335545104L
-#define isc_map_down 335545105L
-#define isc_login_error 335545106L
-#define isc_already_opened 335545107L
-#define isc_bad_crypt_key 335545108L
-#define isc_encrypt_error 335545109L
-#define isc_max_idx_depth 335545110L
-#define isc_wrong_prvlg 335545111L
-#define isc_miss_prvlg 335545112L
-#define isc_crypt_checksum 335545113L
-#define isc_not_dba 335545114L
-#define isc_no_cursor 335545115L
-#define isc_dsql_window_incompat_frames 335545116L
-#define isc_dsql_window_range_multi_key 335545117L
-#define isc_dsql_window_range_inv_key_type 335545118L
-#define isc_dsql_window_frame_value_inv_type 335545119L
-#define isc_window_frame_value_invalid 335545120L
-#define isc_dsql_window_not_found 335545121L
-#define isc_dsql_window_cant_overr_part 335545122L
-#define isc_dsql_window_cant_overr_order 335545123L
-#define isc_dsql_window_cant_overr_frame 335545124L
-#define isc_dsql_window_duplicate 335545125L
-#define isc_sql_too_long 335545126L
-#define isc_cfg_stmt_timeout 335545127L
-#define isc_att_stmt_timeout 335545128L
-#define isc_req_stmt_timeout 335545129L
-#define isc_att_shut_killed 335545130L
-#define isc_att_shut_idle 335545131L
-#define isc_att_shut_db_down 335545132L
-#define isc_att_shut_engine 335545133L
-#define isc_overriding_without_identity 335545134L
-#define isc_overriding_system_invalid 335545135L
-#define isc_overriding_user_invalid 335545136L
-#define isc_overriding_missing 335545137L
-#define isc_decprecision_err 335545138L
-#define isc_decfloat_divide_by_zero 335545139L
-#define isc_decfloat_inexact_result 335545140L
-#define isc_decfloat_invalid_operation 335545141L
-#define isc_decfloat_overflow 335545142L
-#define isc_decfloat_underflow 335545143L
-#define isc_subfunc_notdef 335545144L
-#define isc_subproc_notdef 335545145L
-#define isc_subfunc_signat 335545146L
-#define isc_subproc_signat 335545147L
-#define isc_subfunc_defvaldecl 335545148L
-#define isc_subproc_defvaldecl 335545149L
-#define isc_subfunc_not_impl 335545150L
-#define isc_subproc_not_impl 335545151L
-#define isc_sysf_invalid_hash_algorithm 335545152L
-#define isc_expression_eval_index 335545153L
-#define isc_invalid_decfloat_trap 335545154L
-#define isc_invalid_decfloat_round 335545155L
-#define isc_sysf_invalid_first_last_part 335545156L
-#define isc_sysf_invalid_date_timestamp 335545157L
-#define isc_precision_err2 335545158L
-#define isc_bad_batch_handle 335545159L
-#define isc_intl_char 335545160L
-#define isc_null_block 335545161L
-#define isc_mixed_info 335545162L
-#define isc_unknown_info 335545163L
-#define isc_bpb_version 335545164L
-#define isc_user_manager 335545165L
-#define isc_icu_entrypoint 335545166L
-#define isc_icu_library 335545167L
-#define isc_metadata_name 335545168L
-#define isc_tokens_parse 335545169L
-#define isc_iconv_open 335545170L
-#define isc_batch_compl_range 335545171L
-#define isc_batch_compl_detail 335545172L
-#define isc_deflate_init 335545173L
-#define isc_inflate_init 335545174L
-#define isc_big_segment 335545175L
-#define isc_batch_policy 335545176L
-#define isc_batch_defbpb 335545177L
-#define isc_batch_align 335545178L
-#define isc_multi_segment_dup 335545179L
-#define isc_non_plugin_protocol 335545180L
-#define isc_message_format 335545181L
-#define isc_batch_param_version 335545182L
-#define isc_batch_msg_long 335545183L
-#define isc_batch_open 335545184L
-#define isc_batch_type 335545185L
-#define isc_batch_param 335545186L
-#define isc_batch_blobs 335545187L
-#define isc_batch_blob_append 335545188L
-#define isc_batch_stream_align 335545189L
-#define isc_batch_rpt_blob 335545190L
-#define isc_batch_blob_buf 335545191L
-#define isc_batch_small_data 335545192L
-#define isc_batch_cont_bpb 335545193L
-#define isc_batch_big_bpb 335545194L
-#define isc_batch_big_segment 335545195L
-#define isc_batch_big_seg2 335545196L
-#define isc_batch_blob_id 335545197L
-#define isc_batch_too_big 335545198L
-#define isc_num_literal 335545199L
-#define isc_map_event 335545200L
-#define isc_map_overflow 335545201L
-#define isc_hdr_overflow 335545202L
-#define isc_vld_plugins 335545203L
-#define isc_db_crypt_key 335545204L
-#define isc_no_keyholder_plugin 335545205L
-#define isc_ses_reset_err 335545206L
-#define isc_ses_reset_open_trans 335545207L
-#define isc_ses_reset_warn 335545208L
-#define isc_ses_reset_tran_rollback 335545209L
-#define isc_plugin_name 335545210L
-#define isc_parameter_name 335545211L
-#define isc_file_starting_page_err 335545212L
-#define isc_invalid_timezone_offset 335545213L
-#define isc_invalid_timezone_region 335545214L
-#define isc_invalid_timezone_id 335545215L
-#define isc_tom_decode64len 335545216L
-#define isc_tom_strblob 335545217L
-#define isc_tom_reg 335545218L
-#define isc_tom_algorithm 335545219L
-#define isc_tom_mode_miss 335545220L
-#define isc_tom_mode_bad 335545221L
-#define isc_tom_no_mode 335545222L
-#define isc_tom_iv_miss 335545223L
-#define isc_tom_no_iv 335545224L
-#define isc_tom_ctrtype_bad 335545225L
-#define isc_tom_no_ctrtype 335545226L
-#define isc_tom_ctr_big 335545227L
-#define isc_tom_no_ctr 335545228L
-#define isc_tom_iv_length 335545229L
-#define isc_tom_error 335545230L
-#define isc_tom_yarrow_start 335545231L
-#define isc_tom_yarrow_setup 335545232L
-#define isc_tom_init_mode 335545233L
-#define isc_tom_crypt_mode 335545234L
-#define isc_tom_decrypt_mode 335545235L
-#define isc_tom_init_cip 335545236L
-#define isc_tom_crypt_cip 335545237L
-#define isc_tom_decrypt_cip 335545238L
-#define isc_tom_setup_cip 335545239L
-#define isc_tom_setup_chacha 335545240L
-#define isc_tom_encode 335545241L
-#define isc_tom_decode 335545242L
-#define isc_tom_rsa_import 335545243L
-#define isc_tom_oaep 335545244L
-#define isc_tom_hash_bad 335545245L
-#define isc_tom_rsa_make 335545246L
-#define isc_tom_rsa_export 335545247L
-#define isc_tom_rsa_sign 335545248L
-#define isc_tom_rsa_verify 335545249L
-#define isc_tom_chacha_key 335545250L
-#define isc_bad_repl_handle 335545251L
-#define isc_tra_snapshot_does_not_exist 335545252L
-#define isc_eds_input_prm_not_used 335545253L
-#define isc_effective_user 335545254L
-#define isc_invalid_time_zone_bind 335545255L
-#define isc_invalid_decfloat_bind 335545256L
-#define isc_odd_hex_len 335545257L
-#define isc_invalid_hex_digit 335545258L
-#define isc_bind_err 335545259L
-#define isc_bind_statement 335545260L
-#define isc_bind_convert 335545261L
-#define isc_cannot_update_old_blob 335545262L
-#define isc_cannot_read_new_blob 335545263L
-#define isc_dyn_no_create_priv 335545264L
-#define isc_suspend_without_returns 335545265L
-#define isc_truncate_warn 335545266L
-#define isc_truncate_monitor 335545267L
-#define isc_truncate_context 335545268L
-#define isc_merge_dup_update 335545269L
-#define isc_wrong_page 335545270L
-#define isc_repl_error 335545271L
-#define isc_ses_reset_failed 335545272L
-#define isc_block_size 335545273L
-#define isc_tom_key_length 335545274L
-#define isc_inf_invalid_args 335545275L
-#define isc_sysf_invalid_null_empty 335545276L
-#define isc_bad_loctab_num 335545277L
-#define isc_quoted_str_bad 335545278L
-#define isc_quoted_str_miss 335545279L
-#define isc_wrong_shmem_ver 335545280L
-#define isc_wrong_shmem_bitness 335545281L
-#define isc_wrong_proc_plan 335545282L
-#define isc_invalid_blob_util_handle 335545283L
-#define isc_bad_temp_blob_id 335545284L
-#define isc_ods_upgrade_err 335545285L
-#define isc_bad_par_workers 335545286L
-#define isc_idx_expr_not_found 335545287L
-#define isc_idx_cond_not_found 335545288L
-#define isc_gfix_db_name 335740929L
-#define isc_gfix_invalid_sw 335740930L
-#define isc_gfix_incmp_sw 335740932L
-#define isc_gfix_replay_req 335740933L
-#define isc_gfix_pgbuf_req 335740934L
-#define isc_gfix_val_req 335740935L
-#define isc_gfix_pval_req 335740936L
-#define isc_gfix_trn_req 335740937L
-#define isc_gfix_full_req 335740940L
-#define isc_gfix_usrname_req 335740941L
-#define isc_gfix_pass_req 335740942L
-#define isc_gfix_subs_name 335740943L
-#define isc_gfix_wal_req 335740944L
-#define isc_gfix_sec_req 335740945L
-#define isc_gfix_nval_req 335740946L
-#define isc_gfix_type_shut 335740947L
-#define isc_gfix_retry 335740948L
-#define isc_gfix_retry_db 335740951L
-#define isc_gfix_exceed_max 335740991L
-#define isc_gfix_corrupt_pool 335740992L
-#define isc_gfix_mem_exhausted 335740993L
-#define isc_gfix_bad_pool 335740994L
-#define isc_gfix_trn_not_valid 335740995L
-#define isc_gfix_unexp_eoi 335741012L
-#define isc_gfix_recon_fail 335741018L
-#define isc_gfix_trn_unknown 335741036L
-#define isc_gfix_mode_req 335741038L
-#define isc_gfix_pzval_req 335741042L
-#define isc_dsql_dbkey_from_non_table 336003074L
-#define isc_dsql_transitional_numeric 336003075L
-#define isc_dsql_dialect_warning_expr 336003076L
-#define isc_sql_db_dialect_dtype_unsupport 336003077L
-#define isc_sql_dialect_conflict_num 336003079L
-#define isc_dsql_warning_number_ambiguous 336003080L
-#define isc_dsql_warning_number_ambiguous1 336003081L
-#define isc_dsql_warn_precision_ambiguous 336003082L
-#define isc_dsql_warn_precision_ambiguous1 336003083L
-#define isc_dsql_warn_precision_ambiguous2 336003084L
-#define isc_dsql_ambiguous_field_name 336003085L
-#define isc_dsql_udf_return_pos_err 336003086L
-#define isc_dsql_invalid_label 336003087L
-#define isc_dsql_datatypes_not_comparable 336003088L
-#define isc_dsql_cursor_invalid 336003089L
-#define isc_dsql_cursor_redefined 336003090L
-#define isc_dsql_cursor_not_found 336003091L
-#define isc_dsql_cursor_exists 336003092L
-#define isc_dsql_cursor_rel_ambiguous 336003093L
-#define isc_dsql_cursor_rel_not_found 336003094L
-#define isc_dsql_cursor_not_open 336003095L
-#define isc_dsql_type_not_supp_ext_tab 336003096L
-#define isc_dsql_feature_not_supported_ods 336003097L
-#define isc_primary_key_required 336003098L
-#define isc_upd_ins_doesnt_match_pk 336003099L
-#define isc_upd_ins_doesnt_match_matching 336003100L
-#define isc_upd_ins_with_complex_view 336003101L
-#define isc_dsql_incompatible_trigger_type 336003102L
-#define isc_dsql_db_trigger_type_cant_change 336003103L
-#define isc_dsql_record_version_table 336003104L
-#define isc_dsql_invalid_sqlda_version 336003105L
-#define isc_dsql_sqlvar_index 336003106L
-#define isc_dsql_no_sqlind 336003107L
-#define isc_dsql_no_sqldata 336003108L
-#define isc_dsql_no_input_sqlda 336003109L
-#define isc_dsql_no_output_sqlda 336003110L
-#define isc_dsql_wrong_param_num 336003111L
-#define isc_dsql_invalid_drop_ss_clause 336003112L
-#define isc_upd_ins_cannot_default 336003113L
-#define isc_dyn_filter_not_found 336068645L
-#define isc_dyn_func_not_found 336068649L
-#define isc_dyn_index_not_found 336068656L
-#define isc_dyn_view_not_found 336068662L
-#define isc_dyn_domain_not_found 336068697L
-#define isc_dyn_cant_modify_auto_trig 336068717L
-#define isc_dyn_dup_table 336068740L
-#define isc_dyn_proc_not_found 336068748L
-#define isc_dyn_exception_not_found 336068752L
-#define isc_dyn_proc_param_not_found 336068754L
-#define isc_dyn_trig_not_found 336068755L
-#define isc_dyn_charset_not_found 336068759L
-#define isc_dyn_collation_not_found 336068760L
-#define isc_dyn_role_not_found 336068763L
-#define isc_dyn_name_longer 336068767L
-#define isc_dyn_column_does_not_exist 336068784L
-#define isc_dyn_role_does_not_exist 336068796L
-#define isc_dyn_no_grant_admin_opt 336068797L
-#define isc_dyn_user_not_role_member 336068798L
-#define isc_dyn_delete_role_failed 336068799L
-#define isc_dyn_grant_role_to_user 336068800L
-#define isc_dyn_inv_sql_role_name 336068801L
-#define isc_dyn_dup_sql_role 336068802L
-#define isc_dyn_kywd_spec_for_role 336068803L
-#define isc_dyn_roles_not_supported 336068804L
-#define isc_dyn_domain_name_exists 336068812L
-#define isc_dyn_field_name_exists 336068813L
-#define isc_dyn_dependency_exists 336068814L
-#define isc_dyn_dtype_invalid 336068815L
-#define isc_dyn_char_fld_too_small 336068816L
-#define isc_dyn_invalid_dtype_conversion 336068817L
-#define isc_dyn_dtype_conv_invalid 336068818L
-#define isc_dyn_zero_len_id 336068820L
-#define isc_dyn_gen_not_found 336068822L
-#define isc_max_coll_per_charset 336068829L
-#define isc_invalid_coll_attr 336068830L
-#define isc_dyn_wrong_gtt_scope 336068840L
-#define isc_dyn_coll_used_table 336068843L
-#define isc_dyn_coll_used_domain 336068844L
-#define isc_dyn_cannot_del_syscoll 336068845L
-#define isc_dyn_cannot_del_def_coll 336068846L
-#define isc_dyn_table_not_found 336068849L
-#define isc_dyn_coll_used_procedure 336068851L
-#define isc_dyn_scale_too_big 336068852L
-#define isc_dyn_precision_too_small 336068853L
-#define isc_dyn_miss_priv_warning 336068855L
-#define isc_dyn_ods_not_supp_feature 336068856L
-#define isc_dyn_cannot_addrem_computed 336068857L
-#define isc_dyn_no_empty_pw 336068858L
-#define isc_dyn_dup_index 336068859L
-#define isc_dyn_package_not_found 336068864L
-#define isc_dyn_schema_not_found 336068865L
-#define isc_dyn_cannot_mod_sysproc 336068866L
-#define isc_dyn_cannot_mod_systrig 336068867L
-#define isc_dyn_cannot_mod_sysfunc 336068868L
-#define isc_dyn_invalid_ddl_proc 336068869L
-#define isc_dyn_invalid_ddl_trig 336068870L
-#define isc_dyn_funcnotdef_package 336068871L
-#define isc_dyn_procnotdef_package 336068872L
-#define isc_dyn_funcsignat_package 336068873L
-#define isc_dyn_procsignat_package 336068874L
-#define isc_dyn_defvaldecl_package_proc 336068875L
-#define isc_dyn_package_body_exists 336068877L
-#define isc_dyn_invalid_ddl_func 336068878L
-#define isc_dyn_newfc_oldsyntax 336068879L
-#define isc_dyn_func_param_not_found 336068886L
-#define isc_dyn_routine_param_not_found 336068887L
-#define isc_dyn_routine_param_ambiguous 336068888L
-#define isc_dyn_coll_used_function 336068889L
-#define isc_dyn_domain_used_function 336068890L
-#define isc_dyn_alter_user_no_clause 336068891L
-#define isc_dyn_duplicate_package_item 336068894L
-#define isc_dyn_cant_modify_sysobj 336068895L
-#define isc_dyn_cant_use_zero_increment 336068896L
-#define isc_dyn_cant_use_in_foreignkey 336068897L
-#define isc_dyn_defvaldecl_package_func 336068898L
-#define isc_dyn_cyclic_role 336068900L
-#define isc_dyn_cant_use_zero_inc_ident 336068904L
-#define isc_dyn_no_ddl_grant_opt_priv 336068907L
-#define isc_dyn_no_grant_opt_priv 336068908L
-#define isc_dyn_func_not_exist 336068909L
-#define isc_dyn_proc_not_exist 336068910L
-#define isc_dyn_pack_not_exist 336068911L
-#define isc_dyn_trig_not_exist 336068912L
-#define isc_dyn_view_not_exist 336068913L
-#define isc_dyn_rel_not_exist 336068914L
-#define isc_dyn_exc_not_exist 336068915L
-#define isc_dyn_gen_not_exist 336068916L
-#define isc_dyn_fld_not_exist 336068917L
-#define isc_gbak_unknown_switch 336330753L
-#define isc_gbak_page_size_missing 336330754L
-#define isc_gbak_page_size_toobig 336330755L
-#define isc_gbak_redir_ouput_missing 336330756L
-#define isc_gbak_switches_conflict 336330757L
-#define isc_gbak_unknown_device 336330758L
-#define isc_gbak_no_protection 336330759L
-#define isc_gbak_page_size_not_allowed 336330760L
-#define isc_gbak_multi_source_dest 336330761L
-#define isc_gbak_filename_missing 336330762L
-#define isc_gbak_dup_inout_names 336330763L
-#define isc_gbak_inv_page_size 336330764L
-#define isc_gbak_db_specified 336330765L
-#define isc_gbak_db_exists 336330766L
-#define isc_gbak_unk_device 336330767L
-#define isc_gbak_blob_info_failed 336330772L
-#define isc_gbak_unk_blob_item 336330773L
-#define isc_gbak_get_seg_failed 336330774L
-#define isc_gbak_close_blob_failed 336330775L
-#define isc_gbak_open_blob_failed 336330776L
-#define isc_gbak_put_blr_gen_id_failed 336330777L
-#define isc_gbak_unk_type 336330778L
-#define isc_gbak_comp_req_failed 336330779L
-#define isc_gbak_start_req_failed 336330780L
-#define isc_gbak_rec_failed 336330781L
-#define isc_gbak_rel_req_failed 336330782L
-#define isc_gbak_db_info_failed 336330783L
-#define isc_gbak_no_db_desc 336330784L
-#define isc_gbak_db_create_failed 336330785L
-#define isc_gbak_decomp_len_error 336330786L
-#define isc_gbak_tbl_missing 336330787L
-#define isc_gbak_blob_col_missing 336330788L
-#define isc_gbak_create_blob_failed 336330789L
-#define isc_gbak_put_seg_failed 336330790L
-#define isc_gbak_rec_len_exp 336330791L
-#define isc_gbak_inv_rec_len 336330792L
-#define isc_gbak_exp_data_type 336330793L
-#define isc_gbak_gen_id_failed 336330794L
-#define isc_gbak_unk_rec_type 336330795L
-#define isc_gbak_inv_bkup_ver 336330796L
-#define isc_gbak_missing_bkup_desc 336330797L
-#define isc_gbak_string_trunc 336330798L
-#define isc_gbak_cant_rest_record 336330799L
-#define isc_gbak_send_failed 336330800L
-#define isc_gbak_no_tbl_name 336330801L
-#define isc_gbak_unexp_eof 336330802L
-#define isc_gbak_db_format_too_old 336330803L
-#define isc_gbak_inv_array_dim 336330804L
-#define isc_gbak_xdr_len_expected 336330807L
-#define isc_gbak_open_bkup_error 336330817L
-#define isc_gbak_open_error 336330818L
-#define isc_gbak_missing_block_fac 336330934L
-#define isc_gbak_inv_block_fac 336330935L
-#define isc_gbak_block_fac_specified 336330936L
-#define isc_gbak_missing_username 336330940L
-#define isc_gbak_missing_password 336330941L
-#define isc_gbak_missing_skipped_bytes 336330952L
-#define isc_gbak_inv_skipped_bytes 336330953L
-#define isc_gbak_err_restore_charset 336330965L
-#define isc_gbak_err_restore_collation 336330967L
-#define isc_gbak_read_error 336330972L
-#define isc_gbak_write_error 336330973L
-#define isc_gbak_db_in_use 336330985L
-#define isc_gbak_sysmemex 336330990L
-#define isc_gbak_restore_role_failed 336331002L
-#define isc_gbak_role_op_missing 336331005L
-#define isc_gbak_page_buffers_missing 336331010L
-#define isc_gbak_page_buffers_wrong_param 336331011L
-#define isc_gbak_page_buffers_restore 336331012L
-#define isc_gbak_inv_size 336331014L
-#define isc_gbak_file_outof_sequence 336331015L
-#define isc_gbak_join_file_missing 336331016L
-#define isc_gbak_stdin_not_supptd 336331017L
-#define isc_gbak_stdout_not_supptd 336331018L
-#define isc_gbak_bkup_corrupt 336331019L
-#define isc_gbak_unk_db_file_spec 336331020L
-#define isc_gbak_hdr_write_failed 336331021L
-#define isc_gbak_disk_space_ex 336331022L
-#define isc_gbak_size_lt_min 336331023L
-#define isc_gbak_svc_name_missing 336331025L
-#define isc_gbak_not_ownr 336331026L
-#define isc_gbak_mode_req 336331031L
-#define isc_gbak_just_data 336331033L
-#define isc_gbak_data_only 336331034L
-#define isc_gbak_missing_interval 336331078L
-#define isc_gbak_wrong_interval 336331079L
-#define isc_gbak_verify_verbint 336331081L
-#define isc_gbak_option_only_restore 336331082L
-#define isc_gbak_option_only_backup 336331083L
-#define isc_gbak_option_conflict 336331084L
-#define isc_gbak_param_conflict 336331085L
-#define isc_gbak_option_repeated 336331086L
-#define isc_gbak_max_dbkey_recursion 336331091L
-#define isc_gbak_max_dbkey_length 336331092L
-#define isc_gbak_invalid_metadata 336331093L
-#define isc_gbak_invalid_data 336331094L
-#define isc_gbak_inv_bkup_ver2 336331096L
-#define isc_gbak_db_format_too_old2 336331100L
-#define isc_dsql_too_old_ods 336397205L
-#define isc_dsql_table_not_found 336397206L
-#define isc_dsql_view_not_found 336397207L
-#define isc_dsql_line_col_error 336397208L
-#define isc_dsql_unknown_pos 336397209L
-#define isc_dsql_no_dup_name 336397210L
-#define isc_dsql_too_many_values 336397211L
-#define isc_dsql_no_array_computed 336397212L
-#define isc_dsql_implicit_domain_name 336397213L
-#define isc_dsql_only_can_subscript_array 336397214L
-#define isc_dsql_max_sort_items 336397215L
-#define isc_dsql_max_group_items 336397216L
-#define isc_dsql_conflicting_sort_field 336397217L
-#define isc_dsql_derived_table_more_columns 336397218L
-#define isc_dsql_derived_table_less_columns 336397219L
-#define isc_dsql_derived_field_unnamed 336397220L
-#define isc_dsql_derived_field_dup_name 336397221L
-#define isc_dsql_derived_alias_select 336397222L
-#define isc_dsql_derived_alias_field 336397223L
-#define isc_dsql_auto_field_bad_pos 336397224L
-#define isc_dsql_cte_wrong_reference 336397225L
-#define isc_dsql_cte_cycle 336397226L
-#define isc_dsql_cte_outer_join 336397227L
-#define isc_dsql_cte_mult_references 336397228L
-#define isc_dsql_cte_not_a_union 336397229L
-#define isc_dsql_cte_nonrecurs_after_recurs 336397230L
-#define isc_dsql_cte_wrong_clause 336397231L
-#define isc_dsql_cte_union_all 336397232L
-#define isc_dsql_cte_miss_nonrecursive 336397233L
-#define isc_dsql_cte_nested_with 336397234L
-#define isc_dsql_col_more_than_once_using 336397235L
-#define isc_dsql_unsupp_feature_dialect 336397236L
-#define isc_dsql_cte_not_used 336397237L
-#define isc_dsql_col_more_than_once_view 336397238L
-#define isc_dsql_unsupported_in_auto_trans 336397239L
-#define isc_dsql_eval_unknode 336397240L
-#define isc_dsql_agg_wrongarg 336397241L
-#define isc_dsql_agg2_wrongarg 336397242L
-#define isc_dsql_nodateortime_pm_string 336397243L
-#define isc_dsql_invalid_datetime_subtract 336397244L
-#define isc_dsql_invalid_dateortime_add 336397245L
-#define isc_dsql_invalid_type_minus_date 336397246L
-#define isc_dsql_nostring_addsub_dial3 336397247L
-#define isc_dsql_invalid_type_addsub_dial3 336397248L
-#define isc_dsql_invalid_type_multip_dial1 336397249L
-#define isc_dsql_nostring_multip_dial3 336397250L
-#define isc_dsql_invalid_type_multip_dial3 336397251L
-#define isc_dsql_mustuse_numeric_div_dial1 336397252L
-#define isc_dsql_nostring_div_dial3 336397253L
-#define isc_dsql_invalid_type_div_dial3 336397254L
-#define isc_dsql_nostring_neg_dial3 336397255L
-#define isc_dsql_invalid_type_neg 336397256L
-#define isc_dsql_max_distinct_items 336397257L
-#define isc_dsql_alter_charset_failed 336397258L
-#define isc_dsql_comment_on_failed 336397259L
-#define isc_dsql_create_func_failed 336397260L
-#define isc_dsql_alter_func_failed 336397261L
-#define isc_dsql_create_alter_func_failed 336397262L
-#define isc_dsql_drop_func_failed 336397263L
-#define isc_dsql_recreate_func_failed 336397264L
-#define isc_dsql_create_proc_failed 336397265L
-#define isc_dsql_alter_proc_failed 336397266L
-#define isc_dsql_create_alter_proc_failed 336397267L
-#define isc_dsql_drop_proc_failed 336397268L
-#define isc_dsql_recreate_proc_failed 336397269L
-#define isc_dsql_create_trigger_failed 336397270L
-#define isc_dsql_alter_trigger_failed 336397271L
-#define isc_dsql_create_alter_trigger_failed 336397272L
-#define isc_dsql_drop_trigger_failed 336397273L
-#define isc_dsql_recreate_trigger_failed 336397274L
-#define isc_dsql_create_collation_failed 336397275L
-#define isc_dsql_drop_collation_failed 336397276L
-#define isc_dsql_create_domain_failed 336397277L
-#define isc_dsql_alter_domain_failed 336397278L
-#define isc_dsql_drop_domain_failed 336397279L
-#define isc_dsql_create_except_failed 336397280L
-#define isc_dsql_alter_except_failed 336397281L
-#define isc_dsql_create_alter_except_failed 336397282L
-#define isc_dsql_recreate_except_failed 336397283L
-#define isc_dsql_drop_except_failed 336397284L
-#define isc_dsql_create_sequence_failed 336397285L
-#define isc_dsql_create_table_failed 336397286L
-#define isc_dsql_alter_table_failed 336397287L
-#define isc_dsql_drop_table_failed 336397288L
-#define isc_dsql_recreate_table_failed 336397289L
-#define isc_dsql_create_pack_failed 336397290L
-#define isc_dsql_alter_pack_failed 336397291L
-#define isc_dsql_create_alter_pack_failed 336397292L
-#define isc_dsql_drop_pack_failed 336397293L
-#define isc_dsql_recreate_pack_failed 336397294L
-#define isc_dsql_create_pack_body_failed 336397295L
-#define isc_dsql_drop_pack_body_failed 336397296L
-#define isc_dsql_recreate_pack_body_failed 336397297L
-#define isc_dsql_create_view_failed 336397298L
-#define isc_dsql_alter_view_failed 336397299L
-#define isc_dsql_create_alter_view_failed 336397300L
-#define isc_dsql_recreate_view_failed 336397301L
-#define isc_dsql_drop_view_failed 336397302L
-#define isc_dsql_drop_sequence_failed 336397303L
-#define isc_dsql_recreate_sequence_failed 336397304L
-#define isc_dsql_drop_index_failed 336397305L
-#define isc_dsql_drop_filter_failed 336397306L
-#define isc_dsql_drop_shadow_failed 336397307L
-#define isc_dsql_drop_role_failed 336397308L
-#define isc_dsql_drop_user_failed 336397309L
-#define isc_dsql_create_role_failed 336397310L
-#define isc_dsql_alter_role_failed 336397311L
-#define isc_dsql_alter_index_failed 336397312L
-#define isc_dsql_alter_database_failed 336397313L
-#define isc_dsql_create_shadow_failed 336397314L
-#define isc_dsql_create_filter_failed 336397315L
-#define isc_dsql_create_index_failed 336397316L
-#define isc_dsql_create_user_failed 336397317L
-#define isc_dsql_alter_user_failed 336397318L
-#define isc_dsql_grant_failed 336397319L
-#define isc_dsql_revoke_failed 336397320L
-#define isc_dsql_cte_recursive_aggregate 336397321L
-#define isc_dsql_mapping_failed 336397322L
-#define isc_dsql_alter_sequence_failed 336397323L
-#define isc_dsql_create_generator_failed 336397324L
-#define isc_dsql_set_generator_failed 336397325L
-#define isc_dsql_wlock_simple 336397326L
-#define isc_dsql_firstskip_rows 336397327L
-#define isc_dsql_wlock_aggregates 336397328L
-#define isc_dsql_wlock_conflict 336397329L
-#define isc_dsql_max_exception_arguments 336397330L
-#define isc_dsql_string_byte_length 336397331L
-#define isc_dsql_string_char_length 336397332L
-#define isc_dsql_max_nesting 336397333L
-#define isc_dsql_recreate_user_failed 336397334L
-#define isc_gsec_cant_open_db 336723983L
-#define isc_gsec_switches_error 336723984L
-#define isc_gsec_no_op_spec 336723985L
-#define isc_gsec_no_usr_name 336723986L
-#define isc_gsec_err_add 336723987L
-#define isc_gsec_err_modify 336723988L
-#define isc_gsec_err_find_mod 336723989L
-#define isc_gsec_err_rec_not_found 336723990L
-#define isc_gsec_err_delete 336723991L
-#define isc_gsec_err_find_del 336723992L
-#define isc_gsec_err_find_disp 336723996L
-#define isc_gsec_inv_param 336723997L
-#define isc_gsec_op_specified 336723998L
-#define isc_gsec_pw_specified 336723999L
-#define isc_gsec_uid_specified 336724000L
-#define isc_gsec_gid_specified 336724001L
-#define isc_gsec_proj_specified 336724002L
-#define isc_gsec_org_specified 336724003L
-#define isc_gsec_fname_specified 336724004L
-#define isc_gsec_mname_specified 336724005L
-#define isc_gsec_lname_specified 336724006L
-#define isc_gsec_inv_switch 336724008L
-#define isc_gsec_amb_switch 336724009L
-#define isc_gsec_no_op_specified 336724010L
-#define isc_gsec_params_not_allowed 336724011L
-#define isc_gsec_incompat_switch 336724012L
-#define isc_gsec_inv_username 336724044L
-#define isc_gsec_inv_pw_length 336724045L
-#define isc_gsec_db_specified 336724046L
-#define isc_gsec_db_admin_specified 336724047L
-#define isc_gsec_db_admin_pw_specified 336724048L
-#define isc_gsec_sql_role_specified 336724049L
-#define isc_gstat_unknown_switch 336920577L
-#define isc_gstat_retry 336920578L
-#define isc_gstat_wrong_ods 336920579L
-#define isc_gstat_unexpected_eof 336920580L
-#define isc_gstat_open_err 336920605L
-#define isc_gstat_read_err 336920606L
-#define isc_gstat_sysmemex 336920607L
-#define isc_fbsvcmgr_bad_am 336986113L
-#define isc_fbsvcmgr_bad_wm 336986114L
-#define isc_fbsvcmgr_bad_rs 336986115L
-#define isc_fbsvcmgr_info_err 336986116L
-#define isc_fbsvcmgr_query_err 336986117L
-#define isc_fbsvcmgr_switch_unknown 336986118L
-#define isc_fbsvcmgr_bad_sm 336986159L
-#define isc_fbsvcmgr_fp_open 336986160L
-#define isc_fbsvcmgr_fp_read 336986161L
-#define isc_fbsvcmgr_fp_empty 336986162L
-#define isc_fbsvcmgr_bad_arg 336986164L
-#define isc_fbsvcmgr_info_limbo 336986170L
-#define isc_fbsvcmgr_limbo_state 336986171L
-#define isc_fbsvcmgr_limbo_advise 336986172L
-#define isc_fbsvcmgr_bad_rm 336986173L
-#define isc_utl_trusted_switch 337051649L
-#define isc_nbackup_missing_param 337117213L
-#define isc_nbackup_allowed_switches 337117214L
-#define isc_nbackup_unknown_param 337117215L
-#define isc_nbackup_unknown_switch 337117216L
-#define isc_nbackup_nofetchpw_svc 337117217L
-#define isc_nbackup_pwfile_error 337117218L
-#define isc_nbackup_size_with_lock 337117219L
-#define isc_nbackup_no_switch 337117220L
-#define isc_nbackup_err_read 337117223L
-#define isc_nbackup_err_write 337117224L
-#define isc_nbackup_err_seek 337117225L
-#define isc_nbackup_err_opendb 337117226L
-#define isc_nbackup_err_fadvice 337117227L
-#define isc_nbackup_err_createdb 337117228L
-#define isc_nbackup_err_openbk 337117229L
-#define isc_nbackup_err_createbk 337117230L
-#define isc_nbackup_err_eofdb 337117231L
-#define isc_nbackup_fixup_wrongstate 337117232L
-#define isc_nbackup_err_db 337117233L
-#define isc_nbackup_userpw_toolong 337117234L
-#define isc_nbackup_lostrec_db 337117235L
-#define isc_nbackup_lostguid_db 337117236L
-#define isc_nbackup_err_eofhdrdb 337117237L
-#define isc_nbackup_db_notlock 337117238L
-#define isc_nbackup_lostguid_bk 337117239L
-#define isc_nbackup_page_changed 337117240L
-#define isc_nbackup_dbsize_inconsistent 337117241L
-#define isc_nbackup_failed_lzbk 337117242L
-#define isc_nbackup_err_eofhdrbk 337117243L
-#define isc_nbackup_invalid_incbk 337117244L
-#define isc_nbackup_unsupvers_incbk 337117245L
-#define isc_nbackup_invlevel_incbk 337117246L
-#define isc_nbackup_wrong_orderbk 337117247L
-#define isc_nbackup_err_eofbk 337117248L
-#define isc_nbackup_err_copy 337117249L
-#define isc_nbackup_err_eofhdr_restdb 337117250L
-#define isc_nbackup_lostguid_l0bk 337117251L
-#define isc_nbackup_switchd_parameter 337117255L
-#define isc_nbackup_user_stop 337117257L
-#define isc_nbackup_deco_parse 337117259L
-#define isc_nbackup_lostrec_guid_db 337117261L
-#define isc_nbackup_seq_misuse 337117265L
-#define isc_nbackup_wrong_param 337117268L
-#define isc_nbackup_clean_hist_misuse 337117269L
-#define isc_nbackup_clean_hist_missed 337117270L
-#define isc_nbackup_keep_hist_missed 337117271L
-#define isc_nbackup_second_keep_switch 337117272L
-#define isc_trace_conflict_acts 337182750L
-#define isc_trace_act_notfound 337182751L
-#define isc_trace_switch_once 337182752L
-#define isc_trace_param_val_miss 337182753L
-#define isc_trace_param_invalid 337182754L
-#define isc_trace_switch_unknown 337182755L
-#define isc_trace_switch_svc_only 337182756L
-#define isc_trace_switch_user_only 337182757L
-#define isc_trace_switch_param_miss 337182758L
-#define isc_trace_param_act_notcompat 337182759L
-#define isc_trace_mandatory_switch_miss 337182760L
-#define isc_err_max 1465
diff --git a/FBClient.Headers/firebird/impl/inf_pub.h b/FBClient.Headers/firebird/impl/inf_pub.h
deleted file mode 100644
index 06afa3c7..00000000
--- a/FBClient.Headers/firebird/impl/inf_pub.h
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- *	PROGRAM:	JRD Access Method
- *	MODULE:		inf.h
- *	DESCRIPTION:	Information call declarations.
- *
- * The contents of this file are subject to the Interbase Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy
- * of the License at http://www.Inprise.com/IPL.html
- *
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
- * or implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code was created by Inprise Corporation
- * and its predecessors. Portions created by Inprise Corporation are
- * Copyright (C) Inprise Corporation.
- *
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- *
- * 2001.07.28: John Bellardo: Added isc_info_rsb_skip to support LIMIT.
- */
-
-#ifndef FIREBIRD_IMPL_INF_PUB_H
-#define FIREBIRD_IMPL_INF_PUB_H
-
-/* Common, structural codes */
-/****************************/
-
-#define isc_info_end			1
-#define isc_info_truncated		2
-#define isc_info_error			3
-#define isc_info_data_not_ready	          4
-#define isc_info_length			126
-#define isc_info_flag_end		127
-
-/******************************/
-/* Database information items */
-/******************************/
-
-enum db_info_types
-{
-	isc_info_db_id			= 4,
-	isc_info_reads			= 5,
-	isc_info_writes		    = 6,
-	isc_info_fetches		= 7,
-	isc_info_marks			= 8,
-
-	isc_info_implementation = 11,
-	isc_info_isc_version		= 12,
-	isc_info_base_level		= 13,
-	isc_info_page_size		= 14,
-	isc_info_num_buffers	= 15,
-	isc_info_limbo			= 16,
-	isc_info_current_memory	= 17,
-	isc_info_max_memory		= 18,
-	isc_info_window_turns	= 19,
-	isc_info_license		= 20,
-
-	isc_info_allocation		= 21,
-	isc_info_attachment_id	 = 22,
-	isc_info_read_seq_count	= 23,
-	isc_info_read_idx_count	= 24,
-	isc_info_insert_count		= 25,
-	isc_info_update_count		= 26,
-	isc_info_delete_count		= 27,
-	isc_info_backout_count	 	= 28,
-	isc_info_purge_count		= 29,
-	isc_info_expunge_count		= 30,
-
-	isc_info_sweep_interval	= 31,
-	isc_info_ods_version		= 32,
-	isc_info_ods_minor_version	= 33,
-	isc_info_no_reserve		= 34,
-	/* Begin deprecated WAL and JOURNAL items. */
-	isc_info_logfile		= 35,
-	isc_info_cur_logfile_name	= 36,
-	isc_info_cur_log_part_offset	= 37,
-	isc_info_num_wal_buffers	= 38,
-	isc_info_wal_buffer_size	= 39,
-	isc_info_wal_ckpt_length	= 40,
-
-	isc_info_wal_cur_ckpt_interval = 41,
-	isc_info_wal_prv_ckpt_fname	= 42,
-	isc_info_wal_prv_ckpt_poffset	= 43,
-	isc_info_wal_recv_ckpt_fname	= 44,
-	isc_info_wal_recv_ckpt_poffset = 45,
-	isc_info_wal_grpc_wait_usecs	= 47,
-	isc_info_wal_num_io		= 48,
-	isc_info_wal_avg_io_size	= 49,
-	isc_info_wal_num_commits	= 50,
-	isc_info_wal_avg_grpc_size	= 51,
-	/* End deprecated WAL and JOURNAL items. */
-
-	isc_info_forced_writes		= 52,
-	isc_info_user_names = 53,
-	isc_info_page_errors = 54,
-	isc_info_record_errors = 55,
-	isc_info_bpage_errors = 56,
-	isc_info_dpage_errors = 57,
-	isc_info_ipage_errors = 58,
-	isc_info_ppage_errors = 59,
-	isc_info_tpage_errors = 60,
-
-	isc_info_set_page_buffers = 61,
-	isc_info_db_sql_dialect = 62,
-	isc_info_db_read_only = 63,
-	isc_info_db_size_in_pages = 64,
-
-	/* Values 65 -100 unused to avoid conflict with InterBase */
-
-	frb_info_att_charset = 101,
-	isc_info_db_class = 102,
-	isc_info_firebird_version = 103,
-	isc_info_oldest_transaction = 104,
-	isc_info_oldest_active = 105,
-	isc_info_oldest_snapshot = 106,
-	isc_info_next_transaction = 107,
-	isc_info_db_provider = 108,
-	isc_info_active_transactions = 109,
-	isc_info_active_tran_count = 110,
-	isc_info_creation_date = 111,
-	isc_info_db_file_size = 112,
-	fb_info_page_contents = 113,
-
-	fb_info_implementation = 114,
-
-	fb_info_page_warns = 115,
-	fb_info_record_warns = 116,
-	fb_info_bpage_warns = 117,
-	fb_info_dpage_warns = 118,
-	fb_info_ipage_warns = 119,
-	fb_info_ppage_warns = 120,
-	fb_info_tpage_warns = 121,
-	fb_info_pip_errors = 122,
-	fb_info_pip_warns = 123,
-
-	fb_info_pages_used = 124,
-	fb_info_pages_free = 125,
-
-	// codes 126 and 127 are used for special purposes
-	// do not use them here
-
-	fb_info_ses_idle_timeout_db = 129,
-	fb_info_ses_idle_timeout_att = 130,
-	fb_info_ses_idle_timeout_run = 131,
-
-	fb_info_conn_flags = 132,
-
-	fb_info_crypt_key = 133,
-	fb_info_crypt_state = 134,
-
-	fb_info_statement_timeout_db = 135,
-	fb_info_statement_timeout_att = 136,
-
-	fb_info_protocol_version = 137,
-	fb_info_crypt_plugin = 138,
-
-	fb_info_creation_timestamp_tz = 139,
-
-	fb_info_wire_crypt = 140,
-
-	// Return list of features supported by provider of current connection
-	fb_info_features = 141,
-
-	fb_info_next_attachment = 142,
-	fb_info_next_statement = 143,
-
-	fb_info_db_guid = 144,
-	fb_info_db_file_id = 145,
-
-	fb_info_replica_mode = 146,
-
-	fb_info_username = 147,
-	fb_info_sqlrole = 148,
-
-	fb_info_parallel_workers = 149,
-
-	isc_info_db_last_value   /* Leave this LAST! */
-};
-
-enum db_info_crypt			/* flags set in fb_info_crypt_state */
-{
-	fb_info_crypt_encrypted = 0x01,
-	fb_info_crypt_process = 0x02
-};
-
-enum info_features // response to fb_info_features
-{
-	fb_feature_multi_statements 	= 1,    // Multiple prepared statements in single attachment
-	fb_feature_multi_transactions	= 2,	// Multiple concurrent transaction in single attachment
-	fb_feature_named_parameters		= 3,	// Query parameters can be named
-	fb_feature_session_reset		= 4,	// ALTER SESSION RESET is supported
-	fb_feature_read_consistency		= 5,	// Read consistency TIL is supported
-	fb_feature_statement_timeout	= 6,	// Statement timeout is supported
-	fb_feature_statement_long_life  = 7,    // Prepared statements are not dropped on transaction end
-
-	fb_feature_max      // Not really a feature. Keep this last.
-};
-
-enum replica_mode // response to fb_info_replica_mode
-{
-	fb_info_replica_none = 0,
-	fb_info_replica_read_only = 1,
-	fb_info_replica_read_write = 2
-};
-
-#define isc_info_version isc_info_isc_version
-
-
-/**************************************/
-/* Database information return values */
-/**************************************/
-
-enum  info_db_implementations
-{
-	isc_info_db_impl_rdb_vms = 1,
-	isc_info_db_impl_rdb_eln = 2,
-	isc_info_db_impl_rdb_eln_dev = 3,
-	isc_info_db_impl_rdb_vms_y = 4,
-	isc_info_db_impl_rdb_eln_y = 5,
-	isc_info_db_impl_jri = 6,
-	isc_info_db_impl_jsv = 7,
-
-	isc_info_db_impl_isc_apl_68K = 25,
-	isc_info_db_impl_isc_vax_ultr = 26,
-	isc_info_db_impl_isc_vms = 27,
-	isc_info_db_impl_isc_sun_68k = 28,
-	isc_info_db_impl_isc_os2 = 29,
-	isc_info_db_impl_isc_sun4 = 30,
-
-	isc_info_db_impl_isc_hp_ux = 31,
-	isc_info_db_impl_isc_sun_386i = 32,
-	isc_info_db_impl_isc_vms_orcl = 33,
-	isc_info_db_impl_isc_mac_aux = 34,
-	isc_info_db_impl_isc_rt_aix = 35,
-	isc_info_db_impl_isc_mips_ult = 36,
-	isc_info_db_impl_isc_xenix = 37,
-	isc_info_db_impl_isc_dg = 38,
-	isc_info_db_impl_isc_hp_mpexl = 39,
-	isc_info_db_impl_isc_hp_ux68K = 40,
-
-	isc_info_db_impl_isc_sgi = 41,
-	isc_info_db_impl_isc_sco_unix = 42,
-	isc_info_db_impl_isc_cray = 43,
-	isc_info_db_impl_isc_imp = 44,
-	isc_info_db_impl_isc_delta = 45,
-	isc_info_db_impl_isc_next = 46,
-	isc_info_db_impl_isc_dos = 47,
-	isc_info_db_impl_m88K = 48,
-	isc_info_db_impl_unixware = 49,
-	isc_info_db_impl_isc_winnt_x86 = 50,
-
-	isc_info_db_impl_isc_epson = 51,
-	isc_info_db_impl_alpha_osf = 52,
-	isc_info_db_impl_alpha_vms = 53,
-	isc_info_db_impl_netware_386 = 54,
-	isc_info_db_impl_win_only = 55,
-	isc_info_db_impl_ncr_3000 = 56,
-	isc_info_db_impl_winnt_ppc = 57,
-	isc_info_db_impl_dg_x86 = 58,
-	isc_info_db_impl_sco_ev = 59,
-	isc_info_db_impl_i386 = 60,
-
-	isc_info_db_impl_freebsd = 61,
-	isc_info_db_impl_netbsd = 62,
-	isc_info_db_impl_darwin_ppc = 63,
-	isc_info_db_impl_sinixz = 64,
-
-	isc_info_db_impl_linux_sparc = 65,
-	isc_info_db_impl_linux_amd64 = 66,
-
-	isc_info_db_impl_freebsd_amd64 = 67,
-
-	isc_info_db_impl_winnt_amd64 = 68,
-
-	isc_info_db_impl_linux_ppc = 69,
-	isc_info_db_impl_darwin_x86 = 70,
-	isc_info_db_impl_linux_mipsel = 71,
-	isc_info_db_impl_linux_mips = 72,
-	isc_info_db_impl_darwin_x64 = 73,
-	isc_info_db_impl_sun_amd64 = 74,
-
-	isc_info_db_impl_linux_arm = 75,
-	isc_info_db_impl_linux_ia64 = 76,
-
-	isc_info_db_impl_darwin_ppc64 = 77,
-	isc_info_db_impl_linux_s390x = 78,
-	isc_info_db_impl_linux_s390 = 79,
-
-	isc_info_db_impl_linux_sh = 80,
-	isc_info_db_impl_linux_sheb = 81,
-	isc_info_db_impl_linux_hppa = 82,
-	isc_info_db_impl_linux_alpha = 83,
-	isc_info_db_impl_linux_arm64 = 84,
-	isc_info_db_impl_linux_ppc64el = 85,
-	isc_info_db_impl_linux_ppc64 = 86,
-	isc_info_db_impl_linux_m68k = 87,
-	isc_info_db_impl_linux_riscv64 = 88,
-
-	isc_info_db_impl_freebsd_ppc64el = 89,
-
-	isc_info_db_impl_linux_mips64el = 90,
-
-	isc_info_db_impl_freebsd_ppc64 = 91,
-	isc_info_db_impl_freebsd_ppc = 92,
-
-	isc_info_db_impl_last_value   // Leave this LAST!
-};
-
-enum info_db_class
-{
-	isc_info_db_class_access = 1,
-	isc_info_db_class_y_valve = 2,
-	isc_info_db_class_rem_int = 3,
-	isc_info_db_class_rem_srvr = 4,
-	isc_info_db_class_pipe_int = 7,
-	isc_info_db_class_pipe_srvr = 8,
-	isc_info_db_class_sam_int = 9,
-	isc_info_db_class_sam_srvr = 10,
-	isc_info_db_class_gateway = 11,
-	isc_info_db_class_cache = 12,
-	isc_info_db_class_classic_access = 13,
-	isc_info_db_class_server_access = 14,
-
-	isc_info_db_class_last_value   /* Leave this LAST! */
-};
-
-enum info_db_provider
-{
-	isc_info_db_code_rdb_eln = 1,
-	isc_info_db_code_rdb_vms = 2,
-	isc_info_db_code_interbase = 3,
-	isc_info_db_code_firebird = 4,
-
-	isc_info_db_code_last_value   /* Leave this LAST! */
-};
-
-
-/*****************************/
-/* Request information items */
-/*****************************/
-
-#define isc_info_number_messages	4
-#define isc_info_max_message		5
-#define isc_info_max_send		6
-#define isc_info_max_receive		7
-#define isc_info_state			8
-#define isc_info_message_number	9
-#define isc_info_message_size		10
-#define isc_info_request_cost		11
-#define isc_info_access_path		12
-#define isc_info_req_select_count	13
-#define isc_info_req_insert_count	14
-#define isc_info_req_update_count	15
-#define isc_info_req_delete_count	16
-
-
-/*********************/
-/* Access path items */
-/*********************/
-
-#define isc_info_rsb_end		0
-#define isc_info_rsb_begin		1
-#define isc_info_rsb_type		2
-#define isc_info_rsb_relation		3
-#define isc_info_rsb_plan			4
-
-/*************/
-/* RecordSource (RSB) types */
-/*************/
-
-#define isc_info_rsb_unknown		1
-#define isc_info_rsb_indexed		2
-#define isc_info_rsb_navigate		3
-#define isc_info_rsb_sequential	4
-#define isc_info_rsb_cross		5
-#define isc_info_rsb_sort		6
-#define isc_info_rsb_first		7
-#define isc_info_rsb_boolean		8
-#define isc_info_rsb_union		9
-#define isc_info_rsb_aggregate		10
-#define isc_info_rsb_merge		11
-#define isc_info_rsb_ext_sequential	12
-#define isc_info_rsb_ext_indexed	13
-#define isc_info_rsb_ext_dbkey		14
-#define isc_info_rsb_left_cross	15
-#define isc_info_rsb_select		16
-#define isc_info_rsb_sql_join		17
-#define isc_info_rsb_simulate		18
-#define isc_info_rsb_sim_cross		19
-#define isc_info_rsb_once		20
-#define isc_info_rsb_procedure		21
-#define isc_info_rsb_skip		22
-#define isc_info_rsb_virt_sequential	23
-#define isc_info_rsb_recursive	24
-#define isc_info_rsb_window		25
-#define isc_info_rsb_singular	26
-#define isc_info_rsb_writelock	27
-#define isc_info_rsb_buffer		28
-#define isc_info_rsb_hash		29
-
-/**********************/
-/* Bitmap expressions */
-/**********************/
-
-#define isc_info_rsb_and		1
-#define isc_info_rsb_or		2
-#define isc_info_rsb_dbkey		3
-#define isc_info_rsb_index		4
-
-#define isc_info_req_active		2
-#define isc_info_req_inactive		3
-#define isc_info_req_send		4
-#define isc_info_req_receive		5
-#define isc_info_req_select		6
-#define isc_info_req_sql_stall		7
-
-/**************************/
-/* Blob information items */
-/**************************/
-
-#define isc_info_blob_num_segments	4
-#define isc_info_blob_max_segment	5
-#define isc_info_blob_total_length	6
-#define isc_info_blob_type		7
-
-/*********************************/
-/* Transaction information items */
-/*********************************/
-
-#define isc_info_tra_id						4
-#define isc_info_tra_oldest_interesting		5
-#define isc_info_tra_oldest_snapshot		6
-#define isc_info_tra_oldest_active			7
-#define isc_info_tra_isolation				8
-#define isc_info_tra_access					9
-#define isc_info_tra_lock_timeout			10
-#define fb_info_tra_dbpath					11
-#define fb_info_tra_snapshot_number			12
-
-// isc_info_tra_isolation responses
-#define isc_info_tra_consistency		1
-#define isc_info_tra_concurrency		2
-#define isc_info_tra_read_committed		3
-
-// isc_info_tra_read_committed options
-#define isc_info_tra_no_rec_version		0
-#define isc_info_tra_rec_version		1
-#define isc_info_tra_read_consistency	2
-
-// isc_info_tra_access responses
-#define isc_info_tra_readonly	0
-#define isc_info_tra_readwrite	1
-
-
-/*************************/
-/* SQL information items */
-/*************************/
-
-#define isc_info_sql_select		4
-#define isc_info_sql_bind		5
-#define isc_info_sql_num_variables	6
-#define isc_info_sql_describe_vars	7
-#define isc_info_sql_describe_end	8
-#define isc_info_sql_sqlda_seq		9
-#define isc_info_sql_message_seq	10
-#define isc_info_sql_type		11
-#define isc_info_sql_sub_type		12
-#define isc_info_sql_scale		13
-#define isc_info_sql_length		14
-#define isc_info_sql_null_ind		15
-#define isc_info_sql_field		16
-#define isc_info_sql_relation		17
-#define isc_info_sql_owner		18
-#define isc_info_sql_alias		19
-#define isc_info_sql_sqlda_start	20
-#define isc_info_sql_stmt_type		21
-#define isc_info_sql_get_plan             22
-#define isc_info_sql_records		  23
-#define isc_info_sql_batch_fetch	  24
-#define isc_info_sql_relation_alias		25
-#define isc_info_sql_explain_plan		26
-#define isc_info_sql_stmt_flags         27
-#define isc_info_sql_stmt_timeout_user	28
-#define isc_info_sql_stmt_timeout_run	29
-#define isc_info_sql_stmt_blob_align	30
-#define isc_info_sql_exec_path_blr_bytes	31
-#define isc_info_sql_exec_path_blr_text		32
-
-/*********************************/
-/* SQL information return values */
-/*********************************/
-
-#define isc_info_sql_stmt_select          1
-#define isc_info_sql_stmt_insert          2
-#define isc_info_sql_stmt_update          3
-#define isc_info_sql_stmt_delete          4
-#define isc_info_sql_stmt_ddl             5
-#define isc_info_sql_stmt_get_segment     6
-#define isc_info_sql_stmt_put_segment     7
-#define isc_info_sql_stmt_exec_procedure  8
-#define isc_info_sql_stmt_start_trans     9
-#define isc_info_sql_stmt_commit          10
-#define isc_info_sql_stmt_rollback        11
-#define isc_info_sql_stmt_select_for_upd  12
-#define isc_info_sql_stmt_set_generator   13
-#define isc_info_sql_stmt_savepoint       14
-
-#endif /* FIREBIRD_IMPL_INF_PUB_H */
diff --git a/FBClient.Headers/firebird/impl/msg/all.h b/FBClient.Headers/firebird/impl/msg/all.h
deleted file mode 100644
index 664f5bad..00000000
--- a/FBClient.Headers/firebird/impl/msg/all.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  The contents of this file are subject to the Initial
- *  Developer's Public License Version 1.0 (the "License");
- *  you may not use this file except in compliance with the
- *  License. You may obtain a copy of the License at
- *  http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
- *
- *  Software distributed under the License is distributed AS IS,
- *  WITHOUT WARRANTY OF ANY KIND, either express or implied.
- *  See the License for the specific language governing rights
- *  and limitations under the License.
- *
- *  The Original Code was created by Adriano dos Santos Fernandes
- *  for the Firebird Open Source RDBMS project.
- *
- *  Copyright (c) 2021 Adriano dos Santos Fernandes <adrianosf@gmail.com>
- *  and all contributors signed below.
- *
- *  All Rights Reserved.
- *  Contributor(s): ______________________________________.
- */
-
-// Include headers by their facility order (see firebird/impl/msg_helper.h)
-#include "jrd.h"
-#include "gfix.h"
-#include "dsql.h"
-#include "dyn.h"
-#include "gbak.h"
-#include "sqlerr.h"
-#include "sqlwarn.h"
-#include "jrd_bugchk.h"
-#include "isql.h"
-#include "gsec.h"
-#include "gstat.h"
-#include "fbsvcmgr.h"
-#include "utl.h"
-#include "nbackup.h"
-#include "fbtracemgr.h"
diff --git a/FBClient.Headers/firebird/impl/msg/dsql.h b/FBClient.Headers/firebird/impl/msg/dsql.h
deleted file mode 100644
index 54a53394..00000000
--- a/FBClient.Headers/firebird/impl/msg/dsql.h
+++ /dev/null
@@ -1,40 +0,0 @@
-FB_IMPL_MSG(DSQL, 2, dsql_dbkey_from_non_table, -607, "HY", "000", "Cannot SELECT RDB$DB_KEY from a stored procedure.")
-FB_IMPL_MSG(DSQL, 3, dsql_transitional_numeric, -104, "HY", "000", "Precision 10 to 18 changed from DOUBLE PRECISION in SQL dialect 1 to 64-bit scaled integer in SQL dialect 3")
-FB_IMPL_MSG(DSQL, 4, dsql_dialect_warning_expr, 301, "01", "000", "Use of @1 expression that returns different results in dialect 1 and dialect 3")
-FB_IMPL_MSG(DSQL, 5, sql_db_dialect_dtype_unsupport, -104, "HY", "000", "Database SQL dialect @1 does not support reference to @2 datatype")
-FB_IMPL_MSG_NO_SYMBOL(DSQL, 6, "")
-FB_IMPL_MSG(DSQL, 7, sql_dialect_conflict_num, -817, "HY", "000", "DB dialect @1 and client dialect @2 conflict with respect to numeric precision @3.")
-FB_IMPL_MSG(DSQL, 8, dsql_warning_number_ambiguous, 301, "HY", "104", "WARNING: Numeric literal @1 is interpreted as a floating-point")
-FB_IMPL_MSG(DSQL, 9, dsql_warning_number_ambiguous1, 301, "HY", "104", "value in SQL dialect 1, but as an exact numeric value in SQL dialect 3.")
-FB_IMPL_MSG(DSQL, 10, dsql_warn_precision_ambiguous, 301, "HY", "104", "WARNING: NUMERIC and DECIMAL fields with precision 10 or greater are stored")
-FB_IMPL_MSG(DSQL, 11, dsql_warn_precision_ambiguous1, 301, "HY", "104", "as approximate floating-point values in SQL dialect 1, but as 64-bit")
-FB_IMPL_MSG(DSQL, 12, dsql_warn_precision_ambiguous2, 301, "HY", "104", "integers in SQL dialect 3.")
-FB_IMPL_MSG(DSQL, 13, dsql_ambiguous_field_name, -204, "42", "702", "Ambiguous field name between @1 and @2")
-FB_IMPL_MSG(DSQL, 14, dsql_udf_return_pos_err, -607, "38", "000", "External function should have return position between 1 and @1")
-FB_IMPL_MSG(DSQL, 15, dsql_invalid_label, -104, "HY", "000", "Label @1 @2 in the current scope")
-FB_IMPL_MSG(DSQL, 16, dsql_datatypes_not_comparable, -104, "HY", "004", "Datatypes @1are not comparable in expression @2")
-FB_IMPL_MSG(DSQL, 17, dsql_cursor_invalid, -504, "24", "000", "Empty cursor name is not allowed")
-FB_IMPL_MSG(DSQL, 18, dsql_cursor_redefined, -502, "24", "000", "Statement already has a cursor @1 assigned")
-FB_IMPL_MSG(DSQL, 19, dsql_cursor_not_found, -502, "34", "000", "Cursor @1 is not found in the current context")
-FB_IMPL_MSG(DSQL, 20, dsql_cursor_exists, -502, "24", "000", "Cursor @1 already exists in the current context")
-FB_IMPL_MSG(DSQL, 21, dsql_cursor_rel_ambiguous, -502, "34", "000", "Relation @1 is ambiguous in cursor @2")
-FB_IMPL_MSG(DSQL, 22, dsql_cursor_rel_not_found, -502, "34", "000", "Relation @1 is not found in cursor @2")
-FB_IMPL_MSG(DSQL, 23, dsql_cursor_not_open, -504, "24", "000", "Cursor is not open")
-FB_IMPL_MSG(DSQL, 24, dsql_type_not_supp_ext_tab, -607, "HY", "004", "Data type @1 is not supported for EXTERNAL TABLES. Relation '@2', field '@3'")
-FB_IMPL_MSG(DSQL, 25, dsql_feature_not_supported_ods, -804, "0A", "000", "Feature not supported on ODS version older than @1.@2")
-FB_IMPL_MSG(DSQL, 26, primary_key_required, -660, "22", "000", "Primary key required on table @1")
-FB_IMPL_MSG(DSQL, 27, upd_ins_doesnt_match_pk, -313, "42", "000", "UPDATE OR INSERT field list does not match primary key of table @1")
-FB_IMPL_MSG(DSQL, 28, upd_ins_doesnt_match_matching, -313, "42", "000", "UPDATE OR INSERT field list does not match MATCHING clause")
-FB_IMPL_MSG(DSQL, 29, upd_ins_with_complex_view, -817, "54", "001", "UPDATE OR INSERT without MATCHING could not be used with views based on more than one table")
-FB_IMPL_MSG(DSQL, 30, dsql_incompatible_trigger_type, -817, "42", "000", "Incompatible trigger type")
-FB_IMPL_MSG(DSQL, 31, dsql_db_trigger_type_cant_change, -817, "42", "000", "Database trigger type can't be changed")
-FB_IMPL_MSG(DSQL, 32, dsql_record_version_table, -607, "HY", "000", "To be used with RDB$RECORD_VERSION, @1 must be a table or a view of single table")
-FB_IMPL_MSG(DSQL, 33, dsql_invalid_sqlda_version, -802, "07", "002", "SQLDA version expected between @1 and @2, found @3")
-FB_IMPL_MSG(DSQL, 34, dsql_sqlvar_index, -802, "07", "002", "at SQLVAR index @1")
-FB_IMPL_MSG(DSQL, 35, dsql_no_sqlind, -802, "07", "002", "empty pointer to NULL indicator variable")
-FB_IMPL_MSG(DSQL, 36, dsql_no_sqldata, -802, "07", "002", "empty pointer to data")
-FB_IMPL_MSG(DSQL, 37, dsql_no_input_sqlda, -802, "07", "002", "No SQLDA for input values provided")
-FB_IMPL_MSG(DSQL, 38, dsql_no_output_sqlda, -802, "07", "002", "No SQLDA for output values provided")
-FB_IMPL_MSG(DSQL, 39, dsql_wrong_param_num, -313, "07", "001", "Wrong number of parameters (expected @1, got @2)")
-FB_IMPL_MSG(DSQL, 40, dsql_invalid_drop_ss_clause, -817, "42", "000", "Invalid DROP SQL SECURITY clause")
-FB_IMPL_MSG(DSQL, 41, upd_ins_cannot_default, -313, "42", "000", "UPDATE OR INSERT value for field @1, part of the implicit or explicit MATCHING clause, cannot be DEFAULT")
diff --git a/FBClient.Headers/firebird/impl/msg/dyn.h b/FBClient.Headers/firebird/impl/msg/dyn.h
deleted file mode 100644
index 058b2176..00000000
--- a/FBClient.Headers/firebird/impl/msg/dyn.h
+++ /dev/null
@@ -1,301 +0,0 @@
-FB_IMPL_MSG_NO_SYMBOL(DYN, 1, "ODS version not supported by DYN")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 2, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 3, "STORE RDB$FIELD_DIMENSIONS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 4, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 5, "@1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 6, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 7, "DEFINE BLOB FILTER failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 8, "DEFINE GENERATOR failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 9, "DEFINE GENERATOR unexpected DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 10, "DEFINE FUNCTION failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 11, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 12, "DEFINE FUNCTION ARGUMENT failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 13, "STORE RDB$FIELDS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 14, "No table specified for index")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 15, "STORE RDB$INDEX_SEGMENTS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 16, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 17, "PRIMARY KEY column lookup failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 18, "could not find UNIQUE or PRIMARY KEY constraint in table @1 with specified columns")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 19, "PRIMARY KEY lookup failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 20, "could not find PRIMARY KEY index in specified table @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 21, "STORE RDB$INDICES failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 22, "STORE RDB$FIELDS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 23, "STORE RDB$RELATION_FIELDS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 24, "STORE RDB$RELATIONS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 25, "STORE RDB$USER_PRIVILEGES failed defining a table")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 26, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 27, "STORE RDB$RELATIONS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 28, "STORE RDB$FIELDS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 29, "STORE RDB$RELATION_FIELDS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 30, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 31, "DEFINE TRIGGER failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 32, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 33, "DEFINE TRIGGER MESSAGE failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 34, "STORE RDB$VIEW_RELATIONS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 35, "ERASE RDB$FIELDS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 36, "ERASE BLOB FILTER failed")
-FB_IMPL_MSG(DYN, 37, dyn_filter_not_found, -901, "42", "000", "BLOB Filter @1 not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 38, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 39, "ERASE RDB$FUNCTION_ARGUMENTS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 40, "ERASE RDB$FUNCTIONS failed")
-FB_IMPL_MSG(DYN, 41, dyn_func_not_found, -901, "42", "000", "Function @1 not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 42, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 43, "Domain @1 is used in table @2 (local name @3) and cannot be dropped")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 44, "ERASE RDB$FIELDS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 45, "ERASE RDB$FIELDS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 46, "Column not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 47, "ERASE RDB$INDICES failed")
-FB_IMPL_MSG(DYN, 48, dyn_index_not_found, -901, "42", "000", "Index not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 49, "ERASE RDB$INDEX_SEGMENTS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 50, "No segments found for index")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 51, "No table specified in ERASE RFR")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 52, "Column @1 from table @2 is referenced in view @3")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 53, "ERASE RDB$RELATION_FIELDS failed")
-FB_IMPL_MSG(DYN, 54, dyn_view_not_found, -901, "42", "000", "View @1 not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 55, "Column not found for table")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 56, "ERASE RDB$INDEX_SEGMENTS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 57, "ERASE RDB$INDICES failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 58, "ERASE RDB$RELATION_FIELDS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 59, "ERASE RDB$VIEW_RELATIONS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 60, "ERASE RDB$RELATIONS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 61, "Table not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 62, "ERASE RDB$USER_PRIVILEGES failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 63, "ERASE RDB$FILES failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 64, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 65, "ERASE RDB$TRIGGER_MESSAGES failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 66, "ERASE RDB$TRIGGERS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 67, "Trigger not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 68, "MODIFY RDB$VIEW_RELATIONS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 69, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 70, "TRIGGER NAME expected")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 71, "ERASE TRIGGER MESSAGE failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 72, "Trigger Message not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 73, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 74, "ERASE RDB$SECURITY_CLASSES failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 75, "Security class not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 76, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 77, "SELECT RDB$USER_PRIVILEGES failed in grant")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 78, "SELECT RDB$USER_PRIVILEGES failed in grant")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 79, "STORE RDB$USER_PRIVILEGES failed in grant")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 80, "Specified domain or source column does not exist")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 81, "Generation of column name failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 82, "Generation of index name failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 83, "Generation of trigger name failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 84, "MODIFY DATABASE failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 85, "MODIFY RDB$CHARACTER_SETS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 86, "MODIFY RDB$COLLATIONS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 87, "MODIFY RDB$FIELDS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 88, "MODIFY RDB$BLOB_FILTERS failed")
-FB_IMPL_MSG(DYN, 89, dyn_domain_not_found, -901, "42", "000", "Domain not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 90, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 91, "MODIFY RDB$INDICES failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 92, "MODIFY RDB$FUNCTIONS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 93, "Index column not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 94, "MODIFY RDB$GENERATORS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 95, "MODIFY RDB$RELATION_FIELDS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 96, "Local column @1 not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 97, "add EXTERNAL FILE not allowed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 98, "drop EXTERNAL FILE not allowed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 99, "MODIFY RDB$RELATIONS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 100, "MODIFY RDB$PROCEDURE_PARAMETERS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 101, "Table column not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 102, "MODIFY TRIGGER failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 103, "TRIGGER NAME expected")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 104, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 105, "MODIFY TRIGGER MESSAGE failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 106, "Create metadata BLOB failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 107, "Write metadata BLOB failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 108, "Close metadata BLOB failed")
-FB_IMPL_MSG(DYN, 109, dyn_cant_modify_auto_trig, -901, "42", "000", "Triggers created automatically cannot be modified")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 110, "unsupported DYN verb")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 111, "ERASE RDB$USER_PRIVILEGES failed in revoke(1)")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 112, "Access to RDB$USER_PRIVILEGES failed in revoke(2)")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 113, "ERASE RDB$USER_PRIVILEGES failed in revoke (3)")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 114, "Access to RDB$USER_PRIVILEGES failed in revoke (4)")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 115, "CREATE VIEW failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 116, " attempt to index BLOB column in INDEX @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 117, " attempt to index array column in index @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 118, "key size too big for index @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 119, "no keys for index @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 120, "Unknown columns in index @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 121, "STORE RDB$RELATION_CONSTRAINTS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 122, "STORE RDB$CHECK_CONSTRAINTS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 123, "Column: @1 not defined as NOT NULL - cannot be used in PRIMARY KEY constraint definition")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 124, "A column name is repeated in the definition of constraint: @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 125, "Integrity Constraint lookup failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 126, "Same set of columns cannot be used in more than one PRIMARY KEY and/or UNIQUE constraint definition")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 127, "STORE RDB$REF_CONSTRAINTS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 128, "No table specified in delete_constraint")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 129, "ERASE RDB$RELATION_CONSTRAINTS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 130, "CONSTRAINT @1 does not exist.")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 131, "Generation of constraint name failed")
-FB_IMPL_MSG(DYN, 132, dyn_dup_table, -901, "42", "S01", "Table @1 already exists")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 133, "Number of referencing columns do not equal number of referenced columns")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 134, "STORE RDB$PROCEDURES failed")
-FB_IMPL_MSG_SYMBOL(DYN, 135, dyn_dup_procedure, "Procedure @1 already exists")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 136, "STORE RDB$PROCEDURE_PARAMETERS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 137, "Store into system table @1 failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 138, "ERASE RDB$PROCEDURE_PARAMETERS failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 139, "ERASE RDB$PROCEDURES failed")
-FB_IMPL_MSG(DYN, 140, dyn_proc_not_found, -901, "42", "000", "Procedure @1 not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 141, "MODIFY RDB$PROCEDURES failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 142, "DEFINE EXCEPTION failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 143, "ERASE EXCEPTION failed")
-FB_IMPL_MSG(DYN, 144, dyn_exception_not_found, -901, "42", "000", "Exception not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 145, "MODIFY EXCEPTION failed")
-FB_IMPL_MSG(DYN, 146, dyn_proc_param_not_found, -901, "42", "000", "Parameter @1 in procedure @2 not found")
-FB_IMPL_MSG(DYN, 147, dyn_trig_not_found, -901, "42", "000", "Trigger @1 not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 148, "Only one data type change to the domain @1 allowed at a time")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 149, "Only one data type change to the field @1 allowed at a time")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 150, "STORE RDB$FILES failed")
-FB_IMPL_MSG(DYN, 151, dyn_charset_not_found, -901, "42", "000", "Character set @1 not found")
-FB_IMPL_MSG(DYN, 152, dyn_collation_not_found, -901, "42", "000", "Collation @1 not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 153, "ERASE RDB$LOG_FILES failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 154, "STORE RDB$LOG_FILES failed")
-FB_IMPL_MSG(DYN, 155, dyn_role_not_found, -901, "42", "000", "Role @1 not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 156, "Difference file lookup failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 157, "DEFINE SHADOW failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 158, "MODIFY RDB$ROLES failed")
-FB_IMPL_MSG(DYN, 159, dyn_name_longer, -901, "42", "000", "Name longer than database column size")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 160, "\"Only one constraint allowed for a domain\"")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 162, "Looking up column position failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 163, "A node name is not permitted in a table with external file definition")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 164, "Shadow lookup failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 165, "Shadow @1 already exists")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 166, "Cannot add file with the same name as the database or added files")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 167, "no grant option for privilege @1 on column @2 of table/view @3")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 168, "no grant option for privilege @1 on column @2 of base table/view @3")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 169, "no grant option for privilege @1 on table/view @2 (for column @3)")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 170, "no grant option for privilege @1 on base table/view @2 (for column @3)")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 171, "no @1 privilege with grant option on table/view @2 (for column @3)")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 172, "no @1 privilege with grant option on base table/view @2 (for column @3)")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 173, "no grant option for privilege @1 on table/view @2")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 174, "no @1 privilege with grant option on table/view @2")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 175, "table/view @1 does not exist")
-FB_IMPL_MSG(DYN, 176, dyn_column_does_not_exist, -901, "42", "S22", "column @1 does not exist in table/view @2")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 177, "Can not alter a view")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 178, "EXTERNAL FILE table not supported in this context")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 179, "attempt to index COMPUTED BY column in INDEX @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 180, "Table Name lookup failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 181, "attempt to index a view")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 182, "SELECT RDB$RELATIONS failed in grant")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 183, "SELECT RDB$RELATION_FIELDS failed in grant")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 184, "SELECT RDB$RELATIONS/RDB$OWNER_NAME failed in grant")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 185, "SELECT RDB$USER_PRIVILEGES failed in grant")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 186, "SELECT RDB$VIEW_RELATIONS/RDB$RELATION_FIELDS/... failed in grant")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 187, "column @1 from table @2 is referenced in index @3")
-FB_IMPL_MSG(DYN, 188, dyn_role_does_not_exist, -901, "28", "000", "SQL role @1 does not exist")
-FB_IMPL_MSG(DYN, 189, dyn_no_grant_admin_opt, -901, "28", "000", "user @1 has no grant admin option on SQL role @2")
-FB_IMPL_MSG(DYN, 190, dyn_user_not_role_member, -901, "28", "000", "user @1 is not a member of SQL role @2")
-FB_IMPL_MSG(DYN, 191, dyn_delete_role_failed, -901, "28", "000", "@1 is not the owner of SQL role @2")
-FB_IMPL_MSG(DYN, 192, dyn_grant_role_to_user, -901, "28", "000", "@1 is a SQL role and not a user")
-FB_IMPL_MSG(DYN, 193, dyn_inv_sql_role_name, -901, "28", "000", "user name @1 could not be used for SQL role")
-FB_IMPL_MSG(DYN, 194, dyn_dup_sql_role, -901, "42", "000", "SQL role @1 already exists")
-FB_IMPL_MSG(DYN, 195, dyn_kywd_spec_for_role, -901, "28", "000", "keyword @1 can not be used as a SQL role name")
-FB_IMPL_MSG(DYN, 196, dyn_roles_not_supported, -901, "28", "000", "SQL roles are not supported in on older versions of the database.  A backup and restore of the database is required.")
-FB_IMPL_MSG(DYN, 204, dyn_domain_name_exists, -612, "42", "000", "Cannot rename domain @1 to @2.  A domain with that name already exists.")
-FB_IMPL_MSG(DYN, 205, dyn_field_name_exists, -612, "42", "S21", "Cannot rename column @1 to @2.  A column with that name already exists in table @3.")
-FB_IMPL_MSG(DYN, 206, dyn_dependency_exists, -383, "42", "000", "Column @1 from table @2 is referenced in @3")
-FB_IMPL_MSG(DYN, 207, dyn_dtype_invalid, -315, "42", "000", "Cannot change datatype for column @1.  Changing datatype is not supported for BLOB or ARRAY columns.")
-FB_IMPL_MSG(DYN, 208, dyn_char_fld_too_small, -829, "42", "000", "New size specified for column @1 must be at least @2 characters.")
-FB_IMPL_MSG(DYN, 209, dyn_invalid_dtype_conversion, -829, "42", "000", "Cannot change datatype for @1.  Conversion from base type @2 to @3 is not supported.")
-FB_IMPL_MSG(DYN, 210, dyn_dtype_conv_invalid, -829, "42", "000", "Cannot change datatype for column @1 from a character type to a non-character type.")
-FB_IMPL_MSG_SYMBOL(DYN, 211, dyn_virmemexh, "unable to allocate memory from the operating system")
-FB_IMPL_MSG(DYN, 212, dyn_zero_len_id, -901, "42", "000", "Zero length identifiers are not allowed")
-FB_IMPL_MSG_SYMBOL(DYN, 213, del_gen_fail, "ERASE RDB$GENERATORS failed")
-FB_IMPL_MSG(DYN, 214, dyn_gen_not_found, -901, "42", "000", "Sequence @1 not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 215, "Difference file is not defined")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 216, "Difference file is already defined")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 217, "Database is already in the physical backup mode")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 218, "Database is not in the physical backup mode")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 219, "DEFINE COLLATION failed")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 220, "CREATE COLLATION statement is not supported in older versions of the database.  A backup and restore is required.")
-FB_IMPL_MSG(DYN, 221, max_coll_per_charset, -829, "2C", "000", "Maximum number of collations per character set exceeded")
-FB_IMPL_MSG(DYN, 222, invalid_coll_attr, -829, "HY", "000", "Invalid collation attributes")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 223, "Collation @1 not installed for character set @2")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 224, "Cannot use the internal domain @1 as new type for field @2")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 225, "Default value is not allowed for array type in field @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 226, "Default value is not allowed for array type in domain @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 227, "DYN_UTIL_is_array failed for domain @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 228, "DYN_UTIL_copy_domain failed for domain @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 229, "Local column @1 doesn't have a default")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 230, "Local column @1 default belongs to domain @2")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 231, "File name is invalid")
-FB_IMPL_MSG(DYN, 232, dyn_wrong_gtt_scope, -901, "HY", "000", "@1 cannot reference @2")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 233, "Local column @1 is computed, cannot set a default value")
-FB_IMPL_MSG_SYMBOL(DYN, 234, del_coll_fail, "ERASE RDB$COLLATIONS failed")
-FB_IMPL_MSG(DYN, 235, dyn_coll_used_table, -901, "HY", "000", "Collation @1 is used in table @2 (field name @3) and cannot be dropped")
-FB_IMPL_MSG(DYN, 236, dyn_coll_used_domain, -901, "HY", "000", "Collation @1 is used in domain @2 and cannot be dropped")
-FB_IMPL_MSG(DYN, 237, dyn_cannot_del_syscoll, -607, "HY", "000", "Cannot delete system collation")
-FB_IMPL_MSG(DYN, 238, dyn_cannot_del_def_coll, -901, "HY", "000", "Cannot delete default collation of CHARACTER SET @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 239, "Domain @1 is used in procedure @2 (parameter name @3) and cannot be dropped")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 240, "Field @1 cannot be used twice in index @2")
-FB_IMPL_MSG(DYN, 241, dyn_table_not_found, -901, "42", "000", "Table @1 not found")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 242, "attempt to reference a view (@1) in a foreign key")
-FB_IMPL_MSG(DYN, 243, dyn_coll_used_procedure, -901, "HY", "000", "Collation @1 is used in procedure @2 (parameter name @3) and cannot be dropped")
-FB_IMPL_MSG(DYN, 244, dyn_scale_too_big, -829, "42", "000", "New scale specified for column @1 must be at most @2.")
-FB_IMPL_MSG(DYN, 245, dyn_precision_too_small, -829, "42", "000", "New precision specified for column @1 must be at least @2.")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 246, "@1 is not grantor of @2 on @3 to @4.")
-FB_IMPL_MSG(DYN, 247, dyn_miss_priv_warning, 106, "42", "000", "Warning: @1 on @2 is not granted to @3.")
-FB_IMPL_MSG(DYN, 248, dyn_ods_not_supp_feature, -901, "0A", "000", "Feature '@1' is not supported in ODS @2.@3")
-FB_IMPL_MSG(DYN, 249, dyn_cannot_addrem_computed, -829, "42", "000", "Cannot add or remove COMPUTED from column @1")
-FB_IMPL_MSG(DYN, 250, dyn_no_empty_pw, -901, "42", "000", "Password should not be empty string")
-FB_IMPL_MSG(DYN, 251, dyn_dup_index, -901, "42", "S11", "Index @1 already exists")
-FB_IMPL_MSG_SYMBOL(DYN, 252, dyn_locksmith_use_granted, "Only @1 or user with privilege USE_GRANTED_BY_CLAUSE can use GRANTED BY clause")
-FB_IMPL_MSG_SYMBOL(DYN, 253, dyn_dup_exception, "Exception @1 already exists")
-FB_IMPL_MSG_SYMBOL(DYN, 254, dyn_dup_generator, "Sequence @1 already exists")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 255, "ERASE RDB$USER_PRIVILEGES failed in REVOKE ALL ON ALL")
-FB_IMPL_MSG(DYN, 256, dyn_package_not_found, -901, "42", "000", "Package @1 not found")
-FB_IMPL_MSG(DYN, 257, dyn_schema_not_found, -901, "42", "000", "Schema @1 not found")
-FB_IMPL_MSG(DYN, 258, dyn_cannot_mod_sysproc, -607, "HY", "000", "Cannot ALTER or DROP system procedure @1")
-FB_IMPL_MSG(DYN, 259, dyn_cannot_mod_systrig, -607, "HY", "000", "Cannot ALTER or DROP system trigger @1")
-FB_IMPL_MSG(DYN, 260, dyn_cannot_mod_sysfunc, -607, "HY", "000", "Cannot ALTER or DROP system function @1")
-FB_IMPL_MSG(DYN, 261, dyn_invalid_ddl_proc, -607, "HY", "000", "Invalid DDL statement for procedure @1")
-FB_IMPL_MSG(DYN, 262, dyn_invalid_ddl_trig, -607, "HY", "000", "Invalid DDL statement for trigger @1")
-FB_IMPL_MSG(DYN, 263, dyn_funcnotdef_package, -901, "42", "000", "Function @1 has not been defined on the package body @2")
-FB_IMPL_MSG(DYN, 264, dyn_procnotdef_package, -901, "42", "000", "Procedure @1 has not been defined on the package body @2")
-FB_IMPL_MSG(DYN, 265, dyn_funcsignat_package, -901, "42", "000", "Function @1 has a signature mismatch on package body @2")
-FB_IMPL_MSG(DYN, 266, dyn_procsignat_package, -901, "42", "000", "Procedure @1 has a signature mismatch on package body @2")
-FB_IMPL_MSG(DYN, 267, dyn_defvaldecl_package_proc, -901, "42", "000", "Default values for parameters are not allowed in the definition of a previously declared packaged procedure @1.@2")
-FB_IMPL_MSG_SYMBOL(DYN, 268, dyn_dup_function, "Function @1 already exists")
-FB_IMPL_MSG(DYN, 269, dyn_package_body_exists, -901, "42", "000", "Package body @1 already exists")
-FB_IMPL_MSG(DYN, 270, dyn_invalid_ddl_func, -607, "HY", "000", "Invalid DDL statement for function @1")
-FB_IMPL_MSG(DYN, 271, dyn_newfc_oldsyntax, -901, "42", "000", "Cannot alter new style function @1 with ALTER EXTERNAL FUNCTION. Use ALTER FUNCTION instead.")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 272, "Cannot delete system generator @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 273, "Identity column @1 of table @2 must be of exact number type with zero scale")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 274, "Identity column @1 of table @2 cannot be changed to NULLable")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 275, "Identity column @1 of table @2 cannot have default value")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 276, "Domain @1 must be of exact number type with zero scale because it's used in an identity column")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 277, "Generation of generator name failed")
-FB_IMPL_MSG(DYN, 278, dyn_func_param_not_found, -901, "42", "000", "Parameter @1 in function @2 not found")
-FB_IMPL_MSG(DYN, 279, dyn_routine_param_not_found, -901, "42", "000", "Parameter @1 of routine @2 not found")
-FB_IMPL_MSG(DYN, 280, dyn_routine_param_ambiguous, -901, "42", "000", "Parameter @1 of routine @2 is ambiguous (found in both procedures and functions). Use a specifier keyword.")
-FB_IMPL_MSG(DYN, 281, dyn_coll_used_function, -901, "HY", "000", "Collation @1 is used in function @2 (parameter name @3) and cannot be dropped")
-FB_IMPL_MSG(DYN, 282, dyn_domain_used_function, -901, "HY", "000", "Domain @1 is used in function @2 (parameter name @3) and cannot be dropped")
-FB_IMPL_MSG(DYN, 283, dyn_alter_user_no_clause, -901, "42", "000", "ALTER USER requires at least one clause to be specified")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 284, "Cannot delete system SQL role @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 285, "Column @1 is not an identity column")
-FB_IMPL_MSG(DYN, 286, dyn_duplicate_package_item, -901, "42", "000", "Duplicate @1 @2")
-FB_IMPL_MSG(DYN, 287, dyn_cant_modify_sysobj, -901, "42", "000", "System @1 @2 cannot be modified")
-FB_IMPL_MSG(DYN, 288, dyn_cant_use_zero_increment, -901, "42", "000", "INCREMENT BY 0 is an illegal option for sequence @1")
-FB_IMPL_MSG(DYN, 289, dyn_cant_use_in_foreignkey, -901, "42", "000", "Can't use @1 in FOREIGN KEY constraint")
-FB_IMPL_MSG(DYN, 290, dyn_defvaldecl_package_func, -901, "42", "000", "Default values for parameters are not allowed in the definition of a previously declared packaged function @1.@2")
-FB_IMPL_MSG_SYMBOL(DYN, 291, dyn_create_user_no_password, "Password must be specified when creating user")
-FB_IMPL_MSG(DYN, 292, dyn_cyclic_role, -901, "42", "000", "role @1 can not be granted to role @2")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 293, "DROP SYSTEM PRIVILEGES should not be used in CREATE ROLE operator")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 294, "Access to SYSTEM PRIVILEGES in ROLES denied to @1")
-FB_IMPL_MSG_NO_SYMBOL(DYN, 295, "Only @1, DB owner @2 or user with privilege USE_GRANTED_BY_CLAUSE can use GRANTED BY clause")
-FB_IMPL_MSG(DYN, 296, dyn_cant_use_zero_inc_ident, -901, "42", "000", "INCREMENT BY 0 is an illegal option for identity column @1 of table @2")
-FB_IMPL_MSG_SYMBOL(DYN, 297, dyn_concur_alter_database, "Concurrent ALTER DATABASE is not supported")
-FB_IMPL_MSG_SYMBOL(DYN, 298, dyn_incompat_alter_database, "Incompatible ALTER DATABASE clauses: '@1' and '@2'")
-FB_IMPL_MSG(DYN, 299, dyn_no_ddl_grant_opt_priv, -901, "42", "000", "no @1 privilege with grant option on DDL @2")
-FB_IMPL_MSG(DYN, 300, dyn_no_grant_opt_priv, -901, "42", "000", "no @1 privilege with grant option on object @2")
-FB_IMPL_MSG(DYN, 301, dyn_func_not_exist, -901, "42", "000", "Function @1 does not exist")
-FB_IMPL_MSG(DYN, 302, dyn_proc_not_exist, -901, "42", "000", "Procedure @1 does not exist")
-FB_IMPL_MSG(DYN, 303, dyn_pack_not_exist, -901, "42", "000", "Package @1 does not exist")
-FB_IMPL_MSG(DYN, 304, dyn_trig_not_exist, -901, "42", "000", "Trigger @1 does not exist")
-FB_IMPL_MSG(DYN, 305, dyn_view_not_exist, -901, "42", "000", "View @1 does not exist")
-FB_IMPL_MSG(DYN, 306, dyn_rel_not_exist, -901, "42", "000", "Table @1 does not exist")
-FB_IMPL_MSG(DYN, 307, dyn_exc_not_exist, -901, "42", "000", "Exception @1 does not exist")
-FB_IMPL_MSG(DYN, 308, dyn_gen_not_exist, -901, "42", "000", "Generator/Sequence @1 does not exist")
-FB_IMPL_MSG(DYN, 309, dyn_fld_not_exist, -901, "42", "000", "Field @1 of table @2 does not exist")
diff --git a/FBClient.Headers/firebird/impl/msg/fbsvcmgr.h b/FBClient.Headers/firebird/impl/msg/fbsvcmgr.h
deleted file mode 100644
index 1d610f3c..00000000
--- a/FBClient.Headers/firebird/impl/msg/fbsvcmgr.h
+++ /dev/null
@@ -1,61 +0,0 @@
-FB_IMPL_MSG(FBSVCMGR, 1, fbsvcmgr_bad_am, -901, "00", "000", "Wrong value for access mode")
-FB_IMPL_MSG(FBSVCMGR, 2, fbsvcmgr_bad_wm, -901, "00", "000", "Wrong value for write mode")
-FB_IMPL_MSG(FBSVCMGR, 3, fbsvcmgr_bad_rs, -901, "00", "000", "Wrong value for reserve space")
-FB_IMPL_MSG(FBSVCMGR, 4, fbsvcmgr_info_err, -901, "00", "000", "Unknown tag (@1) in info_svr_db_info block after isc_svc_query()")
-FB_IMPL_MSG(FBSVCMGR, 5, fbsvcmgr_query_err, -901, "00", "000", "Unknown tag (@1) in isc_svc_query() results")
-FB_IMPL_MSG(FBSVCMGR, 6, fbsvcmgr_switch_unknown, -901, "00", "000", "Unknown switch \"@1\"")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 7, "Service Manager Version")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 8, "Server version")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 9, "Server implementation")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 10, "Path to firebird.msg")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 11, "Server root")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 12, "Path to lock files")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 13, "Security database")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 14, "Databases")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 15, "   Database in use")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 16, "   Number of attachments")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 17, "   Number of databases")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 18, "Information truncated")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 19, "Usage: fbsvcmgr manager-name switches...")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 20, "Manager-name should be service_mgr, may be prefixed with host name")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 21, "according to common rules (host:service_mgr, \\\\host\\service_mgr).")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 22, "Switches exactly match SPB tags, used in abbreviated form.")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 23, "Remove isc_, spb_ and svc_ parts of tag and you will get the switch.")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 24, "For example: isc_action_svc_backup is specified as action_backup,")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 25, "             isc_spb_dbname => dbname,")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 26, "             isc_info_svc_implementation => info_implementation,")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 27, "             isc_spb_prp_db_online => prp_db_online and so on.")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 28, "You may specify single action or multiple info items when calling fbsvcmgr once.")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 29, "Full command line samples:")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 30, "fbsvcmgr service_mgr user sysdba password masterkey action_db_stats dbname employee sts_hdr_pages")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 31, "  (will list header info in database employee on local machine)")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 32, "fbsvcmgr yourserver:service_mgr user sysdba password masterkey info_server_version info_svr_db_info")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 33, "  (will show firebird version and databases usage on yourserver)")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 34, "Transaction in limbo")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 35, "Multidatabase transaction in limbo")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 36, "Host Site")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 37, "Transaction")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 38, "has been prepared")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 39, "has been committed")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 40, "has been rolled back")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 41, "is not available")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 42, "Remote Site")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 43, "Database Path")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 44, "Automated recovery would commit this transaction")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 45, "Automated recovery would rollback this transaction")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 46, "No idea should it be commited or rolled back")
-FB_IMPL_MSG(FBSVCMGR, 47, fbsvcmgr_bad_sm, -901, "00", "000", "Wrong value for shutdown mode")
-FB_IMPL_MSG(FBSVCMGR, 48, fbsvcmgr_fp_open, -901, "00", "000", "could not open file @1")
-FB_IMPL_MSG(FBSVCMGR, 49, fbsvcmgr_fp_read, -901, "00", "000", "could not read file @1")
-FB_IMPL_MSG(FBSVCMGR, 50, fbsvcmgr_fp_empty, -901, "00", "000", "empty file @1")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 51, "Firebird Services Manager version @1")
-FB_IMPL_MSG(FBSVCMGR, 52, fbsvcmgr_bad_arg, -901, "00", "000", "Invalid or missing parameter for switch @1")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 53, "To get full list of known services run with -? switch")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 54, "Attaching to services manager:")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 55, "Information requests:")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 56, "Actions:")
-FB_IMPL_MSG_NO_SYMBOL(FBSVCMGR, 57, "Server capabilities:")
-FB_IMPL_MSG(FBSVCMGR, 58, fbsvcmgr_info_limbo, -901, "00", "000", "Unknown tag (@1) in isc_info_svc_limbo_trans block after isc_svc_query()")
-FB_IMPL_MSG(FBSVCMGR, 59, fbsvcmgr_limbo_state, -901, "00", "000", "Unknown tag (@1) in isc_spb_tra_state block after isc_svc_query()")
-FB_IMPL_MSG(FBSVCMGR, 60, fbsvcmgr_limbo_advise, -901, "00", "000", "Unknown tag (@1) in isc_spb_tra_advise block after isc_svc_query()")
-FB_IMPL_MSG(FBSVCMGR, 61, fbsvcmgr_bad_rm, -901, "00", "000", "Wrong value for replica mode")
diff --git a/FBClient.Headers/firebird/impl/msg/fbtracemgr.h b/FBClient.Headers/firebird/impl/msg/fbtracemgr.h
deleted file mode 100644
index fa4f34f5..00000000
--- a/FBClient.Headers/firebird/impl/msg/fbtracemgr.h
+++ /dev/null
@@ -1,40 +0,0 @@
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 1, "Firebird Trace Manager version @1")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 2, "ERROR: ")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 3, "Firebird Trace Manager.")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 4, "Usage: fbtracemgr <action> [<parameters>]")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 5, "Actions:")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 6, "  -STA[RT]                              Start trace session")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 7, "  -STO[P]                               Stop trace session")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 8, "  -SU[SPEND]                            Suspend trace session")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 9, "  -R[ESUME]                             Resume trace session")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 10, "  -L[IST]                               List existing trace sessions")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 11, "  -Z                                    Show program version")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 12, "Action parameters:")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 13, "  -N[AME]    <string>                   Session name")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 14, "  -I[D]      <number>                   Session ID")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 15, "  -C[ONFIG]  <string>                   Trace configuration file name")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 16, "Connection parameters:")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 17, "  -SE[RVICE]  <string>                  Service name")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 18, "  -U[SER]     <string>                  User name")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 19, "  -P[ASSWORD] <string>                  Password")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 20, "  -FE[TCH]    <string>                  Fetch password from file")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 21, "  -T[RUSTED]  <string>                  Force trusted authentication")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 22, "Examples:")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 23, "  fbtracemgr -SE remote_host:service_mgr -USER SYSDBA -PASS masterkey -LIST")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 24, "  fbtracemgr -SE service_mgr -START -NAME my_trace -CONFIG my_cfg.txt")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 25, "  fbtracemgr -SE service_mgr -SUSPEND -ID 2")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 26, "  fbtracemgr -SE service_mgr -RESUME -ID 2")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 27, "  fbtracemgr -SE service_mgr -STOP -ID 4")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 28, "Notes:")
-FB_IMPL_MSG_NO_SYMBOL(FBTRACEMGR, 29, "  Press CTRL+C to stop interactive trace session")
-FB_IMPL_MSG(FBTRACEMGR, 30, trace_conflict_acts, -901, "00", "000", "conflicting actions \"@1\" and \"@2\" found")
-FB_IMPL_MSG(FBTRACEMGR, 31, trace_act_notfound, -901, "00", "000", "action switch not found")
-FB_IMPL_MSG(FBTRACEMGR, 32, trace_switch_once, -901, "00", "000", "switch \"@1\" must be set only once")
-FB_IMPL_MSG(FBTRACEMGR, 33, trace_param_val_miss, -901, "00", "000", "value for switch \"@1\" is missing")
-FB_IMPL_MSG(FBTRACEMGR, 34, trace_param_invalid, -901, "00", "000", "invalid value (\"@1\") for switch \"@2\"")
-FB_IMPL_MSG(FBTRACEMGR, 35, trace_switch_unknown, -901, "00", "000", "unknown switch \"@1\" encountered")
-FB_IMPL_MSG(FBTRACEMGR, 36, trace_switch_svc_only, -901, "00", "000", "switch \"@1\" can be used by service only")
-FB_IMPL_MSG(FBTRACEMGR, 37, trace_switch_user_only, -901, "00", "000", "switch \"@1\" can be used by interactive user only")
-FB_IMPL_MSG(FBTRACEMGR, 38, trace_switch_param_miss, -901, "00", "000", "mandatory parameter \"@1\" for switch \"@2\" is missing")
-FB_IMPL_MSG(FBTRACEMGR, 39, trace_param_act_notcompat, -901, "00", "000", "parameter \"@1\" is incompatible with action \"@2\"")
-FB_IMPL_MSG(FBTRACEMGR, 40, trace_mandatory_switch_miss, -901, "00", "000", "mandatory switch \"@1\" is missing")
diff --git a/FBClient.Headers/firebird/impl/msg/gbak.h b/FBClient.Headers/firebird/impl/msg/gbak.h
deleted file mode 100644
index ea6291af..00000000
--- a/FBClient.Headers/firebird/impl/msg/gbak.h
+++ /dev/null
@@ -1,408 +0,0 @@
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 0, "could not locate appropriate error message")
-FB_IMPL_MSG(GBAK, 1, gbak_unknown_switch, -901, "00", "000", "found unknown switch")
-FB_IMPL_MSG(GBAK, 2, gbak_page_size_missing, -901, "00", "000", "page size parameter missing")
-FB_IMPL_MSG(GBAK, 3, gbak_page_size_toobig, -901, "00", "000", "Page size specified (@1) greater than limit (32768 bytes)")
-FB_IMPL_MSG(GBAK, 4, gbak_redir_ouput_missing, -901, "00", "000", "redirect location for output is not specified")
-FB_IMPL_MSG(GBAK, 5, gbak_switches_conflict, -901, "00", "000", "conflicting switches for backup/restore")
-FB_IMPL_MSG(GBAK, 6, gbak_unknown_device, -901, "00", "000", "device type @1 not known")
-FB_IMPL_MSG(GBAK, 7, gbak_no_protection, -901, "00", "000", "protection is not there yet")
-FB_IMPL_MSG(GBAK, 8, gbak_page_size_not_allowed, -901, "00", "000", "page size is allowed only on restore or create")
-FB_IMPL_MSG(GBAK, 9, gbak_multi_source_dest, -901, "00", "000", "multiple sources or destinations specified")
-FB_IMPL_MSG(GBAK, 10, gbak_filename_missing, -901, "00", "000", "requires both input and output filenames")
-FB_IMPL_MSG(GBAK, 11, gbak_dup_inout_names, -901, "00", "000", "input and output have the same name.  Disallowed.")
-FB_IMPL_MSG(GBAK, 12, gbak_inv_page_size, -901, "00", "000", "expected page size, encountered \"@1\"")
-FB_IMPL_MSG(GBAK, 13, gbak_db_specified, -901, "00", "000", "REPLACE specified, but the first file @1 is a database")
-FB_IMPL_MSG(GBAK, 14, gbak_db_exists, -901, "00", "000", "database @1 already exists.  To replace it, use the -REP switch")
-FB_IMPL_MSG(GBAK, 15, gbak_unk_device, -901, "00", "000", "device type not specified")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 16, "cannot create APOLLO tape descriptor file @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 17, "cannot set APOLLO tape descriptor attribute for @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 18, "cannot create APOLLO cartridge descriptor file @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 19, "cannot close APOLLO tape descriptor file @1")
-FB_IMPL_MSG(GBAK, 20, gbak_blob_info_failed, -901, "00", "000", "gds_$blob_info failed")
-FB_IMPL_MSG(GBAK, 21, gbak_unk_blob_item, -901, "00", "000", "do not understand BLOB INFO item @1")
-FB_IMPL_MSG(GBAK, 22, gbak_get_seg_failed, -901, "00", "000", "gds_$get_segment failed")
-FB_IMPL_MSG(GBAK, 23, gbak_close_blob_failed, -901, "00", "000", "gds_$close_blob failed")
-FB_IMPL_MSG(GBAK, 24, gbak_open_blob_failed, -901, "00", "000", "gds_$open_blob failed")
-FB_IMPL_MSG(GBAK, 25, gbak_put_blr_gen_id_failed, -901, "00", "000", "Failed in put_blr_gen_id")
-FB_IMPL_MSG(GBAK, 26, gbak_unk_type, -901, "00", "000", "data type @1 not understood")
-FB_IMPL_MSG(GBAK, 27, gbak_comp_req_failed, -901, "00", "000", "gds_$compile_request failed")
-FB_IMPL_MSG(GBAK, 28, gbak_start_req_failed, -901, "00", "000", "gds_$start_request failed")
-FB_IMPL_MSG(GBAK, 29, gbak_rec_failed, -901, "00", "000", "gds_$receive failed")
-FB_IMPL_MSG(GBAK, 30, gbak_rel_req_failed, -901, "00", "000", "gds_$release_request failed")
-FB_IMPL_MSG(GBAK, 31, gbak_db_info_failed, -901, "00", "000", "gds_$database_info failed")
-FB_IMPL_MSG(GBAK, 32, gbak_no_db_desc, -901, "00", "000", "Expected database description record")
-FB_IMPL_MSG(GBAK, 33, gbak_db_create_failed, -901, "00", "000", "failed to create database @1")
-FB_IMPL_MSG(GBAK, 34, gbak_decomp_len_error, -901, "00", "000", "RESTORE: decompression length error")
-FB_IMPL_MSG(GBAK, 35, gbak_tbl_missing, -901, "00", "000", "cannot find table @1")
-FB_IMPL_MSG(GBAK, 36, gbak_blob_col_missing, -901, "00", "000", "Cannot find column for BLOB")
-FB_IMPL_MSG(GBAK, 37, gbak_create_blob_failed, -901, "00", "000", "gds_$create_blob failed")
-FB_IMPL_MSG(GBAK, 38, gbak_put_seg_failed, -901, "00", "000", "gds_$put_segment failed")
-FB_IMPL_MSG(GBAK, 39, gbak_rec_len_exp, -901, "00", "000", "expected record length")
-FB_IMPL_MSG(GBAK, 40, gbak_inv_rec_len, -901, "00", "000", "wrong length record, expected @1 encountered @2")
-FB_IMPL_MSG(GBAK, 41, gbak_exp_data_type, -901, "00", "000", "expected data attribute")
-FB_IMPL_MSG(GBAK, 42, gbak_gen_id_failed, -901, "00", "000", "Failed in store_blr_gen_id")
-FB_IMPL_MSG(GBAK, 43, gbak_unk_rec_type, -901, "00", "000", "do not recognize record type @1")
-FB_IMPL_MSG(GBAK, 44, gbak_inv_bkup_ver, -901, "00", "000", "Expected backup version 1..10.  Found @1")
-FB_IMPL_MSG(GBAK, 45, gbak_missing_bkup_desc, -901, "00", "000", "expected backup description record")
-FB_IMPL_MSG(GBAK, 46, gbak_string_trunc, -901, "00", "000", "string truncated")
-FB_IMPL_MSG(GBAK, 47, gbak_cant_rest_record, -901, "00", "000", "warning -- record could not be restored")
-FB_IMPL_MSG(GBAK, 48, gbak_send_failed, -901, "00", "000", "gds_$send failed")
-FB_IMPL_MSG(GBAK, 49, gbak_no_tbl_name, -901, "00", "000", "no table name for data")
-FB_IMPL_MSG(GBAK, 50, gbak_unexp_eof, -901, "00", "000", "unexpected end of file on backup file")
-FB_IMPL_MSG(GBAK, 51, gbak_db_format_too_old, -901, "00", "000", "database format @1 is too old to restore to")
-FB_IMPL_MSG(GBAK, 52, gbak_inv_array_dim, -901, "00", "000", "array dimension for column @1 is invalid")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 53, "expected array version number @1 but instead found @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 54, "expected array dimension @1 but instead found @2")
-FB_IMPL_MSG(GBAK, 55, gbak_xdr_len_expected, -901, "00", "000", "Expected XDR record length")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 56, "Unexpected I/O error while @1 backup file")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 57, "adding file @1, starting at page @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 58, "array")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 59, "backup")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 60, "    @1B(ACKUP_DATABASE)    backup database to file")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 61, "		backup file is compressed")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 62, "    @1D(EVICE)             backup file device type on APOLLO (CT or MT)")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 63, "    @1M(ETA_DATA)          backup or restore metadata only")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 64, "blob")
-FB_IMPL_MSG(GBAK, 65, gbak_open_bkup_error, -901, "00", "000", "cannot open backup file @1")
-FB_IMPL_MSG(GBAK, 66, gbak_open_error, -901, "00", "000", "cannot open status and error output file @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 67, "closing file, committing, and finishing")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 68, "committing metadata")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 69, "commit failed on table @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 70, "committing secondary files")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 71, "creating index @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 72, "committing data for table @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 73, "    @1C(REATE_DATABASE)    create database from backup file (restore)")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 74, "created database @1, page_size @2 bytes")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 75, "creating file @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 76, "creating indexes")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 77, "database @1 has a page size of @2 bytes.")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 78, "    @1I(NACTIVE)           deactivate indexes during restore")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 79, "do not understand BLOB INFO item @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 80, "do not recognize @1 attribute @2 -- continuing")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 81, "error accessing BLOB column @1 -- continuing")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 82, "Exiting before completion due to errors")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 83, "Exiting before completion due to errors")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 84, "column")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 85, "file")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 86, "file length")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 87, "filter")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 88, "finishing, closing, and going home")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 89, "function")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 90, "function argument")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 91, "gbak version @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 92, "domain")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 93, "index")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 94, "trigger @1 is invalid")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 95, "legal switches are:")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 96, "length given for initial file (@1) is less than minimum (@2)")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 97, "    @1E(XPAND)             no data compression")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 98, "    @1L(IMBO)              ignore transactions in limbo")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 99, "    @1O(NE_AT_A_TIME)      restore one table at a time")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 100, "opened file @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 101, "    @1P(AGE_SIZE)          override default page size")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 102, "page size")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 103, "page size specified (@1 bytes) rounded up to @2 bytes")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 104, "    @1Z                    print version number")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 105, "privilege")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 106, "     @1 records ignored")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 107, "   @1 records restored")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 108, "@1 records written")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 109, "    @1Y  <path>            redirect/suppress status message output")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 110, "Reducing the database page size from @1 bytes to @2 bytes")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 111, "table")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 112, "    @1REP(LACE_DATABASE)   replace database from backup file (restore)")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 113, "    @1V(ERIFY)             report each action taken")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 114, "restore failed for record in table @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 115, "    restoring column @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 116, "    restoring file @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 117, "    restoring filter @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 118, "restoring function @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 119, "    restoring argument for function @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 120, "     restoring gen id value of: @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 121, "restoring domain @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 122, "    restoring index @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 123, "    restoring privilege for user @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 124, "restoring data for table @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 125, "restoring security class @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 126, "    restoring trigger @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 127, "    restoring trigger message for @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 128, "    restoring type @1 for column @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 129, "started transaction")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 130, "starting transaction")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 131, "security class")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 132, "switches can be abbreviated to the unparenthesized characters")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 133, "transportable backup -- data in XDR format")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 134, "trigger")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 135, "trigger message")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 136, "trigger type")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 137, "unknown switch \"@1\"")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 138, "validation error on column in table @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 139, "    Version(s) for database \"@1\"")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 140, "view")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 141, "    writing argument for function @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 142, "    writing data for table @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 143, "     writing gen id of: @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 144, "         writing column @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 145, "    writing filter @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 146, "writing filters")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 147, "    writing function @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 148, "writing functions")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 149, "    writing domain @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 150, "writing domains")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 151, "    writing index @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 152, "    writing privilege for user @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 153, "    writing table @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 154, "writing tables")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 155, "    writing security class @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 156, "    writing trigger @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 157, "    writing trigger message for @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 158, "writing trigger messages")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 159, "writing triggers")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 160, "    writing type @1 for column @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 161, "writing types")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 162, "writing shadow files")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 163, "    writing shadow file @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 164, "writing id generators")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 165, "    writing generator @1 value @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 166, "readied database @1 for backup")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 167, "restoring table @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 168, "type")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 169, "gbak:")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 170, "committing metadata for table @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 171, "error committing metadata for table @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 172, "    @1K(ILL)               restore without creating shadows")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 173, "cannot commit index @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 174, "cannot commit files")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 175, "    @1T(RANSPORTABLE)      transportable backup -- data in XDR format")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 176, "closing file, committing, and finishing. @1 bytes written")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 177, "    @1G(ARBAGE_COLLECT)    inhibit garbage collection")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 178, "    @1IG(NORE)             ignore bad checksums")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 179, "	column @1 used in index @2 seems to have vanished")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 180, "index @1 omitted because @2 of the expected @3 keys were found")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 181, "    @1FA(CTOR)             blocking factor")
-FB_IMPL_MSG(GBAK, 182, gbak_missing_block_fac, -901, "00", "000", "blocking factor parameter missing")
-FB_IMPL_MSG(GBAK, 183, gbak_inv_block_fac, -901, "00", "000", "expected blocking factor, encountered \"@1\"")
-FB_IMPL_MSG(GBAK, 184, gbak_block_fac_specified, -901, "00", "000", "a blocking factor may not be used in conjunction with device CT")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 185, "restoring generator @1 value: @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 186, "    @1OL(D_DESCRIPTIONS)   save old style metadata descriptions")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 187, "    @1N(O_VALIDITY)        do not restore database validity conditions")
-FB_IMPL_MSG(GBAK, 188, gbak_missing_username, -901, "00", "000", "user name parameter missing")
-FB_IMPL_MSG(GBAK, 189, gbak_missing_password, -901, "00", "000", "password parameter missing")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 190, "    @1PAS(SWORD)           Firebird password")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 191, "    @1USER                 Firebird user name")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 192, "writing stored procedures")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 193, "writing stored procedure @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 194, "writing parameter @1 for stored procedure")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 195, "restoring stored procedure @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 196, "    restoring parameter @1 for stored procedure")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 197, "writing exceptions")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 198, "writing exception @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 199, "restoring exception @1")
-FB_IMPL_MSG(GBAK, 200, gbak_missing_skipped_bytes, -901, "00", "000", " missing parameter for the number of bytes to be skipped")
-FB_IMPL_MSG(GBAK, 201, gbak_inv_skipped_bytes, -901, "00", "000", "expected number of bytes to be skipped, encountered \"@1\"")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 202, "adjusting an invalid decompression length from @1 to @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 203, "skipped @1 bytes after reading a bad attribute @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 204, "    @1S(KIP_BAD_DATA)      skip number of bytes after reading bad data")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 205, "skipped @1 bytes looking for next valid attribute, encountered attribute @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 206, "writing table constraints")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 207, "writing constraint @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 208, "table constraint")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 209, "writing referential constraints")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 210, "writing check constraints")
-FB_IMPL_MSG_SYMBOL(GBAK, 211, msgVerbose_write_charsets, "writing character sets")
-FB_IMPL_MSG_SYMBOL(GBAK, 212, msgVerbose_write_collations, "writing collations")
-FB_IMPL_MSG(GBAK, 213, gbak_err_restore_charset, -901, "00", "000", "character set")
-FB_IMPL_MSG_SYMBOL(GBAK, 214, msgVerbose_restore_charset, "writing character set @1")
-FB_IMPL_MSG(GBAK, 215, gbak_err_restore_collation, -901, "00", "000", "collation")
-FB_IMPL_MSG_SYMBOL(GBAK, 216, msgVerbose_restore_collation, "writing collation @1")
-FB_IMPL_MSG(GBAK, 220, gbak_read_error, -901, "00", "000", "Unexpected I/O error while reading from backup file")
-FB_IMPL_MSG(GBAK, 221, gbak_write_error, -901, "00", "000", "Unexpected I/O error while writing to backup file")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 222, "\n\nCould not open file name \"@1\"")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 223, "\n\nCould not write to file \"@1\"")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 224, "\n\nCould not read from file \"@1\"")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 225, "Done with volume #@1, \"@2\"")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 226, "	Press return to reopen that file, or type a new\n	name followed by return to open a different file.")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 227, "Type a file name to open and hit return")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 228, "  Name: ")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 229, "\n\nERROR: Backup incomplete")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 230, "Expected backup start time @1, found @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 231, "Expected backup database @1, found @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 232, "Expected volume number @1, found volume @2")
-FB_IMPL_MSG(GBAK, 233, gbak_db_in_use, -901, "00", "000", "could not drop database @1 (no privilege or database might be in use)")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 234, "Skipped bad security class entry: @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 235, "Unknown V3 SUB_TYPE: @1 in FIELD: @2.")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 236, "Converted V3 sub_type: @1 to character_set_id: @2 and collate_id: @3.")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 237, "Converted V3 scale: @1 to character_set_id: @2 and callate_id: @3.")
-FB_IMPL_MSG(GBAK, 238, gbak_sysmemex, -901, "00", "000", "System memory exhausted")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 239, "    @1NT                   Non-Transportable backup file format")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 240, "Index \"@1\" failed to activate because:")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 241, "  The unique index has duplicate values or NULLs.")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 242, "  Delete or Update duplicate values or NULLs, and activate index with")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 243, "  ALTER INDEX \"@1\" ACTIVE;")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 244, "  Not enough disk space to create the sort file for an index.")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 245, "  Set the TMP environment variable to a directory on a filesystem that does have enough space, and activate index with")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 246, "Database is not online due to failure to activate one or more indices.")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 247, "Run gfix -online to bring database online without active indices.")
-FB_IMPL_MSG_SYMBOL(GBAK, 248, write_role_1, "writing SQL roles")
-FB_IMPL_MSG_SYMBOL(GBAK, 249, write_role_2, "    writing SQL role: @1")
-FB_IMPL_MSG(GBAK, 250, gbak_restore_role_failed, -901, "00", "000", "SQL role")
-FB_IMPL_MSG_SYMBOL(GBAK, 251, restore_role, "    restoring SQL role: @1")
-FB_IMPL_MSG_SYMBOL(GBAK, 252, gbak_role_op, "    @1RO(LE)               Firebird SQL role")
-FB_IMPL_MSG(GBAK, 253, gbak_role_op_missing, -901, "00", "000", "SQL role parameter missing")
-FB_IMPL_MSG_SYMBOL(GBAK, 254, gbak_convert_ext_tables, "    @1CO(NVERT)            backup external files as tables")
-FB_IMPL_MSG_SYMBOL(GBAK, 255, gbak_warning, "gbak: WARNING:")
-FB_IMPL_MSG_SYMBOL(GBAK, 256, gbak_error, "gbak: ERROR:")
-FB_IMPL_MSG_SYMBOL(GBAK, 257, gbak_page_buffers, "    @1BU(FFERS)            override page buffers default")
-FB_IMPL_MSG(GBAK, 258, gbak_page_buffers_missing, -901, "00", "000", "page buffers parameter missing")
-FB_IMPL_MSG(GBAK, 259, gbak_page_buffers_wrong_param, -901, "00", "000", "expected page buffers, encountered \"@1\"")
-FB_IMPL_MSG(GBAK, 260, gbak_page_buffers_restore, -901, "00", "000", "page buffers is allowed only on restore or create")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 261, "Starting with volume #@1, \"@2\"")
-FB_IMPL_MSG(GBAK, 262, gbak_inv_size, -901, "00", "000", "size specification either missing or incorrect for file @1")
-FB_IMPL_MSG(GBAK, 263, gbak_file_outof_sequence, -901, "00", "000", "file @1 out of sequence")
-FB_IMPL_MSG(GBAK, 264, gbak_join_file_missing, -901, "00", "000", "can't join -- one of the files missing")
-FB_IMPL_MSG(GBAK, 265, gbak_stdin_not_supptd, -901, "00", "000", " standard input is not supported when using join operation")
-FB_IMPL_MSG(GBAK, 266, gbak_stdout_not_supptd, -901, "00", "000", "standard output is not supported when using split operation or in verbose mode")
-FB_IMPL_MSG(GBAK, 267, gbak_bkup_corrupt, -901, "00", "000", "backup file @1 might be corrupt")
-FB_IMPL_MSG(GBAK, 268, gbak_unk_db_file_spec, -901, "00", "000", "database file specification missing")
-FB_IMPL_MSG(GBAK, 269, gbak_hdr_write_failed, -901, "00", "000", "can't write a header record to file @1")
-FB_IMPL_MSG(GBAK, 270, gbak_disk_space_ex, -901, "00", "000", "free disk space exhausted")
-FB_IMPL_MSG(GBAK, 271, gbak_size_lt_min, -901, "00", "000", "file size given (@1) is less than minimum allowed (@2)")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 272, "Warning -- free disk space exhausted for file @1, the rest of the bytes (@2) will be written to file @3")
-FB_IMPL_MSG(GBAK, 273, gbak_svc_name_missing, -901, "00", "000", "service name parameter missing")
-FB_IMPL_MSG(GBAK, 274, gbak_not_ownr, -901, "00", "000", "Cannot restore over current database, must be SYSDBA or owner of the existing database.")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 275, "")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 276, "    @1USE_(ALL_SPACE)      do not reserve space for record versions")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 277, "    @1SE(RVICE)            use services manager")
-FB_IMPL_MSG_SYMBOL(GBAK, 278, gbak_opt_mode, "    @1MO(DE) <access>      \"read_only\" or \"read_write\" access")
-FB_IMPL_MSG(GBAK, 279, gbak_mode_req, -901, "00", "000", "\"read_only\" or \"read_write\" required")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 280, "setting database to read-only access")
-FB_IMPL_MSG(GBAK, 281, gbak_just_data, -901, "00", "000", "just data ignore all constraints etc.")
-FB_IMPL_MSG(GBAK, 282, gbak_data_only, -901, "00", "000", "restoring data only ignoring foreign key, unique, not null & other constraints")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 283, "closing file, committing, and finishing. @1 bytes written")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 284, "    @1R(ECREATE_DATABASE) [O(VERWRITE)] create (or replace if OVERWRITE used)\\n				database from backup file (restore)")
-FB_IMPL_MSG_SYMBOL(GBAK, 285, gbak_activating_idx, "    activating and creating deferred index @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 286, "check constraint")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 287, "exception")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 288, "array dimensions")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 289, "generator")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 290, "procedure")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 291, "procedure parameter")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 292, "referential constraint")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 293, "type (in RDB$TYPES)")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 294, "    @1NOD(BTRIGGERS)       do not run database triggers")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 295, "    @1TRU(STED)            use trusted authentication")
-FB_IMPL_MSG_SYMBOL(GBAK, 296, write_map_1, "writing names mapping")
-FB_IMPL_MSG_SYMBOL(GBAK, 297, write_map_2, "    writing map for @1")
-FB_IMPL_MSG_SYMBOL(GBAK, 298, get_map_1, "    restoring map for @1")
-FB_IMPL_MSG_SYMBOL(GBAK, 299, get_map_2, "name mapping")
-FB_IMPL_MSG_SYMBOL(GBAK, 300, get_map_3, "cannot restore arbitrary mapping")
-FB_IMPL_MSG_SYMBOL(GBAK, 301, get_map_4, "restoring names mapping")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 302, "    @1FIX_FSS_D(ATA)       fix malformed UNICODE_FSS data")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 303, "    @1FIX_FSS_M(ETADATA)   fix malformed UNICODE_FSS metadata")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 304, "Character set parameter missing")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 305, "Character set @1 not found")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 306, "    @1FE(TCH_PASSWORD)     fetch password from file")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 307, "too many passwords provided")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 308, "could not open password file @1, errno @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 309, "could not read password file @1, errno @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 310, "empty password file @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 311, "Attribute @1 was already processed for exception @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 312, "Skipping attribute @1 because the message already exists for exception @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 313, "Trying to recover from unexpected attribute @1 due to wrong message length for exception @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 314, "Attribute not specified for storing text bigger than 255 bytes")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 315, "Unable to store text bigger than 65536 bytes")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 316, "Failed while adjusting the security class name")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 317, "Usage:")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 318, "     gbak -b <db set> <backup set> [backup options] [general options]")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 319, "     gbak -c <backup set> <db set> [restore options] [general options]")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 320, "     <db set> = <database> | <db1 size1>...<dbN> (size in db pages)")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 321, "     <backup set> = <backup> | <bk1 size1>...<bkN> (size in bytes = n[K|M|G])")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 322, "     -recreate overwrite and -replace can be used instead of -c")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 323, "backup options are:")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 324, "restore options are:")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 325, "general options are:")
-FB_IMPL_MSG(GBAK, 326, gbak_missing_interval, -901, "00", "000", "verbose interval value parameter missing")
-FB_IMPL_MSG(GBAK, 327, gbak_wrong_interval, -901, "00", "000", "verbose interval value cannot be smaller than @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 328, "    @1VERBI(NT) <n>        verbose information with explicit interval")
-FB_IMPL_MSG(GBAK, 329, gbak_verify_verbint, -901, "00", "000", "verify (verbose) and verbint options are mutually exclusive")
-FB_IMPL_MSG(GBAK, 330, gbak_option_only_restore, -901, "00", "000", "option -@1 is allowed only on restore or create")
-FB_IMPL_MSG(GBAK, 331, gbak_option_only_backup, -901, "00", "000", "option -@1 is allowed only on backup")
-FB_IMPL_MSG(GBAK, 332, gbak_option_conflict, -901, "00", "000", "options -@1 and -@2 are mutually exclusive")
-FB_IMPL_MSG(GBAK, 333, gbak_param_conflict, -901, "00", "000", "parameter for option -@1 was already specified with value \"@2\"")
-FB_IMPL_MSG(GBAK, 334, gbak_option_repeated, -901, "00", "000", "option -@1 was already specified")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 335, "writing package @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 336, "writing packages")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 337, "restoring package @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 338, "package")
-FB_IMPL_MSG(GBAK, 339, gbak_max_dbkey_recursion, -901, "00", "000", "dependency depth greater than @1 for view @2")
-FB_IMPL_MSG(GBAK, 340, gbak_max_dbkey_length, -901, "00", "000", "value greater than @1 when calculating length of rdb$db_key for view @2")
-FB_IMPL_MSG(GBAK, 341, gbak_invalid_metadata, -901, "00", "000", "Invalid metadata detected. Use -FIX_FSS_METADATA option.")
-FB_IMPL_MSG(GBAK, 342, gbak_invalid_data, -901, "00", "000", "Invalid data detected. Use -FIX_FSS_DATA option.")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 343, "text for attribute @1 is too large in @2, truncating to @3 bytes")
-FB_IMPL_MSG(GBAK, 344, gbak_inv_bkup_ver2, -901, "00", "000", "Expected backup version @2..@3.  Found @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 345, "    writing view @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 346, "    table @1 is a view")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 347, "writing security classes")
-FB_IMPL_MSG(GBAK, 348, gbak_db_format_too_old2, -901, "00", "000", "database format @1 is too old to backup")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 349, "backup version is @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 350, "adjusting system generators")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 351, "Error closing database, but backup file is OK")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 352, "database")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 353, "required mapping attributes are missing in backup file")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 354, "missing regular expression to skip tables")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 355, "    @1SKIP_D(ATA)          skip data for table")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 356, "regular expression to skip tables was already set")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 357, "adjusting views dbkey length")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 358, "updating ownership of packages, procedures and tables")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 359, "adding missing privileges")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 360, "adjusting the ONLINE and FORCED WRITES flags")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 361, "    @1ST(ATISTICS) TDRW    show statistics:")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 362, "        T                 time from start")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 363, "        D                 delta time")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 364, "        R                 page reads")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 365, "        W                 page writes")
-FB_IMPL_MSG_SYMBOL(GBAK, 366, gbak_missing_perf, "statistics parameter missing")
-FB_IMPL_MSG_SYMBOL(GBAK, 367, gbak_wrong_perf, "wrong char \"@1\" at statistics parameter")
-FB_IMPL_MSG_SYMBOL(GBAK, 368, gbak_too_long_perf, "too many chars at statistics parameter")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 369, "total statistics")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 370, "could not append BLOB data to batch")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 371, "could not start batch when restoring table @1, trying old way")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 372, "    @1KEYNAME              name of a key to be used for encryption")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 373, "    @1CRYPT                crypt plugin name")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 374, "    @1ZIP                  backup file is in zip compressed format")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 375, "Keyname parameter missing")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 376, "Key holder parameter missing but backup file is encrypted")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 377, "CryptPlugin parameter missing")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 378, "Unknown crypt plugin name - use -CRYPT switch")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 379, "Inflate error @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 380, "Deflate error @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 381, "Key holder parameter missing")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 382, "    @1KEYHOLDER            name of a key holder plugin")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 383, "Decompression stream init error @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 384, "Compression stream init error @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 385, "Invalid reply from getInfo() when waiting for DB encryption")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 386, "Problems with just created database encryption")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 387, "Skipped trigger @1 on system table @2")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 388, "    @1INCLUDE(_DATA)       backup data of table(s)")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 389, "missing regular expression to include tables")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 390, "regular expression to include tables was already set")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 391, "writing database create grants")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 392, "    database create grant for @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 393, "    restoring database create grant for @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 394, "restoring database create grants")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 395, "database create grant")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 396, "writing publications")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 397, "    writing publication @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 398, "    writing publication for table @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 399, "restoring publication @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 400, "publication")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 401, "restoring publication for table @1")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 402, "publication for table")
-FB_IMPL_MSG_SYMBOL(GBAK, 403, gbak_opt_replica, "    @1REPLICA <mode>      \"none\", \"read_only\" or \"read_write\" replica mode")
-FB_IMPL_MSG_SYMBOL(GBAK, 404, gbak_replica_req, "\"none\", \"read_only\" or \"read_write\" required")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 405, "could not access batch parameters")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 406, "    @1PAR(ALLEL)           parallel workers")
-FB_IMPL_MSG_SYMBOL(GBAK, 407, gbak_missing_prl_wrks, "parallel workers parameter missing")
-FB_IMPL_MSG_SYMBOL(GBAK, 408, gbak_inv_prl_wrks, "expected parallel workers, encountered \"@1\"")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 409, "    @1D(IRECT_IO)          direct IO for backup file(s)")
-FB_IMPL_MSG_NO_SYMBOL(GBAK, 410, "use up to @1 parallel workers")
diff --git a/FBClient.Headers/firebird/impl/msg/gfix.h b/FBClient.Headers/firebird/impl/msg/gfix.h
deleted file mode 100644
index f8f5135e..00000000
--- a/FBClient.Headers/firebird/impl/msg/gfix.h
+++ /dev/null
@@ -1,137 +0,0 @@
-FB_IMPL_MSG(GFIX, 1, gfix_db_name, -901, "00", "000", "data base file name (@1) already given")
-FB_IMPL_MSG(GFIX, 2, gfix_invalid_sw, -901, "00", "000", "invalid switch @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 3, gfix_version, "gfix version @1")
-FB_IMPL_MSG(GFIX, 4, gfix_incmp_sw, -901, "00", "000", "incompatible switch combination")
-FB_IMPL_MSG(GFIX, 5, gfix_replay_req, -901, "00", "000", "replay log pathname required")
-FB_IMPL_MSG(GFIX, 6, gfix_pgbuf_req, -901, "00", "000", "number of page buffers for cache required")
-FB_IMPL_MSG(GFIX, 7, gfix_val_req, -901, "00", "000", "numeric value required")
-FB_IMPL_MSG(GFIX, 8, gfix_pval_req, -901, "00", "000", "positive numeric value required")
-FB_IMPL_MSG(GFIX, 9, gfix_trn_req, -901, "00", "000", "number of transactions per sweep required")
-FB_IMPL_MSG_SYMBOL(GFIX, 10, gfix_trn_all_req, "transaction number or \"all\" required")
-FB_IMPL_MSG_SYMBOL(GFIX, 11, gfix_sync_req, "\"sync\" or \"async\" required")
-FB_IMPL_MSG(GFIX, 12, gfix_full_req, -901, "00", "000", "\"full\" or \"reserve\" required")
-FB_IMPL_MSG(GFIX, 13, gfix_usrname_req, -901, "00", "000", "user name required")
-FB_IMPL_MSG(GFIX, 14, gfix_pass_req, -901, "00", "000", "password required")
-FB_IMPL_MSG(GFIX, 15, gfix_subs_name, -901, "00", "000", "subsystem name")
-FB_IMPL_MSG(GFIX, 16, gfix_wal_req, -901, "00", "000", "\"wal\" required")
-FB_IMPL_MSG(GFIX, 17, gfix_sec_req, -901, "00", "000", "number of seconds required")
-FB_IMPL_MSG(GFIX, 18, gfix_nval_req, -901, "00", "000", "numeric value between 0 and 32767 inclusive required")
-FB_IMPL_MSG(GFIX, 19, gfix_type_shut, -901, "00", "000", "must specify type of shutdown")
-FB_IMPL_MSG(GFIX, 20, gfix_retry, -901, "00", "000", "please retry, specifying an option")
-FB_IMPL_MSG_SYMBOL(GFIX, 21, gfix_opt, "plausible options are:")
-FB_IMPL_MSG_SYMBOL(GFIX, 22, gfix_qualifiers, "\\n    Options can be abbreviated to the unparenthesized characters")
-FB_IMPL_MSG(GFIX, 23, gfix_retry_db, -901, "00", "000", "please retry, giving a database name")
-FB_IMPL_MSG_SYMBOL(GFIX, 24, gfix_summary, "Summary of validation errors")
-FB_IMPL_MSG_SYMBOL(GFIX, 25, gfix_opt_active, "   -ac(tivate_shadow)   activate shadow file for database usage")
-FB_IMPL_MSG_SYMBOL(GFIX, 26, gfix_opt_attach, "   -at(tach)            shutdown new database attachments")
-FB_IMPL_MSG_SYMBOL(GFIX, 27, gfix_opt_begin_log, "	-begin_log	begin logging for replay utility")
-FB_IMPL_MSG_SYMBOL(GFIX, 28, gfix_opt_buffers, "   -b(uffers)           set page buffers <n>")
-FB_IMPL_MSG_SYMBOL(GFIX, 29, gfix_opt_commit, "   -co(mmit)            commit transaction <tr / all>")
-FB_IMPL_MSG_SYMBOL(GFIX, 30, gfix_opt_cache, "   -ca(che)             shutdown cache manager")
-FB_IMPL_MSG_SYMBOL(GFIX, 31, gfix_opt_disable, "	-disable	disable WAL")
-FB_IMPL_MSG_SYMBOL(GFIX, 32, gfix_opt_full, "   -fu(ll)              validate record fragments (-v)")
-FB_IMPL_MSG_SYMBOL(GFIX, 33, gfix_opt_force, "   -fo(rce_shutdown)    force database shutdown")
-FB_IMPL_MSG_SYMBOL(GFIX, 34, gfix_opt_housekeep, "   -h(ousekeeping)      set sweep interval <n>")
-FB_IMPL_MSG_SYMBOL(GFIX, 35, gfix_opt_ignore, "   -i(gnore)            ignore checksum errors")
-FB_IMPL_MSG_SYMBOL(GFIX, 36, gfix_opt_kill, "   -k(ill_shadow)       kill all unavailable shadow files")
-FB_IMPL_MSG_SYMBOL(GFIX, 37, gfix_opt_list, "   -l(ist)              show limbo transactions")
-FB_IMPL_MSG_SYMBOL(GFIX, 38, gfix_opt_mend, "   -me(nd)              prepare corrupt database for backup")
-FB_IMPL_MSG_SYMBOL(GFIX, 39, gfix_opt_no_update, "   -n(o_update)         read-only validation (-v)")
-FB_IMPL_MSG_SYMBOL(GFIX, 40, gfix_opt_online, "   -o(nline)            database online <single / multi / normal>")
-FB_IMPL_MSG_SYMBOL(GFIX, 41, gfix_opt_prompt, "   -pr(ompt)            prompt for commit/rollback (-l)")
-FB_IMPL_MSG_SYMBOL(GFIX, 42, gfix_opt_password, "   -pa(ssword)          default password")
-FB_IMPL_MSG_SYMBOL(GFIX, 43, gfix_opt_quit_log, "	-quit_log	quit logging for replay utility")
-FB_IMPL_MSG_SYMBOL(GFIX, 44, gfix_opt_rollback, "   -r(ollback)          rollback transaction <tr / all>")
-FB_IMPL_MSG_SYMBOL(GFIX, 45, gfix_opt_sweep, "   -sw(eep)             force garbage collection")
-FB_IMPL_MSG_SYMBOL(GFIX, 46, gfix_opt_shut, "   -sh(utdown)          shutdown <full / single / multi>")
-FB_IMPL_MSG_SYMBOL(GFIX, 47, gfix_opt_two_phase, "   -tw(o_phase)         perform automated two-phase recovery")
-FB_IMPL_MSG_SYMBOL(GFIX, 48, gfix_opt_tran, "   -tra(nsaction)       shutdown transaction startup")
-FB_IMPL_MSG_SYMBOL(GFIX, 49, gfix_opt_use, "   -u(se)               use full or reserve space for versions")
-FB_IMPL_MSG_SYMBOL(GFIX, 50, gfix_opt_user, "   -user                default user name")
-FB_IMPL_MSG_SYMBOL(GFIX, 51, gfix_opt_validate, "   -v(alidate)          validate database structure")
-FB_IMPL_MSG_SYMBOL(GFIX, 52, gfix_opt_write, "   -w(rite)             write synchronously or asynchronously")
-FB_IMPL_MSG_SYMBOL(GFIX, 53, gfix_opt_x, "   -x                   set debug on")
-FB_IMPL_MSG_SYMBOL(GFIX, 54, gfix_opt_z, "   -z                   print software version number")
-FB_IMPL_MSG_SYMBOL(GFIX, 55, gfix_rec_err, "\\n	Number of record level errors	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 56, gfix_blob_err, "	Number of Blob page errors	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 57, gfix_data_err, "	Number of data page errors	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 58, gfix_index_err, "	Number of index page errors	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 59, gfix_pointer_err, "	Number of pointer page errors	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 60, gfix_trn_err, "	Number of transaction page errors	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 61, gfix_db_err, "	Number of database page errors	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 62, gfix_bad_block, "bad block type")
-FB_IMPL_MSG(GFIX, 63, gfix_exceed_max, -901, "00", "000", "internal block exceeds maximum size")
-FB_IMPL_MSG(GFIX, 64, gfix_corrupt_pool, -901, "00", "000", "corrupt pool")
-FB_IMPL_MSG(GFIX, 65, gfix_mem_exhausted, -901, "00", "000", "virtual memory exhausted")
-FB_IMPL_MSG(GFIX, 66, gfix_bad_pool, -901, "00", "000", "bad pool id")
-FB_IMPL_MSG(GFIX, 67, gfix_trn_not_valid, -901, "00", "000", "Transaction state @1 not in valid range.")
-FB_IMPL_MSG_SYMBOL(GFIX, 68, gfix_dbg_attach, "ATTACH_DATABASE: attempted attach of @1,")
-FB_IMPL_MSG_SYMBOL(GFIX, 69, gfix_dbg_failed, " failed")
-FB_IMPL_MSG_SYMBOL(GFIX, 70, gfix_dbg_success, " succeeded")
-FB_IMPL_MSG_SYMBOL(GFIX, 71, gfix_trn_limbo, "Transaction @1 is in limbo.")
-FB_IMPL_MSG_SYMBOL(GFIX, 72, gfix_try_again, "More limbo transactions than fit.  Try again")
-FB_IMPL_MSG_SYMBOL(GFIX, 73, gfix_unrec_item, "Unrecognized info item @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 74, gfix_commit_violate, "A commit of transaction @1 will violate two-phase commit.")
-FB_IMPL_MSG_SYMBOL(GFIX, 75, gfix_preserve, "A rollback of transaction @1 is needed to preserve two-phase commit.")
-FB_IMPL_MSG_SYMBOL(GFIX, 76, gfix_part_commit, "Transaction @1 has already been partially committed.")
-FB_IMPL_MSG_SYMBOL(GFIX, 77, gfix_rback_violate, "A rollback of this transaction will violate two-phase commit.")
-FB_IMPL_MSG_SYMBOL(GFIX, 78, gfix_part_commit2, "Transaction @1 has been partially committed.")
-FB_IMPL_MSG_SYMBOL(GFIX, 79, gfix_commit_pres, "A commit is necessary to preserve the two-phase commit.")
-FB_IMPL_MSG_SYMBOL(GFIX, 80, gfix_insuff_info, "Insufficient information is available to determine")
-FB_IMPL_MSG_SYMBOL(GFIX, 81, gfix_action, "a proper action for transaction @1.")
-FB_IMPL_MSG_SYMBOL(GFIX, 82, gfix_all_prep, "Transaction @1: All subtransactions have been prepared.")
-FB_IMPL_MSG_SYMBOL(GFIX, 83, gfix_comm_rback, "Either commit or rollback is possible.")
-FB_IMPL_MSG(GFIX, 84, gfix_unexp_eoi, -901, "00", "000", "unexpected end of input")
-FB_IMPL_MSG_SYMBOL(GFIX, 85, gfix_ask, "Commit, rollback, or neither (c, r, or n)?")
-FB_IMPL_MSG_SYMBOL(GFIX, 86, gfix_reattach_failed, "Could not reattach to database for transaction @1.")
-FB_IMPL_MSG_SYMBOL(GFIX, 87, gfix_org_path, "Original path: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 88, gfix_enter_path, "Enter a valid path:")
-FB_IMPL_MSG_SYMBOL(GFIX, 89, gfix_att_unsucc, "Attach unsuccessful.")
-FB_IMPL_MSG(GFIX, 90, gfix_recon_fail, -901, "00", "000", "failed to reconnect to a transaction in database @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 91, gfix_trn2, "Transaction @1:")
-FB_IMPL_MSG_SYMBOL(GFIX, 92, gfix_mdb_trn, "  Multidatabase transaction:")
-FB_IMPL_MSG_SYMBOL(GFIX, 93, gfix_host_site, "    Host Site: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 94, gfix_trn, "    Transaction @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 95, gfix_prepared, "has been prepared.")
-FB_IMPL_MSG_SYMBOL(GFIX, 96, gfix_committed, "has been committed.")
-FB_IMPL_MSG_SYMBOL(GFIX, 97, gfix_rolled_back, "has been rolled back.")
-FB_IMPL_MSG_SYMBOL(GFIX, 98, gfix_not_available, "is not available.")
-FB_IMPL_MSG_SYMBOL(GFIX, 99, gfix_not_prepared, "is not found, assumed not prepared.")
-FB_IMPL_MSG_SYMBOL(GFIX, 100, gfix_be_committed, "is not found, assumed to be committed.")
-FB_IMPL_MSG_SYMBOL(GFIX, 101, gfix_rmt_site, "        Remote Site: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 102, gfix_db_path, "        Database Path: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 103, gfix_auto_comm, "  Automated recovery would commit this transaction.")
-FB_IMPL_MSG_SYMBOL(GFIX, 104, gfix_auto_rback, "  Automated recovery would rollback this transaction.")
-FB_IMPL_MSG_SYMBOL(GFIX, 105, gfix_warning, "Warning: Multidatabase transaction is in inconsistent state for recovery.")
-FB_IMPL_MSG_SYMBOL(GFIX, 106, gfix_trn_was_comm, "Transaction @1 was committed, but prior ones were rolled back.")
-FB_IMPL_MSG_SYMBOL(GFIX, 107, gfix_trn_was_rback, "Transaction @1 was rolled back, but prior ones were committed.")
-FB_IMPL_MSG(GFIX, 108, gfix_trn_unknown, -901, "00", "000", "Transaction description item unknown")
-FB_IMPL_MSG_SYMBOL(GFIX, 109, gfix_opt_mode, "   -mo(de)              read_only or read_write database")
-FB_IMPL_MSG(GFIX, 110, gfix_mode_req, -901, "00", "000", "\"read_only\" or \"read_write\" required")
-FB_IMPL_MSG_SYMBOL(GFIX, 111, gfix_opt_SQL_dialect, "   -sq(l_dialect)       set database dialect n")
-FB_IMPL_MSG_SYMBOL(GFIX, 112, gfix_SQL_dialect, "database SQL dialect must be one of '@1'")
-FB_IMPL_MSG_SYMBOL(GFIX, 113, gfix_dialect_req, "dialect number required")
-FB_IMPL_MSG(GFIX, 114, gfix_pzval_req, -901, "00", "000", "positive or zero numeric value required")
-FB_IMPL_MSG_SYMBOL(GFIX, 115, gfix_opt_trusted, "   -tru(sted)           use trusted authentication")
-FB_IMPL_MSG_NO_SYMBOL(GFIX, 116, "could not open password file @1, errno @2")
-FB_IMPL_MSG_NO_SYMBOL(GFIX, 117, "could not read password file @1, errno @2")
-FB_IMPL_MSG_NO_SYMBOL(GFIX, 118, "empty password file @1")
-FB_IMPL_MSG_NO_SYMBOL(GFIX, 119, "   -fe(tch_password)    fetch password from file")
-FB_IMPL_MSG_NO_SYMBOL(GFIX, 120, "usage: gfix [options] <database>")
-FB_IMPL_MSG_SYMBOL(GFIX, 121, gfix_opt_nolinger, "   -nol(inger)          close database ignoring linger setting for it")
-FB_IMPL_MSG_SYMBOL(GFIX, 122, gfix_pip_err, "	Number of inventory page errors	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 123, gfix_rec_warn, "	Number of record level warnings	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 124, gfix_blob_warn, "	Number of blob page warnings	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 125, gfix_data_warn, "	Number of data page warnings	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 126, gfix_index_warn, "	Number of index page warnings	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 127, gfix_pointer_warn, "	Number of pointer page warnings	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 128, gfix_trn_warn, "	Number of transaction page warnings	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 129, gfix_db_warn, "	Number of database page warnings	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 130, gfix_pip_warn, "	Number of inventory page warnings	: @1")
-FB_IMPL_MSG_SYMBOL(GFIX, 131, gfix_opt_icu, "   -icu                 fix database to be usable with present ICU version")
-FB_IMPL_MSG_SYMBOL(GFIX, 132, gfix_opt_role, "   -role                set SQL role name")
-FB_IMPL_MSG_SYMBOL(GFIX, 133, gfix_role_req, "SQL role name required")
-FB_IMPL_MSG_SYMBOL(GFIX, 134, gfix_opt_repl, "   -repl(ica)           replica mode <none / read_only / read_write>")
-FB_IMPL_MSG_SYMBOL(GFIX, 135, gfix_repl_mode_req, "replica mode (none / read_only / read_write) required")
-FB_IMPL_MSG_SYMBOL(GFIX, 136, gfix_opt_parallel, "   -par(allel)          parallel workers <n> (-sweep, -icu)")
-FB_IMPL_MSG_SYMBOL(GFIX, 137, gfix_opt_upgrade, "   -up(grade)           upgrade database ODS")
diff --git a/FBClient.Headers/firebird/impl/msg/gsec.h b/FBClient.Headers/firebird/impl/msg/gsec.h
deleted file mode 100644
index ff0582cf..00000000
--- a/FBClient.Headers/firebird/impl/msg/gsec.h
+++ /dev/null
@@ -1,104 +0,0 @@
-FB_IMPL_MSG_SYMBOL(GSEC, 1, GsecMsg1, "GSEC>")
-FB_IMPL_MSG_SYMBOL(GSEC, 2, GsecMsg2, "gsec")
-FB_IMPL_MSG_SYMBOL(GSEC, 3, GsecMsg3, "ADD            add user")
-FB_IMPL_MSG_SYMBOL(GSEC, 4, GsecMsg4, "DELETE         delete user")
-FB_IMPL_MSG_SYMBOL(GSEC, 5, GsecMsg5, "DISPLAY        display user(s)")
-FB_IMPL_MSG_SYMBOL(GSEC, 6, GsecMsg6, "MODIFY         modify user")
-FB_IMPL_MSG_SYMBOL(GSEC, 7, GsecMsg7, "PW             user's password")
-FB_IMPL_MSG_SYMBOL(GSEC, 8, GsecMsg8, "UID            user's ID")
-FB_IMPL_MSG_SYMBOL(GSEC, 9, GsecMsg9, "GID            user's group ID")
-FB_IMPL_MSG_SYMBOL(GSEC, 10, GsecMsg10, "PROJ           user's project name")
-FB_IMPL_MSG_SYMBOL(GSEC, 11, GsecMsg11, "ORG            user's organization name")
-FB_IMPL_MSG_SYMBOL(GSEC, 12, GsecMsg12, "FNAME          user's first name")
-FB_IMPL_MSG_SYMBOL(GSEC, 13, GsecMsg13, "MNAME          user's middle name/initial")
-FB_IMPL_MSG_SYMBOL(GSEC, 14, GsecMsg14, "LNAME          user's last name")
-FB_IMPL_MSG(GSEC, 15, gsec_cant_open_db, -901, "00", "000", "unable to open database")
-FB_IMPL_MSG(GSEC, 16, gsec_switches_error, -901, "00", "000", "error in switch specifications")
-FB_IMPL_MSG(GSEC, 17, gsec_no_op_spec, -901, "00", "000", "no operation specified")
-FB_IMPL_MSG(GSEC, 18, gsec_no_usr_name, -901, "00", "000", "no user name specified")
-FB_IMPL_MSG(GSEC, 19, gsec_err_add, -901, "00", "000", "add record error")
-FB_IMPL_MSG(GSEC, 20, gsec_err_modify, -901, "00", "000", "modify record error")
-FB_IMPL_MSG(GSEC, 21, gsec_err_find_mod, -901, "00", "000", "find/modify record error")
-FB_IMPL_MSG(GSEC, 22, gsec_err_rec_not_found, -901, "00", "000", "record not found for user: @1")
-FB_IMPL_MSG(GSEC, 23, gsec_err_delete, -901, "00", "000", "delete record error")
-FB_IMPL_MSG(GSEC, 24, gsec_err_find_del, -901, "00", "000", "find/delete record error")
-FB_IMPL_MSG_SYMBOL(GSEC, 25, GsecMsg25, "users defined for node")
-FB_IMPL_MSG_SYMBOL(GSEC, 26, GsecMsg26, "     user name                    uid   gid admin     full name")
-FB_IMPL_MSG_SYMBOL(GSEC, 27, GsecMsg27, "------------------------------------------------------------------------------------------------")
-FB_IMPL_MSG(GSEC, 28, gsec_err_find_disp, -901, "00", "000", "find/display record error")
-FB_IMPL_MSG(GSEC, 29, gsec_inv_param, -901, "00", "000", "invalid parameter, no switch defined")
-FB_IMPL_MSG(GSEC, 30, gsec_op_specified, -901, "00", "000", "operation already specified")
-FB_IMPL_MSG(GSEC, 31, gsec_pw_specified, -901, "00", "000", "password already specified")
-FB_IMPL_MSG(GSEC, 32, gsec_uid_specified, -901, "00", "000", "uid already specified")
-FB_IMPL_MSG(GSEC, 33, gsec_gid_specified, -901, "00", "000", "gid already specified")
-FB_IMPL_MSG(GSEC, 34, gsec_proj_specified, -901, "00", "000", "project already specified")
-FB_IMPL_MSG(GSEC, 35, gsec_org_specified, -901, "00", "000", "organization already specified")
-FB_IMPL_MSG(GSEC, 36, gsec_fname_specified, -901, "00", "000", "first name already specified")
-FB_IMPL_MSG(GSEC, 37, gsec_mname_specified, -901, "00", "000", "middle name already specified")
-FB_IMPL_MSG(GSEC, 38, gsec_lname_specified, -901, "00", "000", "last name already specified")
-FB_IMPL_MSG_SYMBOL(GSEC, 39, GsecMsg39, "gsec version")
-FB_IMPL_MSG(GSEC, 40, gsec_inv_switch, -901, "00", "000", "invalid switch specified")
-FB_IMPL_MSG(GSEC, 41, gsec_amb_switch, -901, "00", "000", "ambiguous switch specified")
-FB_IMPL_MSG(GSEC, 42, gsec_no_op_specified, -901, "00", "000", "no operation specified for parameters")
-FB_IMPL_MSG(GSEC, 43, gsec_params_not_allowed, -901, "00", "000", "no parameters allowed for this operation")
-FB_IMPL_MSG(GSEC, 44, gsec_incompat_switch, -901, "00", "000", "incompatible switches specified")
-FB_IMPL_MSG_SYMBOL(GSEC, 45, GsecMsg45, "gsec utility - maintains user password database")
-FB_IMPL_MSG_SYMBOL(GSEC, 46, GsecMsg46, "command line usage:")
-FB_IMPL_MSG_SYMBOL(GSEC, 47, GsecMsg47, "<command> [ <parameter> ... ]")
-FB_IMPL_MSG_SYMBOL(GSEC, 48, GsecMsg48, "interactive usage:")
-FB_IMPL_MSG_SYMBOL(GSEC, 49, GsecMsg49, "available commands:")
-FB_IMPL_MSG_SYMBOL(GSEC, 50, GsecMsgs50, "adding a new user:")
-FB_IMPL_MSG_SYMBOL(GSEC, 51, GsecMsg51, "add <name> [ <parameter> ... ]")
-FB_IMPL_MSG_SYMBOL(GSEC, 52, GsecMsg52, "deleting a current user:")
-FB_IMPL_MSG_SYMBOL(GSEC, 53, GsecMsg53, "delete <name>")
-FB_IMPL_MSG_SYMBOL(GSEC, 54, GsecMsg54, "displaying all users:")
-FB_IMPL_MSG_SYMBOL(GSEC, 55, GsecMsg55, "display")
-FB_IMPL_MSG_SYMBOL(GSEC, 56, GsecMsg56, "displaying one user:")
-FB_IMPL_MSG_SYMBOL(GSEC, 57, GsecMsg57, "display <name>")
-FB_IMPL_MSG_SYMBOL(GSEC, 58, GsecMsg58, "modifying a user's parameters:")
-FB_IMPL_MSG_SYMBOL(GSEC, 59, GsecMsg59, "modify <name> <parameter> [ <parameter> ... ]")
-FB_IMPL_MSG_SYMBOL(GSEC, 60, GsecMsg60, "help:")
-FB_IMPL_MSG_SYMBOL(GSEC, 61, GsecMsg61, "? (interactive only)")
-FB_IMPL_MSG_SYMBOL(GSEC, 62, GsecMsg62, "help")
-FB_IMPL_MSG_SYMBOL(GSEC, 63, GsecMsg63, "quit interactive session:")
-FB_IMPL_MSG_SYMBOL(GSEC, 64, GsecMsg64, "quit (interactive only)")
-FB_IMPL_MSG_SYMBOL(GSEC, 65, GsecMsg65, "available parameters:")
-FB_IMPL_MSG_SYMBOL(GSEC, 66, GsecMsg66, "-pw <password>")
-FB_IMPL_MSG_SYMBOL(GSEC, 67, GsecMsg67, "-uid <uid>")
-FB_IMPL_MSG_SYMBOL(GSEC, 68, GsecMsg68, "-gid <uid>")
-FB_IMPL_MSG_SYMBOL(GSEC, 69, GsecMsg69, "-proj <projectname>")
-FB_IMPL_MSG_SYMBOL(GSEC, 70, GsecMsg70, "-org <organizationname>")
-FB_IMPL_MSG_SYMBOL(GSEC, 71, GsecMsg71, "-fname <firstname>")
-FB_IMPL_MSG_SYMBOL(GSEC, 72, GsecMsg72, "-mname <middlename>")
-FB_IMPL_MSG_SYMBOL(GSEC, 73, GsecMsg73, "-lname <lastname>")
-FB_IMPL_MSG_NO_SYMBOL(GSEC, 74, "gsec - memory allocation error")
-FB_IMPL_MSG_NO_SYMBOL(GSEC, 75, "gsec error")
-FB_IMPL_MSG(GSEC, 76, gsec_inv_username, -901, "00", "000", "Invalid user name (maximum 31 bytes allowed)")
-FB_IMPL_MSG(GSEC, 77, gsec_inv_pw_length, -901, "00", "000", "Warning - maximum 8 significant bytes of password used")
-FB_IMPL_MSG(GSEC, 78, gsec_db_specified, -901, "00", "000", "database already specified")
-FB_IMPL_MSG(GSEC, 79, gsec_db_admin_specified, -901, "00", "000", "database administrator name already specified")
-FB_IMPL_MSG(GSEC, 80, gsec_db_admin_pw_specified, -901, "00", "000", "database administrator password already specified")
-FB_IMPL_MSG(GSEC, 81, gsec_sql_role_specified, -901, "00", "000", "SQL role name already specified")
-FB_IMPL_MSG_SYMBOL(GSEC, 82, GsecMsg82, "[ <options> ... ]")
-FB_IMPL_MSG_SYMBOL(GSEC, 83, GsecMsg83, "available options:")
-FB_IMPL_MSG_SYMBOL(GSEC, 84, GsecMsg84, "-user <database administrator name>")
-FB_IMPL_MSG_SYMBOL(GSEC, 85, GsecMsg85, "-password <database administrator password>")
-FB_IMPL_MSG_SYMBOL(GSEC, 86, GsecMsg86, "-role <database administrator SQL role name>")
-FB_IMPL_MSG_SYMBOL(GSEC, 87, GsecMsg87, "-database <database to manage>")
-FB_IMPL_MSG_SYMBOL(GSEC, 88, GsecMsg88, "-z")
-FB_IMPL_MSG_SYMBOL(GSEC, 89, GsecMsg89, "displaying version number:")
-FB_IMPL_MSG_SYMBOL(GSEC, 90, GsecMsg90, "z (interactive only)")
-FB_IMPL_MSG_SYMBOL(GSEC, 91, GsecMsg91, "-trusted (use trusted authentication)")
-FB_IMPL_MSG_SYMBOL(GSEC, 92, GsecMsg92, "invalid switch specified in interactive mode")
-FB_IMPL_MSG_SYMBOL(GSEC, 93, GsecMsg93, "error closing security database")
-FB_IMPL_MSG_SYMBOL(GSEC, 94, GsecMsg94, "error releasing request in security database")
-FB_IMPL_MSG_SYMBOL(GSEC, 95, GsecMsg95, "-fetch_password <file to fetch password from>")
-FB_IMPL_MSG_SYMBOL(GSEC, 96, GsecMsg96, "error fetching password from file")
-FB_IMPL_MSG_SYMBOL(GSEC, 97, GsecMsg97, "error changing AUTO ADMINS MAPPING in security database")
-FB_IMPL_MSG_SYMBOL(GSEC, 98, GsecMsg98, "changing admins mapping to RDB$ADMIN role in security database:")
-FB_IMPL_MSG_SYMBOL(GSEC, 99, GsecMsg99, "invalid parameter for -MAPPING, only SET or DROP is accepted")
-FB_IMPL_MSG_SYMBOL(GSEC, 100, GsecMsg100, "mapping {set|drop}")
-FB_IMPL_MSG_SYMBOL(GSEC, 101, GsecMsg101, "use gsec -? to get help")
-FB_IMPL_MSG_SYMBOL(GSEC, 102, GsecMsg102, "-admin {yes|no}")
-FB_IMPL_MSG_SYMBOL(GSEC, 103, GsecMsg103, "invalid parameter for -ADMIN, only YES or NO is accepted")
-FB_IMPL_MSG_SYMBOL(GSEC, 104, GsecMsg104, "not enough privileges to complete operation")
diff --git a/FBClient.Headers/firebird/impl/msg/gstat.h b/FBClient.Headers/firebird/impl/msg/gstat.h
deleted file mode 100644
index 6fe4f062..00000000
--- a/FBClient.Headers/firebird/impl/msg/gstat.h
+++ /dev/null
@@ -1,62 +0,0 @@
-FB_IMPL_MSG(GSTAT, 1, gstat_unknown_switch, -901, "00", "000", "found unknown switch")
-FB_IMPL_MSG(GSTAT, 2, gstat_retry, -901, "00", "000", "please retry, giving a database name")
-FB_IMPL_MSG(GSTAT, 3, gstat_wrong_ods, -901, "00", "000", "Wrong ODS version, expected @1, encountered @2")
-FB_IMPL_MSG(GSTAT, 4, gstat_unexpected_eof, -901, "00", "000", "Unexpected end of database file.")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 5, "gstat version @1")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 6, "\nDatabase \"@1\"")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 7, "\n\nDatabase file sequence:")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 8, "File @1 continues as file @2")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 9, "File @1 is the @2 file")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 10, "\nAnalyzing database pages ...")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 11, "    Primary pointer page: @1, Index root page: @2")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 12, "    Data pages: @1, data page slots: @2, average fill: @3")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 13, "    Fill distribution:")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 14, "    Index @1 (@2)")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 15, "	Depth: @1, leaf buckets: @2, nodes: @3")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 16, "	Average data length: @1, total dup: @2, max dup: @3")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 17, "	Fill distribution:")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 18, "    Expected data on page @1")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 19, "    Expected b-tree bucket on page @1 from @2")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 20, "unknown switch \"@1\"")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 21, "Available switches:")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 22, "    -a      analyze data and index pages")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 23, "    -d      analyze data pages")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 24, "    -h      analyze header page ONLY")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 25, "    -i      analyze index leaf pages")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 26, "    -l      analyze log page")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 27, "    -s      analyze system relations in addition to user tables")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 28, "    -z      display version number")
-FB_IMPL_MSG(GSTAT, 29, gstat_open_err, -901, "00", "000", "Can't open database file @1")
-FB_IMPL_MSG(GSTAT, 30, gstat_read_err, -901, "00", "000", "Can't read a database page")
-FB_IMPL_MSG(GSTAT, 31, gstat_sysmemex, -901, "00", "000", "System memory exhausted")
-FB_IMPL_MSG_SYMBOL(GSTAT, 32, gstat_username, "    -u      username")
-FB_IMPL_MSG_SYMBOL(GSTAT, 33, gstat_password, "    -p      password")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 34, "    -r      analyze average record and version length")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 35, "    -t      tablename <tablename2...> (case sensitive)")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 36, "    -tr     use trusted authentication")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 37, "    -fetch  fetch password from file")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 38, "option -h is incompatible with options -a, -d, -i, -r, -s and -t")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 39, "usage:   gstat [options] <database> or gstat <database> [options]")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 40, "database name was already specified")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 41, "option -t needs a table name")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 42, "option -t got a too long table name @1")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 43, "option -t accepts several table names only if used after <database>")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 44, "table \"@1\" not found")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 45, "use gstat -? to get help")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 46, "    Primary pages: @1, secondary pages: @2, swept pages: @3")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 47, "    Big record pages: @1")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 48, "    Blobs: @1, total length: @2, blob pages: @3")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 49, "        Level 0: @1, Level 1: @2, Level 2: @3")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 50, "option -e is incompatible with options -a, -d, -h, -i, -r, -s and -t")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 51, "    -e      analyze database encryption")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 52, "Data pages: total @1, encrypted @2, non-crypted @3")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 53, "Index pages: total @1, encrypted @2, non-crypted @3")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 54, "Blob pages: total @1, encrypted @2, non-crypted @3")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 55, "no encrypted database support, only -e and -h can be used")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 56, "    Empty pages: @1, full pages: @2")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 57, "    -role   SQL role name")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 58, "Other pages: total @1, ENCRYPTED @2 (DB problem!), non-crypted @3")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 59, "Gstat execution time @1")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 60, "Gstat completion time @1")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 61, "    Expected page inventory page @1")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 62, "Generator pages: total @1, encrypted @2, non-crypted @3")
diff --git a/FBClient.Headers/firebird/impl/msg/isql.h b/FBClient.Headers/firebird/impl/msg/isql.h
deleted file mode 100644
index bd62ec79..00000000
--- a/FBClient.Headers/firebird/impl/msg/isql.h
+++ /dev/null
@@ -1,203 +0,0 @@
-FB_IMPL_MSG_SYMBOL(ISQL, 0, GEN_ERR, "Statement failed, SQLSTATE = @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 1, USAGE, "usage:    isql [options] [<database>]")
-FB_IMPL_MSG_SYMBOL(ISQL, 2, SWITCH, "Unknown switch: @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 3, NO_DB, "Use CONNECT or CREATE DATABASE to specify a database")
-FB_IMPL_MSG_SYMBOL(ISQL, 4, FILE_OPEN_ERR, "Unable to open @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 5, COMMIT_PROMPT, "Commit current transaction (y/n)?")
-FB_IMPL_MSG_SYMBOL(ISQL, 6, COMMIT_MSG, "Committing.")
-FB_IMPL_MSG_SYMBOL(ISQL, 7, ROLLBACK_MSG, "Rolling back work.")
-FB_IMPL_MSG_SYMBOL(ISQL, 8, CMD_ERR, "Command error: @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 9, ADD_PROMPT, "Enter data or NULL for each column.  RETURN to end.")
-FB_IMPL_MSG_SYMBOL(ISQL, 10, VERSION, "ISQL Version: @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 11, USAGE_ALL, "	-a(ll)                  extract metadata incl. legacy non-SQL tables")
-FB_IMPL_MSG_SYMBOL(ISQL, 12, NUMBER_PAGES, "Number of DB pages allocated = @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 13, SWEEP_INTERV, "Sweep interval = @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 14, NUM_WAL_BUFF, "Number of wal buffers = @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 15, WAL_BUFF_SIZE, "Wal buffer size = @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 16, CKPT_LENGTH, "Check point length = @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 17, CKPT_INTERV, "Check point interval = @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 18, WAL_GRPC_WAIT, "Wal group commit wait = @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 19, BASE_LEVEL, "Base level = @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 20, LIMBO, "Transaction in limbo = @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 21, HLP_FRONTEND, "Frontend commands:")
-FB_IMPL_MSG_SYMBOL(ISQL, 22, HLP_BLOBED, "BLOBVIEW <blobid>          -- view BLOB in text editor")
-FB_IMPL_MSG_SYMBOL(ISQL, 23, HLP_BLOBDMP, "BLOBDUMP <blobid> <file>   -- dump BLOB to a file")
-FB_IMPL_MSG_SYMBOL(ISQL, 24, HLP_EDIT, "EDIT     [<filename>]      -- edit SQL script file and execute")
-FB_IMPL_MSG_SYMBOL(ISQL, 25, HLP_INPUT, "INput    <filename>        -- take input from the named SQL file")
-FB_IMPL_MSG_SYMBOL(ISQL, 26, HLP_OUTPUT, "OUTput   [<filename>]      -- write output to named file")
-FB_IMPL_MSG_SYMBOL(ISQL, 27, HLP_SHELL, "SHELL    <command>         -- execute Operating System command in sub-shell")
-FB_IMPL_MSG_SYMBOL(ISQL, 28, HLP_HELP, "HELP                       -- display this menu")
-FB_IMPL_MSG_SYMBOL(ISQL, 29, HLP_SETCOM, "Set commands:")
-FB_IMPL_MSG_SYMBOL(ISQL, 30, HLP_SET, "    SET                    -- display current SET options")
-FB_IMPL_MSG_SYMBOL(ISQL, 31, HLP_SETAUTO, "    SET AUTOddl            -- toggle autocommit of DDL statements")
-FB_IMPL_MSG_SYMBOL(ISQL, 32, HLP_SETBLOB, "    SET BLOB [ALL|<n>]     -- display BLOBS of subtype <n> or ALL")
-FB_IMPL_MSG_SYMBOL(ISQL, 33, HLP_SETCOUNT, "    SET COUNT              -- toggle count of selected rows on/off")
-FB_IMPL_MSG_SYMBOL(ISQL, 34, HLP_SETECHO, "    SET ECHO               -- toggle command echo on/off")
-FB_IMPL_MSG_SYMBOL(ISQL, 35, HLP_SETSTAT, "    SET STATs              -- toggle display of performance statistics")
-FB_IMPL_MSG_SYMBOL(ISQL, 36, HLP_SETTERM, "    SET TERM <string>      -- change statement terminator string")
-FB_IMPL_MSG_SYMBOL(ISQL, 37, HLP_SHOW, "SHOW     <object> [<name>] -- display system information")
-FB_IMPL_MSG_SYMBOL(ISQL, 38, HLP_OBJTYPE, "    <object> = CHECK, COLLATION, DATABASE, DOMAIN, EXCEPTION, FILTER, FUNCTION,")
-FB_IMPL_MSG_SYMBOL(ISQL, 39, HLP_EXIT, "EXIT                       -- exit and commit changes")
-FB_IMPL_MSG_SYMBOL(ISQL, 40, HLP_QUIT, "QUIT                       -- exit and roll back changes")
-FB_IMPL_MSG_SYMBOL(ISQL, 41, HLP_ALL, "All commands may be abbreviated to letters in CAPitals")
-FB_IMPL_MSG_SYMBOL(ISQL, 42, HLP_SETSCHEMA, "	SET SCHema/DB <db name> -- changes current database")
-FB_IMPL_MSG_SYMBOL(ISQL, 43, YES_ANS, "Yes")
-FB_IMPL_MSG_SYMBOL(ISQL, 44, REPORT1, "Current memory = !c\nDelta memory = !d\nMax memory = !x\nElapsed time = !e sec\n")
-FB_IMPL_MSG_SYMBOL(ISQL, 45, REPORT2, "Cpu = !u sec\nBuffers = !b\nReads = !r\nWrites = !w\nFetches = !f")
-FB_IMPL_MSG_SYMBOL(ISQL, 46, BLOB_SUBTYPE, "BLOB display set to subtype @1. This BLOB: subtype = @2")
-FB_IMPL_MSG_SYMBOL(ISQL, 47, BLOB_PROMPT, "BLOB: @1, type 'edit' or filename to load>")
-FB_IMPL_MSG_SYMBOL(ISQL, 48, DATE_PROMPT, "Enter @1 as Y/M/D>")
-FB_IMPL_MSG_SYMBOL(ISQL, 49, NAME_PROMPT, "Enter @1>")
-FB_IMPL_MSG_SYMBOL(ISQL, 50, DATE_ERR, "Bad date @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 51, CON_PROMPT, "CON> ")
-FB_IMPL_MSG_SYMBOL(ISQL, 52, HLP_SETLIST, "    SET LIST               -- toggle column or table display format")
-FB_IMPL_MSG_SYMBOL(ISQL, 53, NOT_FOUND, "@1 not found")
-FB_IMPL_MSG_SYMBOL(ISQL, 54, COPY_ERR, "Errors occurred (possibly duplicate domains) in creating @1 in @2")
-FB_IMPL_MSG_SYMBOL(ISQL, 55, SERVER_TOO_OLD, "Server version too old to support the isql command")
-FB_IMPL_MSG_SYMBOL(ISQL, 56, REC_COUNT, "Records affected: @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 57, UNLICENSED, "Unlicensed for database \"@1\"")
-FB_IMPL_MSG_SYMBOL(ISQL, 58, HLP_SETWIDTH, "    SET WIDTH <col> [<n>]  -- set/unset print width to <n> for column <col>")
-FB_IMPL_MSG_SYMBOL(ISQL, 59, HLP_SETPLAN, "    SET PLAN               -- toggle display of query access plan")
-FB_IMPL_MSG_SYMBOL(ISQL, 60, HLP_SETTIME, "    SET TIME               -- toggle display of timestamp with DATE values")
-FB_IMPL_MSG_SYMBOL(ISQL, 61, HLP_EDIT2, "EDIT                       -- edit current command buffer and execute")
-FB_IMPL_MSG_SYMBOL(ISQL, 62, HLP_OUTPUT2, "OUTput                     -- return output to stdout")
-FB_IMPL_MSG_SYMBOL(ISQL, 63, HLP_SETNAMES, "    SET NAMES <csname>     -- set name of runtime character set")
-FB_IMPL_MSG_SYMBOL(ISQL, 64, HLP_OBJTYPE2, "               GENERATOR, GRANT, INDEX, PACKAGE, PROCEDURE, ROLE, SQL DIALECT,")
-FB_IMPL_MSG_SYMBOL(ISQL, 65, HLP_SETBLOB2, "    SET BLOB               -- turn off BLOB display")
-FB_IMPL_MSG_SYMBOL(ISQL, 66, HLP_SET_ROOT, "SET      <option>          -- (Use HELP SET for complete list)")
-FB_IMPL_MSG_SYMBOL(ISQL, 67, NO_TABLES, "There are no tables in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 68, NO_TABLE, "There is no table @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 69, NO_VIEWS, "There are no views in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 70, NO_VIEW, "There is no view @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 71, NO_INDICES_ON_REL, "There are no indices on table @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 72, NO_REL_OR_INDEX, "There is no table or index @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 73, NO_INDICES, "There are no indices in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 74, NO_DOMAIN, "There is no domain @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 75, NO_DOMAINS, "There are no domains in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 76, NO_EXCEPTION, "There is no exception @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 77, NO_EXCEPTIONS, "There are no exceptions in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 78, NO_FILTER, "There is no filter @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 79, NO_FILTERS, "There are no filters in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 80, NO_FUNCTION, "There is no user-defined function @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 81, NO_FUNCTIONS, "There are no user-defined functions in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 82, NO_GEN, "There is no generator @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 83, NO_GENS, "There are no generators in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 84, NO_GRANT_ON_REL, "There is no privilege granted on table @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 85, NO_GRANT_ON_PROC, "There is no privilege granted on stored procedure @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 86, NO_REL_OR_PROC, "There is no table or stored procedure @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 87, NO_PROC, "There is no stored procedure @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 88, NO_PROCS, "There are no stored procedures in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 89, NO_TRIGGERS_ON_REL, "There are no triggers on table @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 90, NO_REL_OR_TRIGGER, "There is no table or trigger @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 91, NO_TRIGGERS, "There are no triggers in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 92, NO_CHECKS_ON_REL, "There are no check constraints on table @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 93, REPORT2_WINDOWS_ONLY, "Buffers = !b\nReads = !r\nWrites !w\nFetches = !f")
-FB_IMPL_MSG_SYMBOL(ISQL, 94, BUFFER_OVERFLOW, "Single isql command exceeded maximum buffer size")
-FB_IMPL_MSG_SYMBOL(ISQL, 95, NO_ROLES, "There are no roles in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 96, NO_OBJECT, "There is no metadata object @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 97, NO_GRANT_ON_ROL, "There is no membership privilege granted on @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 98, UNEXPECTED_EOF, "Expected end of statement, encountered EOF")
-FB_IMPL_MSG_SYMBOL(ISQL, 101, TIME_ERR, "Bad TIME: @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 102, HLP_OBJTYPE3, "               SYSTEM, TABLE, TRIGGER, VERSION, USERS, VIEW")
-FB_IMPL_MSG_SYMBOL(ISQL, 103, NO_ROLE, "There is no role @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 104, USAGE_BAIL, "	-b(ail)                 bail on errors (set bail on)")
-FB_IMPL_MSG_NO_SYMBOL(ISQL, 105, "Incomplete string in @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 106, HLP_SETSQLDIALECT, "    SET SQL DIALECT <n>    -- set sql dialect to <n>")
-FB_IMPL_MSG_SYMBOL(ISQL, 107, NO_GRANT_ON_ANY, "There is no privilege granted in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 108, HLP_SETPLANONLY, "    SET PLANONLY           -- toggle display of query plan without executing")
-FB_IMPL_MSG_SYMBOL(ISQL, 109, HLP_SETHEADING, "    SET HEADING            -- toggle display of query column titles")
-FB_IMPL_MSG_SYMBOL(ISQL, 110, HLP_SETBAIL, "    SET BAIL               -- toggle bailing out on errors in non-interactive mode")
-FB_IMPL_MSG_SYMBOL(ISQL, 111, USAGE_CACHE, "	-c(ache) <num>          number of cache buffers")
-FB_IMPL_MSG_SYMBOL(ISQL, 112, TIME_PROMPT, "Enter @1 as H:M:S>")
-FB_IMPL_MSG_SYMBOL(ISQL, 113, TIMESTAMP_PROMPT, "Enter @1 as Y/MON/D H:MIN:S[.MSEC]>")
-FB_IMPL_MSG_SYMBOL(ISQL, 114, TIMESTAMP_ERR, "Bad TIMESTAMP: @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 115, NO_COMMENTS, "There are no comments for objects in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 116, ONLY_FIRST_BLOBS, "Printing only the first @1 blobs.")
-FB_IMPL_MSG_SYMBOL(ISQL, 117, MSG_TABLES, "Tables:")
-FB_IMPL_MSG_SYMBOL(ISQL, 118, MSG_FUNCTIONS, "Functions:")
-FB_IMPL_MSG_SYMBOL(ISQL, 119, EXACTLINE, "At line @1 in file @2")
-FB_IMPL_MSG_SYMBOL(ISQL, 120, AFTERLINE, "After line @1 in file @2")
-FB_IMPL_MSG_SYMBOL(ISQL, 121, NO_TRIGGER, "There is no trigger @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 122, USAGE_CHARSET, "	-ch(arset) <charset>    connection charset (set names)")
-FB_IMPL_MSG_SYMBOL(ISQL, 123, USAGE_DATABASE, "	-d(atabase) <database>  database name to put in script creation")
-FB_IMPL_MSG_SYMBOL(ISQL, 124, USAGE_ECHO, "	-e(cho)                 echo commands (set echo on)")
-FB_IMPL_MSG_SYMBOL(ISQL, 125, USAGE_EXTRACT, "	-ex(tract)              extract metadata")
-FB_IMPL_MSG_SYMBOL(ISQL, 126, USAGE_INPUT, "	-i(nput) <file>         input file (set input)")
-FB_IMPL_MSG_SYMBOL(ISQL, 127, USAGE_MERGE, "	-m(erge)                merge standard error")
-FB_IMPL_MSG_SYMBOL(ISQL, 128, USAGE_MERGE2, "	-m2                     merge diagnostic")
-FB_IMPL_MSG_SYMBOL(ISQL, 129, USAGE_NOAUTOCOMMIT, "	-n(oautocommit)         no autocommit DDL (set autoddl off)")
-FB_IMPL_MSG_SYMBOL(ISQL, 130, USAGE_NOWARN, "	-now(arnings)           do not show warnings")
-FB_IMPL_MSG_SYMBOL(ISQL, 131, USAGE_OUTPUT, "	-o(utput) <file>        output file (set output)")
-FB_IMPL_MSG_SYMBOL(ISQL, 132, USAGE_PAGE, "	-pag(elength) <size>    page length")
-FB_IMPL_MSG_SYMBOL(ISQL, 133, USAGE_PASSWORD, "	-p(assword) <password>  connection password")
-FB_IMPL_MSG_SYMBOL(ISQL, 134, USAGE_QUIET, "	-q(uiet)                do not show the message \"Use CONNECT...\"")
-FB_IMPL_MSG_SYMBOL(ISQL, 135, USAGE_ROLE, "	-r(ole) <role>          role name")
-FB_IMPL_MSG_SYMBOL(ISQL, 136, USAGE_ROLE2, "	-r2 <role>              role (uses quoted identifier)")
-FB_IMPL_MSG_SYMBOL(ISQL, 137, USAGE_SQLDIALECT, "	-s(qldialect) <dialect> SQL dialect (set sql dialect)")
-FB_IMPL_MSG_SYMBOL(ISQL, 138, USAGE_TERM, "	-t(erminator) <term>    command terminator (set term)")
-FB_IMPL_MSG_SYMBOL(ISQL, 139, USAGE_USER, "	-u(ser) <user>          user name")
-FB_IMPL_MSG_SYMBOL(ISQL, 140, USAGE_XTRACT, "	-x                      extract metadata")
-FB_IMPL_MSG_SYMBOL(ISQL, 141, USAGE_VERSION, "	-z                      show program and server version")
-FB_IMPL_MSG_SYMBOL(ISQL, 142, USAGE_NOARG, "missing argument for switch \"@1\"")
-FB_IMPL_MSG_SYMBOL(ISQL, 143, USAGE_NOTINT, "argument \"@1\" for switch \"@2\" is not an integer")
-FB_IMPL_MSG_SYMBOL(ISQL, 144, USAGE_RANGE, "value \"@1\" for switch \"@2\" is out of range")
-FB_IMPL_MSG_SYMBOL(ISQL, 145, USAGE_DUPSW, "switch \"@1\" or its equivalent used more than once")
-FB_IMPL_MSG_SYMBOL(ISQL, 146, USAGE_DUPDB, "more than one database name: \"@1\", \"@2\"")
-FB_IMPL_MSG_SYMBOL(ISQL, 147, NO_DEPENDENCIES, "No dependencies for @1 were found")
-FB_IMPL_MSG_SYMBOL(ISQL, 148, NO_COLLATION, "There is no collation @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 149, NO_COLLATIONS, "There are no user-defined collations in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 150, MSG_COLLATIONS, "Collations:")
-FB_IMPL_MSG_SYMBOL(ISQL, 151, NO_SECCLASS, "There are no security classes for @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 152, NO_DB_WIDE_SECCLASS, "There is no database-wide security class")
-FB_IMPL_MSG_SYMBOL(ISQL, 153, CANNOT_GET_SRV_VER, "Cannot get server version without database connection")
-FB_IMPL_MSG_SYMBOL(ISQL, 154, USAGE_NODBTRIGGERS, "	-nod(btriggers)         do not run database triggers")
-FB_IMPL_MSG_SYMBOL(ISQL, 155, USAGE_TRUSTED, "	-tr(usted)              use trusted authentication")
-FB_IMPL_MSG_SYMBOL(ISQL, 156, BULK_PROMPT, "BULK> ")
-FB_IMPL_MSG_SYMBOL(ISQL, 157, NO_CONNECTED_USERS, "There are no connected users")
-FB_IMPL_MSG_SYMBOL(ISQL, 158, USERS_IN_DB, "Users in the database")
-FB_IMPL_MSG_SYMBOL(ISQL, 159, OUTPUT_TRUNCATED, "Output was truncated")
-FB_IMPL_MSG_SYMBOL(ISQL, 160, VALID_OPTIONS, "Valid options are:")
-FB_IMPL_MSG_SYMBOL(ISQL, 161, USAGE_FETCH, "	-f(etch_password)       fetch password from file")
-FB_IMPL_MSG_SYMBOL(ISQL, 162, PASS_FILE_OPEN, "could not open password file @1, errno @2")
-FB_IMPL_MSG_SYMBOL(ISQL, 163, PASS_FILE_READ, "could not read password file @1, errno @2")
-FB_IMPL_MSG_SYMBOL(ISQL, 164, EMPTY_PASS, "empty password file @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 165, HLP_SETMAXROWS, "    SET MAXROWS [<n>]      -- limit select stmt to <n> rows, zero is no limit")
-FB_IMPL_MSG_SYMBOL(ISQL, 166, NO_PACKAGE, "There is no package @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 167, NO_PACKAGES, "There are no packages in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 168, NO_SCHEMA, "There is no schema @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 169, NO_SCHEMAS, "There are no schemas in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 170, MAXROWS_INVALID, "Unable to convert @1 to a number for MAXROWS option")
-FB_IMPL_MSG_SYMBOL(ISQL, 171, MAXROWS_OUTOF_RANGE, "Value @1 for MAXROWS is out of range. Max value is @2")
-FB_IMPL_MSG_SYMBOL(ISQL, 172, MAXROWS_NEGATIVE, "The value (@1) for MAXROWS must be zero or greater")
-FB_IMPL_MSG_SYMBOL(ISQL, 173, HLP_SETEXPLAIN, "    SET EXPLAIN            -- toggle display of query access plan in the explained form")
-FB_IMPL_MSG_SYMBOL(ISQL, 174, NO_GRANT_ON_GEN, "There is no privilege granted on generator @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 175, NO_GRANT_ON_XCP, "There is no privilege granted on exception @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 176, NO_GRANT_ON_FLD, "There is no privilege granted on domain @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 177, NO_GRANT_ON_CS, "There is no privilege granted on character set @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 178, NO_GRANT_ON_COLL, "There is no privilege granted on collation @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 179, NO_GRANT_ON_PKG, "There is no privilege granted on package @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 180, NO_GRANT_ON_FUN, "There is no privilege granted on function @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 181, REPORT_NEW1, "Current memory = !\nDelta memory = !\nMax memory = !\nElapsed time = ~ sec\n")
-FB_IMPL_MSG_SYMBOL(ISQL, 182, REPORT_NEW2, "Cpu = ~ sec\n")
-FB_IMPL_MSG_SYMBOL(ISQL, 183, REPORT_NEW3, "Buffers = !\nReads = !\nWrites = !\nFetches = !")
-FB_IMPL_MSG_SYMBOL(ISQL, 184, NO_MAP, "There is no mapping @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 185, NO_MAPS, "There are no mappings in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 186, INVALID_TERM_CHARS, "Invalid characters for SET TERMINATOR are @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 187, REC_DISPLAYCOUNT, "Records displayed: @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 188, COLUMNS_HIDDEN, "Full NULL columns hidden due to RecordBuff: @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 189, HLP_SETRECORDBUF, "    SET RECORDBuf          -- toggle limited buffering and trimming of columns")
-FB_IMPL_MSG_SYMBOL(ISQL, 190, NUMBER_USED_PAGES, "Number of DB pages used = @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 191, NUMBER_FREE_PAGES, "Number of DB pages free = @1")
-FB_IMPL_MSG_SYMBOL(ISQL, 192, DATABASE_CRYPTED, "Database encrypted")
-FB_IMPL_MSG_SYMBOL(ISQL, 193, DATABASE_NOT_CRYPTED, "Database not encrypted")
-FB_IMPL_MSG_SYMBOL(ISQL, 194, DATABASE_CRYPT_PROCESS, "crypt thread not complete")
-FB_IMPL_MSG_SYMBOL(ISQL, 195, MSG_ROLES, "Roles:")
-FB_IMPL_MSG_SYMBOL(ISQL, 196, NO_TIMEOUTS, "Timeouts are not supported by server")
-FB_IMPL_MSG_SYMBOL(ISQL, 197, HLP_SETKEEPTRAN, "    SET KEEP_TRAN_params   -- toggle to keep or not to keep text of following successful SET TRANSACTION statement")
-FB_IMPL_MSG_SYMBOL(ISQL, 198, HLP_SETPERTAB, "    SET PER_TABle_stats    -- toggle display of detailed per-table statistics")
-FB_IMPL_MSG_SYMBOL(ISQL, 199, BAD_STMT_TYPE, "Statement type is not recognized")
-FB_IMPL_MSG_SYMBOL(ISQL, 200, MSG_PACKAGES, "Packages:")
-FB_IMPL_MSG_SYMBOL(ISQL, 201, NO_PUBLICATION, "There is no publication @1 in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 202, NO_PUBLICATIONS, "There is no publications in this database")
-FB_IMPL_MSG_SYMBOL(ISQL, 203, MSG_PUBLICATIONS, "Publications:")
-FB_IMPL_MSG_SYMBOL(ISQL, 204, MSG_PROCEDURES, "Procedures:")
diff --git a/FBClient.Headers/firebird/impl/msg/jrd.h b/FBClient.Headers/firebird/impl/msg/jrd.h
deleted file mode 100644
index 535d4e4f..00000000
--- a/FBClient.Headers/firebird/impl/msg/jrd.h
+++ /dev/null
@@ -1,970 +0,0 @@
-FB_IMPL_MSG_NO_SYMBOL(JRD, 0, "")
-FB_IMPL_MSG(JRD, 1, arith_except, -802, "22", "000", "arithmetic exception, numeric overflow, or string truncation")
-FB_IMPL_MSG(JRD, 2, bad_dbkey, -901, "HY", "000", "invalid database key")
-FB_IMPL_MSG(JRD, 3, bad_db_format, -922, "HY", "000", "file @1 is not a valid database")
-FB_IMPL_MSG(JRD, 4, bad_db_handle, -904, "08", "003", "invalid database handle (no active connection)")
-FB_IMPL_MSG(JRD, 5, bad_dpb_content, -924, "HY", "000", "bad parameters on attach or create database")
-FB_IMPL_MSG(JRD, 6, bad_dpb_form, -901, "HY", "000", "unrecognized database parameter block")
-FB_IMPL_MSG(JRD, 7, bad_req_handle, -901, "42", "000", "invalid request handle")
-FB_IMPL_MSG(JRD, 8, bad_segstr_handle, -901, "42", "000", "invalid BLOB handle")
-FB_IMPL_MSG(JRD, 9, bad_segstr_id, -901, "42", "000", "invalid BLOB ID")
-FB_IMPL_MSG(JRD, 10, bad_tpb_content, -901, "HY", "000", "invalid parameter in transaction parameter block")
-FB_IMPL_MSG(JRD, 11, bad_tpb_form, -901, "HY", "000", "invalid format for transaction parameter block")
-FB_IMPL_MSG(JRD, 12, bad_trans_handle, -901, "08", "003", "invalid transaction handle (expecting explicit transaction start)")
-FB_IMPL_MSG(JRD, 13, bug_check, -902, "XX", "000", "internal Firebird consistency check (@1)")
-FB_IMPL_MSG(JRD, 14, convert_error, -413, "22", "018", "conversion error from string \"@1\"")
-FB_IMPL_MSG(JRD, 15, db_corrupt, -902, "XX", "001", "database file appears corrupt (@1)")
-FB_IMPL_MSG(JRD, 16, deadlock, -913, "40", "001", "deadlock")
-FB_IMPL_MSG(JRD, 17, excess_trans, -901, "HY", "000", "attempt to start more than @1 transactions")
-FB_IMPL_MSG(JRD, 18, from_no_match, 100, "01", "000", "no match for first value expression")
-FB_IMPL_MSG(JRD, 19, infinap, -901, "HY", "000", "information type inappropriate for object specified")
-FB_IMPL_MSG(JRD, 20, infona, -901, "HY", "000", "no information of this type available for object specified")
-FB_IMPL_MSG(JRD, 21, infunk, -901, "HY", "000", "unknown information item")
-FB_IMPL_MSG(JRD, 22, integ_fail, -901, "27", "000", "action cancelled by trigger (@1) to preserve data integrity")
-FB_IMPL_MSG(JRD, 23, invalid_blr, -104, "HY", "000", "invalid request BLR at offset @1")
-FB_IMPL_MSG(JRD, 24, io_error, -902, "08", "001", "I/O error during \"@1\" operation for file \"@2\"")
-FB_IMPL_MSG(JRD, 25, lock_conflict, -901, "40", "001", "lock conflict on no wait transaction")
-FB_IMPL_MSG(JRD, 26, metadata_corrupt, -902, "XX", "001", "corrupt system table")
-FB_IMPL_MSG(JRD, 27, not_valid, -625, "23", "000", "validation error for column @1, value \"@2\"")
-FB_IMPL_MSG(JRD, 28, no_cur_rec, -508, "22", "000", "no current record for fetch operation")
-FB_IMPL_MSG(JRD, 29, no_dup, -803, "23", "000", "attempt to store duplicate value (visible to active transactions) in unique index \"@1\"")
-FB_IMPL_MSG(JRD, 30, no_finish, -901, "HY", "000", "program attempted to exit without finishing database")
-FB_IMPL_MSG(JRD, 31, no_meta_update, -607, "42", "000", "unsuccessful metadata update")
-FB_IMPL_MSG(JRD, 32, no_priv, -551, "28", "000", "no permission for @1 access to @2 @3")
-FB_IMPL_MSG(JRD, 33, no_recon, -901, "HY", "000", "transaction is not in limbo")
-FB_IMPL_MSG(JRD, 34, no_record, 100, "01", "000", "invalid database key")
-FB_IMPL_MSG(JRD, 35, no_segstr_close, -901, "HY", "000", "BLOB was not closed")
-FB_IMPL_MSG(JRD, 36, obsolete_metadata, -820, "HY", "000", "metadata is obsolete")
-FB_IMPL_MSG(JRD, 37, open_trans, -901, "01", "002", "cannot disconnect database with open transactions (@1 active)")
-FB_IMPL_MSG(JRD, 38, port_len, -901, "HY", "000", "message length error (encountered @1, expected @2)")
-FB_IMPL_MSG(JRD, 39, read_only_field, -151, "42", "000", "attempted update of read-only column @1")
-FB_IMPL_MSG(JRD, 40, read_only_rel, -150, "42", "000", "attempted update of read-only table")
-FB_IMPL_MSG(JRD, 41, read_only_trans, -817, "42", "000", "attempted update during read-only transaction")
-FB_IMPL_MSG(JRD, 42, read_only_view, -150, "42", "000", "cannot update read-only view @1")
-FB_IMPL_MSG(JRD, 43, req_no_trans, -901, "25", "000", "no transaction for request")
-FB_IMPL_MSG(JRD, 44, req_sync, -901, "HY", "000", "request synchronization error")
-FB_IMPL_MSG(JRD, 45, req_wrong_db, -901, "HY", "000", "request referenced an unavailable database")
-FB_IMPL_MSG(JRD, 46, segment, 101, "01", "000", "segment buffer length shorter than expected")
-FB_IMPL_MSG(JRD, 47, segstr_eof, 100, "01", "000", "attempted retrieval of more segments than exist")
-FB_IMPL_MSG(JRD, 48, segstr_no_op, -402, "HY", "000", "attempted invalid operation on a BLOB")
-FB_IMPL_MSG(JRD, 49, segstr_no_read, -901, "HY", "000", "attempted read of a new, open BLOB")
-FB_IMPL_MSG(JRD, 50, segstr_no_trans, -901, "HY", "000", "attempted action on BLOB outside transaction")
-FB_IMPL_MSG(JRD, 51, segstr_no_write, -817, "HY", "000", "attempted write to read-only BLOB")
-FB_IMPL_MSG(JRD, 52, segstr_wrong_db, -901, "HY", "000", "attempted reference to BLOB in unavailable database")
-FB_IMPL_MSG(JRD, 53, sys_request, -902, "HY", "000", "operating system directive @1 failed")
-FB_IMPL_MSG(JRD, 54, stream_eof, -596, "HY", "109", "attempt to fetch past the last record in a record stream")
-FB_IMPL_MSG(JRD, 55, unavailable, -904, "08", "001", "unavailable database")
-FB_IMPL_MSG(JRD, 56, unres_rel, -901, "HY", "000", "table @1 was omitted from the transaction reserving list")
-FB_IMPL_MSG(JRD, 57, uns_ext, -901, "HY", "000", "request includes a DSRI extension not supported in this implementation")
-FB_IMPL_MSG(JRD, 58, wish_list, -901, "0A", "000", "feature is not supported")
-FB_IMPL_MSG(JRD, 59, wrong_ods, -820, "HY", "000", "unsupported on-disk structure for file @1; found @2.@3, support @4.@5")
-FB_IMPL_MSG(JRD, 60, wronumarg, -804, "07", "002", "wrong number of arguments on call")
-FB_IMPL_MSG(JRD, 61, imp_exc, -904, "54", "000", "Implementation limit exceeded")
-FB_IMPL_MSG(JRD, 62, random, -901, "HY", "000", "@1")
-FB_IMPL_MSG(JRD, 63, fatal_conflict, -901, "HY", "000", "unrecoverable conflict with limbo transaction @1")
-FB_IMPL_MSG(JRD, 64, badblk, -902, "XX", "000", "internal error")
-FB_IMPL_MSG(JRD, 65, invpoolcl, -902, "XX", "000", "internal error")
-FB_IMPL_MSG(JRD, 66, nopoolids, -904, "HY", "000", "too many requests")
-FB_IMPL_MSG(JRD, 67, relbadblk, -902, "XX", "000", "internal error")
-FB_IMPL_MSG(JRD, 68, blktoobig, -902, "54", "000", "block size exceeds implementation restriction")
-FB_IMPL_MSG(JRD, 69, bufexh, -904, "HY", "001", "buffer exhausted")
-FB_IMPL_MSG(JRD, 70, syntaxerr, -104, "HY", "000", "BLR syntax error: expected @1 at offset @2, encountered @3")
-FB_IMPL_MSG(JRD, 71, bufinuse, -904, "HY", "000", "buffer in use")
-FB_IMPL_MSG(JRD, 72, bdbincon, -901, "XX", "000", "internal error")
-FB_IMPL_MSG(JRD, 73, reqinuse, -904, "HY", "000", "request in use")
-FB_IMPL_MSG(JRD, 74, badodsver, -902, "HY", "000", "incompatible version of on-disk structure")
-FB_IMPL_MSG(JRD, 75, relnotdef, -219, "42", "S02", "table @1 is not defined")
-FB_IMPL_MSG(JRD, 76, fldnotdef, -205, "42", "S22", "column @1 is not defined in table @2")
-FB_IMPL_MSG(JRD, 77, dirtypage, -902, "XX", "000", "internal error")
-FB_IMPL_MSG(JRD, 78, waifortra, -902, "XX", "000", "internal error")
-FB_IMPL_MSG(JRD, 79, doubleloc, -902, "XX", "000", "internal error")
-FB_IMPL_MSG(JRD, 80, nodnotfnd, -902, "XX", "000", "internal error")
-FB_IMPL_MSG(JRD, 81, dupnodfnd, -902, "XX", "000", "internal error")
-FB_IMPL_MSG(JRD, 82, locnotmar, -902, "XX", "000", "internal error")
-FB_IMPL_MSG(JRD, 83, badpagtyp, -689, "42", "000", "page @1 is of wrong type (expected @2, found @3)")
-FB_IMPL_MSG(JRD, 84, corrupt, -902, "XX", "000", "database corrupted")
-FB_IMPL_MSG(JRD, 85, badpage, -902, "42", "000", "checksum error on database page @1")
-FB_IMPL_MSG(JRD, 86, badindex, -902, "XX", "002", "index is broken")
-FB_IMPL_MSG(JRD, 87, dbbnotzer, -901, "HY", "000", "database handle not zero")
-FB_IMPL_MSG(JRD, 88, tranotzer, -901, "25", "000", "transaction handle not zero")
-FB_IMPL_MSG(JRD, 89, trareqmis, -902, "25", "000", "transaction--request mismatch (synchronization error)")
-FB_IMPL_MSG(JRD, 90, badhndcnt, -902, "HY", "000", "bad handle count")
-FB_IMPL_MSG(JRD, 91, wrotpbver, -902, "HY", "000", "wrong version of transaction parameter block")
-FB_IMPL_MSG(JRD, 92, wroblrver, -902, "HY", "000", "unsupported BLR version (expected @1, encountered @2)")
-FB_IMPL_MSG(JRD, 93, wrodpbver, -902, "HY", "000", "wrong version of database parameter block")
-FB_IMPL_MSG(JRD, 94, blobnotsup, -402, "42", "000", "BLOB and array data types are not supported for @1 operation")
-FB_IMPL_MSG(JRD, 95, badrelation, -902, "XX", "001", "database corrupted")
-FB_IMPL_MSG(JRD, 96, nodetach, -902, "XX", "000", "internal error")
-FB_IMPL_MSG(JRD, 97, notremote, -902, "XX", "000", "internal error")
-FB_IMPL_MSG(JRD, 98, trainlim, -901, "25", "000", "transaction in limbo")
-FB_IMPL_MSG(JRD, 99, notinlim, -901, "25", "000", "transaction not in limbo")
-FB_IMPL_MSG(JRD, 100, traoutsta, -901, "25", "000", "transaction outstanding")
-FB_IMPL_MSG(JRD, 101, connect_reject, -923, "08", "004", "connection rejected by remote interface")
-FB_IMPL_MSG(JRD, 102, dbfile, -902, "XX", "000", "internal error")
-FB_IMPL_MSG(JRD, 103, orphan, -902, "XX", "000", "internal error")
-FB_IMPL_MSG(JRD, 104, no_lock_mgr, -904, "HY", "000", "no lock manager available")
-FB_IMPL_MSG(JRD, 105, ctxinuse, -104, "HY", "000", "context already in use (BLR error)")
-FB_IMPL_MSG(JRD, 106, ctxnotdef, -104, "HY", "000", "context not defined (BLR error)")
-FB_IMPL_MSG(JRD, 107, datnotsup, -402, "42", "000", "data operation not supported")
-FB_IMPL_MSG(JRD, 108, badmsgnum, -901, "HY", "000", "undefined message number")
-FB_IMPL_MSG(JRD, 109, badparnum, -104, "HY", "000", "undefined parameter number")
-FB_IMPL_MSG(JRD, 110, virmemexh, -904, "HY", "001", "unable to allocate memory from operating system")
-FB_IMPL_MSG(JRD, 111, blocking_signal, -901, "HY", "000", "blocking signal has been received")
-FB_IMPL_MSG(JRD, 112, lockmanerr, -902, "40", "001", "lock manager error")
-FB_IMPL_MSG(JRD, 113, journerr, -924, "HY", "000", "communication error with journal \"@1\"")
-FB_IMPL_MSG(JRD, 114, keytoobig, -664, "42", "000", "key size exceeds implementation restriction for index \"@1\"")
-FB_IMPL_MSG(JRD, 115, nullsegkey, -407, "HY", "000", "null segment of UNIQUE KEY")
-FB_IMPL_MSG(JRD, 116, sqlerr, -902, "00", "000", "SQL error code = @1")
-FB_IMPL_MSG(JRD, 117, wrodynver, -820, "HY", "000", "wrong DYN version")
-FB_IMPL_MSG(JRD, 118, funnotdef, -172, "39", "000", "function @1 is not defined")
-FB_IMPL_MSG(JRD, 119, funmismat, -171, "39", "000", "function @1 could not be matched")
-FB_IMPL_MSG(JRD, 120, bad_msg_vec, -104, "22", "001", "")
-FB_IMPL_MSG(JRD, 121, bad_detach, -924, "08", "007", "database detach completed with errors")
-FB_IMPL_MSG(JRD, 122, noargacc_read, -901, "HY", "000", "database system cannot read argument @1")
-FB_IMPL_MSG(JRD, 123, noargacc_write, -901, "HY", "000", "database system cannot write argument @1")
-FB_IMPL_MSG(JRD, 124, read_only, -817, "42", "000", "operation not supported")
-FB_IMPL_MSG(JRD, 125, ext_err, -677, "42", "000", "@1 extension error")
-FB_IMPL_MSG(JRD, 126, non_updatable, -150, "42", "000", "not updatable")
-FB_IMPL_MSG(JRD, 127, no_rollback, -926, "25", "S02", "no rollback performed")
-FB_IMPL_MSG(JRD, 128, bad_sec_info, -902, "HY", "000", "")
-FB_IMPL_MSG(JRD, 129, invalid_sec_info, -902, "28", "000", "")
-FB_IMPL_MSG(JRD, 130, misc_interpreted, -901, "HY", "000", "@1")
-FB_IMPL_MSG(JRD, 131, update_conflict, -904, "40", "001", "update conflicts with concurrent update")
-FB_IMPL_MSG(JRD, 132, unlicensed, -906, "HY", "000", "product @1 is not licensed")
-FB_IMPL_MSG(JRD, 133, obj_in_use, -904, "42", "000", "object @1 is in use")
-FB_IMPL_MSG(JRD, 134, nofilter, -413, "HY", "000", "filter not found to convert type @1 to type @2")
-FB_IMPL_MSG(JRD, 135, shadow_accessed, -904, "00", "000", "cannot attach active shadow file")
-FB_IMPL_MSG(JRD, 136, invalid_sdl, -104, "HY", "000", "invalid slice description language at offset @1")
-FB_IMPL_MSG(JRD, 137, out_of_bounds, -406, "42", "000", "subscript out of bounds")
-FB_IMPL_MSG(JRD, 138, invalid_dimension, -171, "42", "000", "column not array or invalid dimensions (expected @1, encountered @2)")
-FB_IMPL_MSG(JRD, 139, rec_in_limbo, -911, "HY", "000", "record from transaction @1 is stuck in limbo")
-FB_IMPL_MSG(JRD, 140, shadow_missing, -904, "HY", "000", "a file in manual shadow @1 is unavailable")
-FB_IMPL_MSG(JRD, 141, cant_validate, -923, "HY", "000", "secondary server attachments cannot validate databases")
-FB_IMPL_MSG(JRD, 142, cant_start_journal, -923, "HY", "000", "secondary server attachments cannot start journaling")
-FB_IMPL_MSG(JRD, 143, gennotdef, -204, "42", "000", "generator @1 is not defined")
-FB_IMPL_MSG(JRD, 144, cant_start_logging, -923, "HY", "000", "secondary server attachments cannot start logging")
-FB_IMPL_MSG(JRD, 145, bad_segstr_type, -685, "42", "000", "invalid BLOB type for operation")
-FB_IMPL_MSG(JRD, 146, foreign_key, -530, "23", "000", "violation of FOREIGN KEY constraint \"@1\" on table \"@2\"")
-FB_IMPL_MSG(JRD, 147, high_minor, -820, "HY", "000", "minor version too high found @1 expected @2")
-FB_IMPL_MSG(JRD, 148, tra_state, -901, "00", "000", "transaction @1 is @2")
-FB_IMPL_MSG(JRD, 149, trans_invalid, -532, "25", "000", "transaction marked invalid and cannot be committed")
-FB_IMPL_MSG(JRD, 150, buf_invalid, -902, "HY", "000", "cache buffer for page @1 invalid")
-FB_IMPL_MSG(JRD, 151, indexnotdefined, -902, "42", "S12", "there is no index in table @1 with id @2")
-FB_IMPL_MSG(JRD, 152, login, -902, "28", "000", "Your user name and password are not defined. Ask your database administrator to set up a Firebird login.")
-FB_IMPL_MSG(JRD, 153, invalid_bookmark, -823, "HY", "111", "invalid bookmark handle")
-FB_IMPL_MSG(JRD, 154, bad_lock_level, -824, "HY", "000", "invalid lock level @1")
-FB_IMPL_MSG(JRD, 155, relation_lock, -615, "40", "001", "lock on table @1 conflicts with existing lock")
-FB_IMPL_MSG(JRD, 156, record_lock, -615, "40", "001", "requested record lock conflicts with existing lock")
-FB_IMPL_MSG(JRD, 157, max_idx, -692, "54", "000", "maximum indexes per table (@1) exceeded")
-FB_IMPL_MSG(JRD, 158, jrn_enable, -902, "HY", "000", "enable journal for database before starting online dump")
-FB_IMPL_MSG(JRD, 159, old_failure, -902, "HY", "000", "online dump failure. Retry dump")
-FB_IMPL_MSG(JRD, 160, old_in_progress, -902, "HY", "000", "an online dump is already in progress")
-FB_IMPL_MSG(JRD, 161, old_no_space, -902, "HY", "000", "no more disk/tape space.  Cannot continue online dump")
-FB_IMPL_MSG(JRD, 162, no_wal_no_jrn, -902, "HY", "000", "journaling allowed only if database has Write-ahead Log")
-FB_IMPL_MSG(JRD, 163, num_old_files, -902, "HY", "000", "maximum number of online dump files that can be specified is 16")
-FB_IMPL_MSG(JRD, 164, wal_file_open, -902, "HY", "000", "error in opening Write-ahead Log file during recovery")
-FB_IMPL_MSG(JRD, 165, bad_stmt_handle, -901, "26", "000", "invalid statement handle")
-FB_IMPL_MSG(JRD, 166, wal_failure, -902, "HY", "000", "Write-ahead log subsystem failure")
-FB_IMPL_MSG(JRD, 167, walw_err, -230, "HY", "000", "WAL Writer error")
-FB_IMPL_MSG(JRD, 168, logh_small, -231, "HY", "000", "Log file header of @1 too small")
-FB_IMPL_MSG(JRD, 169, logh_inv_version, -232, "HY", "000", "Invalid version of log file @1")
-FB_IMPL_MSG(JRD, 170, logh_open_flag, -233, "HY", "000", "Log file @1 not latest in the chain but open flag still set")
-FB_IMPL_MSG(JRD, 171, logh_open_flag2, -234, "HY", "000", "Log file @1 not closed properly; database recovery may be required")
-FB_IMPL_MSG(JRD, 172, logh_diff_dbname, -235, "HY", "000", "Database name in the log file @1 is different")
-FB_IMPL_MSG(JRD, 173, logf_unexpected_eof, -236, "HY", "000", "Unexpected end of log file @1 at offset @2")
-FB_IMPL_MSG(JRD, 174, logr_incomplete, -237, "HY", "000", "Incomplete log record at offset @1 in log file @2")
-FB_IMPL_MSG(JRD, 175, logr_header_small, -238, "HY", "000", "Log record header too small at offset @1 in log file @2")
-FB_IMPL_MSG(JRD, 176, logb_small, -239, "HY", "000", "Log block too small at offset @1 in log file @2")
-FB_IMPL_MSG(JRD, 177, wal_illegal_attach, -240, "HY", "000", "Illegal attempt to attach to an uninitialized WAL segment for @1")
-FB_IMPL_MSG(JRD, 178, wal_invalid_wpb, -241, "HY", "000", "Invalid WAL parameter block option @1")
-FB_IMPL_MSG(JRD, 179, wal_err_rollover, -242, "HY", "000", "Cannot roll over to the next log file @1")
-FB_IMPL_MSG(JRD, 180, no_wal, -243, "HY", "000", "database does not use Write-ahead Log")
-FB_IMPL_MSG(JRD, 181, drop_wal, -615, "HY", "000", "cannot drop log file when journaling is enabled")
-FB_IMPL_MSG(JRD, 182, stream_not_defined, -204, "HY", "000", "reference to invalid stream number")
-FB_IMPL_MSG(JRD, 183, wal_subsys_error, -244, "HY", "000", "WAL subsystem encountered error")
-FB_IMPL_MSG(JRD, 184, wal_subsys_corrupt, -245, "XX", "000", "WAL subsystem corrupted")
-FB_IMPL_MSG(JRD, 185, no_archive, -902, "HY", "000", "must specify archive file when enabling long term journal for databases with round-robin log files")
-FB_IMPL_MSG(JRD, 186, shutinprog, -902, "HY", "000", "database @1 shutdown in progress")
-FB_IMPL_MSG(JRD, 187, range_in_use, -615, "42", "000", "refresh range number @1 already in use")
-FB_IMPL_MSG(JRD, 188, range_not_found, -834, "42", "000", "refresh range number @1 not found")
-FB_IMPL_MSG(JRD, 189, charset_not_found, -204, "2C", "000", "CHARACTER SET @1 is not defined")
-FB_IMPL_MSG(JRD, 190, lock_timeout, -901, "40", "001", "lock time-out on wait transaction")
-FB_IMPL_MSG(JRD, 191, prcnotdef, -204, "42", "000", "procedure @1 is not defined")
-FB_IMPL_MSG(JRD, 192, prcmismat, -170, "07", "001", "Input parameter mismatch for procedure @1")
-FB_IMPL_MSG(JRD, 193, wal_bugcheck, -246, "XX", "000", "Database @1: WAL subsystem bug for pid @2\n@3")
-FB_IMPL_MSG(JRD, 194, wal_cant_expand, -247, "HY", "000", "Could not expand the WAL segment for database @1")
-FB_IMPL_MSG(JRD, 195, codnotdef, -204, "HY", "000", "status code @1 unknown")
-FB_IMPL_MSG(JRD, 196, xcpnotdef, -204, "HY", "000", "exception @1 not defined")
-FB_IMPL_MSG(JRD, 197, except, -836, "HY", "000", "exception @1")
-FB_IMPL_MSG(JRD, 198, cache_restart, -837, "HY", "013", "restart shared cache manager")
-FB_IMPL_MSG(JRD, 199, bad_lock_handle, -825, "HY", "000", "invalid lock handle")
-FB_IMPL_MSG(JRD, 200, jrn_present, -902, "HY", "000", "long-term journaling already enabled")
-FB_IMPL_MSG(JRD, 201, wal_err_rollover2, -248, "HY", "000", "Unable to roll over please see Firebird log.")
-FB_IMPL_MSG(JRD, 202, wal_err_logwrite, -249, "HY", "000", "WAL I/O error.  Please see Firebird log.")
-FB_IMPL_MSG(JRD, 203, wal_err_jrn_comm, -250, "HY", "000", "WAL writer - Journal server communication error.  Please see Firebird log.")
-FB_IMPL_MSG(JRD, 204, wal_err_expansion, -251, "HY", "000", "WAL buffers cannot be increased.  Please see Firebird log.")
-FB_IMPL_MSG(JRD, 205, wal_err_setup, -252, "HY", "000", "WAL setup error.  Please see Firebird log.")
-FB_IMPL_MSG(JRD, 206, wal_err_ww_sync, -253, "HY", "000", "obsolete")
-FB_IMPL_MSG(JRD, 207, wal_err_ww_start, -254, "HY", "000", "Cannot start WAL writer for the database @1")
-FB_IMPL_MSG(JRD, 208, shutdown, -902, "HY", "000", "database @1 shutdown")
-FB_IMPL_MSG(JRD, 209, existing_priv_mod, -553, "28", "000", "cannot modify an existing user privilege")
-FB_IMPL_MSG(JRD, 210, primary_key_ref, -616, "42", "000", "Cannot delete PRIMARY KEY being used in FOREIGN KEY definition.")
-FB_IMPL_MSG(JRD, 211, primary_key_notnull, -291, "42", "000", "Column used in a PRIMARY constraint must be NOT NULL.")
-FB_IMPL_MSG(JRD, 212, ref_cnstrnt_notfound, -204, "42", "000", "Name of Referential Constraint not defined in constraints table.")
-FB_IMPL_MSG(JRD, 213, foreign_key_notfound, -660, "42", "000", "Non-existent PRIMARY or UNIQUE KEY specified for FOREIGN KEY.")
-FB_IMPL_MSG(JRD, 214, ref_cnstrnt_update, -292, "42", "000", "Cannot update constraints (RDB$REF_CONSTRAINTS).")
-FB_IMPL_MSG(JRD, 215, check_cnstrnt_update, -293, "44", "000", "Cannot update constraints (RDB$CHECK_CONSTRAINTS).")
-FB_IMPL_MSG(JRD, 216, check_cnstrnt_del, -294, "44", "000", "Cannot delete CHECK constraint entry (RDB$CHECK_CONSTRAINTS)")
-FB_IMPL_MSG(JRD, 217, integ_index_seg_del, -618, "42", "000", "Cannot delete index segment used by an Integrity Constraint")
-FB_IMPL_MSG(JRD, 218, integ_index_seg_mod, -618, "42", "000", "Cannot update index segment used by an Integrity Constraint")
-FB_IMPL_MSG(JRD, 219, integ_index_del, -616, "42", "000", "Cannot delete index used by an Integrity Constraint")
-FB_IMPL_MSG(JRD, 220, integ_index_mod, -616, "42", "000", "Cannot modify index used by an Integrity Constraint")
-FB_IMPL_MSG(JRD, 221, check_trig_del, -616, "44", "000", "Cannot delete trigger used by a CHECK Constraint")
-FB_IMPL_MSG(JRD, 222, check_trig_update, -617, "44", "000", "Cannot update trigger used by a CHECK Constraint")
-FB_IMPL_MSG(JRD, 223, cnstrnt_fld_del, -616, "23", "000", "Cannot delete column being used in an Integrity Constraint.")
-FB_IMPL_MSG(JRD, 224, cnstrnt_fld_rename, -617, "23", "000", "Cannot rename column being used in an Integrity Constraint.")
-FB_IMPL_MSG(JRD, 225, rel_cnstrnt_update, -295, "42", "000", "Cannot update constraints (RDB$RELATION_CONSTRAINTS).")
-FB_IMPL_MSG(JRD, 226, constaint_on_view, -150, "42", "000", "Cannot define constraints on views")
-FB_IMPL_MSG(JRD, 227, invld_cnstrnt_type, -296, "42", "000", "internal Firebird consistency check (invalid RDB$CONSTRAINT_TYPE)")
-FB_IMPL_MSG(JRD, 228, primary_key_exists, -831, "42", "S11", "Attempt to define a second PRIMARY KEY for the same table")
-FB_IMPL_MSG(JRD, 229, systrig_update, -607, "HY", "000", "cannot modify or erase a system trigger")
-FB_IMPL_MSG(JRD, 230, not_rel_owner, -552, "28", "000", "only the owner of a table may reassign ownership")
-FB_IMPL_MSG(JRD, 231, grant_obj_notfound, -204, "01", "007", "could not find object for GRANT")
-FB_IMPL_MSG(JRD, 232, grant_fld_notfound, -205, "01", "007", "could not find column for GRANT")
-FB_IMPL_MSG(JRD, 233, grant_nopriv, -552, "01", "007", "user does not have GRANT privileges for operation")
-FB_IMPL_MSG(JRD, 234, nonsql_security_rel, -84, "28", "000", "object has non-SQL security class defined")
-FB_IMPL_MSG(JRD, 235, nonsql_security_fld, -84, "28", "000", "column has non-SQL security class defined")
-FB_IMPL_MSG(JRD, 236, wal_cache_err, -255, "HY", "000", "Write-ahead Log without shared cache configuration not allowed")
-FB_IMPL_MSG(JRD, 237, shutfail, -902, "HY", "000", "database shutdown unsuccessful")
-FB_IMPL_MSG(JRD, 238, check_constraint, -297, "23", "000", "Operation violates CHECK constraint @1 on view or table @2")
-FB_IMPL_MSG(JRD, 239, bad_svc_handle, -901, "HY", "000", "invalid service handle")
-FB_IMPL_MSG(JRD, 240, shutwarn, -838, "HY", "000", "database @1 shutdown in @2 seconds")
-FB_IMPL_MSG(JRD, 241, wrospbver, -901, "HY", "000", "wrong version of service parameter block")
-FB_IMPL_MSG(JRD, 242, bad_spb_form, -901, "42", "000", "unrecognized service parameter block")
-FB_IMPL_MSG(JRD, 243, svcnotdef, -901, "HY", "000", "service @1 is not defined")
-FB_IMPL_MSG(JRD, 244, no_jrn, -902, "HY", "000", "long-term journaling not enabled")
-FB_IMPL_MSG(JRD, 245, transliteration_failed, -314, "22", "018", "Cannot transliterate character between character sets")
-FB_IMPL_MSG(JRD, 246, start_cm_for_wal, -257, "HY", "000", "WAL defined; Cache Manager must be started first")
-FB_IMPL_MSG(JRD, 247, wal_ovflow_log_required, -258, "HY", "000", "Overflow log specification required for round-robin log")
-FB_IMPL_MSG(JRD, 248, text_subtype, -204, "42", "000", "Implementation of text subtype @1 not located.")
-FB_IMPL_MSG(JRD, 249, dsql_error, -902, "42", "000", "Dynamic SQL Error")
-FB_IMPL_MSG(JRD, 250, dsql_command_err, -104, "42", "000", "Invalid command")
-FB_IMPL_MSG(JRD, 251, dsql_constant_err, -103, "HY", "004", "Data type for constant unknown")
-FB_IMPL_MSG(JRD, 252, dsql_cursor_err, -504, "HY", "015", "Invalid cursor reference")
-FB_IMPL_MSG(JRD, 253, dsql_datatype_err, -204, "HY", "004", "Data type unknown")
-FB_IMPL_MSG(JRD, 254, dsql_decl_err, -502, "34", "000", "Invalid cursor declaration")
-FB_IMPL_MSG(JRD, 255, dsql_cursor_update_err, -510, "24", "000", "Cursor @1 is not updatable")
-FB_IMPL_MSG(JRD, 256, dsql_cursor_open_err, -502, "24", "000", "Attempt to reopen an open cursor")
-FB_IMPL_MSG(JRD, 257, dsql_cursor_close_err, -501, "24", "000", "Attempt to reclose a closed cursor")
-FB_IMPL_MSG(JRD, 258, dsql_field_err, -206, "42", "S22", "Column unknown")
-FB_IMPL_MSG(JRD, 259, dsql_internal_err, -104, "XX", "000", "Internal error")
-FB_IMPL_MSG(JRD, 260, dsql_relation_err, -204, "42", "S02", "Table unknown")
-FB_IMPL_MSG(JRD, 261, dsql_procedure_err, -204, "42", "000", "Procedure unknown")
-FB_IMPL_MSG(JRD, 262, dsql_request_err, -518, "42", "000", "Request unknown")
-FB_IMPL_MSG(JRD, 263, dsql_sqlda_err, -804, "07", "002", "SQLDA error")
-FB_IMPL_MSG(JRD, 264, dsql_var_count_err, -804, "21", "S01", "Count of read-write columns does not equal count of values")
-FB_IMPL_MSG(JRD, 265, dsql_stmt_handle, -826, "HY", "000", "Invalid statement handle")
-FB_IMPL_MSG(JRD, 266, dsql_function_err, -804, "39", "000", "Function unknown")
-FB_IMPL_MSG(JRD, 267, dsql_blob_err, -206, "42", "000", "Column is not a BLOB")
-FB_IMPL_MSG(JRD, 268, collation_not_found, -204, "22", "021", "COLLATION @1 for CHARACTER SET @2 is not defined")
-FB_IMPL_MSG(JRD, 269, collation_not_for_charset, -204, "22", "021", "COLLATION @1 is not valid for specified CHARACTER SET")
-FB_IMPL_MSG(JRD, 270, dsql_dup_option, -104, "42", "000", "Option specified more than once")
-FB_IMPL_MSG(JRD, 271, dsql_tran_err, -104, "25", "000", "Unknown transaction option")
-FB_IMPL_MSG(JRD, 272, dsql_invalid_array, -104, "HY", "000", "Invalid array reference")
-FB_IMPL_MSG(JRD, 273, dsql_max_arr_dim_exceeded, -604, "54", "000", "Array declared with too many dimensions")
-FB_IMPL_MSG(JRD, 274, dsql_arr_range_error, -604, "42", "000", "Illegal array dimension range")
-FB_IMPL_MSG(JRD, 275, dsql_trigger_err, -204, "HY", "000", "Trigger unknown")
-FB_IMPL_MSG(JRD, 276, dsql_subselect_err, -206, "42", "000", "Subselect illegal in this context")
-FB_IMPL_MSG(JRD, 277, dsql_crdb_prepare_err, -531, "42", "000", "Cannot prepare a CREATE DATABASE/SCHEMA statement")
-FB_IMPL_MSG(JRD, 278, specify_field_err, -157, "42", "000", "must specify column name for view select expression")
-FB_IMPL_MSG(JRD, 279, num_field_err, -158, "07", "002", "number of columns does not match select list")
-FB_IMPL_MSG(JRD, 280, col_name_err, -806, "42", "000", "Only simple column names permitted for VIEW WITH CHECK OPTION")
-FB_IMPL_MSG(JRD, 281, where_err, -807, "42", "000", "No WHERE clause for VIEW WITH CHECK OPTION")
-FB_IMPL_MSG(JRD, 282, table_view_err, -808, "42", "000", "Only one table allowed for VIEW WITH CHECK OPTION")
-FB_IMPL_MSG(JRD, 283, distinct_err, -809, "42", "000", "DISTINCT, GROUP or HAVING not permitted for VIEW WITH CHECK OPTION")
-FB_IMPL_MSG(JRD, 284, key_field_count_err, -832, "42", "000", "FOREIGN KEY column count does not match PRIMARY KEY")
-FB_IMPL_MSG(JRD, 285, subquery_err, -810, "42", "000", "No subqueries permitted for VIEW WITH CHECK OPTION")
-FB_IMPL_MSG(JRD, 286, expression_eval_err, -833, "42", "000", "expression evaluation not supported")
-FB_IMPL_MSG(JRD, 287, node_err, -599, "HY", "000", "gen.c: node not supported")
-FB_IMPL_MSG(JRD, 288, command_end_err, -104, "42", "000", "Unexpected end of command")
-FB_IMPL_MSG(JRD, 289, index_name, -901, "42", "000", "INDEX @1")
-FB_IMPL_MSG(JRD, 290, exception_name, -901, "22", "000", "EXCEPTION @1")
-FB_IMPL_MSG(JRD, 291, field_name, -901, "42", "000", "COLUMN @1")
-FB_IMPL_MSG(JRD, 292, token_err, -104, "42", "000", "Token unknown")
-FB_IMPL_MSG(JRD, 293, union_err, -901, "42", "000", "union not supported")
-FB_IMPL_MSG(JRD, 294, dsql_construct_err, -901, "42", "000", "Unsupported DSQL construct")
-FB_IMPL_MSG(JRD, 295, field_aggregate_err, -830, "42", "000", "column used with aggregate")
-FB_IMPL_MSG(JRD, 296, field_ref_err, -829, "42", "S22", "invalid column reference")
-FB_IMPL_MSG(JRD, 297, order_by_err, -208, "42", "000", "invalid ORDER BY clause")
-FB_IMPL_MSG(JRD, 298, return_mode_err, -171, "HY", "000", "Return mode by value not allowed for this data type")
-FB_IMPL_MSG(JRD, 299, extern_func_err, -170, "38", "000", "External functions cannot have more than 10 parameters")
-FB_IMPL_MSG(JRD, 300, alias_conflict_err, -204, "08", "001", "alias @1 conflicts with an alias in the same statement")
-FB_IMPL_MSG(JRD, 301, procedure_conflict_error, -204, "42", "000", "alias @1 conflicts with a procedure in the same statement")
-FB_IMPL_MSG(JRD, 302, relation_conflict_err, -204, "42", "000", "alias @1 conflicts with a table in the same statement")
-FB_IMPL_MSG(JRD, 303, dsql_domain_err, -901, "42", "000", "Illegal use of keyword VALUE")
-FB_IMPL_MSG(JRD, 304, idx_seg_err, -663, "42", "000", "segment count of 0 defined for index @1")
-FB_IMPL_MSG(JRD, 305, node_name_err, -599, "HY", "000", "A node name is not permitted in a secondary, shadow, cache or log file name")
-FB_IMPL_MSG(JRD, 306, table_name, -901, "00", "000", "TABLE @1")
-FB_IMPL_MSG(JRD, 307, proc_name, -901, "42", "000", "PROCEDURE @1")
-FB_IMPL_MSG(JRD, 308, idx_create_err, -660, "42", "000", "cannot create index @1")
-FB_IMPL_MSG(JRD, 309, wal_shadow_err, -259, "HY", "000", "Write-ahead Log with shadowing configuration not allowed")
-FB_IMPL_MSG(JRD, 310, dependency, -616, "42", "000", "there are @1 dependencies")
-FB_IMPL_MSG(JRD, 311, idx_key_err, -663, "54", "011", "too many keys defined for index @1")
-FB_IMPL_MSG(JRD, 312, dsql_file_length_err, -597, "42", "000", "Preceding file did not specify length, so @1 must include starting page number")
-FB_IMPL_MSG(JRD, 313, dsql_shadow_number_err, -598, "HY", "000", "Shadow number must be a positive integer")
-FB_IMPL_MSG(JRD, 314, dsql_token_unk_err, -104, "42", "000", "Token unknown - line @1, column @2")
-FB_IMPL_MSG(JRD, 315, dsql_no_relation_alias, -204, "42", "S02", "there is no alias or table named @1 at this scope level")
-FB_IMPL_MSG(JRD, 316, indexname, -204, "42", "000", "there is no index @1 for table @2")
-FB_IMPL_MSG(JRD, 317, no_stream_plan, -281, "HY", "000", "table or procedure @1 is not referenced in plan")
-FB_IMPL_MSG(JRD, 318, stream_twice, -282, "HY", "000", "table or procedure @1 is referenced more than once in plan; use aliases to distinguish")
-FB_IMPL_MSG(JRD, 319, stream_not_found, -283, "HY", "000", "table or procedure @1 is referenced in the plan but not the from list")
-FB_IMPL_MSG(JRD, 320, collation_requires_text, -204, "22", "021", "Invalid use of CHARACTER SET or COLLATE")
-FB_IMPL_MSG(JRD, 321, dsql_domain_not_found, -901, "42", "000", "Specified domain or source column @1 does not exist")
-FB_IMPL_MSG(JRD, 322, index_unused, -284, "42", "000", "index @1 cannot be used in the specified plan")
-FB_IMPL_MSG(JRD, 323, dsql_self_join, -282, "42", "000", "the table @1 is referenced twice; use aliases to differentiate")
-FB_IMPL_MSG(JRD, 324, stream_bof, -596, "HY", "109", "attempt to fetch before the first record in a record stream")
-FB_IMPL_MSG(JRD, 325, stream_crack, -595, "HY", "000", "the current position is on a crack")
-FB_IMPL_MSG(JRD, 326, db_or_file_exists, -601, "HY", "000", "database or file exists")
-FB_IMPL_MSG(JRD, 327, invalid_operator, -401, "42", "000", "invalid comparison operator for find operation")
-FB_IMPL_MSG(JRD, 328, conn_lost, -924, "HY", "000", "Connection lost to pipe server")
-FB_IMPL_MSG(JRD, 329, bad_checksum, -835, "42", "000", "bad checksum")
-FB_IMPL_MSG(JRD, 330, page_type_err, -689, "HY", "000", "wrong page type")
-FB_IMPL_MSG(JRD, 331, ext_readonly_err, -816, "42", "000", "Cannot insert because the file is readonly or is on a read only medium.")
-FB_IMPL_MSG(JRD, 332, sing_select_err, -811, "21", "000", "multiple rows in singleton select")
-FB_IMPL_MSG(JRD, 333, psw_attach, -902, "28", "000", "cannot attach to password database")
-FB_IMPL_MSG(JRD, 334, psw_start_trans, -902, "28", "000", "cannot start transaction for password database")
-FB_IMPL_MSG(JRD, 335, invalid_direction, -827, "42", "000", "invalid direction for find operation")
-FB_IMPL_MSG(JRD, 336, dsql_var_conflict, -901, "HY", "000", "variable @1 conflicts with parameter in same procedure")
-FB_IMPL_MSG(JRD, 337, dsql_no_blob_array, -607, "HY", "000", "Array/BLOB/DATE data types not allowed in arithmetic")
-FB_IMPL_MSG(JRD, 338, dsql_base_table, -155, "42", "000", "@1 is not a valid base table of the specified view")
-FB_IMPL_MSG(JRD, 339, duplicate_base_table, -282, "42", "000", "table or procedure @1 is referenced twice in view; use an alias to distinguish")
-FB_IMPL_MSG(JRD, 340, view_alias, -282, "42", "000", "view @1 has more than one base table; use aliases to distinguish")
-FB_IMPL_MSG(JRD, 341, index_root_page_full, -904, "54", "000", "cannot add index, index root page is full.")
-FB_IMPL_MSG(JRD, 342, dsql_blob_type_unknown, -204, "42", "000", "BLOB SUB_TYPE @1 is not defined")
-FB_IMPL_MSG(JRD, 343, req_max_clones_exceeded, -693, "54", "001", "Too many concurrent executions of the same request")
-FB_IMPL_MSG(JRD, 344, dsql_duplicate_spec, -637, "42", "000", "duplicate specification of @1 - not supported")
-FB_IMPL_MSG(JRD, 345, unique_key_violation, -803, "23", "000", "violation of PRIMARY or UNIQUE KEY constraint \"@1\" on table \"@2\"")
-FB_IMPL_MSG(JRD, 346, srvr_version_too_old, -901, "HY", "000", "server version too old to support all CREATE DATABASE options")
-FB_IMPL_MSG(JRD, 347, drdb_completed_with_errs, -909, "HY", "000", "drop database completed with errors")
-FB_IMPL_MSG(JRD, 348, dsql_procedure_use_err, -84, "42", "000", "procedure @1 does not return any values")
-FB_IMPL_MSG(JRD, 349, dsql_count_mismatch, -313, "07", "002", "count of column list and variable list do not match")
-FB_IMPL_MSG(JRD, 350, blob_idx_err, -685, "42", "000", "attempt to index BLOB column in index @1")
-FB_IMPL_MSG(JRD, 351, array_idx_err, -685, "42", "000", "attempt to index array column in index @1")
-FB_IMPL_MSG(JRD, 352, key_field_err, -663, "42", "000", "too few key columns found for index @1 (incorrect column name?)")
-FB_IMPL_MSG(JRD, 353, no_delete, -901, "HY", "000", "cannot delete")
-FB_IMPL_MSG(JRD, 354, del_last_field, -616, "42", "000", "last column in a table cannot be deleted")
-FB_IMPL_MSG(JRD, 355, sort_err, -901, "HY", "000", "sort error")
-FB_IMPL_MSG(JRD, 356, sort_mem_err, -904, "HY", "001", "sort error: not enough memory")
-FB_IMPL_MSG(JRD, 357, version_err, -841, "54", "000", "too many versions")
-FB_IMPL_MSG(JRD, 358, inval_key_posn, -828, "HY", "000", "invalid key position")
-FB_IMPL_MSG(JRD, 359, no_segments_err, -690, "HY", "000", "segments not allowed in expression index @1")
-FB_IMPL_MSG(JRD, 360, crrp_data_err, -600, "XX", "000", "sort error: corruption in data structure")
-FB_IMPL_MSG(JRD, 361, rec_size_err, -691, "54", "000", "new record size of @1 bytes is too big")
-FB_IMPL_MSG(JRD, 362, dsql_field_ref, -605, "42", "000", "Inappropriate self-reference of column")
-FB_IMPL_MSG(JRD, 363, req_depth_exceeded, -904, "54", "001", "request depth exceeded. (Recursive definition?)")
-FB_IMPL_MSG(JRD, 364, no_field_access, -694, "42", "S22", "cannot access column @1 in view @2")
-FB_IMPL_MSG(JRD, 365, no_dbkey, -162, "HY", "000", "dbkey not available for multi-table views")
-FB_IMPL_MSG(JRD, 366, jrn_format_err, -839, "HY", "000", "journal file wrong format")
-FB_IMPL_MSG(JRD, 367, jrn_file_full, -840, "HY", "000", "intermediate journal file full")
-FB_IMPL_MSG(JRD, 368, dsql_open_cursor_request, -519, "24", "000", "The prepare statement identifies a prepare statement with an open cursor")
-FB_IMPL_MSG(JRD, 369, ib_error, -999, "HY", "000", "Firebird error")
-FB_IMPL_MSG(JRD, 370, cache_redef, -260, "HY", "013", "Cache redefined")
-FB_IMPL_MSG(JRD, 371, cache_too_small, -239, "HY", "013", "Insufficient memory to allocate page buffer cache")
-FB_IMPL_MSG(JRD, 372, log_redef, -260, "HY", "000", "Log redefined")
-FB_IMPL_MSG(JRD, 373, log_too_small, -239, "HY", "000", "Log size too small")
-FB_IMPL_MSG(JRD, 374, partition_too_small, -239, "HY", "000", "Log partition size too small")
-FB_IMPL_MSG(JRD, 375, partition_not_supp, -261, "HY", "000", "Partitions not supported in series of log file specification")
-FB_IMPL_MSG(JRD, 376, log_length_spec, -261, "HY", "000", "Total length of a partitioned log must be specified")
-FB_IMPL_MSG(JRD, 377, precision_err, -842, "HY", "104", "Precision must be from 1 to 18")
-FB_IMPL_MSG(JRD, 378, scale_nogt, -842, "HY", "104", "Scale must be between zero and precision")
-FB_IMPL_MSG(JRD, 379, expec_short, -842, "22", "003", "Short integer expected")
-FB_IMPL_MSG(JRD, 380, expec_long, -842, "22", "003", "Long integer expected")
-FB_IMPL_MSG(JRD, 381, expec_ushort, -842, "22", "003", "Unsigned short integer expected")
-FB_IMPL_MSG(JRD, 382, escape_invalid, -105, "22", "025", "Invalid ESCAPE sequence")
-FB_IMPL_MSG(JRD, 383, svcnoexe, -901, "HY", "000", "service @1 does not have an associated executable")
-FB_IMPL_MSG(JRD, 384, net_lookup_err, -901, "08", "006", "Failed to locate host machine.")
-FB_IMPL_MSG(JRD, 385, service_unknown, -901, "HY", "000", "Undefined service @1/@2.")
-FB_IMPL_MSG(JRD, 386, host_unknown, -901, "08", "001", "The specified name was not found in the hosts file or Domain Name Services.")
-FB_IMPL_MSG(JRD, 387, grant_nopriv_on_base, -552, "01", "007", "user does not have GRANT privileges on base table/view for operation")
-FB_IMPL_MSG(JRD, 388, dyn_fld_ambiguous, -203, "42", "702", "Ambiguous column reference.")
-FB_IMPL_MSG(JRD, 389, dsql_agg_ref_err, -104, "42", "000", "Invalid aggregate reference")
-FB_IMPL_MSG(JRD, 390, complex_view, -282, "HY", "000", "navigational stream @1 references a view with more than one base table")
-FB_IMPL_MSG(JRD, 391, unprepared_stmt, -901, "HY", "007", "Attempt to execute an unprepared dynamic SQL statement.")
-FB_IMPL_MSG(JRD, 392, expec_positive, -842, "42", "000", "Positive value expected")
-FB_IMPL_MSG(JRD, 393, dsql_sqlda_value_err, -804, "HY", "000", "Incorrect values within SQLDA structure")
-FB_IMPL_MSG(JRD, 394, invalid_array_id, -104, "HY", "000", "invalid blob id")
-FB_IMPL_MSG(JRD, 395, extfile_uns_op, -816, "42", "000", "Operation not supported for EXTERNAL FILE table @1")
-FB_IMPL_MSG(JRD, 396, svc_in_use, -901, "HY", "000", "Service is currently busy: @1")
-FB_IMPL_MSG(JRD, 397, err_stack_limit, -902, "HY", "013", "stack size insufficent to execute current request")
-FB_IMPL_MSG(JRD, 398, invalid_key, -827, "42", "000", "Invalid key for find operation")
-FB_IMPL_MSG(JRD, 399, net_init_error, -901, "08", "006", "Error initializing the network software.")
-FB_IMPL_MSG(JRD, 400, loadlib_failure, -901, "HY", "000", "Unable to load required library @1.")
-FB_IMPL_MSG(JRD, 401, network_error, -902, "08", "006", "Unable to complete network request to host \"@1\".")
-FB_IMPL_MSG(JRD, 402, net_connect_err, -902, "08", "006", "Failed to establish a connection.")
-FB_IMPL_MSG(JRD, 403, net_connect_listen_err, -902, "08", "006", "Error while listening for an incoming connection.")
-FB_IMPL_MSG(JRD, 404, net_event_connect_err, -902, "08", "006", "Failed to establish a secondary connection for event processing.")
-FB_IMPL_MSG(JRD, 405, net_event_listen_err, -902, "08", "006", "Error while listening for an incoming event connection request.")
-FB_IMPL_MSG(JRD, 406, net_read_err, -902, "08", "006", "Error reading data from the connection.")
-FB_IMPL_MSG(JRD, 407, net_write_err, -902, "08", "006", "Error writing data to the connection.")
-FB_IMPL_MSG(JRD, 408, integ_index_deactivate, -616, "42", "000", "Cannot deactivate index used by an integrity constraint")
-FB_IMPL_MSG(JRD, 409, integ_deactivate_primary, -616, "42", "000", "Cannot deactivate index used by a PRIMARY/UNIQUE constraint")
-FB_IMPL_MSG(JRD, 410, cse_not_supported, -104, "HY", "000", "Client/Server Express not supported in this release")
-FB_IMPL_MSG(JRD, 411, tra_must_sweep, -901, "HY", "000", "")
-FB_IMPL_MSG(JRD, 412, unsupported_network_drive, -902, "HY", "000", "Access to databases on file servers is not supported.")
-FB_IMPL_MSG(JRD, 413, io_create_err, -902, "08", "001", "Error while trying to create file")
-FB_IMPL_MSG(JRD, 414, io_open_err, -902, "08", "001", "Error while trying to open file")
-FB_IMPL_MSG(JRD, 415, io_close_err, -902, "HY", "000", "Error while trying to close file")
-FB_IMPL_MSG(JRD, 416, io_read_err, -902, "HY", "000", "Error while trying to read from file")
-FB_IMPL_MSG(JRD, 417, io_write_err, -902, "HY", "000", "Error while trying to write to file")
-FB_IMPL_MSG(JRD, 418, io_delete_err, -902, "HY", "000", "Error while trying to delete file")
-FB_IMPL_MSG(JRD, 419, io_access_err, -902, "HY", "000", "Error while trying to access file")
-FB_IMPL_MSG(JRD, 420, udf_exception, -901, "38", "000", "A fatal exception occurred during the execution of a user defined function.")
-FB_IMPL_MSG(JRD, 421, lost_db_connection, -901, "08", "006", "connection lost to database")
-FB_IMPL_MSG(JRD, 422, no_write_user_priv, -901, "28", "000", "User cannot write to RDB$USER_PRIVILEGES")
-FB_IMPL_MSG(JRD, 423, token_too_long, -104, "42", "000", "token size exceeds limit")
-FB_IMPL_MSG(JRD, 424, max_att_exceeded, -906, "08", "001", "Maximum user count exceeded.  Contact your database administrator.")
-FB_IMPL_MSG(JRD, 425, login_same_as_role_name, -902, "28", "000", "Your login @1 is same as one of the SQL role name. Ask your database administrator to set up a valid Firebird login.")
-FB_IMPL_MSG(JRD, 426, reftable_requires_pk, -607, "42", "000", "\"REFERENCES table\" without \"(column)\" requires PRIMARY KEY on referenced table")
-FB_IMPL_MSG(JRD, 427, usrname_too_long, -85, "28", "000", "The username entered is too long.  Maximum length is 31 bytes.")
-FB_IMPL_MSG(JRD, 428, password_too_long, -85, "28", "000", "The password specified is too long.  Maximum length is 8 bytes.")
-FB_IMPL_MSG(JRD, 429, usrname_required, -85, "28", "000", "A username is required for this operation.")
-FB_IMPL_MSG(JRD, 430, password_required, -85, "28", "000", "A password is required for this operation")
-FB_IMPL_MSG(JRD, 431, bad_protocol, -85, "42", "000", "The network protocol specified is invalid")
-FB_IMPL_MSG(JRD, 432, dup_usrname_found, -85, "28", "000", "A duplicate user name was found in the security database")
-FB_IMPL_MSG(JRD, 433, usrname_not_found, -85, "28", "000", "The user name specified was not found in the security database")
-FB_IMPL_MSG(JRD, 434, error_adding_sec_record, -85, "28", "000", "An error occurred while attempting to add the user.")
-FB_IMPL_MSG(JRD, 435, error_modifying_sec_record, -85, "28", "000", "An error occurred while attempting to modify the user record.")
-FB_IMPL_MSG(JRD, 436, error_deleting_sec_record, -85, "28", "000", "An error occurred while attempting to delete the user record.")
-FB_IMPL_MSG(JRD, 437, error_updating_sec_db, -85, "28", "000", "An error occurred while updating the security database.")
-FB_IMPL_MSG(JRD, 438, sort_rec_size_err, -904, "HY", "000", "sort record size of @1 bytes is too big")
-FB_IMPL_MSG(JRD, 439, bad_default_value, -204, "42", "000", "can not define a not null column with NULL as default value")
-FB_IMPL_MSG(JRD, 440, invalid_clause, -204, "42", "000", "invalid clause --- '@1'")
-FB_IMPL_MSG(JRD, 441, too_many_handles, -904, "HY", "000", "too many open handles to database")
-FB_IMPL_MSG(JRD, 442, optimizer_blk_exc, -904, "HY", "000", "size of optimizer block exceeded")
-FB_IMPL_MSG(JRD, 443, invalid_string_constant, -104, "42", "000", "a string constant is delimited by double quotes")
-FB_IMPL_MSG(JRD, 444, transitional_date, -104, "HY", "000", "DATE must be changed to TIMESTAMP")
-FB_IMPL_MSG(JRD, 445, read_only_database, -817, "42", "000", "attempted update on read-only database")
-FB_IMPL_MSG(JRD, 446, must_be_dialect_2_and_up, -817, "HY", "000", "SQL dialect @1 is not supported in this database")
-FB_IMPL_MSG(JRD, 447, blob_filter_exception, -901, "HY", "000", "A fatal exception occurred during the execution of a blob filter.")
-FB_IMPL_MSG(JRD, 448, exception_access_violation, -901, "HY", "000", "Access violation.  The code attempted to access a virtual address without privilege to do so.")
-FB_IMPL_MSG(JRD, 449, exception_datatype_missalignment, -901, "22", "000", "Datatype misalignment.  The attempted to read or write a value that was not stored on a memory boundary.")
-FB_IMPL_MSG(JRD, 450, exception_array_bounds_exceeded, -901, "22", "000", "Array bounds exceeded.  The code attempted to access an array element that is out of bounds.")
-FB_IMPL_MSG(JRD, 451, exception_float_denormal_operand, -901, "22", "000", "Float denormal operand.  One of the floating-point operands is too small to represent a standard float value.")
-FB_IMPL_MSG(JRD, 452, exception_float_divide_by_zero, -901, "22", "012", "Floating-point divide by zero.  The code attempted to divide a floating-point value by zero.")
-FB_IMPL_MSG(JRD, 453, exception_float_inexact_result, -901, "22", "000", "Floating-point inexact result.  The result of a floating-point operation cannot be represented as a decimal fraction.")
-FB_IMPL_MSG(JRD, 454, exception_float_invalid_operand, -901, "22", "000", "Floating-point invalid operand.  An indeterminant error occurred during a floating-point operation.")
-FB_IMPL_MSG(JRD, 455, exception_float_overflow, -901, "22", "003", "Floating-point overflow.  The exponent of a floating-point operation is greater than the magnitude allowed.")
-FB_IMPL_MSG(JRD, 456, exception_float_stack_check, -901, "22", "000", "Floating-point stack check.  The stack overflowed or underflowed as the result of a floating-point operation.")
-FB_IMPL_MSG(JRD, 457, exception_float_underflow, -901, "22", "003", "Floating-point underflow.  The exponent of a floating-point operation is less than the magnitude allowed.")
-FB_IMPL_MSG(JRD, 458, exception_integer_divide_by_zero, -901, "22", "012", "Integer divide by zero.  The code attempted to divide an integer value by an integer divisor of zero.")
-FB_IMPL_MSG(JRD, 459, exception_integer_overflow, -901, "22", "003", "Integer overflow.  The result of an integer operation caused the most significant bit of the result to carry.")
-FB_IMPL_MSG(JRD, 460, exception_unknown, -901, "HY", "000", "An exception occurred that does not have a description.  Exception number @1.")
-FB_IMPL_MSG(JRD, 461, exception_stack_overflow, -901, "HY", "001", "Stack overflow.  The resource requirements of the runtime stack have exceeded the memory available to it.")
-FB_IMPL_MSG(JRD, 462, exception_sigsegv, -901, "HY", "000", "Segmentation Fault. The code attempted to access memory without privileges.")
-FB_IMPL_MSG(JRD, 463, exception_sigill, -901, "HY", "000", "Illegal Instruction. The Code attempted to perform an illegal operation.")
-FB_IMPL_MSG(JRD, 464, exception_sigbus, -901, "HY", "000", "Bus Error. The Code caused a system bus error.")
-FB_IMPL_MSG(JRD, 465, exception_sigfpe, -901, "HY", "000", "Floating Point Error. The Code caused an Arithmetic Exception or a floating point exception.")
-FB_IMPL_MSG(JRD, 466, ext_file_delete, -901, "42", "000", "Cannot delete rows from external files.")
-FB_IMPL_MSG(JRD, 467, ext_file_modify, -901, "42", "000", "Cannot update rows in external files.")
-FB_IMPL_MSG(JRD, 468, adm_task_denied, -901, "28", "000", "Unable to perform operation")
-FB_IMPL_MSG(JRD, 469, extract_input_mismatch, -105, "42", "000", "Specified EXTRACT part does not exist in input datatype")
-FB_IMPL_MSG(JRD, 470, insufficient_svc_privileges, -551, "28", "000", "Service @1 requires SYSDBA permissions.  Reattach to the Service Manager using the SYSDBA account.")
-FB_IMPL_MSG(JRD, 471, file_in_use, -902, "HY", "000", "The file @1 is currently in use by another process.  Try again later.")
-FB_IMPL_MSG(JRD, 472, service_att_err, -904, "HY", "000", "Cannot attach to services manager")
-FB_IMPL_MSG(JRD, 473, ddl_not_allowed_by_db_sql_dial, -817, "42", "000", "Metadata update statement is not allowed by the current database SQL dialect @1")
-FB_IMPL_MSG(JRD, 474, cancelled, -901, "HY", "008", "operation was cancelled")
-FB_IMPL_MSG(JRD, 475, unexp_spb_form, -902, "HY", "000", "unexpected item in service parameter block, expected @1")
-FB_IMPL_MSG(JRD, 476, sql_dialect_datatype_unsupport, -104, "HY", "000", "Client SQL dialect @1 does not support reference to @2 datatype")
-FB_IMPL_MSG(JRD, 477, svcnouser, -901, "HY", "000", "user name and password are required while attaching to the services manager")
-FB_IMPL_MSG(JRD, 478, depend_on_uncommitted_rel, -104, "42", "000", "You created an indirect dependency on uncommitted metadata. You must roll back the current transaction.")
-FB_IMPL_MSG(JRD, 479, svc_name_missing, -904, "HY", "000", "The service name was not specified.")
-FB_IMPL_MSG(JRD, 480, too_many_contexts, -204, "54", "001", "Too many Contexts of Relation/Procedure/Views. Maximum allowed is 256")
-FB_IMPL_MSG(JRD, 481, datype_notsup, -901, "22", "008", "data type not supported for arithmetic")
-FB_IMPL_MSG(JRD, 482, dialect_reset_warning, 501, "01", "000", "Database dialect being changed from 3 to 1")
-FB_IMPL_MSG(JRD, 483, dialect_not_changed, -901, "HY", "000", "Database dialect not changed.")
-FB_IMPL_MSG(JRD, 484, database_create_failed, -901, "HY", "000", "Unable to create database @1")
-FB_IMPL_MSG(JRD, 485, inv_dialect_specified, -901, "42", "000", "Database dialect @1 is not a valid dialect.")
-FB_IMPL_MSG(JRD, 486, valid_db_dialects, -901, "00", "000", "Valid database dialects are @1.")
-FB_IMPL_MSG(JRD, 487, sqlwarn, 300, "00", "000", "SQL warning code = @1")
-FB_IMPL_MSG(JRD, 488, dtype_renamed, 301, "HY", "000", "DATE data type is now called TIMESTAMP")
-FB_IMPL_MSG(JRD, 489, extern_func_dir_error, -902, "38", "000", "Function @1 is in @2, which is not in a permitted directory for external functions.")
-FB_IMPL_MSG(JRD, 490, date_range_exceeded, -833, "22", "008", "value exceeds the range for valid dates")
-FB_IMPL_MSG(JRD, 491, inv_client_dialect_specified, -901, "42", "000", "passed client dialect @1 is not a valid dialect.")
-FB_IMPL_MSG(JRD, 492, valid_client_dialects, -901, "00", "000", "Valid client dialects are @1.")
-FB_IMPL_MSG(JRD, 493, optimizer_between_err, -904, "HY", "004", "Unsupported field type specified in BETWEEN predicate.")
-FB_IMPL_MSG(JRD, 494, service_not_supported, -901, "HY", "000", "Services functionality will be supported in a later version  of the product")
-FB_IMPL_MSG(JRD, 495, generator_name, -607, "00", "000", "GENERATOR @1")
-FB_IMPL_MSG(JRD, 496, udf_name, -607, "38", "000", "Function @1")
-FB_IMPL_MSG(JRD, 497, bad_limit_param, -204, "HY", "000", "Invalid parameter to FETCH or FIRST. Only integers >= 0 are allowed.")
-FB_IMPL_MSG(JRD, 498, bad_skip_param, -204, "42", "000", "Invalid parameter to OFFSET or SKIP. Only integers >= 0 are allowed.")
-FB_IMPL_MSG(JRD, 499, io_32bit_exceeded_err, -902, "54", "000", "File exceeded maximum size of 2GB.  Add another database file or use a 64 bit I/O version of Firebird.")
-FB_IMPL_MSG(JRD, 500, invalid_savepoint, -901, "3B", "000", "Unable to find savepoint with name @1 in transaction context")
-FB_IMPL_MSG(JRD, 501, dsql_column_pos_err, -104, "42", "000", "Invalid column position used in the @1 clause")
-FB_IMPL_MSG(JRD, 502, dsql_agg_where_err, -104, "42", "000", "Cannot use an aggregate or window function in a WHERE clause, use HAVING (for aggregate only) instead")
-FB_IMPL_MSG(JRD, 503, dsql_agg_group_err, -104, "42", "000", "Cannot use an aggregate or window function in a GROUP BY clause")
-FB_IMPL_MSG(JRD, 504, dsql_agg_column_err, -104, "42", "000", "Invalid expression in the @1 (not contained in either an aggregate function or the GROUP BY clause)")
-FB_IMPL_MSG(JRD, 505, dsql_agg_having_err, -104, "42", "000", "Invalid expression in the @1 (neither an aggregate function nor a part of the GROUP BY clause)")
-FB_IMPL_MSG(JRD, 506, dsql_agg_nested_err, -104, "42", "000", "Nested aggregate and window functions are not allowed")
-FB_IMPL_MSG(JRD, 507, exec_sql_invalid_arg, -904, "42", "000", "Invalid argument in EXECUTE STATEMENT - cannot convert to string")
-FB_IMPL_MSG(JRD, 508, exec_sql_invalid_req, -904, "42", "000", "Wrong request type in EXECUTE STATEMENT '@1'")
-FB_IMPL_MSG(JRD, 509, exec_sql_invalid_var, -904, "42", "000", "Variable type (position @1) in EXECUTE STATEMENT '@2' INTO does not match returned column type")
-FB_IMPL_MSG(JRD, 510, exec_sql_max_call_exceeded, -904, "42", "000", "Too many recursion levels of EXECUTE STATEMENT")
-FB_IMPL_MSG(JRD, 511, conf_access_denied, -902, "28", "000", "Use of @1 at location @2 is not allowed by server configuration")
-FB_IMPL_MSG(JRD, 512, wrong_backup_state, -904, "HY", "000", "Cannot change difference file name while database is in backup mode")
-FB_IMPL_MSG(JRD, 513, wal_backup_err, -904, "HY", "000", "Physical backup is not allowed while Write-Ahead Log is in use")
-FB_IMPL_MSG(JRD, 514, cursor_not_open, -902, "24", "000", "Cursor is not open")
-FB_IMPL_MSG(JRD, 515, bad_shutdown_mode, -901, "08", "007", "Target shutdown mode is invalid for database \"@1\"")
-FB_IMPL_MSG(JRD, 516, concat_overflow, -802, "HY", "000", "Concatenation overflow. Resulting string cannot exceed 32765 bytes in length.")
-FB_IMPL_MSG(JRD, 517, bad_substring_offset, -204, "22", "011", "Invalid offset parameter @1 to SUBSTRING. Only positive integers are allowed.")
-FB_IMPL_MSG(JRD, 518, foreign_key_target_doesnt_exist, -530, "42", "000", "Foreign key reference target does not exist")
-FB_IMPL_MSG(JRD, 519, foreign_key_references_present, -530, "42", "000", "Foreign key references are present for the record")
-FB_IMPL_MSG(JRD, 520, no_update, -901, "HY", "000", "cannot update")
-FB_IMPL_MSG(JRD, 521, cursor_already_open, -902, "24", "000", "Cursor is already open")
-FB_IMPL_MSG(JRD, 522, stack_trace, -901, "00", "000", "@1")
-FB_IMPL_MSG(JRD, 523, ctx_var_not_found, -901, "HY", "000", "Context variable '@1' is not found in namespace '@2'")
-FB_IMPL_MSG(JRD, 524, ctx_namespace_invalid, -901, "HY", "000", "Invalid namespace name '@1' passed to @2")
-FB_IMPL_MSG(JRD, 525, ctx_too_big, -901, "54", "000", "Too many context variables")
-FB_IMPL_MSG(JRD, 526, ctx_bad_argument, -901, "HY", "000", "Invalid argument passed to @1")
-FB_IMPL_MSG(JRD, 527, identifier_too_long, -901, "42", "000", "BLR syntax error. Identifier @1... is too long")
-FB_IMPL_MSG(JRD, 528, except2, -836, "HY", "000", "exception @1")
-FB_IMPL_MSG(JRD, 529, malformed_string, -104, "22", "000", "Malformed string")
-FB_IMPL_MSG(JRD, 530, prc_out_param_mismatch, -170, "07", "002", "Output parameter mismatch for procedure @1")
-FB_IMPL_MSG(JRD, 531, command_end_err2, -104, "42", "000", "Unexpected end of command - line @1, column @2")
-FB_IMPL_MSG(JRD, 532, partner_idx_incompat_type, -904, "42", "000", "partner index segment no @1 has incompatible data type")
-FB_IMPL_MSG(JRD, 533, bad_substring_length, -204, "22", "011", "Invalid length parameter @1 to SUBSTRING. Negative integers are not allowed.")
-FB_IMPL_MSG(JRD, 534, charset_not_installed, -204, "2C", "000", "CHARACTER SET @1 is not installed")
-FB_IMPL_MSG(JRD, 535, collation_not_installed, -204, "22", "021", "COLLATION @1 for CHARACTER SET @2 is not installed")
-FB_IMPL_MSG(JRD, 536, att_shutdown, -902, "08", "003", "connection shutdown")
-FB_IMPL_MSG(JRD, 537, blobtoobig, -904, "54", "000", "Maximum BLOB size exceeded")
-FB_IMPL_MSG(JRD, 538, must_have_phys_field, -607, "42", "000", "Can't have relation with only computed fields or constraints")
-FB_IMPL_MSG(JRD, 539, invalid_time_precision, -901, "22", "007", "Time precision exceeds allowed range (0-@1)")
-FB_IMPL_MSG(JRD, 540, blob_convert_error, -413, "HY", "000", "Unsupported conversion to target type BLOB (subtype @1)")
-FB_IMPL_MSG(JRD, 541, array_convert_error, -413, "22", "000", "Unsupported conversion to target type ARRAY")
-FB_IMPL_MSG(JRD, 542, record_lock_not_supp, -904, "40", "001", "Stream does not support record locking")
-FB_IMPL_MSG(JRD, 543, partner_idx_not_found, -904, "42", "000", "Cannot create foreign key constraint @1. Partner index does not exist or is inactive.")
-FB_IMPL_MSG(JRD, 544, tra_num_exc, -904, "54", "000", "Transactions count exceeded. Perform backup and restore to make database operable again")
-FB_IMPL_MSG(JRD, 545, field_disappeared, -904, "42", "000", "Column has been unexpectedly deleted")
-FB_IMPL_MSG(JRD, 546, met_wrong_gtt_scope, -901, "HY", "000", "@1 cannot depend on @2")
-FB_IMPL_MSG(JRD, 547, subtype_for_internal_use, -204, "HY", "000", "Blob sub_types bigger than 1 (text) are for internal use only")
-FB_IMPL_MSG(JRD, 548, illegal_prc_type, -901, "42", "000", "Procedure @1 is not selectable (it does not contain a SUSPEND statement)")
-FB_IMPL_MSG(JRD, 549, invalid_sort_datatype, -901, "42", "000", "Datatype @1 is not supported for sorting operation")
-FB_IMPL_MSG(JRD, 550, collation_name, -901, "00", "000", "COLLATION @1")
-FB_IMPL_MSG(JRD, 551, domain_name, -901, "00", "000", "DOMAIN @1")
-FB_IMPL_MSG(JRD, 552, domnotdef, -219, "42", "000", "domain @1 is not defined")
-FB_IMPL_MSG(JRD, 553, array_max_dimensions, -171, "54", "000", "Array data type can use up to @1 dimensions")
-FB_IMPL_MSG(JRD, 554, max_db_per_trans_allowed, -901, "54", "000", "A multi database transaction cannot span more than @1 databases")
-FB_IMPL_MSG(JRD, 555, bad_debug_format, 0, "00", "000", "Bad debug info format")
-FB_IMPL_MSG(JRD, 556, bad_proc_BLR, -901, "2F", "000", "Error while parsing procedure @1's BLR")
-FB_IMPL_MSG(JRD, 557, key_too_big, -901, "54", "000", "index key too big")
-FB_IMPL_MSG(JRD, 558, concurrent_transaction, -904, "HY", "000", "concurrent transaction number is @1")
-FB_IMPL_MSG(JRD, 559, not_valid_for_var, -625, "42", "000", "validation error for variable @1, value \"@2\"")
-FB_IMPL_MSG(JRD, 560, not_valid_for, -625, "42", "000", "validation error for @1, value \"@2\"")
-FB_IMPL_MSG(JRD, 561, need_difference, -820, "HY", "000", "Difference file name should be set explicitly for database on raw device")
-FB_IMPL_MSG(JRD, 562, long_login, -902, "HY", "000", "Login name too long (@1 characters, maximum allowed @2)")
-FB_IMPL_MSG(JRD, 563, fldnotdef2, -205, "42", "S22", "column @1 is not defined in procedure @2")
-FB_IMPL_MSG(JRD, 564, invalid_similar_pattern, -105, "42", "000", "Invalid SIMILAR TO pattern")
-FB_IMPL_MSG(JRD, 565, bad_teb_form, -901, "HY", "000", "Invalid TEB format")
-FB_IMPL_MSG(JRD, 566, tpb_multiple_txn_isolation, -901, "HY", "000", "Found more than one transaction isolation in TPB")
-FB_IMPL_MSG(JRD, 567, tpb_reserv_before_table, -901, "HY", "000", "Table reservation lock type @1 requires table name before in TPB")
-FB_IMPL_MSG(JRD, 568, tpb_multiple_spec, -901, "HY", "000", "Found more than one @1 specification in TPB")
-FB_IMPL_MSG(JRD, 569, tpb_option_without_rc, -901, "HY", "000", "Option @1 requires READ COMMITTED isolation in TPB")
-FB_IMPL_MSG(JRD, 570, tpb_conflicting_options, -901, "HY", "000", "Option @1 is not valid if @2 was used previously in TPB")
-FB_IMPL_MSG(JRD, 571, tpb_reserv_missing_tlen, -901, "HY", "000", "Table name length missing after table reservation @1 in TPB")
-FB_IMPL_MSG(JRD, 572, tpb_reserv_long_tlen, -901, "HY", "000", "Table name length @1 is too long after table reservation @2 in TPB")
-FB_IMPL_MSG(JRD, 573, tpb_reserv_missing_tname, -901, "HY", "000", "Table name length @1 without table name after table reservation @2 in TPB")
-FB_IMPL_MSG(JRD, 574, tpb_reserv_corrup_tlen, -901, "HY", "000", "Table name length @1 goes beyond the remaining TPB size after table reservation @2")
-FB_IMPL_MSG(JRD, 575, tpb_reserv_null_tlen, -901, "HY", "000", "Table name length is zero after table reservation @1 in TPB")
-FB_IMPL_MSG(JRD, 576, tpb_reserv_relnotfound, -901, "HY", "000", "Table or view @1 not defined in system tables after table reservation @2 in TPB")
-FB_IMPL_MSG(JRD, 577, tpb_reserv_baserelnotfound, -901, "HY", "000", "Base table or view @1 for view @2 not defined in system tables after table reservation @3 in TPB")
-FB_IMPL_MSG(JRD, 578, tpb_missing_len, -901, "HY", "000", "Option length missing after option @1 in TPB")
-FB_IMPL_MSG(JRD, 579, tpb_missing_value, -901, "HY", "000", "Option length @1 without value after option @2 in TPB")
-FB_IMPL_MSG(JRD, 580, tpb_corrupt_len, -901, "HY", "000", "Option length @1 goes beyond the remaining TPB size after option @2")
-FB_IMPL_MSG(JRD, 581, tpb_null_len, -901, "HY", "000", "Option length is zero after table reservation @1 in TPB")
-FB_IMPL_MSG(JRD, 582, tpb_overflow_len, -901, "HY", "000", "Option length @1 exceeds the range for option @2 in TPB")
-FB_IMPL_MSG(JRD, 583, tpb_invalid_value, -901, "HY", "000", "Option value @1 is invalid for the option @2 in TPB")
-FB_IMPL_MSG(JRD, 584, tpb_reserv_stronger_wng, -901, "HY", "000", "Preserving previous table reservation @1 for table @2, stronger than new @3 in TPB")
-FB_IMPL_MSG(JRD, 585, tpb_reserv_stronger, -901, "HY", "000", "Table reservation @1 for table @2 already specified and is stronger than new @3 in TPB")
-FB_IMPL_MSG(JRD, 586, tpb_reserv_max_recursion, -901, "HY", "000", "Table reservation reached maximum recursion of @1 when expanding views in TPB")
-FB_IMPL_MSG(JRD, 587, tpb_reserv_virtualtbl, -901, "HY", "000", "Table reservation in TPB cannot be applied to @1 because it's a virtual table")
-FB_IMPL_MSG(JRD, 588, tpb_reserv_systbl, -901, "HY", "000", "Table reservation in TPB cannot be applied to @1 because it's a system table")
-FB_IMPL_MSG(JRD, 589, tpb_reserv_temptbl, -901, "HY", "000", "Table reservation @1 or @2 in TPB cannot be applied to @3 because it's a temporary table")
-FB_IMPL_MSG(JRD, 590, tpb_readtxn_after_writelock, -901, "HY", "000", "Cannot set the transaction in read only mode after a table reservation isc_tpb_lock_write in TPB")
-FB_IMPL_MSG(JRD, 591, tpb_writelock_after_readtxn, -901, "HY", "000", "Cannot take a table reservation isc_tpb_lock_write in TPB because the transaction is in read only mode")
-FB_IMPL_MSG(JRD, 592, time_range_exceeded, -833, "22", "008", "value exceeds the range for a valid time")
-FB_IMPL_MSG(JRD, 593, datetime_range_exceeded, -833, "22", "008", "value exceeds the range for valid timestamps")
-FB_IMPL_MSG(JRD, 594, string_truncation, -802, "22", "001", "string right truncation")
-FB_IMPL_MSG(JRD, 595, blob_truncation, -802, "22", "001", "blob truncation when converting to a string: length limit exceeded")
-FB_IMPL_MSG(JRD, 596, numeric_out_of_range, -802, "22", "003", "numeric value is out of range")
-FB_IMPL_MSG(JRD, 597, shutdown_timeout, -901, "HY", "T00", "Firebird shutdown is still in progress after the specified timeout")
-FB_IMPL_MSG(JRD, 598, att_handle_busy, -901, "HY", "010", "Attachment handle is busy")
-FB_IMPL_MSG(JRD, 599, bad_udf_freeit, -901, "39", "000", "Bad written UDF detected: pointer returned in FREE_IT function was not allocated by ib_util_malloc")
-FB_IMPL_MSG(JRD, 600, eds_provider_not_found, -901, "42", "000", "External Data Source provider '@1' not found")
-FB_IMPL_MSG(JRD, 601, eds_connection, -901, "42", "000", "Execute statement error at @1 :\n@2Data source : @3")
-FB_IMPL_MSG(JRD, 602, eds_preprocess, -901, "42", "000", "Execute statement preprocess SQL error")
-FB_IMPL_MSG(JRD, 603, eds_stmt_expected, -901, "42", "000", "Statement expected")
-FB_IMPL_MSG(JRD, 604, eds_prm_name_expected, -901, "42", "000", "Parameter name expected")
-FB_IMPL_MSG(JRD, 605, eds_unclosed_comment, -901, "42", "000", "Unclosed comment found near '@1'")
-FB_IMPL_MSG(JRD, 606, eds_statement, -901, "42", "000", "Execute statement error at @1 :\n@2Statement : @3\nData source : @4")
-FB_IMPL_MSG(JRD, 607, eds_input_prm_mismatch, -901, "42", "000", "Input parameters mismatch")
-FB_IMPL_MSG(JRD, 608, eds_output_prm_mismatch, -901, "42", "000", "Output parameters mismatch")
-FB_IMPL_MSG(JRD, 609, eds_input_prm_not_set, -901, "42", "000", "Input parameter '@1' have no value set")
-FB_IMPL_MSG(JRD, 610, too_big_blr, -104, "HY", "000", "BLR stream length @1 exceeds implementation limit @2")
-FB_IMPL_MSG(JRD, 611, montabexh, 0, "HY", "001", "Monitoring table space exhausted")
-FB_IMPL_MSG(JRD, 612, modnotfound, -172, "39", "000", "module name or entrypoint could not be found")
-FB_IMPL_MSG(JRD, 613, nothing_to_cancel, -901, "HY", "018", "nothing to cancel")
-FB_IMPL_MSG(JRD, 614, ibutil_not_loaded, -901, "39", "000", "ib_util library has not been loaded to deallocate memory returned by FREE_IT function")
-FB_IMPL_MSG(JRD, 615, circular_computed, -904, "42", "000", "Cannot have circular dependencies with computed fields")
-FB_IMPL_MSG(JRD, 616, psw_db_error, -902, "28", "000", "Security database error")
-FB_IMPL_MSG(JRD, 617, invalid_type_datetime_op, -833, "42", "000", "Invalid data type in DATE/TIME/TIMESTAMP addition or subtraction in add_datettime()")
-FB_IMPL_MSG(JRD, 618, onlycan_add_timetodate, -833, "42", "000", "Only a TIME value can be added to a DATE value")
-FB_IMPL_MSG(JRD, 619, onlycan_add_datetotime, -833, "42", "000", "Only a DATE value can be added to a TIME value")
-FB_IMPL_MSG(JRD, 620, onlycansub_tstampfromtstamp, -833, "42", "000", "TIMESTAMP values can be subtracted only from another TIMESTAMP value")
-FB_IMPL_MSG(JRD, 621, onlyoneop_mustbe_tstamp, -833, "42", "000", "Only one operand can be of type TIMESTAMP")
-FB_IMPL_MSG(JRD, 622, invalid_extractpart_time, -833, "42", "000", "Only HOUR, MINUTE, SECOND and MILLISECOND can be extracted from TIME values")
-FB_IMPL_MSG(JRD, 623, invalid_extractpart_date, -833, "42", "000", "HOUR, MINUTE, SECOND and MILLISECOND cannot be extracted from DATE values")
-FB_IMPL_MSG(JRD, 624, invalidarg_extract, -833, "42", "000", "Invalid argument for EXTRACT() not being of DATE/TIME/TIMESTAMP type")
-FB_IMPL_MSG(JRD, 625, sysf_argmustbe_exact, -833, "42", "000", "Arguments for @1 must be integral types or NUMERIC/DECIMAL without scale")
-FB_IMPL_MSG(JRD, 626, sysf_argmustbe_exact_or_fp, -833, "42", "000", "First argument for @1 must be integral type or floating point type")
-FB_IMPL_MSG(JRD, 627, sysf_argviolates_uuidtype, -833, "42", "000", "Human readable UUID argument for @1 must be of string type")
-FB_IMPL_MSG(JRD, 628, sysf_argviolates_uuidlen, -833, "42", "000", "Human readable UUID argument for @2 must be of exact length @1")
-FB_IMPL_MSG(JRD, 629, sysf_argviolates_uuidfmt, -833, "42", "000", "Human readable UUID argument for @3 must have \"-\" at position @2 instead of \"@1\"")
-FB_IMPL_MSG(JRD, 630, sysf_argviolates_guidigits, -833, "42", "000", "Human readable UUID argument for @3 must have hex digit at position @2 instead of \"@1\"")
-FB_IMPL_MSG(JRD, 631, sysf_invalid_addpart_time, -833, "42", "000", "Only HOUR, MINUTE, SECOND and MILLISECOND can be added to TIME values in @1")
-FB_IMPL_MSG(JRD, 632, sysf_invalid_add_datetime, -833, "42", "000", "Invalid data type in addition of part to DATE/TIME/TIMESTAMP in @1")
-FB_IMPL_MSG(JRD, 633, sysf_invalid_addpart_dtime, -833, "42", "000", "Invalid part @1 to be added to a DATE/TIME/TIMESTAMP value in @2")
-FB_IMPL_MSG(JRD, 634, sysf_invalid_add_dtime_rc, -833, "42", "000", "Expected DATE/TIME/TIMESTAMP type in evlDateAdd() result")
-FB_IMPL_MSG(JRD, 635, sysf_invalid_diff_dtime, -833, "42", "000", "Expected DATE/TIME/TIMESTAMP type as first and second argument to @1")
-FB_IMPL_MSG(JRD, 636, sysf_invalid_timediff, -833, "42", "000", "The result of TIME-<value> in @1 cannot be expressed in YEAR, MONTH, DAY or WEEK")
-FB_IMPL_MSG(JRD, 637, sysf_invalid_tstamptimediff, -833, "42", "000", "The result of TIME-TIMESTAMP or TIMESTAMP-TIME in @1 cannot be expressed in HOUR, MINUTE, SECOND or MILLISECOND")
-FB_IMPL_MSG(JRD, 638, sysf_invalid_datetimediff, -833, "42", "000", "The result of DATE-TIME or TIME-DATE in @1 cannot be expressed in HOUR, MINUTE, SECOND and MILLISECOND")
-FB_IMPL_MSG(JRD, 639, sysf_invalid_diffpart, -833, "42", "000", "Invalid part @1 to express the difference between two DATE/TIME/TIMESTAMP values in @2")
-FB_IMPL_MSG(JRD, 640, sysf_argmustbe_positive, -833, "42", "000", "Argument for @1 must be positive")
-FB_IMPL_MSG(JRD, 641, sysf_basemustbe_positive, -833, "42", "000", "Base for @1 must be positive")
-FB_IMPL_MSG(JRD, 642, sysf_argnmustbe_nonneg, -833, "42", "000", "Argument #@1 for @2 must be zero or positive")
-FB_IMPL_MSG(JRD, 643, sysf_argnmustbe_positive, -833, "42", "000", "Argument #@1 for @2 must be positive")
-FB_IMPL_MSG(JRD, 644, sysf_invalid_zeropowneg, -833, "42", "000", "Base for @1 cannot be zero if exponent is negative")
-FB_IMPL_MSG(JRD, 645, sysf_invalid_negpowfp, -833, "42", "000", "Base for @1 cannot be negative if exponent is not an integral value")
-FB_IMPL_MSG(JRD, 646, sysf_invalid_scale, -833, "42", "000", "The numeric scale must be between -128 and 127 in @1")
-FB_IMPL_MSG(JRD, 647, sysf_argmustbe_nonneg, -833, "42", "000", "Argument for @1 must be zero or positive")
-FB_IMPL_MSG(JRD, 648, sysf_binuuid_mustbe_str, -833, "42", "000", "Binary UUID argument for @1 must be of string type")
-FB_IMPL_MSG(JRD, 649, sysf_binuuid_wrongsize, -833, "42", "000", "Binary UUID argument for @2 must use @1 bytes")
-FB_IMPL_MSG(JRD, 650, missing_required_spb, -902, "HY", "000", "Missing required item @1 in service parameter block")
-FB_IMPL_MSG(JRD, 651, net_server_shutdown, -902, "08", "006", "@1 server is shutdown")
-FB_IMPL_MSG(JRD, 652, bad_conn_str, -924, "08", "001", "Invalid connection string")
-FB_IMPL_MSG(JRD, 653, bad_epb_form, -901, "HY", "000", "Unrecognized events block")
-FB_IMPL_MSG(JRD, 654, no_threads, -902, "08", "004", "Could not start first worker thread - shutdown server")
-FB_IMPL_MSG(JRD, 655, net_event_connect_timeout, -902, "08", "006", "Timeout occurred while waiting for a secondary connection for event processing")
-FB_IMPL_MSG(JRD, 656, sysf_argmustbe_nonzero, -833, "42", "000", "Argument for @1 must be different than zero")
-FB_IMPL_MSG(JRD, 657, sysf_argmustbe_range_inc1_1, -833, "42", "000", "Argument for @1 must be in the range [-1, 1]")
-FB_IMPL_MSG(JRD, 658, sysf_argmustbe_gteq_one, -833, "42", "000", "Argument for @1 must be greater or equal than one")
-FB_IMPL_MSG(JRD, 659, sysf_argmustbe_range_exc1_1, -833, "42", "000", "Argument for @1 must be in the range ]-1, 1[")
-FB_IMPL_MSG(JRD, 660, internal_rejected_params, -104, "HY", "000", "Incorrect parameters provided to internal function @1")
-FB_IMPL_MSG(JRD, 661, sysf_fp_overflow, -833, "42", "000", "Floating point overflow in built-in function @1")
-FB_IMPL_MSG(JRD, 662, udf_fp_overflow, -901, "39", "000", "Floating point overflow in result from UDF @1")
-FB_IMPL_MSG(JRD, 663, udf_fp_nan, -901, "39", "000", "Invalid floating point value returned by UDF @1")
-FB_IMPL_MSG(JRD, 664, instance_conflict, -902, "42", "000", "Shared memory area is probably already created by another engine instance in another Windows session")
-FB_IMPL_MSG(JRD, 665, out_of_temp_space, -901, "HY", "000", "No free space found in temporary directories")
-FB_IMPL_MSG(JRD, 666, eds_expl_tran_ctrl, -901, "42", "000", "Explicit transaction control is not allowed")
-FB_IMPL_MSG(JRD, 667, no_trusted_spb, -902, "28", "000", "Use of TRUSTED switches in spb_command_line is prohibited")
-FB_IMPL_MSG(JRD, 668, package_name, -901, "42", "000", "PACKAGE @1")
-FB_IMPL_MSG(JRD, 669, cannot_make_not_null, -901, "22", "006", "Cannot make field @1 of table @2 NOT NULL because there are NULLs present")
-FB_IMPL_MSG(JRD, 670, feature_removed, -901, "0A", "000", "Feature @1 is not supported anymore")
-FB_IMPL_MSG(JRD, 671, view_name, -901, "00", "000", "VIEW @1")
-FB_IMPL_MSG(JRD, 672, lock_dir_access, -904, "08", "006", "Can not access lock files directory @1")
-FB_IMPL_MSG(JRD, 673, invalid_fetch_option, -901, "HY", "106", "Fetch option @1 is invalid for a non-scrollable cursor")
-FB_IMPL_MSG(JRD, 674, bad_fun_BLR, -901, "2F", "000", "Error while parsing function @1's BLR")
-FB_IMPL_MSG(JRD, 675, func_pack_not_implemented, -901, "2F", "000", "Cannot execute function @1 of the unimplemented package @2")
-FB_IMPL_MSG(JRD, 676, proc_pack_not_implemented, -901, "2F", "000", "Cannot execute procedure @1 of the unimplemented package @2")
-FB_IMPL_MSG(JRD, 677, eem_func_not_returned, -901, "39", "000", "External function @1 not returned by the external engine plugin @2")
-FB_IMPL_MSG(JRD, 678, eem_proc_not_returned, -901, "39", "000", "External procedure @1 not returned by the external engine plugin @2")
-FB_IMPL_MSG(JRD, 679, eem_trig_not_returned, -901, "39", "000", "External trigger @1 not returned by the external engine plugin @2")
-FB_IMPL_MSG(JRD, 680, eem_bad_plugin_ver, -901, "39", "000", "Incompatible plugin version @1 for external engine @2")
-FB_IMPL_MSG(JRD, 681, eem_engine_notfound, -901, "39", "000", "External engine @1 not found")
-FB_IMPL_MSG(JRD, 682, attachment_in_use, -532, "08", "002", "Attachment is in use")
-FB_IMPL_MSG(JRD, 683, transaction_in_use, -532, "25", "S02", "Transaction is in use")
-FB_IMPL_MSG(JRD, 684, pman_cannot_load_plugin, -901, "39", "000", "Error loading plugin @1")
-FB_IMPL_MSG(JRD, 685, pman_module_notfound, -901, "00", "000", "Loadable module @1 not found")
-FB_IMPL_MSG(JRD, 686, pman_entrypoint_notfound, -901, "00", "000", "Standard plugin entrypoint does not exist in module @1")
-FB_IMPL_MSG(JRD, 687, pman_module_bad, -901, "00", "000", "Module @1 exists but can not be loaded")
-FB_IMPL_MSG(JRD, 688, pman_plugin_notfound, -901, "00", "000", "Module @1 does not contain plugin @2 type @3")
-FB_IMPL_MSG(JRD, 689, sysf_invalid_trig_namespace, -833, "42", "000", "Invalid usage of context namespace DDL_TRIGGER")
-FB_IMPL_MSG(JRD, 690, unexpected_null, -901, "22", "002", "Value is NULL but isNull parameter was not informed")
-FB_IMPL_MSG(JRD, 691, type_notcompat_blob, -901, "22", "00G", "Type @1 is incompatible with BLOB")
-FB_IMPL_MSG(JRD, 692, invalid_date_val, -901, "22", "003", "Invalid date")
-FB_IMPL_MSG(JRD, 693, invalid_time_val, -901, "22", "003", "Invalid time")
-FB_IMPL_MSG(JRD, 694, invalid_timestamp_val, -901, "22", "003", "Invalid timestamp")
-FB_IMPL_MSG(JRD, 695, invalid_index_val, -901, "22", "003", "Invalid index @1 in function @2")
-FB_IMPL_MSG(JRD, 696, formatted_exception, -836, "00", "000", "@1")
-FB_IMPL_MSG(JRD, 697, async_active, -532, "HY", "018", "Asynchronous call is already running for this attachment")
-FB_IMPL_MSG(JRD, 698, private_function, -901, "42", "000", "Function @1 is private to package @2")
-FB_IMPL_MSG(JRD, 699, private_procedure, -901, "42", "000", "Procedure @1 is private to package @2")
-FB_IMPL_MSG(JRD, 700, request_outdated, -904, "24", "000", "Request can't access new records in relation @1 and should be recompiled")
-FB_IMPL_MSG(JRD, 701, bad_events_handle, -901, "08", "003", "invalid events id (handle)")
-FB_IMPL_MSG(JRD, 702, cannot_copy_stmt, -104, "XX", "000", "Cannot copy statement @1")
-FB_IMPL_MSG(JRD, 703, invalid_boolean_usage, -104, "22", "000", "Invalid usage of boolean expression")
-FB_IMPL_MSG(JRD, 704, sysf_argscant_both_be_zero, -833, "42", "000", "Arguments for @1 cannot both be zero")
-FB_IMPL_MSG(JRD, 705, spb_no_id, -901, "HY", "000", "missing service ID in spb")
-FB_IMPL_MSG(JRD, 706, ee_blr_mismatch_null, -901, "42", "000", "External BLR message mismatch: invalid null descriptor at field @1")
-FB_IMPL_MSG(JRD, 707, ee_blr_mismatch_length, -901, "42", "000", "External BLR message mismatch: length = @1, expected @2")
-FB_IMPL_MSG(JRD, 708, ss_out_of_bounds, -406, "42", "000", "Subscript @1 out of bounds [@2, @3]")
-FB_IMPL_MSG(JRD, 709, missing_data_structures, -902, "28", "000", "Install incomplete. To complete security database initialization please CREATE USER. For details read doc/README.security_database.txt.")
-FB_IMPL_MSG(JRD, 710, protect_sys_tab, -902, "42", "000", "@1 operation is not allowed for system table @2")
-FB_IMPL_MSG(JRD, 711, libtommath_generic, -901, "2F", "000", "Libtommath error code @1 in function @2")
-FB_IMPL_MSG(JRD, 712, wroblrver2, -902, "HY", "000", "unsupported BLR version (expected between @1 and @2, encountered @3)")
-FB_IMPL_MSG(JRD, 713, trunc_limits, -551, "28", "000", "expected length @1, actual @2")
-FB_IMPL_MSG(JRD, 714, info_access, -551, "28", "000", "Wrong info requested in isc_svc_query() for anonymous service")
-FB_IMPL_MSG(JRD, 715, svc_no_stdin, -104, "HY", "024", "No isc_info_svc_stdin in user request, but service thread requested stdin data")
-FB_IMPL_MSG(JRD, 716, svc_start_failed, -551, "28", "000", "Start request for anonymous service is impossible")
-FB_IMPL_MSG(JRD, 717, svc_no_switches, -104, "HY", "024", "All services except for getting server log require switches")
-FB_IMPL_MSG(JRD, 718, svc_bad_size, -104, "HY", "109", "Size of stdin data is more than was requested from client")
-FB_IMPL_MSG(JRD, 719, no_crypt_plugin, -104, "HY", "024", "Crypt plugin @1 failed to load")
-FB_IMPL_MSG(JRD, 720, cp_name_too_long, -104, "22", "001", "Length of crypt plugin name should not exceed @1 bytes")
-FB_IMPL_MSG(JRD, 721, cp_process_active, -901, "42", "818", "Crypt failed - already crypting database")
-FB_IMPL_MSG(JRD, 722, cp_already_crypted, -901, "42", "818", "Crypt failed - database is already in requested state")
-FB_IMPL_MSG(JRD, 723, decrypt_error, -902, "XX", "000", "Missing crypt plugin, but page appears encrypted")
-FB_IMPL_MSG(JRD, 724, no_providers, -902, "39", "000", "No providers loaded")
-FB_IMPL_MSG(JRD, 725, null_spb, -104, "42", "818", "NULL data with non-zero SPB length")
-FB_IMPL_MSG(JRD, 726, max_args_exceeded, -833, "42", "000", "Maximum (@1) number of arguments exceeded for function @2")
-FB_IMPL_MSG(JRD, 727, ee_blr_mismatch_names_count, -901, "42", "000", "External BLR message mismatch: names count = @1, blr count = @2")
-FB_IMPL_MSG(JRD, 728, ee_blr_mismatch_name_not_found, -901, "42", "000", "External BLR message mismatch: name @1 not found")
-FB_IMPL_MSG(JRD, 729, bad_result_set, -901, "26", "000", "Invalid resultset interface")
-FB_IMPL_MSG(JRD, 730, wrong_message_length, -804, "07", "000", "Message length passed from user application does not match set of columns")
-FB_IMPL_MSG(JRD, 731, no_output_format, -804, "07", "000", "Resultset is missing output format information")
-FB_IMPL_MSG(JRD, 732, item_finish, -804, "HY", "021", "Message metadata not ready - item @1 is not finished")
-FB_IMPL_MSG(JRD, 733, miss_config, -902, "XX", "000", "Missing configuration file: @1")
-FB_IMPL_MSG(JRD, 734, conf_line, -902, "XX", "000", "@1: illegal line <@2>")
-FB_IMPL_MSG(JRD, 735, conf_include, -902, "XX", "000", "Invalid include operator in @1 for <@2>")
-FB_IMPL_MSG(JRD, 736, include_depth, -902, "XX", "000", "Include depth too big")
-FB_IMPL_MSG(JRD, 737, include_miss, -902, "XX", "000", "File to include not found")
-FB_IMPL_MSG(JRD, 738, protect_ownership, -552, "28", "000", "Only the owner can change the ownership")
-FB_IMPL_MSG(JRD, 739, badvarnum, -901, "HY", "000", "undefined variable number")
-FB_IMPL_MSG(JRD, 740, sec_context, -902, "28", "000", "Missing security context for @1")
-FB_IMPL_MSG(JRD, 741, multi_segment, -902, "28", "000", "Missing segment @1 in multisegment connect block parameter")
-FB_IMPL_MSG(JRD, 742, login_changed, -902, "28", "000", "Different logins in connect and attach packets - client library error")
-FB_IMPL_MSG(JRD, 743, auth_handshake_limit, -902, "28", "000", "Exceeded exchange limit during authentication handshake")
-FB_IMPL_MSG(JRD, 744, wirecrypt_incompatible, -902, "28", "000", "Incompatible wire encryption levels requested on client and server")
-FB_IMPL_MSG(JRD, 745, miss_wirecrypt, -902, "28", "000", "Client attempted to attach unencrypted but wire encryption is required")
-FB_IMPL_MSG(JRD, 746, wirecrypt_key, -902, "28", "000", "Client attempted to start wire encryption using unknown key @1")
-FB_IMPL_MSG(JRD, 747, wirecrypt_plugin, -902, "28", "000", "Client attempted to start wire encryption using unsupported plugin @1")
-FB_IMPL_MSG(JRD, 748, secdb_name, -902, "28", "000", "Error getting security database name from configuration file")
-FB_IMPL_MSG(JRD, 749, auth_data, -902, "28", "000", "Client authentication plugin is missing required data from server")
-FB_IMPL_MSG(JRD, 750, auth_datalength, -902, "28", "000", "Client authentication plugin expected @2 bytes of @3 from server, got @1")
-FB_IMPL_MSG(JRD, 751, info_unprepared_stmt, -901, "HY", "007", "Attempt to get information about an unprepared dynamic SQL statement.")
-FB_IMPL_MSG(JRD, 752, idx_key_value, -901, "HY", "007", "Problematic key value is @1")
-FB_IMPL_MSG(JRD, 753, forupdate_virtualtbl, -901, "HY", "000", "Cannot select virtual table @1 for update WITH LOCK")
-FB_IMPL_MSG(JRD, 754, forupdate_systbl, -901, "HY", "000", "Cannot select system table @1 for update WITH LOCK")
-FB_IMPL_MSG(JRD, 755, forupdate_temptbl, -901, "HY", "000", "Cannot select temporary table @1 for update WITH LOCK")
-FB_IMPL_MSG(JRD, 756, cant_modify_sysobj, -901, "42", "000", "System @1 @2 cannot be modified")
-FB_IMPL_MSG(JRD, 757, server_misconfigured, -901, "08", "004", "Server misconfigured - contact administrator please")
-FB_IMPL_MSG(JRD, 758, alter_role, -901, "0A", "000", "Deprecated backward compatibility ALTER ROLE ... SET/DROP AUTO ADMIN mapping may be used only for RDB$ADMIN role")
-FB_IMPL_MSG(JRD, 759, map_already_exists, -901, "42", "S01", "Mapping @1 already exists")
-FB_IMPL_MSG(JRD, 760, map_not_exists, -901, "42", "S02", "Mapping @1 does not exist")
-FB_IMPL_MSG(JRD, 761, map_load, -901, "08", "004", "@1 failed when loading mapping cache")
-FB_IMPL_MSG(JRD, 762, map_aster, -901, "08", "004", "Invalid name <*> in authentication block")
-FB_IMPL_MSG(JRD, 763, map_multi, -901, "08", "004", "Multiple maps found for @1")
-FB_IMPL_MSG(JRD, 764, map_undefined, -901, "08", "004", "Undefined mapping result - more than one different results found")
-FB_IMPL_MSG(JRD, 765, baddpb_damaged_mode, -924, "HY", "000", "Incompatible mode of attachment to damaged database")
-FB_IMPL_MSG(JRD, 766, baddpb_buffers_range, -924, "HY", "000", "Attempt to set in database number of buffers which is out of acceptable range [@1:@2]")
-FB_IMPL_MSG(JRD, 767, baddpb_temp_buffers, -924, "HY", "000", "Attempt to temporarily set number of buffers less than @1")
-FB_IMPL_MSG(JRD, 768, map_nodb, -901, "0A", "000", "Global mapping is not available when database @1 is not present")
-FB_IMPL_MSG(JRD, 769, map_notable, -901, "0A", "000", "Global mapping is not available when table RDB$MAP is not present in database @1")
-FB_IMPL_MSG(JRD, 770, miss_trusted_role, -901, "0P", "000", "Your attachment has no trusted role")
-FB_IMPL_MSG(JRD, 771, set_invalid_role, -901, "0P", "000", "Role @1 is invalid or unavailable")
-FB_IMPL_MSG(JRD, 772, cursor_not_positioned, -596, "HY", "109", "Cursor @1 is not positioned in a valid record")
-FB_IMPL_MSG(JRD, 773, dup_attribute, -901, "42", "702", "Duplicated user attribute @1")
-FB_IMPL_MSG(JRD, 774, dyn_no_priv, -901, "42", "000", "There is no privilege for this operation")
-FB_IMPL_MSG(JRD, 775, dsql_cant_grant_option, -901, "42", "000", "Using GRANT OPTION on @1 not allowed")
-FB_IMPL_MSG(JRD, 776, read_conflict, -904, "40", "001", "read conflicts with concurrent update")
-FB_IMPL_MSG(JRD, 777, crdb_load, -901, "08", "004", "@1 failed when working with CREATE DATABASE grants")
-FB_IMPL_MSG(JRD, 778, crdb_nodb, -901, "0A", "000", "CREATE DATABASE grants check is not possible when database @1 is not present")
-FB_IMPL_MSG(JRD, 779, crdb_notable, -901, "0A", "000", "CREATE DATABASE grants check is not possible when table RDB$DB_CREATORS is not present in database @1")
-FB_IMPL_MSG(JRD, 780, interface_version_too_old, -804, "HY", "000", "Interface @3 version too old: expected @1, found @2")
-FB_IMPL_MSG(JRD, 781, fun_param_mismatch, -170, "07", "001", "Input parameter mismatch for function @1")
-FB_IMPL_MSG(JRD, 782, savepoint_backout_err, -901, "HY", "000", "Error during savepoint backout - transaction invalidated")
-FB_IMPL_MSG(JRD, 783, domain_primary_key_notnull, -291, "42", "000", "Domain used in the PRIMARY KEY constraint of table @1 must be NOT NULL")
-FB_IMPL_MSG(JRD, 784, invalid_attachment_charset, -204, "2C", "000", "CHARACTER SET @1 cannot be used as a attachment character set")
-FB_IMPL_MSG(JRD, 785, map_down, -901, "08", "004", "Some database(s) were shutdown when trying to read mapping data")
-FB_IMPL_MSG(JRD, 786, login_error, -902, "08", "006", "Error occurred during login, please check server firebird.log for details")
-FB_IMPL_MSG(JRD, 787, already_opened, -902, "08", "006", "Database already opened with engine instance, incompatible with current")
-FB_IMPL_MSG(JRD, 788, bad_crypt_key, -902, "08", "006", "Invalid crypt key @1")
-FB_IMPL_MSG(JRD, 789, encrypt_error, -901, "XX", "000", "Page requires encryption but crypt plugin is missing")
-FB_IMPL_MSG(JRD, 790, max_idx_depth, -904, "54", "000", "Maximum index depth (@1 levels) is reached")
-FB_IMPL_MSG(JRD, 791, wrong_prvlg, -901, "0A", "000", "System privilege @1 does not exist")
-FB_IMPL_MSG(JRD, 792, miss_prvlg, -902, "28", "000", "System privilege @1 is missing")
-FB_IMPL_MSG(JRD, 793, crypt_checksum, -902, "XX", "000", "Invalid or missing checksum of encrypted database")
-FB_IMPL_MSG(JRD, 794, not_dba, -902, "28", "000", "You must have SYSDBA rights at this server")
-FB_IMPL_MSG(JRD, 795, no_cursor, -901, "07", "005", "Cannot open cursor for non-SELECT statement")
-FB_IMPL_MSG(JRD, 796, dsql_window_incompat_frames, -104, "42", "000", "If <window frame bound 1> specifies @1, then <window frame bound 2> shall not specify @2")
-FB_IMPL_MSG(JRD, 797, dsql_window_range_multi_key, -104, "42", "000", "RANGE based window with <expr> {PRECEDING | FOLLOWING} cannot have ORDER BY with more than one value")
-FB_IMPL_MSG(JRD, 798, dsql_window_range_inv_key_type, -104, "42", "000", "RANGE based window with <offset> PRECEDING/FOLLOWING must have a single ORDER BY key of numerical, date, time or timestamp types")
-FB_IMPL_MSG(JRD, 799, dsql_window_frame_value_inv_type, -104, "42", "000", "Window RANGE/ROWS PRECEDING/FOLLOWING value must be of a numerical type")
-FB_IMPL_MSG(JRD, 800, window_frame_value_invalid, -833, "42", "000", "Invalid PRECEDING or FOLLOWING offset in window function: cannot be negative")
-FB_IMPL_MSG(JRD, 801, dsql_window_not_found, -833, "42", "000", "Window @1 not found")
-FB_IMPL_MSG(JRD, 802, dsql_window_cant_overr_part, -833, "42", "000", "Cannot use PARTITION BY clause while overriding the window @1")
-FB_IMPL_MSG(JRD, 803, dsql_window_cant_overr_order, -833, "42", "000", "Cannot use ORDER BY clause while overriding the window @1 which already has an ORDER BY clause")
-FB_IMPL_MSG(JRD, 804, dsql_window_cant_overr_frame, -833, "42", "000", "Cannot override the window @1 because it has a frame clause. Tip: it can be used without parenthesis in OVER")
-FB_IMPL_MSG(JRD, 805, dsql_window_duplicate, -833, "42", "000", "Duplicate window definition for @1")
-FB_IMPL_MSG(JRD, 806, sql_too_long, -902, "54", "001", "SQL statement is too long. Maximum size is @1 bytes.")
-FB_IMPL_MSG(JRD, 807, cfg_stmt_timeout, -901, "HY", "008", "Config level timeout expired.")
-FB_IMPL_MSG(JRD, 808, att_stmt_timeout, -901, "HY", "008", "Attachment level timeout expired.")
-FB_IMPL_MSG(JRD, 809, req_stmt_timeout, -901, "HY", "008", "Statement level timeout expired.")
-FB_IMPL_MSG(JRD, 810, att_shut_killed, -902, "08", "003", "Killed by database administrator.")
-FB_IMPL_MSG(JRD, 811, att_shut_idle, -902, "08", "003", "Idle timeout expired.")
-FB_IMPL_MSG(JRD, 812, att_shut_db_down, -902, "08", "003", "Database is shutdown.")
-FB_IMPL_MSG(JRD, 813, att_shut_engine, -902, "08", "003", "Engine is shutdown.")
-FB_IMPL_MSG(JRD, 814, overriding_without_identity, -902, "42", "000", "OVERRIDING clause can be used only when an identity column is present in the INSERT's field list for table/view @1")
-FB_IMPL_MSG(JRD, 815, overriding_system_invalid, -902, "42", "000", "OVERRIDING SYSTEM VALUE can be used only for identity column defined as 'GENERATED ALWAYS' in INSERT for table/view @1")
-// Next message was incorrect - but left for compatibility with older engines.
-FB_IMPL_MSG(JRD, 816, overriding_user_invalid, -902, "42", "000", "OVERRIDING USER VALUE can be used only for identity column defined as 'GENERATED BY DEFAULT' in INSERT for table/view @1")
-FB_IMPL_MSG(JRD, 817, overriding_missing, -902, "42", "000", "OVERRIDING clause should be used when an identity column defined as 'GENERATED ALWAYS' is present in the INSERT's field list for table table/view @1")
-FB_IMPL_MSG(JRD, 818, decprecision_err, -842, "HY", "104", "DecFloat precision must be 16 or 34")
-FB_IMPL_MSG(JRD, 819, decfloat_divide_by_zero, -901, "22", "012", "Decimal float divide by zero.  The code attempted to divide a DECFLOAT value by zero.")
-FB_IMPL_MSG(JRD, 820, decfloat_inexact_result, -901, "22", "000", "Decimal float inexact result.  The result of an operation cannot be represented as a decimal fraction.")
-FB_IMPL_MSG(JRD, 821, decfloat_invalid_operation, -901, "22", "000", "Decimal float invalid operation.  An indeterminant error occurred during an operation.")
-FB_IMPL_MSG(JRD, 822, decfloat_overflow, -901, "22", "003", "Decimal float overflow.  The exponent of a result is greater than the magnitude allowed.")
-FB_IMPL_MSG(JRD, 823, decfloat_underflow, -901, "22", "003", "Decimal float underflow.  The exponent of a result is less than the magnitude allowed.")
-FB_IMPL_MSG(JRD, 824, subfunc_notdef, -901, "42", "000", "Sub-function @1 has not been defined")
-FB_IMPL_MSG(JRD, 825, subproc_notdef, -901, "42", "000", "Sub-procedure @1 has not been defined")
-FB_IMPL_MSG(JRD, 826, subfunc_signat, -901, "42", "000", "Sub-function @1 has a signature mismatch with its forward declaration")
-FB_IMPL_MSG(JRD, 827, subproc_signat, -901, "42", "000", "Sub-procedure @1 has a signature mismatch with its forward declaration")
-FB_IMPL_MSG(JRD, 828, subfunc_defvaldecl, -901, "42", "000", "Default values for parameters are not allowed in definition of the previously declared sub-function @1")
-FB_IMPL_MSG(JRD, 829, subproc_defvaldecl, -901, "42", "000", "Default values for parameters are not allowed in definition of the previously declared sub-procedure @1")
-FB_IMPL_MSG(JRD, 830, subfunc_not_impl, -901, "42", "000", "Sub-function @1 was declared but not implemented")
-FB_IMPL_MSG(JRD, 831, subproc_not_impl, -901, "42", "000", "Sub-procedure @1 was declared but not implemented")
-FB_IMPL_MSG(JRD, 832, sysf_invalid_hash_algorithm, -901, "42", "000", "Invalid HASH algorithm @1")
-FB_IMPL_MSG(JRD, 833, expression_eval_index, -901, "42", "000", "Expression evaluation error for index \"@1\" on table \"@2\"")
-FB_IMPL_MSG(JRD, 834, invalid_decfloat_trap, -901, "42", "000", "Invalid decfloat trap state @1")
-FB_IMPL_MSG(JRD, 835, invalid_decfloat_round, -901, "42", "000", "Invalid decfloat rounding mode @1")
-FB_IMPL_MSG(JRD, 836, sysf_invalid_first_last_part, -833, "42", "000", "Invalid part @1 to calculate the @1 of a DATE/TIMESTAMP")
-FB_IMPL_MSG(JRD, 837, sysf_invalid_date_timestamp, -833, "42", "000", "Expected DATE/TIMESTAMP value in @1")
-FB_IMPL_MSG(JRD, 838, precision_err2, -842, "HY", "104", "Precision must be from @1 to @2")
-FB_IMPL_MSG(JRD, 839, bad_batch_handle, -901, "08", "003", "invalid batch handle")
-FB_IMPL_MSG(JRD, 840, intl_char, -901, "22", "021", "Bad international character in tag @1")
-FB_IMPL_MSG(JRD, 841, null_block, -901, "22", "000", "Null data in parameters block with non-zero length")
-FB_IMPL_MSG(JRD, 842, mixed_info, -901, "22", "000", "Items working with running service and getting generic server information should not be mixed in single info block")
-FB_IMPL_MSG(JRD, 843, unknown_info, -901, "22", "000", "Unknown information item, code @1")
-FB_IMPL_MSG(JRD, 844, bpb_version, -901, "22", "000", "Wrong version of blob parameters block @1, should be @2")
-FB_IMPL_MSG(JRD, 845, user_manager, -901, "28", "000", "User management plugin is missing or failed to load")
-FB_IMPL_MSG(JRD, 846, icu_entrypoint, -902, "XX", "000", "Missing entrypoint @1 in ICU library")
-FB_IMPL_MSG(JRD, 847, icu_library, -902, "XX", "000", "Could not find acceptable ICU library")
-FB_IMPL_MSG(JRD, 848, metadata_name, -901, "02", "000", "Name @1 not found in system MetadataBuilder")
-FB_IMPL_MSG(JRD, 849, tokens_parse, -901, "42", "000", "Parse to tokens error")
-FB_IMPL_MSG(JRD, 850, iconv_open, -902, "08", "006", "Error opening international conversion descriptor from @1 to @2")
-FB_IMPL_MSG(JRD, 851, batch_compl_range, -901, "07", "002", "Message @1 is out of range, only @2 messages in batch")
-FB_IMPL_MSG(JRD, 852, batch_compl_detail, -901, "07", "002", "Detailed error info for message @1 is missing in batch")
-FB_IMPL_MSG(JRD, 853, deflate_init, -902, "08", "006", "Compression stream init error @1")
-FB_IMPL_MSG(JRD, 854, inflate_init, -902, "08", "006", "Decompression stream init error @1")
-FB_IMPL_MSG(JRD, 855, big_segment, -901, "22", "026", "Segment size (@1) should not exceed 65535 (64K - 1) when using segmented blob")
-FB_IMPL_MSG(JRD, 856, batch_policy, -901, "22", "000", "Invalid blob policy in the batch for @1() call")
-FB_IMPL_MSG(JRD, 857, batch_defbpb, -901, "22", "000", "Can't change default BPB after adding any data to batch")
-FB_IMPL_MSG(JRD, 858, batch_align, -901, "22", "000", "Unexpected info buffer structure querying for server batch parameters")
-FB_IMPL_MSG(JRD, 859, multi_segment_dup, -901, "22", "000", "Duplicated segment @1 in multisegment connect block parameter")
-FB_IMPL_MSG(JRD, 860, non_plugin_protocol, -902, "08", "004", "Plugin not supported by network protocol")
-FB_IMPL_MSG(JRD, 861, message_format, -901, "22", "000", "Error parsing message format")
-FB_IMPL_MSG(JRD, 862, batch_param_version, -901, "22", "000", "Wrong version of batch parameters block @1, should be @2")
-FB_IMPL_MSG(JRD, 863, batch_msg_long, -901, "54", "000", "Message size (@1) in batch exceeds internal buffer size (@2)")
-FB_IMPL_MSG(JRD, 864, batch_open, -901, "08", "002", "Batch already opened for this statement")
-FB_IMPL_MSG(JRD, 865, batch_type, -901, "07", "003", "Invalid type of statement used in batch")
-FB_IMPL_MSG(JRD, 866, batch_param, -901, "07", "001", "Statement used in batch must have parameters")
-FB_IMPL_MSG(JRD, 867, batch_blobs, -901, "07", "001", "There are no blobs in associated with batch statement")
-FB_IMPL_MSG(JRD, 868, batch_blob_append, -901, "22", "000", "appendBlobData() is used to append data to last blob but no such blob was added to the batch")
-FB_IMPL_MSG(JRD, 869, batch_stream_align, -901, "22", "000", "Portions of data, passed as blob stream, should have size multiple to the alignment required for blobs")
-FB_IMPL_MSG(JRD, 870, batch_rpt_blob, -901, "22", "000", "Repeated blob id @1 in registerBlob()")
-FB_IMPL_MSG(JRD, 871, batch_blob_buf, -901, "22", "000", "Blob buffer format error")
-FB_IMPL_MSG(JRD, 872, batch_small_data, -901, "22", "000", "Unusable (too small) data remained in @1 buffer")
-FB_IMPL_MSG(JRD, 873, batch_cont_bpb, -901, "22", "000", "Blob continuation should not contain BPB")
-FB_IMPL_MSG(JRD, 874, batch_big_bpb, -901, "22", "000", "Size of BPB (@1) greater than remaining data (@2)")
-FB_IMPL_MSG(JRD, 875, batch_big_segment, -901, "22", "000", "Size of segment (@1) greater than current BLOB data (@2)")
-FB_IMPL_MSG(JRD, 876, batch_big_seg2, -901, "22", "000", "Size of segment (@1) greater than available data (@2)")
-FB_IMPL_MSG(JRD, 877, batch_blob_id, -901, "22", "000", "Unknown blob ID @1 in the batch message")
-FB_IMPL_MSG(JRD, 878, batch_too_big, -901, "54", "000", "Internal buffer overflow - batch too big")
-FB_IMPL_MSG(JRD, 879, num_literal, -901, "54", "000", "Numeric literal too long")
-FB_IMPL_MSG(JRD, 880, map_event, -902, "XX", "000", "Error using events in mapping shared memory: @1")
-FB_IMPL_MSG(JRD, 881, map_overflow, -902, "54", "000", "Global mapping memory overflow")
-FB_IMPL_MSG(JRD, 882, hdr_overflow, -901, "54", "000", "Header page overflow - too many clumplets on it")
-FB_IMPL_MSG(JRD, 883, vld_plugins, -901, "28", "000", "No matching client/server authentication plugins configured for execute statement in embedded datasource")
-FB_IMPL_MSG(JRD, 884, db_crypt_key, -902, "08", "004", "Missing database encryption key for your attachment")
-FB_IMPL_MSG(JRD, 885, no_keyholder_plugin, -104, "HY", "024", "Key holder plugin @1 failed to load")
-FB_IMPL_MSG(JRD, 886, ses_reset_err, -901, "01", "002", "Cannot reset user session")
-FB_IMPL_MSG(JRD, 887, ses_reset_open_trans, -901, "25", "S02", "There are open transactions (@1 active)")
-FB_IMPL_MSG(JRD, 888, ses_reset_warn, -901, "01", "000", "Session was reset with warning(s)")
-FB_IMPL_MSG(JRD, 889, ses_reset_tran_rollback, -901, "01", "102", "Transaction is rolled back due to session reset, all changes are lost")
-FB_IMPL_MSG(JRD, 890, plugin_name, -901, "00", "000", "Plugin @1:")
-FB_IMPL_MSG(JRD, 891, parameter_name, -901, "42", "000", "PARAMETER @1")
-FB_IMPL_MSG(JRD, 892, file_starting_page_err, -901, "HY", "000", "Starting page number for file @1 must be @2 or greater")
-FB_IMPL_MSG(JRD, 893, invalid_timezone_offset, -901, "22", "009", "Invalid time zone offset: @1 - must use format +/-hours:minutes and be between -14:00 and +14:00")
-FB_IMPL_MSG(JRD, 894, invalid_timezone_region, -901, "22", "009", "Invalid time zone region: @1")
-FB_IMPL_MSG(JRD, 895, invalid_timezone_id, -901, "22", "009", "Invalid time zone ID: @1")
-FB_IMPL_MSG(JRD, 896, tom_decode64len, -901, "22", "023", "Wrong base64 text length @1, should be multiple of 4")
-FB_IMPL_MSG(JRD, 897, tom_strblob, -901, "22", "023", "Invalid first parameter datatype - need string or blob")
-FB_IMPL_MSG(JRD, 898, tom_reg, -901, "22", "023", "Error registering @1 - probably bad tomcrypt library")
-FB_IMPL_MSG(JRD, 899, tom_algorithm, -901, "22", "023", "Unknown crypt algorithm @1 in USING clause")
-FB_IMPL_MSG(JRD, 900, tom_mode_miss, -901, "22", "023", "Should specify mode parameter for symmetric cipher")
-FB_IMPL_MSG(JRD, 901, tom_mode_bad, -901, "22", "023", "Unknown symmetric crypt mode specified")
-FB_IMPL_MSG(JRD, 902, tom_no_mode, -901, "22", "023", "Mode parameter makes no sense for chosen cipher")
-FB_IMPL_MSG(JRD, 903, tom_iv_miss, -901, "22", "023", "Should specify initialization vector (IV) for chosen cipher and/or mode")
-FB_IMPL_MSG(JRD, 904, tom_no_iv, -901, "22", "023", "Initialization vector (IV) makes no sense for chosen cipher and/or mode")
-FB_IMPL_MSG(JRD, 905, tom_ctrtype_bad, -901, "22", "023", "Invalid counter endianess @1")
-FB_IMPL_MSG(JRD, 906, tom_no_ctrtype, -901, "22", "023", "Counter endianess parameter is not used in mode @1")
-FB_IMPL_MSG(JRD, 907, tom_ctr_big, -901, "22", "023", "Too big counter value @1, maximum @2 can be used")
-FB_IMPL_MSG(JRD, 908, tom_no_ctr, -901, "22", "023", "Counter length/value parameter is not used with @1 @2")
-FB_IMPL_MSG(JRD, 909, tom_iv_length, -901, "22", "023", "Invalid initialization vector (IV) length @1, need @2")
-FB_IMPL_MSG(JRD, 910, tom_error, -901, "22", "000", "TomCrypt library error: @1")
-FB_IMPL_MSG(JRD, 911, tom_yarrow_start, -901, "22", "023", "Starting PRNG yarrow")
-FB_IMPL_MSG(JRD, 912, tom_yarrow_setup, -901, "22", "023", "Setting up PRNG yarrow")
-FB_IMPL_MSG(JRD, 913, tom_init_mode, -901, "22", "023", "Initializing @1 mode")
-FB_IMPL_MSG(JRD, 914, tom_crypt_mode, -901, "22", "023", "Encrypting in @1 mode")
-FB_IMPL_MSG(JRD, 915, tom_decrypt_mode, -901, "22", "023", "Decrypting in @1 mode")
-FB_IMPL_MSG(JRD, 916, tom_init_cip, -901, "22", "023", "Initializing cipher @1")
-FB_IMPL_MSG(JRD, 917, tom_crypt_cip, -901, "22", "023", "Encrypting using cipher @1")
-FB_IMPL_MSG(JRD, 918, tom_decrypt_cip, -901, "22", "023", "Decrypting using cipher @1")
-FB_IMPL_MSG(JRD, 919, tom_setup_cip, -901, "22", "023", "Setting initialization vector (IV) for @1")
-FB_IMPL_MSG(JRD, 920, tom_setup_chacha, -901, "22", "023", "Invalid initialization vector (IV) length @1, need  8 or 12")
-FB_IMPL_MSG(JRD, 921, tom_encode, -901, "22", "023", "Encoding @1")
-FB_IMPL_MSG(JRD, 922, tom_decode, -901, "22", "023", "Decoding @1")
-FB_IMPL_MSG(JRD, 923, tom_rsa_import, -901, "22", "023", "Importing RSA key")
-FB_IMPL_MSG(JRD, 924, tom_oaep, -901, "22", "023", "Invalid OAEP packet")
-FB_IMPL_MSG(JRD, 925, tom_hash_bad, -901, "22", "023", "Unknown hash algorithm @1")
-FB_IMPL_MSG(JRD, 926, tom_rsa_make, -901, "22", "023", "Making RSA key")
-FB_IMPL_MSG(JRD, 927, tom_rsa_export, -901, "22", "023", "Exporting @1 RSA key")
-FB_IMPL_MSG(JRD, 928, tom_rsa_sign, -901, "22", "023", "RSA-signing data")
-FB_IMPL_MSG(JRD, 929, tom_rsa_verify, -901, "22", "023", "Verifying RSA-signed data")
-FB_IMPL_MSG(JRD, 930, tom_chacha_key, -901, "22", "023", "Invalid key length @1, need 16 or 32")
-FB_IMPL_MSG(JRD, 931, bad_repl_handle, -901, "08", "003", "invalid replicator handle")
-FB_IMPL_MSG(JRD, 932, tra_snapshot_does_not_exist, -901, "0B", "000", "Transaction's base snapshot number does not exist")
-FB_IMPL_MSG(JRD, 933, eds_input_prm_not_used, -901, "42", "000", "Input parameter '@1' is not used in SQL query text")
-FB_IMPL_MSG(JRD, 934, effective_user, -551, "28", "000", "Effective user is @1")
-FB_IMPL_MSG(JRD, 935, invalid_time_zone_bind, -901, "42", "000", "Invalid time zone bind mode @1")
-FB_IMPL_MSG(JRD, 936, invalid_decfloat_bind, -901, "42", "000", "Invalid decfloat bind mode @1")
-FB_IMPL_MSG(JRD, 937, odd_hex_len, -901, "22", "023", "Invalid hex text length @1, should be multiple of 2")
-FB_IMPL_MSG(JRD, 938, invalid_hex_digit, -901, "22", "023", "Invalid hex digit @1 at position @2")
-FB_IMPL_MSG(JRD, 939, bind_err, -902, "08", "004", "Error processing isc_dpb_set_bind clumplet \"@1\"")
-FB_IMPL_MSG(JRD, 940, bind_statement, -902, "08", "004", "The following statement failed: @1")
-FB_IMPL_MSG(JRD, 941, bind_convert, -901, "22", "000", "Can not convert @1 to @2")
-FB_IMPL_MSG(JRD, 942, cannot_update_old_blob, -402, "42", "000", "cannot update old BLOB")
-FB_IMPL_MSG(JRD, 943, cannot_read_new_blob, -402, "42", "000", "cannot read from new BLOB")
-FB_IMPL_MSG(JRD, 944, dyn_no_create_priv, -901, "42", "000", "No permission for CREATE @1 operation")
-FB_IMPL_MSG(JRD, 945, suspend_without_returns, -901, "42", "000", "SUSPEND could not be used without RETURNS clause in PROCEDURE or EXECUTE BLOCK")
-FB_IMPL_MSG(JRD, 946, truncate_warn, 304, "01", "004", "String truncated warning due to the following reason")
-FB_IMPL_MSG(JRD, 947, truncate_monitor, 304, "01", "004", "Monitoring data does not fit into the field")
-FB_IMPL_MSG(JRD, 948, truncate_context, 304, "01", "004", "Engine data does not fit into return value of system function")
-FB_IMPL_MSG(JRD, 949, merge_dup_update, -811, "21", "000", "Multiple source records cannot match the same target during MERGE")
-FB_IMPL_MSG(JRD, 950, wrong_page, -902, "XX", "000", "RDB$PAGES written by non-system transaction, DB appears to be damaged")
-FB_IMPL_MSG(JRD, 951, repl_error, -902, "HY", "000", "Replication error")
-FB_IMPL_MSG(JRD, 952, ses_reset_failed, -902, "08", "003", "Reset of user session failed. Connection is shut down.")
-FB_IMPL_MSG(JRD, 953, block_size, -902, "XX", "000", "File size is less than expected")
-FB_IMPL_MSG(JRD, 954, tom_key_length, -901, "22", "023", "Invalid key length @1, need >@2")
-FB_IMPL_MSG(JRD, 955, inf_invalid_args, -901, "HY", "000", "Invalid information arguments")
-FB_IMPL_MSG(JRD, 956, sysf_invalid_null_empty, -901, "22", "023", "Empty or NULL parameter @1 is not accepted")
-FB_IMPL_MSG(JRD, 957, bad_loctab_num, -901, "HY", "000", "Undefined local table number @1")
-FB_IMPL_MSG(JRD, 958, quoted_str_bad, -901, "22", "024", "Invalid text <@1> after quoted string")
-FB_IMPL_MSG(JRD, 959, quoted_str_miss, -901, "22", "024", "Missing terminating quote <@1> in the end of quoted string")
-FB_IMPL_MSG(JRD, 960, wrong_shmem_ver, -902, "08", "006", "@1: inconsistent shared memory type/version; found @2, expected @3")
-FB_IMPL_MSG(JRD, 961, wrong_shmem_bitness, -902, "08", "006", "@1-bit engine can't open database already opened by @2-bit engine")
-FB_IMPL_MSG(JRD, 962, wrong_proc_plan, -281, "HY", "000", "Procedures cannot specify access type other than NATURAL in the plan")
-FB_IMPL_MSG(JRD, 963, invalid_blob_util_handle, -402, "42", "000", "Invalid RDB$BLOB_UTIL handle")
-FB_IMPL_MSG(JRD, 964, bad_temp_blob_id, -402, "42", "000", "Invalid temporary BLOB ID")
-FB_IMPL_MSG(JRD, 965, ods_upgrade_err, -901, "HY", "000", "ODS upgrade failed while adding new system %s")
-FB_IMPL_MSG(JRD, 966, bad_par_workers, -924, "HY", "000", "Wrong parallel workers value @1, valid range are from 1 to @2")
-FB_IMPL_MSG(JRD, 967, idx_expr_not_found, -902, "42", "000", "Definition of index expression is not found for index @1")
-FB_IMPL_MSG(JRD, 968, idx_cond_not_found, -902, "42", "000", "Definition of index condition is not found for index @1")
diff --git a/FBClient.Headers/firebird/impl/msg/jrd_bugchk.h b/FBClient.Headers/firebird/impl/msg/jrd_bugchk.h
deleted file mode 100644
index 48bee23c..00000000
--- a/FBClient.Headers/firebird/impl/msg/jrd_bugchk.h
+++ /dev/null
@@ -1,160 +0,0 @@
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 147, "invalid block type encountered")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 148, "wrong packet type")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 149, "cannot map page")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 150, "request to allocate invalid block type")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 151, "request to allocate block type larger than maximum size")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 152, "memory pool free list is invalid")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 153, "invalid pool id encountered")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 154, "attempt to release free block")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 155, "attempt to release block overlapping following free block")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 156, "attempt to release block overlapping prior free block")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 157, "cannot sort on a field that does not exist")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 158, "database file not available")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 159, "cannot assert logical lock")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 160, "wrong ACL version")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 161, "shadow block not found")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 162, "shadow lock not synchronized properly")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 163, "root file name not listed for shadow")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 164, "failed to remove symbol from hash table")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 165, "cannot find tip page")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 166, "invalid rsb type")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 167, "invalid SEND request")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 168, "looper: action not yet implemented")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 169, "return data type not supported")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 170, "unexpected reply from journal server")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 171, "journal server is incompatible version")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 172, "journal server refused connection")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 173, "referenced index description not found")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 174, "index key too big")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 175, "partner index description not found")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 176, "bad difference record")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 177, "applied differences will not fit in record")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 178, "record length inconsistent")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 179, "decompression overran buffer")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 180, "cannot reposition for update after sort for RMS")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 181, "external access type not implemented")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 182, "differences record too long")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 183, "wrong record length")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 184, "limbo impossible")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 185, "wrong record version")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 186, "record disappeared")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 187, "cannot delete system tables")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 188, "cannot update erased record")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 189, "comparison not supported for specified data types")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 190, "conversion not supported for specified data types")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 191, "conversion error")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 192, "overflow during conversion")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 193, "null or invalid array")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 194, "BLOB not found")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 195, "cannot update old BLOB")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 196, "relation for array not known")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 197, "field for array not known")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 198, "array subscript computation error")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 199, "expected field node")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 200, "invalid BLOB ID")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 201, "cannot find BLOB page")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 202, "unknown data type")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 203, "shadow block not found for extend file")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 204, "index inconsistent")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 205, "index bucket overfilled")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 206, "exceeded index level")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 207, "page already in use")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 208, "page not accessed for write")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 209, "attempt to release page not acquired")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 210, "page in use during flush")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 211, "attempt to remove page from dirty page list when not there")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 212, "CCH_precedence: block marked")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 213, "insufficient cache size")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 214, "no cache buffers available for reuse")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 215, "page @1, page type @2 lock conversion denied")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 216, "page @1, page type @2 lock denied")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 217, "buffer marked for update")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 218, "CCH: @1, status = @2 (218)")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 219, "request of unknown resource")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 220, "release of unknown resource")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 221, "(CMP) copy: cannot remap")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 222, "bad BLR -- invalid stream")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 223, "argument of scalar operation must be an array")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 224, "quad word arithmetic not supported")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 225, "data type not supported for arithmetic")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 226, "request size limit exceeded")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 227, "cannot access field @1 in view @2")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 228, "cannot access field in view @1")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 229, "EVL_assign_to: invalid operation")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 230, "EVL_bitmap: invalid operation")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 231, "EVL_boolean: invalid operation")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 232, "EVL_expr: invalid operation")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 233, "eval_statistical: invalid operation")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 234, "Unimplemented conversion, FAO directive O,Z,S")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 235, "Unimplemented conversion, FAO directive X,U")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 236, "Error parsing RDB FAO msg string")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 237, "Error parsing RDB FAO msg str")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 238, "unknown parameter in RdB status vector")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 239, "Firebird status vector inconsistent")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 240, "Firebird/RdB message parameter inconsistency")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 241, "error parsing RDB FAO message string")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 242, "unimplemented FAO directive")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 243, "missing pointer page in DPM_data_pages")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 244, "Fragment does not exist")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 245, "pointer page disappeared in DPM_delete")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 246, "pointer page lost from DPM_delete_relation")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 247, "missing pointer page in DPM_dump")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 248, "cannot find record fragment")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 249, "pointer page vanished from DPM_next")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 250, "temporary page buffer too small")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 251, "damaged data page")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 252, "header fragment length changed")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 253, "pointer page vanished from extend_relation")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 254, "pointer page vanished from relation list in locate_space")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 255, "cannot find free space")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 256, "pointer page vanished from mark_full")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 257, "bad record in RDB$PAGES")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 258, "page slot not empty")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 259, "bad pointer page")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 260, "index unexpectedly deleted")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 261, "scalar operator used on field which is not an array")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 262, "active")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 263, "committed")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 264, "rolled back")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 265, "in an ill-defined state")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 266, "next transaction older than oldest active transaction")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 267, "next transaction older than oldest transaction")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 268, "buffer marked during cache unwind")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 269, "error in recovery! database corrupted")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 270, "error in recovery! wrong data page record")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 271, "error in recovery! no space on data page")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 272, "error in recovery! wrong header page record")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 273, "error in recovery! wrong generator page record")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 274, "error in recovery! wrong b-tree page record")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 275, "error in recovery! wrong page inventory page record")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 276, "error in recovery! wrong pointer page record")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 277, "error in recovery! wrong index root page record")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 278, "error in recovery! wrong transaction page record")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 279, "error in recovery! out of sequence log record encountered")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 280, "error in recovery! unknown page type")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 281, "error in recovery! unknown record type")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 282, "journal server cannot archive to specified archive directory")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 283, "checksum error in log record when reading from log file")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 284, "cannot restore singleton select data")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 285, "lock not found in internal lock manager")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 286, "size of opt block exceeded")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 287, "Too many savepoints")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 288, "garbage collect record disappeared")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 289, "Unknown BLOB FILTER ACTION_")
-FB_IMPL_MSG_SYMBOL(JRD_BUGCHK, 290, savepoint_error, "error during savepoint backout")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 291, "cannot find record back version")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 292, "Illegal user_type.")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 293, "bad ACL")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 294, "inconsistent LATCH_mark release")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 295, "inconsistent LATCH_mark call")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 296, "inconsistent latch downgrade call")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 297, "bdb is unexpectedly marked")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 298, "missing exclusive latch")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 299, "exceeded maximum number of shared latches on a bdb")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 300, "can't find shared latch")
-FB_IMPL_MSG_SYMBOL(JRD_BUGCHK, 301, cache_non_zero_use_count, "Non-zero use_count of a buffer in the empty que")
-FB_IMPL_MSG_SYMBOL(JRD_BUGCHK, 302, unexpected_page_change, "Unexpected page change from latching")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 303, "Invalid expression for evaluation")
-FB_IMPL_MSG_SYMBOL(JRD_BUGCHK, 304, rdb$triggers_rdb$flags_corrupt, "RDB$FLAGS for trigger @1 in RDB$TRIGGERS is corrupted")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 305, "Blobs accounting is inconsistent")
-FB_IMPL_MSG_NO_SYMBOL(JRD_BUGCHK, 306, "Found array data type with more than 16 dimensions")
diff --git a/FBClient.Headers/firebird/impl/msg/nbackup.h b/FBClient.Headers/firebird/impl/msg/nbackup.h
deleted file mode 100644
index 42ef7b14..00000000
--- a/FBClient.Headers/firebird/impl/msg/nbackup.h
+++ /dev/null
@@ -1,88 +0,0 @@
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 1, "ERROR: ")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 2, "Physical Backup Manager    Copyright (C) 2004 Firebird development team")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 3, "  Original idea is of Sean Leyne <sean@@broadviewsoftware.com>")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 4, "  Designed and implemented by Nickolay Samofatov <skidder@@bssys.com>")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 5, "  This work was funded through a grant from BroadView Software, Inc.\\n")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 6, "Usage: nbackup <options>")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 7, "exclusive options are:")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 8, "  -L(OCK) <database>                     Lock database for filesystem copy")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 9, "  -UN(LOCK) <database>                   Unlock previously locked database")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 10, "  -F(IXUP) <database>                    Fixup database after filesystem copy")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 11, "  -B(ACKUP) <level>|<GUID> <db> [<file>] Create incremental backup")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 12, "  -R(ESTORE) <db> [<file0> [<file1>...]] Restore incremental backup")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 13, "  -U(SER) <user>                         User name")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 14, "  -P(ASSWORD) <password>                 Password")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 15, "  -FETCH_PASSWORD <file>                 Fetch password from file")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 16, "  -NOD(BTRIGGERS)                        Do not run database triggers")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 17, "  -S(IZE)                                Print database size in pages after lock")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 18, "  -Z                                     Print program version")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 19, "Notes:")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 20, "  <database> may specify database alias.")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 21, "  Incremental backups of multi-file databases are not supported yet.")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 22, "  \"stdout\" may be used as a value of <filename> for -B option.")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 23, "PROBLEM ON \"@1\".")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 24, "general options are:")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 25, "switches can be abbreviated to the unparenthesized characters")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 26, "  Option -S(IZE) only is valid together with -L(OCK).")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 27, "  For historical reasons, -N is equivalent to -UN(LOCK)")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 28, "  and -T is equivalent to -NOD(BTRIGGERS).")
-FB_IMPL_MSG(NBACKUP, 29, nbackup_missing_param, -901, "00", "000", "Missing parameter for switch @1")
-FB_IMPL_MSG(NBACKUP, 30, nbackup_allowed_switches, -901, "00", "000", "Only one of -LOCK, -UNLOCK, -FIXUP, -BACKUP or -RESTORE should be specified")
-FB_IMPL_MSG(NBACKUP, 31, nbackup_unknown_param, -901, "00", "000", "Unrecognized parameter @1")
-FB_IMPL_MSG(NBACKUP, 32, nbackup_unknown_switch, -901, "00", "000", "Unknown switch @1")
-FB_IMPL_MSG(NBACKUP, 33, nbackup_nofetchpw_svc, -901, "00", "000", "Fetch password can't be used in service mode")
-FB_IMPL_MSG(NBACKUP, 34, nbackup_pwfile_error, -901, "00", "000", "Error working with password file \"@1\"")
-FB_IMPL_MSG(NBACKUP, 35, nbackup_size_with_lock, -901, "00", "000", "Switch -SIZE can be used only with -LOCK")
-FB_IMPL_MSG(NBACKUP, 36, nbackup_no_switch, -901, "00", "000", "None of -LOCK, -UNLOCK, -FIXUP, -BACKUP or -RESTORE specified")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 37, "Failure: ")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 38, "Enter name of the backup file of level @1 (\".\" - do not restore further):")
-FB_IMPL_MSG(NBACKUP, 39, nbackup_err_read, -901, "00", "000", "IO error reading file: @1")
-FB_IMPL_MSG(NBACKUP, 40, nbackup_err_write, -901, "00", "000", "IO error writing file: @1")
-FB_IMPL_MSG(NBACKUP, 41, nbackup_err_seek, -901, "00", "000", "IO error seeking file: @1")
-FB_IMPL_MSG(NBACKUP, 42, nbackup_err_opendb, -901, "00", "000", "Error opening database file: @1")
-FB_IMPL_MSG(NBACKUP, 43, nbackup_err_fadvice, -901, "00", "000", "Error in posix_fadvise(@1) for database @2")
-FB_IMPL_MSG(NBACKUP, 44, nbackup_err_createdb, -901, "00", "000", "Error creating database file: @1")
-FB_IMPL_MSG(NBACKUP, 45, nbackup_err_openbk, -901, "00", "000", "Error opening backup file: @1")
-FB_IMPL_MSG(NBACKUP, 46, nbackup_err_createbk, -901, "00", "000", "Error creating backup file: @1")
-FB_IMPL_MSG(NBACKUP, 47, nbackup_err_eofdb, -901, "00", "000", "Unexpected end of database file @1")
-FB_IMPL_MSG(NBACKUP, 48, nbackup_fixup_wrongstate, -901, "00", "000", "Database @1 is not in state (@2) to be safely fixed up")
-FB_IMPL_MSG(NBACKUP, 49, nbackup_err_db, -901, "00", "000", "Database error")
-FB_IMPL_MSG(NBACKUP, 50, nbackup_userpw_toolong, -901, "00", "000", "Username or password is too long")
-FB_IMPL_MSG(NBACKUP, 51, nbackup_lostrec_db, -901, "00", "000", "Cannot find record for database \"@1\" backup level @2 in the backup history")
-FB_IMPL_MSG(NBACKUP, 52, nbackup_lostguid_db, -901, "00", "000", "Internal error. History query returned null SCN or GUID")
-FB_IMPL_MSG(NBACKUP, 53, nbackup_err_eofhdrdb, -901, "00", "000", "Unexpected end of file when reading header of database file \"@1\" (stage @2)")
-FB_IMPL_MSG(NBACKUP, 54, nbackup_db_notlock, -901, "00", "000", "Internal error. Database file is not locked. Flags are @1")
-FB_IMPL_MSG(NBACKUP, 55, nbackup_lostguid_bk, -901, "00", "000", "Internal error. Cannot get backup guid clumplet")
-FB_IMPL_MSG(NBACKUP, 56, nbackup_page_changed, -901, "00", "000", "Internal error. Database page @1 had been changed during backup (page SCN=@2, backup SCN=@3)")
-FB_IMPL_MSG(NBACKUP, 57, nbackup_dbsize_inconsistent, -901, "00", "000", "Database file size is not a multiple of page size")
-FB_IMPL_MSG(NBACKUP, 58, nbackup_failed_lzbk, -901, "00", "000", "Level 0 backup is not restored")
-FB_IMPL_MSG(NBACKUP, 59, nbackup_err_eofhdrbk, -901, "00", "000", "Unexpected end of file when reading header of backup file: @1")
-FB_IMPL_MSG(NBACKUP, 60, nbackup_invalid_incbk, -901, "00", "000", "Invalid incremental backup file: @1")
-FB_IMPL_MSG(NBACKUP, 61, nbackup_unsupvers_incbk, -901, "00", "000", "Unsupported version @1 of incremental backup file: @2")
-FB_IMPL_MSG(NBACKUP, 62, nbackup_invlevel_incbk, -901, "00", "000", "Invalid level @1 of incremental backup file: @2, expected @3")
-FB_IMPL_MSG(NBACKUP, 63, nbackup_wrong_orderbk, -901, "00", "000", "Wrong order of backup files or invalid incremental backup file detected, file: @1")
-FB_IMPL_MSG(NBACKUP, 64, nbackup_err_eofbk, -901, "00", "000", "Unexpected end of backup file: @1")
-FB_IMPL_MSG(NBACKUP, 65, nbackup_err_copy, -901, "00", "000", "Error creating database file: @1 via copying from: @2")
-FB_IMPL_MSG(NBACKUP, 66, nbackup_err_eofhdr_restdb, -901, "00", "000", "Unexpected end of file when reading header of restored database file (stage @1)")
-FB_IMPL_MSG(NBACKUP, 67, nbackup_lostguid_l0bk, -901, "00", "000", "Cannot get backup guid clumplet from L0 backup")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 68, "Physical Backup Manager version @1")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 69, "Enter name of the backup file of level @1 (\".\" - do not restore further):")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 70, "  -D(IRECT) <ON | OFF>                   Use or not direct I/O when backing up database")
-FB_IMPL_MSG(NBACKUP, 71, nbackup_switchd_parameter, -901, "00", "000", "Wrong parameter @1 for switch -D, need ON or OFF")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 72, "special options are:")
-FB_IMPL_MSG(NBACKUP, 73, nbackup_user_stop, -901, "08", "006", "Terminated due to user request")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 74, "  -DE(COMPRESS) <command>                Command to extract archives during restore")
-FB_IMPL_MSG(NBACKUP, 75, nbackup_deco_parse, -901, "54", "023", "Too complex decompress command (> @1 arguments)")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 76, "  -RO(LE) <role>                         SQL role name")
-FB_IMPL_MSG(NBACKUP, 77, nbackup_lostrec_guid_db, -901, "00", "000", "Cannot find record for database \"@1\" backup GUID @2 in the backup history")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 78, "  -I(NPLACE)                             Restore incremental backup(s) to existing database")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 79, "  -INPLACE option could corrupt the database that has changed since previous restore.")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 80, "  -SEQ(UENCE)                            Preserve original replication sequence")
-FB_IMPL_MSG(NBACKUP, 81, nbackup_seq_misuse, -901, "00", "000", "Switch -SEQ(UENCE) can be used only with -FIXUP or -RESTORE")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 82, "  -CLEAN_HIST(ORY)                       Clean old records from backup history")
-FB_IMPL_MSG_NO_SYMBOL(NBACKUP, 83, "  -K(EEP) <N> <(R)OWS | (D)AYS>          How many recent rows (or days back from today) should be kept in the history")
-FB_IMPL_MSG(NBACKUP, 84, nbackup_wrong_param, -901, "00", "000", "Wrong parameter value for switch @1")
-FB_IMPL_MSG(NBACKUP, 85, nbackup_clean_hist_misuse, -901, "00", "000", "Switch -CLEAN_HISTORY can be used only with -BACKUP")
-FB_IMPL_MSG(NBACKUP, 86, nbackup_clean_hist_missed, -901, "00", "000", "-KEEP can be used only with -CLEAN_HISTORY")
-FB_IMPL_MSG(NBACKUP, 87, nbackup_keep_hist_missed, -901, "00", "000", "-KEEP is required with -CLEAN_HISTORY")
-FB_IMPL_MSG(NBACKUP, 88, nbackup_second_keep_switch, -901, "00", "000", "-KEEP can be used one time only")
diff --git a/FBClient.Headers/firebird/impl/msg/sqlerr.h b/FBClient.Headers/firebird/impl/msg/sqlerr.h
deleted file mode 100644
index 25a7014b..00000000
--- a/FBClient.Headers/firebird/impl/msg/sqlerr.h
+++ /dev/null
@@ -1,285 +0,0 @@
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 1, "Firebird error")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 74, "Rollback not performed")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 76, "Connection error")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 77, "Connection not established")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 78, "Connection authorization failure.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 87, "deadlock")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 88, "Unsuccessful execution caused by deadlock.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 89, "record from transaction @1 is stuck in limbo")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 91, "operation completed with errors")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 94, "the SQL statement cannot be executed")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 96, "Unsuccessful execution caused by an unavailable resource.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 98, "Unsuccessful execution caused by a system error that precludes successful execution of subsequent statements")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 99, "Unsuccessful execution caused by system error that does not preclude successful execution of subsequent statements")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 158, "Wrong numeric type")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 159, "too many versions")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 160, "intermediate journal file full")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 161, "journal file wrong format")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 162, "database @1 shutdown in @2 seconds")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 163, "restart shared cache manager")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 164, "exception @1")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 165, "bad checksum")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 166, "refresh range number @1 not found")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 167, "expression evaluation not supported")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 168, "FOREIGN KEY column count does not match PRIMARY KEY")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 169, "Attempt to define a second PRIMARY KEY for the same table")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 170, "column used with aggregate")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 171, "invalid column reference")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 172, "invalid key position")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 173, "invalid direction for find operation")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 174, "Invalid statement handle")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 175, "invalid lock handle")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 176, "invalid lock level @1")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 177, "invalid bookmark handle")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 180, "wrong or obsolete version")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 183, "The INSERT, UPDATE, DELETE, DDL or authorization statement cannot be executed because the transaction is inquiry only")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 184, "external file could not be opened for output")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 189, "multiple rows in singleton select")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 190, "No subqueries permitted for VIEW WITH CHECK OPTION")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 191, "DISTINCT, GROUP or HAVING not permitted for VIEW WITH CHECK OPTION")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 192, "Only one table allowed for VIEW WITH CHECK OPTION")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 193, "No WHERE clause for VIEW WITH CHECK OPTION")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 194, "Only simple column names permitted for VIEW WITH CHECK OPTION")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 196, "An error was found in the application program input parameters for the SQL statement.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 197, "Invalid insert or update value(s): object columns are constrained - no 2 table rows can have duplicate column values")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 198, "Arithmetic overflow or division by zero has occurred.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 306, "cannot access column @1 in view @2")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 307, "Too many concurrent executions of the same request")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 308, "maximum indexes per table (@1) exceeded")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 309, "new record size of @1 bytes is too big")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 310, "segments not allowed in expression index @1")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 311, "wrong page type")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 315, "invalid ARRAY or BLOB operation")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 323, "@1 extension error")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 336, "key size exceeds implementation restriction for index \"@1\"")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 337, "definition error for index @1")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 340, "cannot create index")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 363, "duplicate specification of @1 - not supported")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 375, "The insert failed because a column definition includes validation constraints.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 382, "Cannot delete object referenced by another object")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 383, "Cannot modify object referenced by another object")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 384, "Object is referenced by another object")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 385, "lock on conflicts with existing lock")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 393, "This operation is not defined for system tables.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 395, "Inappropriate self-reference of column")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 396, "Illegal array dimension range")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 399, "database or file exists")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 400, "sort error: corruption in data structure")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 401, "node not supported")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 402, "Shadow number must be a positive integer")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 403, "Preceding file did not specify length, so @1 must include starting page number")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 404, "illegal operation when at beginning of stream")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 405, "the current position is on a crack")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 447, "cannot modify an existing user privilege")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 448, "user does not have the privilege to perform operation")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 449, "This user does not have privilege to perform this operation on this object.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 468, "transaction marked invalid by I/O error")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 469, "Cannot prepare a CREATE DATABASE/SCHEMA statement")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 470, "violation of FOREIGN KEY constraint \"@1\"")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 481, "The prepare statement identifies a prepare statement with an open cursor")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 482, "Unknown statement or request")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 490, "Attempt to update non-updatable cursor")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 492, "The cursor identified in the UPDATE or DELETE statement is not positioned on a row.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 496, "Unknown cursor")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 498, "The cursor identified in an OPEN statement is already open.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 499, "The cursor identified in a FETCH or CLOSE statement is not open.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 587, "Overflow occurred during data type conversion.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 593, "null segment of UNIQUE KEY")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 594, "subscript out of bounds")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 598, "data operation not supported")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 599, "invalid comparison operator for find operation")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 686, "Cannot transliterate character between character sets")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 687, "count of column list and variable list do not match")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 697, "Incompatible column/host variable data type")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 703, "Operation violates CHECK constraint @1 on view or table")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 704, "internal Firebird consistency check (invalid RDB$CONSTRAINT_TYPE)")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 705, "Cannot update constraints (RDB$RELATION_CONSTRAINTS).")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 706, "Cannot delete CHECK constraint entry (RDB$CHECK_CONSTRAINTS)")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 707, "Cannot update constraints (RDB$CHECK_CONSTRAINTS).")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 708, "Cannot update constraints (RDB$REF_CONSTRAINTS).")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 709, "Column used in a PRIMARY constraint must be NOT NULL.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 716, "index @1 cannot be used in the specified plan")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 717, "table @1 is referenced in the plan but not the from list")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 718, "the table @1 is referenced twice; use aliases to differentiate")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 719, "table @1 is not referenced in plan")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 739, "Log file specification partition error")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 740, "Cache or Log redefined")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 741, "Write-ahead Log with shadowing configuration not allowed")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 742, "Overflow log specification required for round-robin log")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 743, "WAL defined; Cache Manager must be started first")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 745, "Write-ahead Log without shared cache configuration not allowed")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 746, "Cannot start WAL writer for the database @1")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 747, "WAL writer synchronization error for the database @1")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 748, "WAL setup error.  Please see Firebird log.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 749, "WAL buffers cannot be increased.  Please see Firebird log.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 750, "WAL writer - Journal server communication error.  Please see Firebird log.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 751, "WAL I/O error.  Please see Firebird log.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 752, "Unable to roll over; please see Firebird log.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 753, "obsolete")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 754, "obsolete")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 755, "obsolete")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 756, "obsolete")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 757, "database does not use Write-ahead Log")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 758, "Cannot roll over to the next log file @1")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 759, "obsolete")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 760, "obsolete")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 761, "Cache or Log size too small")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 762, "Log record header too small at offset @1 in log file @2")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 763, "Incomplete log record at offset @1 in log file @2")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 764, "Unexpected end of log file @1 at offset @2")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 765, "Database name in the log file @1 is different")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 766, "Log file @1 not closed properly; database recovery may be required")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 767, "Log file @1 not latest in the chain but open flag still set")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 768, "Invalid version of log file @1")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 769, "Log file header of @1 too small")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 770, "obsolete")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 781, "table @1 is not defined")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 792, "invalid ORDER BY clause")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 794, "Column does not belong to referenced table")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 795, "column @1 is not defined in table @2")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 796, "Undefined name")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 797, "Ambiguous column reference.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 828, "function @1 is not defined")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 829, "Invalid data type, length, or value")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 830, "Invalid number of arguments")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 838, "dbkey not available for multi-table views")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 842, "number of columns does not match select list")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 843, "must specify column name for view select expression")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 845, "@1 is not a valid base table of the specified view")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 849, "This column cannot be updated because it is derived from an SQL function or expression.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 850, "The object of the INSERT, DELETE or UPDATE statement is a view for which the requested operation is not permitted.")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 895, "Invalid String")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 896, "Invalid token")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 897, "Invalid numeric literal")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 915, "An error occurred while trying to update the security database")
-FB_IMPL_MSG_NO_SYMBOL(SQLERR, 916, "non-SQL security class defined")
-FB_IMPL_MSG(SQLERR, 917, dsql_too_old_ods, -804, "HY", "000", "ODS versions before ODS@1 are not supported")
-FB_IMPL_MSG(SQLERR, 918, dsql_table_not_found, -607, "42", "S02", "Table @1 does not exist")
-FB_IMPL_MSG(SQLERR, 919, dsql_view_not_found, -607, "42", "S02", "View @1 does not exist")
-FB_IMPL_MSG(SQLERR, 920, dsql_line_col_error, -206, "42", "000", "At line @1, column @2")
-FB_IMPL_MSG(SQLERR, 921, dsql_unknown_pos, -206, "42", "000", "At unknown line and column")
-FB_IMPL_MSG(SQLERR, 922, dsql_no_dup_name, -206, "HY", "000", "Column @1 cannot be repeated in @2 statement")
-FB_IMPL_MSG(SQLERR, 923, dsql_too_many_values, -901, "07", "002", "Too many values (more than @1) in member list to match against")
-FB_IMPL_MSG(SQLERR, 924, dsql_no_array_computed, -607, "HY", "000", "Array and BLOB data types not allowed in computed field")
-FB_IMPL_MSG(SQLERR, 925, dsql_implicit_domain_name, -637, "00", "000", "Implicit domain name @1 not allowed in user created domain")
-FB_IMPL_MSG(SQLERR, 926, dsql_only_can_subscript_array, -607, "42", "000", "scalar operator used on field @1 which is not an array")
-FB_IMPL_MSG(SQLERR, 927, dsql_max_sort_items, -104, "54", "011", "cannot sort on more than 255 items")
-FB_IMPL_MSG(SQLERR, 928, dsql_max_group_items, -104, "54", "011", "cannot group on more than 255 items")
-FB_IMPL_MSG(SQLERR, 929, dsql_conflicting_sort_field, -104, "42", "000", "Cannot include the same field (@1.@2) twice in the ORDER BY clause with conflicting sorting options")
-FB_IMPL_MSG(SQLERR, 930, dsql_derived_table_more_columns, -104, "54", "001", "column list from derived table @1 has more columns than the number of items in its SELECT statement")
-FB_IMPL_MSG(SQLERR, 931, dsql_derived_table_less_columns, -104, "54", "001", "column list from derived table @1 has less columns than the number of items in its SELECT statement")
-FB_IMPL_MSG(SQLERR, 932, dsql_derived_field_unnamed, -104, "42", "000", "no column name specified for column number @1 in derived table @2")
-FB_IMPL_MSG(SQLERR, 933, dsql_derived_field_dup_name, -104, "42", "000", "column @1 was specified multiple times for derived table @2")
-FB_IMPL_MSG(SQLERR, 934, dsql_derived_alias_select, -104, "42", "000", "Internal dsql error: alias type expected by pass1_expand_select_node")
-FB_IMPL_MSG(SQLERR, 935, dsql_derived_alias_field, -104, "42", "000", "Internal dsql error: alias type expected by pass1_field")
-FB_IMPL_MSG(SQLERR, 936, dsql_auto_field_bad_pos, -104, "42", "000", "Internal dsql error: column position out of range in pass1_union_auto_cast")
-FB_IMPL_MSG(SQLERR, 937, dsql_cte_wrong_reference, -104, "42", "000", "Recursive CTE member (@1) can refer itself only in FROM clause")
-FB_IMPL_MSG(SQLERR, 938, dsql_cte_cycle, -104, "42", "000", "CTE '@1' has cyclic dependencies")
-FB_IMPL_MSG(SQLERR, 939, dsql_cte_outer_join, -104, "42", "000", "Recursive member of CTE can't be member of an outer join")
-FB_IMPL_MSG(SQLERR, 940, dsql_cte_mult_references, -104, "42", "000", "Recursive member of CTE can't reference itself more than once")
-FB_IMPL_MSG(SQLERR, 941, dsql_cte_not_a_union, -104, "42", "000", "Recursive CTE (@1) must be an UNION")
-FB_IMPL_MSG(SQLERR, 942, dsql_cte_nonrecurs_after_recurs, -104, "42", "000", "CTE '@1' defined non-recursive member after recursive")
-FB_IMPL_MSG(SQLERR, 943, dsql_cte_wrong_clause, -104, "42", "000", "Recursive member of CTE '@1' has @2 clause")
-FB_IMPL_MSG(SQLERR, 944, dsql_cte_union_all, -104, "42", "000", "Recursive members of CTE (@1) must be linked with another members via UNION ALL")
-FB_IMPL_MSG(SQLERR, 945, dsql_cte_miss_nonrecursive, -104, "42", "000", "Non-recursive member is missing in CTE '@1'")
-FB_IMPL_MSG(SQLERR, 946, dsql_cte_nested_with, -104, "42", "000", "WITH clause can't be nested")
-FB_IMPL_MSG(SQLERR, 947, dsql_col_more_than_once_using, -104, "42", "000", "column @1 appears more than once in USING clause")
-FB_IMPL_MSG(SQLERR, 948, dsql_unsupp_feature_dialect, -901, "HY", "000", "feature is not supported in dialect @1")
-FB_IMPL_MSG(SQLERR, 949, dsql_cte_not_used, -104, "42", "000", "CTE \"@1\" is not used in query")
-FB_IMPL_MSG(SQLERR, 950, dsql_col_more_than_once_view, -104, "42", "000", "column @1 appears more than once in ALTER VIEW")
-FB_IMPL_MSG(SQLERR, 951, dsql_unsupported_in_auto_trans, -901, "HY", "000", "@1 is not supported inside IN AUTONOMOUS TRANSACTION block")
-FB_IMPL_MSG(SQLERR, 952, dsql_eval_unknode, -833, "42", "000", "Unknown node type @1 in dsql/GEN_expr")
-FB_IMPL_MSG(SQLERR, 953, dsql_agg_wrongarg, -833, "42", "000", "Argument for @1 in dialect 1 must be string or numeric")
-FB_IMPL_MSG(SQLERR, 954, dsql_agg2_wrongarg, -833, "42", "000", "Argument for @1 in dialect 3 must be numeric")
-FB_IMPL_MSG(SQLERR, 955, dsql_nodateortime_pm_string, -833, "42", "000", "Strings cannot be added to or subtracted from DATE or TIME types")
-FB_IMPL_MSG(SQLERR, 956, dsql_invalid_datetime_subtract, -833, "42", "000", "Invalid data type for subtraction involving DATE, TIME or TIMESTAMP types")
-FB_IMPL_MSG(SQLERR, 957, dsql_invalid_dateortime_add, -833, "42", "000", "Adding two DATE values or two TIME values is not allowed")
-FB_IMPL_MSG(SQLERR, 958, dsql_invalid_type_minus_date, -833, "42", "000", "DATE value cannot be subtracted from the provided data type")
-FB_IMPL_MSG(SQLERR, 959, dsql_nostring_addsub_dial3, -833, "42", "000", "Strings cannot be added or subtracted in dialect 3")
-FB_IMPL_MSG(SQLERR, 960, dsql_invalid_type_addsub_dial3, -833, "42", "000", "Invalid data type for addition or subtraction in dialect 3")
-FB_IMPL_MSG(SQLERR, 961, dsql_invalid_type_multip_dial1, -833, "42", "000", "Invalid data type for multiplication in dialect 1")
-FB_IMPL_MSG(SQLERR, 962, dsql_nostring_multip_dial3, -833, "42", "000", "Strings cannot be multiplied in dialect 3")
-FB_IMPL_MSG(SQLERR, 963, dsql_invalid_type_multip_dial3, -833, "42", "000", "Invalid data type for multiplication in dialect 3")
-FB_IMPL_MSG(SQLERR, 964, dsql_mustuse_numeric_div_dial1, -833, "42", "000", "Division in dialect 1 must be between numeric data types")
-FB_IMPL_MSG(SQLERR, 965, dsql_nostring_div_dial3, -833, "42", "000", "Strings cannot be divided in dialect 3")
-FB_IMPL_MSG(SQLERR, 966, dsql_invalid_type_div_dial3, -833, "42", "000", "Invalid data type for division in dialect 3")
-FB_IMPL_MSG(SQLERR, 967, dsql_nostring_neg_dial3, -833, "42", "000", "Strings cannot be negated (applied the minus operator) in dialect 3")
-FB_IMPL_MSG(SQLERR, 968, dsql_invalid_type_neg, -833, "42", "000", "Invalid data type for negation (minus operator)")
-FB_IMPL_MSG(SQLERR, 969, dsql_max_distinct_items, -104, "54", "011", "Cannot have more than 255 items in DISTINCT / UNION DISTINCT list")
-FB_IMPL_MSG(SQLERR, 970, dsql_alter_charset_failed, -901, "42", "000", "ALTER CHARACTER SET @1 failed")
-FB_IMPL_MSG(SQLERR, 971, dsql_comment_on_failed, -901, "42", "000", "COMMENT ON @1 failed")
-FB_IMPL_MSG(SQLERR, 972, dsql_create_func_failed, -901, "42", "000", "CREATE FUNCTION @1 failed")
-FB_IMPL_MSG(SQLERR, 973, dsql_alter_func_failed, -901, "42", "000", "ALTER FUNCTION @1 failed")
-FB_IMPL_MSG(SQLERR, 974, dsql_create_alter_func_failed, -901, "42", "000", "CREATE OR ALTER FUNCTION @1 failed")
-FB_IMPL_MSG(SQLERR, 975, dsql_drop_func_failed, -901, "42", "000", "DROP FUNCTION @1 failed")
-FB_IMPL_MSG(SQLERR, 976, dsql_recreate_func_failed, -901, "42", "000", "RECREATE FUNCTION @1 failed")
-FB_IMPL_MSG(SQLERR, 977, dsql_create_proc_failed, -901, "42", "000", "CREATE PROCEDURE @1 failed")
-FB_IMPL_MSG(SQLERR, 978, dsql_alter_proc_failed, -901, "42", "000", "ALTER PROCEDURE @1 failed")
-FB_IMPL_MSG(SQLERR, 979, dsql_create_alter_proc_failed, -901, "42", "000", "CREATE OR ALTER PROCEDURE @1 failed")
-FB_IMPL_MSG(SQLERR, 980, dsql_drop_proc_failed, -901, "42", "000", "DROP PROCEDURE @1 failed")
-FB_IMPL_MSG(SQLERR, 981, dsql_recreate_proc_failed, -901, "42", "000", "RECREATE PROCEDURE @1 failed")
-FB_IMPL_MSG(SQLERR, 982, dsql_create_trigger_failed, -901, "42", "000", "CREATE TRIGGER @1 failed")
-FB_IMPL_MSG(SQLERR, 983, dsql_alter_trigger_failed, -901, "42", "000", "ALTER TRIGGER @1 failed")
-FB_IMPL_MSG(SQLERR, 984, dsql_create_alter_trigger_failed, -901, "42", "000", "CREATE OR ALTER TRIGGER @1 failed")
-FB_IMPL_MSG(SQLERR, 985, dsql_drop_trigger_failed, -901, "42", "000", "DROP TRIGGER @1 failed")
-FB_IMPL_MSG(SQLERR, 986, dsql_recreate_trigger_failed, -901, "42", "000", "RECREATE TRIGGER @1 failed")
-FB_IMPL_MSG(SQLERR, 987, dsql_create_collation_failed, -901, "42", "000", "CREATE COLLATION @1 failed")
-FB_IMPL_MSG(SQLERR, 988, dsql_drop_collation_failed, -901, "42", "000", "DROP COLLATION @1 failed")
-FB_IMPL_MSG(SQLERR, 989, dsql_create_domain_failed, -901, "42", "000", "CREATE DOMAIN @1 failed")
-FB_IMPL_MSG(SQLERR, 990, dsql_alter_domain_failed, -901, "42", "000", "ALTER DOMAIN @1 failed")
-FB_IMPL_MSG(SQLERR, 991, dsql_drop_domain_failed, -901, "42", "000", "DROP DOMAIN @1 failed")
-FB_IMPL_MSG(SQLERR, 992, dsql_create_except_failed, -901, "42", "000", "CREATE EXCEPTION @1 failed")
-FB_IMPL_MSG(SQLERR, 993, dsql_alter_except_failed, -901, "42", "000", "ALTER EXCEPTION @1 failed")
-FB_IMPL_MSG(SQLERR, 994, dsql_create_alter_except_failed, -901, "42", "000", "CREATE OR ALTER EXCEPTION @1 failed")
-FB_IMPL_MSG(SQLERR, 995, dsql_recreate_except_failed, -901, "42", "000", "RECREATE EXCEPTION @1 failed")
-FB_IMPL_MSG(SQLERR, 996, dsql_drop_except_failed, -901, "42", "000", "DROP EXCEPTION @1 failed")
-FB_IMPL_MSG(SQLERR, 997, dsql_create_sequence_failed, -901, "42", "000", "CREATE SEQUENCE @1 failed")
-FB_IMPL_MSG(SQLERR, 998, dsql_create_table_failed, -901, "42", "000", "CREATE TABLE @1 failed")
-FB_IMPL_MSG(SQLERR, 999, dsql_alter_table_failed, -901, "42", "000", "ALTER TABLE @1 failed")
-FB_IMPL_MSG(SQLERR, 1000, dsql_drop_table_failed, -901, "42", "000", "DROP TABLE @1 failed")
-FB_IMPL_MSG(SQLERR, 1001, dsql_recreate_table_failed, -901, "42", "000", "RECREATE TABLE @1 failed")
-FB_IMPL_MSG(SQLERR, 1002, dsql_create_pack_failed, -901, "42", "000", "CREATE PACKAGE @1 failed")
-FB_IMPL_MSG(SQLERR, 1003, dsql_alter_pack_failed, -901, "42", "000", "ALTER PACKAGE @1 failed")
-FB_IMPL_MSG(SQLERR, 1004, dsql_create_alter_pack_failed, -901, "42", "000", "CREATE OR ALTER PACKAGE @1 failed")
-FB_IMPL_MSG(SQLERR, 1005, dsql_drop_pack_failed, -901, "42", "000", "DROP PACKAGE @1 failed")
-FB_IMPL_MSG(SQLERR, 1006, dsql_recreate_pack_failed, -901, "42", "000", "RECREATE PACKAGE @1 failed")
-FB_IMPL_MSG(SQLERR, 1007, dsql_create_pack_body_failed, -901, "42", "000", "CREATE PACKAGE BODY @1 failed")
-FB_IMPL_MSG(SQLERR, 1008, dsql_drop_pack_body_failed, -901, "42", "000", "DROP PACKAGE BODY @1 failed")
-FB_IMPL_MSG(SQLERR, 1009, dsql_recreate_pack_body_failed, -901, "42", "000", "RECREATE PACKAGE BODY @1 failed")
-FB_IMPL_MSG(SQLERR, 1010, dsql_create_view_failed, -901, "42", "000", "CREATE VIEW @1 failed")
-FB_IMPL_MSG(SQLERR, 1011, dsql_alter_view_failed, -901, "42", "000", "ALTER VIEW @1 failed")
-FB_IMPL_MSG(SQLERR, 1012, dsql_create_alter_view_failed, -901, "42", "000", "CREATE OR ALTER VIEW @1 failed")
-FB_IMPL_MSG(SQLERR, 1013, dsql_recreate_view_failed, -901, "42", "000", "RECREATE VIEW @1 failed")
-FB_IMPL_MSG(SQLERR, 1014, dsql_drop_view_failed, -901, "42", "000", "DROP VIEW @1 failed")
-FB_IMPL_MSG(SQLERR, 1015, dsql_drop_sequence_failed, -901, "42", "000", "DROP SEQUENCE @1 failed")
-FB_IMPL_MSG(SQLERR, 1016, dsql_recreate_sequence_failed, -901, "42", "000", "RECREATE SEQUENCE @1 failed")
-FB_IMPL_MSG(SQLERR, 1017, dsql_drop_index_failed, -901, "42", "000", "DROP INDEX @1 failed")
-FB_IMPL_MSG(SQLERR, 1018, dsql_drop_filter_failed, -901, "42", "000", "DROP FILTER @1 failed")
-FB_IMPL_MSG(SQLERR, 1019, dsql_drop_shadow_failed, -901, "42", "000", "DROP SHADOW @1 failed")
-FB_IMPL_MSG(SQLERR, 1020, dsql_drop_role_failed, -901, "42", "000", "DROP ROLE @1 failed")
-FB_IMPL_MSG(SQLERR, 1021, dsql_drop_user_failed, -901, "42", "000", "DROP USER @1 failed")
-FB_IMPL_MSG(SQLERR, 1022, dsql_create_role_failed, -901, "42", "000", "CREATE ROLE @1 failed")
-FB_IMPL_MSG(SQLERR, 1023, dsql_alter_role_failed, -901, "42", "000", "ALTER ROLE @1 failed")
-FB_IMPL_MSG(SQLERR, 1024, dsql_alter_index_failed, -901, "42", "000", "ALTER INDEX @1 failed")
-FB_IMPL_MSG(SQLERR, 1025, dsql_alter_database_failed, -901, "42", "000", "ALTER DATABASE failed")
-FB_IMPL_MSG(SQLERR, 1026, dsql_create_shadow_failed, -901, "42", "000", "CREATE SHADOW @1 failed")
-FB_IMPL_MSG(SQLERR, 1027, dsql_create_filter_failed, -901, "42", "000", "DECLARE FILTER @1 failed")
-FB_IMPL_MSG(SQLERR, 1028, dsql_create_index_failed, -901, "42", "000", "CREATE INDEX @1 failed")
-FB_IMPL_MSG(SQLERR, 1029, dsql_create_user_failed, -901, "42", "000", "CREATE USER @1 failed")
-FB_IMPL_MSG(SQLERR, 1030, dsql_alter_user_failed, -901, "42", "000", "ALTER USER @1 failed")
-FB_IMPL_MSG(SQLERR, 1031, dsql_grant_failed, -901, "42", "000", "GRANT failed")
-FB_IMPL_MSG(SQLERR, 1032, dsql_revoke_failed, -901, "42", "000", "REVOKE failed")
-FB_IMPL_MSG(SQLERR, 1033, dsql_cte_recursive_aggregate, -104, "42", "000", "Recursive member of CTE cannot use aggregate or window function")
-FB_IMPL_MSG(SQLERR, 1034, dsql_mapping_failed, -901, "42", "000", "@2 MAPPING @1 failed")
-FB_IMPL_MSG(SQLERR, 1035, dsql_alter_sequence_failed, -901, "42", "000", "ALTER SEQUENCE @1 failed")
-FB_IMPL_MSG(SQLERR, 1036, dsql_create_generator_failed, -901, "42", "000", "CREATE GENERATOR @1 failed")
-FB_IMPL_MSG(SQLERR, 1037, dsql_set_generator_failed, -901, "42", "000", "SET GENERATOR @1 failed")
-FB_IMPL_MSG(SQLERR, 1038, dsql_wlock_simple, -104, "42", "000", "WITH LOCK can be used only with a single physical table")
-FB_IMPL_MSG(SQLERR, 1039, dsql_firstskip_rows, -104, "42", "000", "FIRST/SKIP cannot be used with OFFSET/FETCH or ROWS")
-FB_IMPL_MSG(SQLERR, 1040, dsql_wlock_aggregates, -104, "42", "000", "WITH LOCK cannot be used with aggregates")
-FB_IMPL_MSG(SQLERR, 1041, dsql_wlock_conflict, -104, "42", "000", "WITH LOCK cannot be used with @1")
-FB_IMPL_MSG(SQLERR, 1042, dsql_max_exception_arguments, -901, "07", "002", "Number of arguments (@1) exceeds the maximum (@2) number of EXCEPTION USING arguments")
-FB_IMPL_MSG(SQLERR, 1043, dsql_string_byte_length, -901, "42", "000", "String literal with @1 bytes exceeds the maximum length of @2 bytes")
-FB_IMPL_MSG(SQLERR, 1044, dsql_string_char_length, -901, "42", "000", "String literal with @1 characters exceeds the maximum length of @2 characters for the @3 character set")
-FB_IMPL_MSG(SQLERR, 1045, dsql_max_nesting, -901, "07", "002", "Too many BEGIN...END nesting. Maximum level is @1")
-FB_IMPL_MSG(SQLERR, 1046, dsql_recreate_user_failed, -901, "42", "000", "RECREATE USER @1 failed")
diff --git a/FBClient.Headers/firebird/impl/msg/sqlwarn.h b/FBClient.Headers/firebird/impl/msg/sqlwarn.h
deleted file mode 100644
index 70fd53f0..00000000
--- a/FBClient.Headers/firebird/impl/msg/sqlwarn.h
+++ /dev/null
@@ -1,4 +0,0 @@
-FB_IMPL_MSG_NO_SYMBOL(SQLWARN, 100, "Row not found for fetch, update or delete, or the result of a query is an empty table.")
-FB_IMPL_MSG_NO_SYMBOL(SQLWARN, 101, "segment buffer length shorter than expected")
-FB_IMPL_MSG_NO_SYMBOL(SQLWARN, 301, "Datatype needs modification")
-FB_IMPL_MSG_NO_SYMBOL(SQLWARN, 612, "Duplicate column or domain name found.")
diff --git a/FBClient.Headers/firebird/impl/msg/utl.h b/FBClient.Headers/firebird/impl/msg/utl.h
deleted file mode 100644
index 4ac7bfdd..00000000
--- a/FBClient.Headers/firebird/impl/msg/utl.h
+++ /dev/null
@@ -1 +0,0 @@
-FB_IMPL_MSG(UTL, 1, utl_trusted_switch, -901, "00", "000", "Switches trusted_user and trusted_role are not supported from command line")
diff --git a/FBClient.Headers/firebird/impl/msg_helper.h b/FBClient.Headers/firebird/impl/msg_helper.h
deleted file mode 100644
index e70cbdb0..00000000
--- a/FBClient.Headers/firebird/impl/msg_helper.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  The contents of this file are subject to the Initial
- *  Developer's Public License Version 1.0 (the "License");
- *  you may not use this file except in compliance with the
- *  License. You may obtain a copy of the License at
- *  http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
- *
- *  Software distributed under the License is distributed AS IS,
- *  WITHOUT WARRANTY OF ANY KIND, either express or implied.
- *  See the License for the specific language governing rights
- *  and limitations under the License.
- *
- *  The Original Code was created by Adriano dos Santos Fernandes
- *  for the Firebird Open Source RDBMS project.
- *
- *  Copyright (c) 2021 Adriano dos Santos Fernandes <adrianosf@gmail.com>
- *  and all contributors signed below.
- *
- *  All Rights Reserved.
- *  Contributor(s): ______________________________________.
- */
-
-#ifndef FIREBIRD_IMPL_MSG_HELPER_H
-#define FIREBIRD_IMPL_MSG_HELPER_H
-
-#define FB_IMPL_MSG_FACILITY_JRD 0
-#define FB_IMPL_MSG_FACILITY_QLI 1
-#define FB_IMPL_MSG_FACILITY_GFIX 3
-#define FB_IMPL_MSG_FACILITY_GPRE 4
-#define FB_IMPL_MSG_FACILITY_DSQL 7
-#define FB_IMPL_MSG_FACILITY_DYN 8
-#define FB_IMPL_MSG_FACILITY_INSTALL 10
-#define FB_IMPL_MSG_FACILITY_TEST 11
-#define FB_IMPL_MSG_FACILITY_GBAK 12
-#define FB_IMPL_MSG_FACILITY_SQLERR 13
-#define FB_IMPL_MSG_FACILITY_SQLWARN 14
-#define FB_IMPL_MSG_FACILITY_JRD_BUGCHK 15
-#define FB_IMPL_MSG_FACILITY_ISQL 17
-#define FB_IMPL_MSG_FACILITY_GSEC 18
-#define FB_IMPL_MSG_FACILITY_GSTAT 21
-#define FB_IMPL_MSG_FACILITY_FBSVCMGR 22
-#define FB_IMPL_MSG_FACILITY_UTL 23
-#define FB_IMPL_MSG_FACILITY_NBACKUP 24
-#define FB_IMPL_MSG_FACILITY_FBTRACEMGR 25
-#define FB_IMPL_MSG_FACILITY_JAYBIRD 26
-#define FB_IMPL_MSG_FACILITY_R2DBC_FIREBIRD 27
-
-#define FB_IMPL_MSG_MASK ((ISC_STATUS) 0x14000000)	/* Defines the code as a valid ISC code */
-
-#define FB_IMPL_MSG_ENCODE(code, facility) \
-	((ISC_STATUS(((ISC_USHORT) facility) & 0x1F) << 16) | (((ISC_STATUS) code) & 0x3FFF) | FB_IMPL_MSG_MASK)
-
-#endif	/* FIREBIRD_IMPL_MSG_HELPER_H */
diff --git a/FBClient.Headers/firebird/impl/sqlda_pub.h b/FBClient.Headers/firebird/impl/sqlda_pub.h
deleted file mode 100644
index 258a5228..00000000
--- a/FBClient.Headers/firebird/impl/sqlda_pub.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *	PROGRAM:	C preprocessor
- *	MODULE:		sqlda_pub.h
- *	DESCRIPTION:	Public DSQL definitions (included in ibase.h)
- *
- * The contents of this file are subject to the Interbase Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy
- * of the License at http://www.Inprise.com/IPL.html
- *
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
- * or implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code was created by Inprise Corporation
- * and its predecessors. Portions created by Inprise Corporation are
- * Copyright (C) Inprise Corporation.
- *
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- */
-
-#ifndef FIREBIRD_IMPL_SQLDA_PUB_H
-#define FIREBIRD_IMPL_SQLDA_PUB_H
-
-/* Definitions for DSQL free_statement routine */
-
-#define DSQL_close		1
-#define DSQL_drop		2
-#define DSQL_unprepare	4
-
-/* Declare the extended SQLDA */
-
-typedef struct
-{
-	ISC_SHORT	sqltype;			/* datatype of field */
-	ISC_SHORT	sqlscale;			/* scale factor */
-	ISC_SHORT	sqlsubtype;			/* datatype subtype - currently BLOBs only */
-	ISC_SHORT	sqllen;				/* length of data area */
-	ISC_SCHAR*	sqldata;			/* address of data */
-	ISC_SHORT*	sqlind;				/* address of indicator variable */
-	ISC_SHORT	sqlname_length;		/* length of sqlname field */
-	ISC_SCHAR	sqlname[32];		/* name of field, name length + space for NULL */
-	ISC_SHORT	relname_length;		/* length of relation name */
-	ISC_SCHAR	relname[32];		/* field's relation name + space for NULL */
-	ISC_SHORT	ownname_length;		/* length of owner name */
-	ISC_SCHAR	ownname[32];		/* relation's owner name + space for NULL */
-	ISC_SHORT	aliasname_length;	/* length of alias name */
-	ISC_SCHAR	aliasname[32];		/* relation's alias name + space for NULL */
-} XSQLVAR;
-
-#define SQLDA_VERSION1		1
-
-typedef struct
-{
-	ISC_SHORT	version;			/* version of this XSQLDA */
-	ISC_SCHAR	sqldaid[8];			/* XSQLDA name field */
-	ISC_LONG	sqldabc;			/* length in bytes of SQLDA */
-	ISC_SHORT	sqln;				/* number of fields allocated */
-	ISC_SHORT	sqld;				/* actual number of fields */
-	XSQLVAR	sqlvar[1];			/* first field address */
-} XSQLDA;
-
-#define XSQLDA_LENGTH(n)	(sizeof (XSQLDA) + (n - 1) * sizeof (XSQLVAR))
-
-#define SQL_TEXT                           452
-#define SQL_VARYING                        448
-#define SQL_SHORT                          500
-#define SQL_LONG                           496
-#define SQL_FLOAT                          482
-#define SQL_DOUBLE                         480
-#define SQL_D_FLOAT                        530
-#define SQL_TIMESTAMP                      510
-#define SQL_BLOB                           520
-#define SQL_ARRAY                          540
-#define SQL_QUAD                           550
-#define SQL_TYPE_TIME                      560
-#define SQL_TYPE_DATE                      570
-#define SQL_INT64                          580
-#define SQL_TIMESTAMP_TZ_EX              32748
-#define SQL_TIME_TZ_EX                   32750
-#define SQL_INT128                       32752
-#define SQL_TIMESTAMP_TZ                 32754
-#define SQL_TIME_TZ                      32756
-#define SQL_DEC16                        32760
-#define SQL_DEC34                        32762
-#define SQL_BOOLEAN                      32764
-#define SQL_NULL                         32766
-
-/* Historical alias for pre v6 code */
-#define SQL_DATE                           SQL_TIMESTAMP
-
-/***************************/
-/* SQL Dialects            */
-/***************************/
-
-#define SQL_DIALECT_V5				1
-#define SQL_DIALECT_V6_TRANSITION	2	/* flagging anything that is delimited
-										   by double quotes as an error and
-										   flagging keyword DATE as an error */
-#define SQL_DIALECT_V6				3	/* supports SQL delimited identifier,
-										   SQLDATE/DATE, TIME, TIMESTAMP,
-										   CURRENT_DATE, CURRENT_TIME,
-										   CURRENT_TIMESTAMP, and 64-bit exact
-										   numeric type */
-#define SQL_DIALECT_CURRENT		SQL_DIALECT_V6	/* latest IB DIALECT */
-
-#endif /* FIREBIRD_IMPL_SQLDA_PUB_H */
diff --git a/FBClient.Headers/firebird/impl/types_pub.h b/FBClient.Headers/firebird/impl/types_pub.h
deleted file mode 100644
index 1baec9e3..00000000
--- a/FBClient.Headers/firebird/impl/types_pub.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- *	PROGRAM:	Client/Server Common Code
- *	MODULE:		types_pub.h
- *	DESCRIPTION:	Types that are used both internally and externally
- *
- *  The contents of this file are subject to the Initial
- *  Developer's Public License Version 1.0 (the "License");
- *  you may not use this file except in compliance with the
- *  License. You may obtain a copy of the License at
- *  http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
- *
- *  Software distributed under the License is distributed AS IS,
- *  WITHOUT WARRANTY OF ANY KIND, either express or implied.
- *  See the License for the specific language governing rights
- *  and limitations under the License.
- *
- *  The Original Code was created by Dmitry Yemanov
- *  for the Firebird Open Source RDBMS project.
- *
- *  Copyright (c) 2004 Dmitry Yemanov <dimitr@users.sf.net>
- *  and all contributors signed below.
- *
- *  All Rights Reserved.
- *  Contributor(s): ______________________________________.
- */
-
-#ifndef FIREBIRD_IMPL_TYPES_PUB_H
-#define FIREBIRD_IMPL_TYPES_PUB_H
-
-#include <stddef.h>
-
-#if defined(__GNUC__) || defined (__HP_cc) || defined (__HP_aCC)
-#include <inttypes.h>
-#else
-
-#if !defined(_INTPTR_T_DEFINED)
-#if defined(_WIN64)
-typedef __int64 intptr_t;
-typedef unsigned __int64 uintptr_t;
-#else
-typedef long intptr_t;
-typedef unsigned long uintptr_t;
-#endif
-#endif
-
-#endif
-
-/******************************************************************/
-/* API handles                                                    */
-/******************************************************************/
-
-#if defined(_LP64) || defined(__LP64__) || defined(__arch64__) || defined(_WIN64)
-typedef unsigned int	FB_API_HANDLE;
-#else
-typedef void*		FB_API_HANDLE;
-#endif
-
-typedef FB_API_HANDLE isc_att_handle;
-typedef FB_API_HANDLE isc_blob_handle;
-typedef FB_API_HANDLE isc_db_handle;
-typedef FB_API_HANDLE isc_req_handle;
-typedef FB_API_HANDLE isc_stmt_handle;
-typedef FB_API_HANDLE isc_svc_handle;
-typedef FB_API_HANDLE isc_tr_handle;
-
-/******************************************************************/
-/* Sizes of memory blocks                                         */
-/******************************************************************/
-
-#ifdef FB_USE_SIZE_T
-/* NS: This is how things were done in original Firebird port to 64-bit platforms
-   Basic classes use these quantities. However in many places in the engine and
-   external libraries 32-bit quantities are used to hold sizes of objects.
-   This produces many warnings. This also produces incredibly dirty interfaces,
-   when functions take size_t as argument, but only handle 32 bits internally
-   without any bounds checking.                                                    */
-typedef size_t FB_SIZE_T;
-typedef intptr_t FB_SSIZE_T;
-#else
-/* NS: This is more clean way to handle things for now. We admit that engine is not
-   prepared to handle 64-bit memory blocks in most places, and it is not necessary really. */
-typedef unsigned int FB_SIZE_T;
-typedef int FB_SSIZE_T;
-#endif
-
-/******************************************************************/
-/* Status vector                                                  */
-/******************************************************************/
-
-typedef intptr_t ISC_STATUS;
-
-#define ISC_STATUS_LENGTH	20
-typedef ISC_STATUS ISC_STATUS_ARRAY[ISC_STATUS_LENGTH];
-
-/* SQL State as defined in the SQL Standard. */
-#define FB_SQLSTATE_LENGTH	5
-#define FB_SQLSTATE_SIZE	(FB_SQLSTATE_LENGTH + 1)
-typedef char FB_SQLSTATE_STRING[FB_SQLSTATE_SIZE];
-
-/******************************************************************/
-/* Define type, export and other stuff based on c/c++ and Windows */
-/******************************************************************/
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
-	#define  ISC_EXPORT	__stdcall
-	#define  ISC_EXPORT_VARARG	__cdecl
-#else
-	#define  ISC_EXPORT
-	#define  ISC_EXPORT_VARARG
-#endif
-
-/*
- * It is difficult to detect 64-bit long from the redistributable header
- * thus we may use plain "int" which is 32-bit on all platforms we support
- *
- * We'll move to this definition in future API releases.
- *
- */
-
-#if defined(_LP64) || defined(__LP64__) || defined(__arch64__)
-typedef	int				ISC_LONG;
-typedef	unsigned int	ISC_ULONG;
-#else
-typedef	signed long		ISC_LONG;
-typedef	unsigned long	ISC_ULONG;
-#endif
-
-typedef	signed short	ISC_SHORT;
-typedef	unsigned short	ISC_USHORT;
-
-typedef	unsigned char	ISC_UCHAR;
-typedef char			ISC_SCHAR;
-
-typedef ISC_UCHAR		FB_BOOLEAN;
-#define	FB_FALSE		'\0'
-#define	FB_TRUE			'\1'
-
-/*******************************************************************/
-/* 64 bit Integers                                                 */
-/*******************************************************************/
-
-#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)) && !defined(__GNUC__)
-typedef __int64				ISC_INT64;
-typedef unsigned __int64	ISC_UINT64;
-#else
-typedef long long int			ISC_INT64;
-typedef unsigned long long int	ISC_UINT64;
-#endif
-
-/*******************************************************************/
-/* Time & Date support                                             */
-/*******************************************************************/
-
-typedef int			ISC_DATE;
-
-typedef unsigned int	ISC_TIME;
-
-typedef struct
-{
-	ISC_TIME utc_time;
-	ISC_USHORT time_zone;
-} ISC_TIME_TZ;
-
-typedef struct
-{
-	ISC_TIME utc_time;
-	ISC_USHORT time_zone;
-	ISC_SHORT ext_offset;
-} ISC_TIME_TZ_EX;
-
-typedef struct
-{
-	ISC_DATE timestamp_date;
-	ISC_TIME timestamp_time;
-} ISC_TIMESTAMP;
-
-typedef struct
-{
-	ISC_TIMESTAMP utc_timestamp;
-	ISC_USHORT time_zone;
-} ISC_TIMESTAMP_TZ;
-
-typedef struct
-{
-	ISC_TIMESTAMP utc_timestamp;
-	ISC_USHORT time_zone;
-	ISC_SHORT ext_offset;
-} ISC_TIMESTAMP_TZ_EX;
-
-/*******************************************************************/
-/* Blob Id support                                                 */
-/*******************************************************************/
-
-struct GDS_QUAD_t {
-	ISC_LONG gds_quad_high;
-	ISC_ULONG gds_quad_low;
-};
-
-typedef struct GDS_QUAD_t GDS_QUAD;
-typedef struct GDS_QUAD_t ISC_QUAD;
-
-#define	isc_quad_high	gds_quad_high
-#define	isc_quad_low	gds_quad_low
-
-typedef int (*FB_SHUTDOWN_CALLBACK)(const int reason, const int mask, void* arg);
-
-struct FB_DEC16_t {
-	ISC_UINT64 fb_data[1];
-};
-
-struct FB_DEC34_t {
-	ISC_UINT64 fb_data[2];
-};
-
-struct FB_I128_t {
-	ISC_UINT64 fb_data[2];
-};
-
-typedef struct FB_DEC16_t FB_DEC16;
-typedef struct FB_DEC34_t FB_DEC34;
-typedef struct FB_I128_t FB_I128;
-
-#endif /* FIREBIRD_IMPL_TYPES_PUB_H */
diff --git a/FBClient.Headers/ib_util.h b/FBClient.Headers/ib_util.h
deleted file mode 100644
index d0bc1828..00000000
--- a/FBClient.Headers/ib_util.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *	PROGRAM:	UDF and Blob filter Utilities library
- *	MODULE:		ib_util.h
- *	DESCRIPTION:	Prototype header file for ib_util.c
- *
- * The contents of this file are subject to the Interbase Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy
- * of the License at http://www.Inprise.com/IPL.html
- *
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
- * or implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code was created by Inprise Corporation
- * and its predecessors. Portions created by Inprise Corporation are
- * Copyright (C) Inprise Corporation.
- *
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- */
-
-#ifndef _IB_UTIL_H
-#define _IB_UTIL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void *ib_util_malloc(long);
-
-#ifdef __cplusplus
-}	/* extern "C" */
-#endif
-
-#endif /* _IB_UTIL_H */
diff --git a/FBClient.Headers/ibase.h b/FBClient.Headers/ibase.h
deleted file mode 100644
index 957afbb2..00000000
--- a/FBClient.Headers/ibase.h
+++ /dev/null
@@ -1,1202 +0,0 @@
-/*
- *	MODULE:		ibase.h
- *	DESCRIPTION:	OSRI entrypoints and defines
- *
- * The contents of this file are subject to the Interbase Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy
- * of the License at http://www.Inprise.com/IPL.html
- *
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
- * or implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code was created by Inprise Corporation
- * and its predecessors. Portions created by Inprise Corporation are
- * Copyright (C) Inprise Corporation.
- *
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- *
- * 2001.07.28: John Bellardo:  Added blr_skip
- * 2001.09.18: Ann Harrison:   New info codes
- * 17-Oct-2001 Mike Nordell: CPU affinity
- * 2001-04-16 Paul Beach: ISC_TIME_SECONDS_PRECISION_SCALE modified for HP10
- * Compiler Compatibility
- * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete ports:
- *                          - EPSON, XENIX, MAC (MAC_AUX), Cray and OS/2
- * 2002.10.29 Nickolay Samofatov: Added support for savepoints
- *
- * 2002.10.29 Sean Leyne - Removed support for obsolete IPX/SPX Protocol
- *
- * 2006.09.06 Steve Boyd - Added various prototypes required by Cobol ESQL
- *                         isc_embed_dsql_length
- *                         isc_event_block_a
- *                         isc_sqlcode_s
- *                         isc_embed_dsql_fetch_a
- *                         isc_event_block_s
- *                         isc_baddress
- *                         isc_baddress_s
- *
- */
-
-#ifndef FIREBIRD_IBASE_H
-#define FIREBIRD_IBASE_H
-
-#define FB_API_VER 50
-#define isc_version4
-
-#define  ISC_TRUE	1
-#define  ISC_FALSE	0
-#if !(defined __cplusplus)
-#define  ISC__TRUE	ISC_TRUE
-#define  ISC__FALSE	ISC_FALSE
-#endif
-
-#define ISC_FAR
-
-#if defined _MSC_VER && _MSC_VER >= 1300
-#define FB_API_DEPRECATED __declspec(deprecated)
-#elif defined __GNUC__ && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
-#define FB_API_DEPRECATED __attribute__((__deprecated__))
-#else
-#define FB_API_DEPRECATED
-#endif
-
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
-#define FB_DLL_EXPORT __declspec(dllexport)
-#elif defined __has_attribute
-#if __has_attribute (visibility)
-#define FB_DLL_EXPORT __attribute__ ((visibility("default")))
-#else
-#define FB_DLL_EXPORT
-#endif
-#else
-#define FB_DLL_EXPORT
-#endif
-
-#include "./firebird/impl/types_pub.h"
-
-/***********************/
-/* Firebird misc types */
-/***********************/
-
-typedef void (* isc_callback) ();
-typedef ISC_LONG isc_resv_handle;
-
-typedef void (*ISC_PRINT_CALLBACK) (void*, ISC_SHORT, const char*);
-typedef void (*ISC_VERSION_CALLBACK)(void*, const char*);
-typedef void (*ISC_EVENT_CALLBACK)(void*, ISC_USHORT, const ISC_UCHAR*);
-
-/*******************************************************************/
-/* Blob id structure                                               */
-/*******************************************************************/
-
-#if !(defined __cplusplus)
-typedef GDS_QUAD GDS__QUAD;
-#endif /* !(defined __cplusplus) */
-
-typedef struct
-{
-	short array_bound_lower;
-	short array_bound_upper;
-} ISC_ARRAY_BOUND;
-
-typedef struct
-{
-	ISC_UCHAR	array_desc_dtype;
-	ISC_SCHAR			array_desc_scale;
-	unsigned short	array_desc_length;
-	ISC_SCHAR			array_desc_field_name[32];
-	ISC_SCHAR			array_desc_relation_name[32];
-	short			array_desc_dimensions;
-	short			array_desc_flags;
-	ISC_ARRAY_BOUND	array_desc_bounds[16];
-} ISC_ARRAY_DESC;
-
-typedef struct
-{
-	short			blob_desc_subtype;
-	short			blob_desc_charset;
-	short			blob_desc_segment_size;
-	ISC_UCHAR	blob_desc_field_name[32];
-	ISC_UCHAR	blob_desc_relation_name[32];
-} ISC_BLOB_DESC;
-
-/***************************/
-/* Blob control structure  */
-/***************************/
-
-typedef struct isc_blob_ctl
-{
-	ISC_STATUS	(* ctl_source)();	/* Source filter */
-	struct isc_blob_ctl*	ctl_source_handle;	/* Argument to pass to source filter */
-	short					ctl_to_sub_type;		/* Target type */
-	short					ctl_from_sub_type;		/* Source type */
-	unsigned short			ctl_buffer_length;		/* Length of buffer */
-	unsigned short			ctl_segment_length;		/* Length of current segment */
-	unsigned short			ctl_bpb_length;			/* Length of blob parameter  block */
-	/* Internally, this is const UCHAR*, but this public struct probably can't change. */
-	ISC_SCHAR*					ctl_bpb;				/* Address of blob parameter block */
-	ISC_UCHAR*			ctl_buffer;				/* Address of segment buffer */
-	ISC_LONG				ctl_max_segment;		/* Length of longest segment */
-	ISC_LONG				ctl_number_segments;	/* Total number of segments */
-	ISC_LONG				ctl_total_length;		/* Total length of blob */
-	ISC_STATUS*				ctl_status;				/* Address of status vector */
-	long					ctl_data[8];			/* Application specific data */
-} * ISC_BLOB_CTL;
-
-/***************************/
-/* Blob stream definitions */
-/***************************/
-
-typedef struct bstream
-{
-	isc_blob_handle	bstr_blob;		/* Blob handle */
-	ISC_SCHAR *			bstr_buffer;	/* Address of buffer */
-	ISC_SCHAR *			bstr_ptr;		/* Next character */
-	short			bstr_length;	/* Length of buffer */
-	short			bstr_cnt;		/* Characters in buffer */
-	char			bstr_mode;		/* (mode) ? OUTPUT : INPUT */
-} BSTREAM, * FB_BLOB_STREAM;
-
-/* Three ugly macros, one even using octal radix... sigh... */
-#define getb(p)	(--(p)->bstr_cnt >= 0 ? *(p)->bstr_ptr++ & 0377: BLOB_get (p))
-#define putb(x, p) (((x) == '\n' || (!(--(p)->bstr_cnt))) ? BLOB_put ((x),p) : ((int) (*(p)->bstr_ptr++ = (unsigned) (x))))
-#define putbx(x, p) ((!(--(p)->bstr_cnt)) ? BLOB_put ((x),p) : ((int) (*(p)->bstr_ptr++ = (unsigned) (x))))
-
-/********************************************************************/
-/* CVC: Public blob interface definition held in val.h.             */
-/* For some unknown reason, it was only documented in langRef       */
-/* and being the structure passed by the engine to UDFs it never    */
-/* made its way into this public definitions file.                  */
-/* Being its original name "blob", I renamed it blobcallback here.  */
-/* I did the full definition with the proper parameters instead of  */
-/* the weak C declaration with any number and type of parameters.   */
-/* Since the first parameter -BLB- is unknown outside the engine,   */
-/* it's more accurate to use void* than int* as the blob pointer    */
-/********************************************************************/
-
-#if !defined(JRD_VAL_H)
-/* Blob passing structure */
-
-/* This enum applies to parameter "mode" in blob_lseek */
-enum blob_lseek_mode {blb_seek_relative = 1, blb_seek_from_tail = 2};
-/* This enum applies to the value returned by blob_get_segment */
-enum blob_get_result {blb_got_fragment = -1, blb_got_eof = 0, blb_got_full_segment = 1};
-
-typedef struct blobcallback {
-    short (*blob_get_segment)
-		(void* hnd, ISC_UCHAR* buffer, ISC_USHORT buf_size, ISC_USHORT* result_len);
-    void*		blob_handle;
-    ISC_LONG	blob_number_segments;
-    ISC_LONG	blob_max_segment;
-    ISC_LONG	blob_total_length;
-    void (*blob_put_segment)
-		(void* hnd, const ISC_UCHAR* buffer, ISC_USHORT buf_size);
-    ISC_LONG (*blob_lseek)
-		(void* hnd, ISC_USHORT mode, ISC_LONG offset);
-}  *BLOBCALLBACK;
-#endif /* !defined(JRD_VAL_H) */
-
-
-/********************************************************************/
-/* CVC: Public descriptor interface held in dsc2.h.                  */
-/* We need it documented to be able to recognize NULL in UDFs.      */
-/* Being its original name "dsc", I renamed it paramdsc here.       */
-/* Notice that I adjust to the original definition: contrary to     */
-/* other cases, the typedef is the same struct not the pointer.     */
-/* I included the enumeration of dsc_dtype possible values.         */
-/* Ultimately, dsc2.h should be part of the public interface.        */
-/********************************************************************/
-
-#if !defined(JRD_DSC_H)
-/* This is the famous internal descriptor that UDFs can use, too. */
-typedef struct paramdsc {
-    ISC_UCHAR	dsc_dtype;
-    signed char		dsc_scale;
-    ISC_USHORT		dsc_length;
-    short		dsc_sub_type;
-    ISC_USHORT		dsc_flags;
-    ISC_UCHAR	*dsc_address;
-} PARAMDSC;
-
-#if !defined(JRD_VAL_H)
-/* This is a helper struct to work with varchars. */
-typedef struct paramvary {
-    ISC_USHORT		vary_length;
-    ISC_UCHAR		vary_string[1];
-} PARAMVARY;
-#endif /* !defined(JRD_VAL_H) */
-
-#include "./firebird/impl/dsc_pub.h"
-
-#endif /* !defined(JRD_DSC_H) */
-
-/***************************/
-/* Dynamic SQL definitions */
-/***************************/
-
-#include "./firebird/impl/sqlda_pub.h"
-
-/***************************/
-/* OSRI database functions */
-/***************************/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-ISC_STATUS ISC_EXPORT isc_attach_database(ISC_STATUS*,
-										  short,
-										  const ISC_SCHAR*,
-										  isc_db_handle*,
-										  short,
-										  const ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_array_gen_sdl(ISC_STATUS*,
-										const ISC_ARRAY_DESC*,
-										ISC_SHORT*,
-										ISC_UCHAR*,
-										ISC_SHORT*);
-
-ISC_STATUS ISC_EXPORT isc_array_get_slice(ISC_STATUS*,
-										  isc_db_handle*,
-										  isc_tr_handle*,
-										  ISC_QUAD*,
-										  const ISC_ARRAY_DESC*,
-										  void*,
-										  ISC_LONG*);
-
-ISC_STATUS ISC_EXPORT isc_array_lookup_bounds(ISC_STATUS*,
-											  isc_db_handle*,
-											  isc_tr_handle*,
-											  const ISC_SCHAR*,
-											  const ISC_SCHAR*,
-											  ISC_ARRAY_DESC*);
-
-ISC_STATUS ISC_EXPORT isc_array_lookup_desc(ISC_STATUS*,
-											isc_db_handle*,
-											isc_tr_handle*,
-											const ISC_SCHAR*,
-											const ISC_SCHAR*,
-											ISC_ARRAY_DESC*);
-
-ISC_STATUS ISC_EXPORT isc_array_set_desc(ISC_STATUS*,
-										 const ISC_SCHAR*,
-										 const ISC_SCHAR*,
-										 const short*,
-										 const short*,
-										 const short*,
-										 ISC_ARRAY_DESC*);
-
-ISC_STATUS ISC_EXPORT isc_array_put_slice(ISC_STATUS*,
-										  isc_db_handle*,
-										  isc_tr_handle*,
-										  ISC_QUAD*,
-										  const ISC_ARRAY_DESC*,
-										  void*,
-										  ISC_LONG *);
-
-void ISC_EXPORT isc_blob_default_desc(ISC_BLOB_DESC*,
-									  const ISC_UCHAR*,
-									  const ISC_UCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_blob_gen_bpb(ISC_STATUS*,
-									   const ISC_BLOB_DESC*,
-									   const ISC_BLOB_DESC*,
-									   unsigned short,
-									   ISC_UCHAR*,
-									   unsigned short*);
-
-ISC_STATUS ISC_EXPORT isc_blob_info(ISC_STATUS*,
-									isc_blob_handle*,
-									short,
-									const ISC_SCHAR*,
-									short,
-									ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_blob_lookup_desc(ISC_STATUS*,
-										   isc_db_handle*,
-										   isc_tr_handle*,
-										   const ISC_UCHAR*,
-										   const ISC_UCHAR*,
-										   ISC_BLOB_DESC*,
-										   ISC_UCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_blob_set_desc(ISC_STATUS*,
-										const ISC_UCHAR*,
-										const ISC_UCHAR*,
-										short,
-										short,
-										short,
-										ISC_BLOB_DESC*);
-
-ISC_STATUS ISC_EXPORT isc_cancel_blob(ISC_STATUS *,
-									  isc_blob_handle *);
-
-ISC_STATUS ISC_EXPORT isc_cancel_events(ISC_STATUS *,
-										isc_db_handle *,
-										ISC_LONG *);
-
-ISC_STATUS ISC_EXPORT isc_close_blob(ISC_STATUS *,
-									 isc_blob_handle *);
-
-ISC_STATUS ISC_EXPORT isc_commit_retaining(ISC_STATUS *,
-										   isc_tr_handle *);
-
-ISC_STATUS ISC_EXPORT isc_commit_transaction(ISC_STATUS *,
-											 isc_tr_handle *);
-
-ISC_STATUS ISC_EXPORT isc_create_blob(ISC_STATUS*,
-									  isc_db_handle*,
-									  isc_tr_handle*,
-									  isc_blob_handle*,
-									  ISC_QUAD*);
-
-ISC_STATUS ISC_EXPORT isc_create_blob2(ISC_STATUS*,
-									   isc_db_handle*,
-									   isc_tr_handle*,
-									   isc_blob_handle*,
-									   ISC_QUAD*,
-									   short,
-									   const ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_create_database(ISC_STATUS*,
-										  unsigned short,
-										  const ISC_SCHAR*,
-										  isc_db_handle*,
-										  unsigned short,
-										  const ISC_SCHAR*,
-										  unsigned short);
-
-ISC_STATUS ISC_EXPORT isc_database_info(ISC_STATUS*,
-										isc_db_handle*,
-										short,
-										const ISC_SCHAR*,
-										short,
-										ISC_SCHAR*);
-
-void ISC_EXPORT isc_decode_date(const ISC_QUAD*,
-								void*);
-
-void ISC_EXPORT isc_decode_sql_date(const ISC_DATE*,
-									void*);
-
-void ISC_EXPORT isc_decode_sql_time(const ISC_TIME*,
-									void*);
-
-void ISC_EXPORT isc_decode_timestamp(const ISC_TIMESTAMP*,
-									 void*);
-
-ISC_STATUS ISC_EXPORT isc_detach_database(ISC_STATUS *,
-										  isc_db_handle *);
-
-ISC_STATUS ISC_EXPORT isc_drop_database(ISC_STATUS *,
-										isc_db_handle *);
-
-ISC_STATUS ISC_EXPORT isc_dsql_allocate_statement(ISC_STATUS *,
-												  isc_db_handle *,
-												  isc_stmt_handle *);
-
-ISC_STATUS ISC_EXPORT isc_dsql_alloc_statement2(ISC_STATUS *,
-												isc_db_handle *,
-												isc_stmt_handle *);
-
-ISC_STATUS ISC_EXPORT isc_dsql_describe(ISC_STATUS *,
-										isc_stmt_handle *,
-										unsigned short,
-										XSQLDA *);
-
-ISC_STATUS ISC_EXPORT isc_dsql_describe_bind(ISC_STATUS *,
-											 isc_stmt_handle *,
-											 unsigned short,
-											 XSQLDA *);
-
-ISC_STATUS ISC_EXPORT isc_dsql_exec_immed2(ISC_STATUS*,
-										   isc_db_handle*,
-										   isc_tr_handle*,
-										   unsigned short,
-										   const ISC_SCHAR*,
-										   unsigned short,
-										   const XSQLDA*,
-										   const XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_dsql_execute(ISC_STATUS*,
-									   isc_tr_handle*,
-									   isc_stmt_handle*,
-									   unsigned short,
-									   const XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_dsql_execute2(ISC_STATUS*,
-										isc_tr_handle*,
-										isc_stmt_handle*,
-										unsigned short,
-										const XSQLDA*,
-										const XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_dsql_execute_immediate(ISC_STATUS*,
-												 isc_db_handle*,
-												 isc_tr_handle*,
-												 unsigned short,
-												 const ISC_SCHAR*,
-												 unsigned short,
-												 const XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_dsql_fetch(ISC_STATUS *,
-									 isc_stmt_handle *,
-									 unsigned short,
-									 const XSQLDA *);
-
-ISC_STATUS ISC_EXPORT isc_dsql_finish(isc_db_handle *);
-
-ISC_STATUS ISC_EXPORT isc_dsql_free_statement(ISC_STATUS *,
-											  isc_stmt_handle *,
-											  unsigned short);
-
-ISC_STATUS ISC_EXPORT isc_dsql_insert(ISC_STATUS*,
-									  isc_stmt_handle*,
-									  unsigned short,
-									  XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_dsql_prepare(ISC_STATUS*,
-									   isc_tr_handle*,
-									   isc_stmt_handle*,
-									   unsigned short,
-									   const ISC_SCHAR*,
-									   unsigned short,
-									   XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_dsql_set_cursor_name(ISC_STATUS*,
-											   isc_stmt_handle*,
-											   const ISC_SCHAR*,
-											   unsigned short);
-
-ISC_STATUS ISC_EXPORT isc_dsql_sql_info(ISC_STATUS*,
-										isc_stmt_handle*,
-										short,
-										const ISC_SCHAR*,
-										short,
-										ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT fb_dsql_set_timeout(ISC_STATUS*,
-										  isc_stmt_handle*,
-										  ISC_ULONG);
-
-/*ISC_STATUS ISC_EXPORT fb_get_statement_interface(ISC_STATUS*,
-												  FB_API_HANDLE*,
-												  void**);
- */
-void ISC_EXPORT isc_encode_date(const void*,
-								ISC_QUAD*);
-
-void ISC_EXPORT isc_encode_sql_date(const void*,
-									ISC_DATE*);
-
-void ISC_EXPORT isc_encode_sql_time(const void*,
-									ISC_TIME*);
-
-void ISC_EXPORT isc_encode_timestamp(const void*,
-									 ISC_TIMESTAMP*);
-
-ISC_LONG ISC_EXPORT_VARARG isc_event_block(ISC_UCHAR**,
-										   ISC_UCHAR**,
-										   ISC_USHORT, ...);
-
-ISC_USHORT ISC_EXPORT isc_event_block_a(ISC_SCHAR**,
-										ISC_SCHAR**,
-										ISC_USHORT,
-										ISC_SCHAR**);
-
-void ISC_EXPORT isc_event_block_s(ISC_SCHAR**,
-								  ISC_SCHAR**,
-								  ISC_USHORT,
-								  ISC_SCHAR**,
-								  ISC_USHORT*);
-
-void ISC_EXPORT isc_event_counts(ISC_ULONG*,
-								 short,
-								 ISC_UCHAR*,
-								 const ISC_UCHAR *);
-
-/* 17 May 2001 - isc_expand_dpb is DEPRECATED */
-void FB_API_DEPRECATED ISC_EXPORT_VARARG isc_expand_dpb(ISC_SCHAR**,
-											  			short*, ...);
-
-int ISC_EXPORT isc_modify_dpb(ISC_SCHAR**,
-							  short*,
-							  unsigned short,
-							  const ISC_SCHAR*,
-							  short);
-
-ISC_LONG ISC_EXPORT isc_free(ISC_SCHAR *);
-
-ISC_STATUS ISC_EXPORT isc_get_segment(ISC_STATUS *,
-									  isc_blob_handle *,
-									  unsigned short *,
-									  unsigned short,
-									  ISC_SCHAR *);
-
-ISC_STATUS ISC_EXPORT isc_get_slice(ISC_STATUS*,
-									isc_db_handle*,
-									isc_tr_handle*,
-									ISC_QUAD*,
-									unsigned short,
-									const ISC_UCHAR*,
-									unsigned short,
-									const ISC_LONG*,
-									ISC_LONG,
-									void*,
-									ISC_LONG*);
-
-/* CVC: This non-const signature is needed for compatibility, see gds.cpp. */
-ISC_LONG FB_API_DEPRECATED ISC_EXPORT isc_interprete(ISC_SCHAR*,
-									 ISC_STATUS**);
-
-/* This const params version used in the engine and other places. */
-ISC_LONG ISC_EXPORT fb_interpret(ISC_SCHAR*,
-								 unsigned int,
-								 const ISC_STATUS**);
-
-ISC_STATUS ISC_EXPORT isc_open_blob(ISC_STATUS*,
-									isc_db_handle*,
-									isc_tr_handle*,
-									isc_blob_handle*,
-									ISC_QUAD*);
-
-ISC_STATUS ISC_EXPORT isc_open_blob2(ISC_STATUS*,
-									 isc_db_handle*,
-									 isc_tr_handle*,
-									 isc_blob_handle*,
-									 ISC_QUAD*,
-									 ISC_USHORT,
-									 const ISC_UCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_prepare_transaction2(ISC_STATUS*,
-											   isc_tr_handle*,
-											   ISC_USHORT,
-											   const ISC_UCHAR*);
-
-void ISC_EXPORT isc_print_sqlerror(ISC_SHORT,
-								   const ISC_STATUS*);
-
-ISC_STATUS ISC_EXPORT isc_print_status(const ISC_STATUS*);
-
-ISC_STATUS ISC_EXPORT isc_put_segment(ISC_STATUS*,
-									  isc_blob_handle*,
-									  unsigned short,
-									  const ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_put_slice(ISC_STATUS*,
-									isc_db_handle*,
-									isc_tr_handle*,
-									ISC_QUAD*,
-									unsigned short,
-									const ISC_SCHAR*,
-									unsigned short,
-									const ISC_LONG*,
-									ISC_LONG,
-									void*);
-
-ISC_STATUS ISC_EXPORT isc_que_events(ISC_STATUS*,
-									 isc_db_handle*,
-									 ISC_LONG*,
-									 unsigned short,
-									 const ISC_UCHAR*,
-									 ISC_EVENT_CALLBACK,
-									 void*);
-
-ISC_STATUS ISC_EXPORT isc_rollback_retaining(ISC_STATUS*,
-											 isc_tr_handle*);
-
-ISC_STATUS ISC_EXPORT isc_rollback_transaction(ISC_STATUS*,
-											   isc_tr_handle*);
-
-ISC_STATUS ISC_EXPORT isc_start_multiple(ISC_STATUS*,
-										 isc_tr_handle*,
-										 short,
-										 void *);
-
-ISC_STATUS ISC_EXPORT_VARARG isc_start_transaction(ISC_STATUS*,
-												   isc_tr_handle*,
-												   short, ...);
-
-ISC_STATUS ISC_EXPORT fb_disconnect_transaction(ISC_STATUS*, isc_tr_handle*);
-
-ISC_LONG ISC_EXPORT isc_sqlcode(const ISC_STATUS*);
-
-void ISC_EXPORT isc_sqlcode_s(const ISC_STATUS*,
-							  ISC_ULONG*);
-
-void ISC_EXPORT fb_sqlstate(char*,
-							const ISC_STATUS*);
-
-void ISC_EXPORT isc_sql_interprete(short,
-								   ISC_SCHAR*,
-								   short);
-
-ISC_STATUS ISC_EXPORT isc_transaction_info(ISC_STATUS*,
-										   isc_tr_handle*,
-										   short,
-										   const ISC_SCHAR*,
-										   short,
-										   ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_transact_request(ISC_STATUS*,
-										   isc_db_handle*,
-										   isc_tr_handle*,
-										   unsigned short,
-										   ISC_SCHAR*,
-										   unsigned short,
-										   ISC_SCHAR*,
-										   unsigned short,
-										   ISC_SCHAR*);
-
-ISC_LONG ISC_EXPORT isc_vax_integer(const ISC_SCHAR*,
-									short);
-
-ISC_INT64 ISC_EXPORT isc_portable_integer(const ISC_UCHAR*,
-										  short);
-
-/*************************************/
-/* Security Functions and structures */
-/*************************************/
-
-#define sec_uid_spec		    0x01
-#define sec_gid_spec		    0x02
-#define sec_server_spec		    0x04
-#define sec_password_spec	    0x08
-#define sec_group_name_spec	    0x10
-#define sec_first_name_spec	    0x20
-#define sec_middle_name_spec        0x40
-#define sec_last_name_spec	    0x80
-#define sec_dba_user_name_spec      0x100
-#define sec_dba_password_spec       0x200
-
-#define sec_protocol_tcpip            1
-#define sec_protocol_netbeui          2
-#define sec_protocol_spx              3 /* -- Deprecated Protocol. Declaration retained for compatibility   */
-#define sec_protocol_local            4
-
-typedef struct {
-	short sec_flags;			/* which fields are specified */
-	int uid;					/* the user's id */
-	int gid;					/* the user's group id */
-	int protocol;				/* protocol to use for connection */
-	ISC_SCHAR *server;				/* server to administer */
-	ISC_SCHAR *user_name;			/* the user's name */
-	ISC_SCHAR *password;				/* the user's password */
-	ISC_SCHAR *group_name;			/* the group name */
-	ISC_SCHAR *first_name;			/* the user's first name */
-	ISC_SCHAR *middle_name;			/* the user's middle name */
-	ISC_SCHAR *last_name;			/* the user's last name */
-	ISC_SCHAR *dba_user_name;		/* the dba user name */
-	ISC_SCHAR *dba_password;			/* the dba password */
-} USER_SEC_DATA;
-
-ISC_STATUS ISC_EXPORT isc_add_user(ISC_STATUS*, const USER_SEC_DATA*);
-
-ISC_STATUS ISC_EXPORT isc_delete_user(ISC_STATUS*, const USER_SEC_DATA*);
-
-ISC_STATUS ISC_EXPORT isc_modify_user(ISC_STATUS*, const USER_SEC_DATA*);
-
-/**********************************/
-/*  Other OSRI functions          */
-/**********************************/
-
-ISC_STATUS ISC_EXPORT isc_compile_request(ISC_STATUS*,
-										  isc_db_handle*,
-										  isc_req_handle*,
-										  ISC_USHORT,
-										  const ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_compile_request2(ISC_STATUS*,
-										   isc_db_handle*,
-										   isc_req_handle*,
-										   unsigned short,
-										   const ISC_SCHAR*);
-
-// This function always returns error since FB 3.0.
-ISC_STATUS FB_API_DEPRECATED ISC_EXPORT isc_ddl(ISC_STATUS*,
-							  isc_db_handle*,
-							  isc_tr_handle*,
-							  short,
-							  const ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_prepare_transaction(ISC_STATUS*,
-											  isc_tr_handle*);
-
-
-ISC_STATUS ISC_EXPORT isc_receive(ISC_STATUS*,
-								  isc_req_handle*,
-								  ISC_USHORT,
-								  ISC_USHORT,
-								  void*,
-								  short);
-
-ISC_STATUS ISC_EXPORT isc_reconnect_transaction(ISC_STATUS*,
-												isc_db_handle*,
-												isc_tr_handle*,
-												unsigned short,
-												const ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_release_request(ISC_STATUS*,
-										  isc_req_handle*);
-
-ISC_STATUS ISC_EXPORT isc_request_info(ISC_STATUS*,
-									   isc_req_handle*,
-									   short,
-									   short,
-									   const ISC_SCHAR*,
-									   short,
-									   ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_seek_blob(ISC_STATUS*,
-									isc_blob_handle*,
-									short,
-									ISC_LONG,
-									ISC_LONG*);
-
-ISC_STATUS ISC_EXPORT isc_send(ISC_STATUS*,
-							   isc_req_handle*,
-							   unsigned short,
-							   unsigned short,
-							   const void*,
-							   short);
-
-ISC_STATUS ISC_EXPORT isc_start_and_send(ISC_STATUS*,
-										 isc_req_handle*,
-										 isc_tr_handle*,
-										 ISC_USHORT,
-										 ISC_USHORT,
-										 const void*,
-										 short);
-
-ISC_STATUS ISC_EXPORT isc_start_request(ISC_STATUS *,
-										isc_req_handle *,
-										isc_tr_handle *,
-										short);
-
-ISC_STATUS ISC_EXPORT isc_unwind_request(ISC_STATUS *,
-										 isc_tr_handle *,
-										 short);
-
-ISC_STATUS ISC_EXPORT isc_wait_for_event(ISC_STATUS*,
-										 isc_db_handle*,
-										 unsigned short,
-										 const ISC_UCHAR*,
-										 ISC_UCHAR*);
-
-
-/*****************************/
-/* Other Sql functions       */
-/*****************************/
-
-ISC_STATUS ISC_EXPORT isc_close(ISC_STATUS*,
-								const ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_declare(ISC_STATUS*,
-								  const ISC_SCHAR*,
-								  const ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_describe(ISC_STATUS*,
-								   const ISC_SCHAR*,
-								   XSQLDA *);
-
-ISC_STATUS ISC_EXPORT isc_describe_bind(ISC_STATUS*,
-										const ISC_SCHAR*,
-										XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_execute(ISC_STATUS*,
-								  isc_tr_handle*,
-								  const ISC_SCHAR*,
-								  XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_execute_immediate(ISC_STATUS*,
-											isc_db_handle*,
-											isc_tr_handle*,
-											short*,
-											const ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_fetch(ISC_STATUS*,
-								const ISC_SCHAR*,
-								XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_open(ISC_STATUS*,
-							   isc_tr_handle*,
-							   const ISC_SCHAR*,
-							   XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_prepare(ISC_STATUS*,
-								  isc_db_handle*,
-								  isc_tr_handle*,
-								  const ISC_SCHAR*,
-								  const short*,
-								  const ISC_SCHAR*,
-								  XSQLDA*);
-
-
-/*************************************/
-/* Other Dynamic sql functions       */
-/*************************************/
-
-ISC_STATUS ISC_EXPORT isc_dsql_execute_m(ISC_STATUS*,
-										 isc_tr_handle*,
-										 isc_stmt_handle*,
-										 unsigned short,
-										 const ISC_SCHAR*,
-										 unsigned short,
-										 unsigned short,
-										 ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_dsql_execute2_m(ISC_STATUS*,
-										  isc_tr_handle*,
-										  isc_stmt_handle*,
-										  unsigned short,
-										  const ISC_SCHAR*,
-										  unsigned short,
-										  unsigned short,
-										  const ISC_SCHAR*,
-										  unsigned short,
-										  ISC_SCHAR*,
-										  unsigned short,
-										  unsigned short,
-										  ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_dsql_execute_immediate_m(ISC_STATUS*,
-												   isc_db_handle*,
-												   isc_tr_handle*,
-												   unsigned short,
-												   const ISC_SCHAR*,
-												   unsigned short,
-												   unsigned short,
-												   ISC_SCHAR*,
-												   unsigned short,
-												   unsigned short,
-												   ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_dsql_fetch_m(ISC_STATUS*,
-									   isc_stmt_handle*,
-									   unsigned short,
-									   ISC_SCHAR*,
-									   unsigned short,
-									   unsigned short,
-									   ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_dsql_insert_m(ISC_STATUS*,
-										isc_stmt_handle*,
-										unsigned short,
-										const ISC_SCHAR*,
-										unsigned short,
-										unsigned short,
-										const ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_dsql_prepare_m(ISC_STATUS*,
-										 isc_tr_handle*,
-										 isc_stmt_handle*,
-										 unsigned short,
-										 const ISC_SCHAR*,
-										 unsigned short,
-										 unsigned short,
-										 const ISC_SCHAR*,
-										 unsigned short,
-										 ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_dsql_release(ISC_STATUS*,
-									   const ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_embed_dsql_close(ISC_STATUS*,
-										   const ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_embed_dsql_declare(ISC_STATUS*,
-											 const ISC_SCHAR*,
-											 const ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_embed_dsql_describe(ISC_STATUS*,
-											  const ISC_SCHAR*,
-											  unsigned short,
-											  XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_embed_dsql_describe_bind(ISC_STATUS*,
-												   const ISC_SCHAR*,
-												   unsigned short,
-												   XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_embed_dsql_execute(ISC_STATUS*,
-											 isc_tr_handle*,
-											 const ISC_SCHAR*,
-											 unsigned short,
-											 XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_embed_dsql_execute2(ISC_STATUS*,
-											  isc_tr_handle*,
-											  const ISC_SCHAR*,
-											  unsigned short,
-											  XSQLDA*,
-											  XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_embed_dsql_execute_immed(ISC_STATUS*,
-												   isc_db_handle*,
-												   isc_tr_handle*,
-												   unsigned short,
-												   const ISC_SCHAR*,
-												   unsigned short,
-												   XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_embed_dsql_fetch(ISC_STATUS*,
-										   const ISC_SCHAR*,
-										   unsigned short,
-										   XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_embed_dsql_fetch_a(ISC_STATUS*,
-											 int*,
-											 const ISC_SCHAR*,
-											 ISC_USHORT,
-											 XSQLDA*);
-
-void ISC_EXPORT isc_embed_dsql_length(const ISC_UCHAR*,
-									  ISC_USHORT*);
-
-ISC_STATUS ISC_EXPORT isc_embed_dsql_open(ISC_STATUS*,
-										  isc_tr_handle*,
-										  const ISC_SCHAR*,
-										  unsigned short,
-										  XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_embed_dsql_open2(ISC_STATUS*,
-										   isc_tr_handle*,
-										   const ISC_SCHAR*,
-										   unsigned short,
-										   XSQLDA*,
-										   XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_embed_dsql_insert(ISC_STATUS*,
-											const ISC_SCHAR*,
-											unsigned short,
-											XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_embed_dsql_prepare(ISC_STATUS*,
-											 isc_db_handle*,
-											 isc_tr_handle*,
-											 const ISC_SCHAR*,
-											 unsigned short,
-											 const ISC_SCHAR*,
-											 unsigned short,
-											 XSQLDA*);
-
-ISC_STATUS ISC_EXPORT isc_embed_dsql_release(ISC_STATUS*,
-											 const ISC_SCHAR*);
-
-
-/******************************/
-/* Other Blob functions       */
-/******************************/
-
-FB_BLOB_STREAM ISC_EXPORT BLOB_open(isc_blob_handle,
-									ISC_SCHAR*,
-									int);
-
-int ISC_EXPORT BLOB_put(ISC_SCHAR,
-						FB_BLOB_STREAM);
-
-int ISC_EXPORT BLOB_close(FB_BLOB_STREAM);
-
-int ISC_EXPORT BLOB_get(FB_BLOB_STREAM);
-
-int ISC_EXPORT BLOB_display(ISC_QUAD*,
-							isc_db_handle,
-							isc_tr_handle,
-							const ISC_SCHAR*);
-
-int ISC_EXPORT BLOB_dump(ISC_QUAD*,
-						 isc_db_handle,
-						 isc_tr_handle,
-						 const ISC_SCHAR*);
-
-int ISC_EXPORT BLOB_edit(ISC_QUAD*,
-						 isc_db_handle,
-						 isc_tr_handle,
-						 const ISC_SCHAR*);
-
-int ISC_EXPORT BLOB_load(ISC_QUAD*,
-						 isc_db_handle,
-						 isc_tr_handle,
-						 const ISC_SCHAR*);
-
-int ISC_EXPORT BLOB_text_dump(ISC_QUAD*,
-							  isc_db_handle,
-							  isc_tr_handle,
-							  const ISC_SCHAR*);
-
-int ISC_EXPORT BLOB_text_load(ISC_QUAD*,
-							  isc_db_handle,
-							  isc_tr_handle,
-							  const ISC_SCHAR*);
-
-FB_BLOB_STREAM ISC_EXPORT Bopen(ISC_QUAD*,
-								isc_db_handle,
-								isc_tr_handle,
-								const ISC_SCHAR*);
-
-
-/******************************/
-/* Other Misc functions       */
-/******************************/
-
-ISC_LONG ISC_EXPORT isc_ftof(const ISC_SCHAR*,
-							 const unsigned short,
-							 ISC_SCHAR*,
-							 const unsigned short);
-
-ISC_STATUS ISC_EXPORT isc_print_blr(const ISC_SCHAR*,
-									ISC_PRINT_CALLBACK,
-									void*,
-									short);
-
-int ISC_EXPORT fb_print_blr(const ISC_UCHAR*,
-							ISC_ULONG,
-							ISC_PRINT_CALLBACK,
-							void*,
-							short);
-
-void ISC_EXPORT isc_set_debug(int);
-
-void ISC_EXPORT isc_qtoq(const ISC_QUAD*,
-						 ISC_QUAD*);
-
-void ISC_EXPORT isc_vtof(const ISC_SCHAR*,
-						 ISC_SCHAR*,
-						 unsigned short);
-
-void ISC_EXPORT isc_vtov(const ISC_SCHAR*,
-						 ISC_SCHAR*,
-						 short);
-
-int ISC_EXPORT isc_version(isc_db_handle*,
-						   ISC_VERSION_CALLBACK,
-						   void*);
-
-ISC_LONG FB_API_DEPRECATED ISC_EXPORT isc_reset_fpe(ISC_USHORT);
-
-uintptr_t	ISC_EXPORT isc_baddress(ISC_SCHAR*);
-void		ISC_EXPORT isc_baddress_s(const ISC_SCHAR*,
-								  uintptr_t*);
-
-/*****************************************/
-/* Service manager functions             */
-/*****************************************/
-
-#define ADD_SPB_LENGTH(p, length)	{*(p)++ = (length); \
-    					 *(p)++ = (length) >> 8;}
-
-#define ADD_SPB_NUMERIC(p, data)	{*(p)++ = (ISC_SCHAR) (ISC_UCHAR) (data); \
-    					 *(p)++ = (ISC_SCHAR) (ISC_UCHAR) ((data) >> 8); \
-					 *(p)++ = (ISC_SCHAR) (ISC_UCHAR) ((data) >> 16); \
-					 *(p)++ = (ISC_SCHAR) (ISC_UCHAR) ((data) >> 24);}
-
-ISC_STATUS ISC_EXPORT isc_service_attach(ISC_STATUS*,
-										 unsigned short,
-										 const ISC_SCHAR*,
-										 isc_svc_handle*,
-										 unsigned short,
-										 const ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_service_detach(ISC_STATUS *,
-										 isc_svc_handle *);
-
-ISC_STATUS ISC_EXPORT isc_service_query(ISC_STATUS*,
-										isc_svc_handle*,
-										isc_resv_handle*,
-										unsigned short,
-										const ISC_SCHAR*,
-										unsigned short,
-										const ISC_SCHAR*,
-										unsigned short,
-										ISC_SCHAR*);
-
-ISC_STATUS ISC_EXPORT isc_service_start(ISC_STATUS*,
-										isc_svc_handle*,
-										isc_resv_handle*,
-										unsigned short,
-										const ISC_SCHAR*);
-
-/***********************/
-/* Shutdown and cancel */
-/***********************/
-
-int ISC_EXPORT fb_shutdown(unsigned int, const int);
-
-ISC_STATUS ISC_EXPORT fb_shutdown_callback(ISC_STATUS*,
-										   FB_SHUTDOWN_CALLBACK,
-										   const int,
-										   void*);
-
-ISC_STATUS ISC_EXPORT fb_cancel_operation(ISC_STATUS*,
-										  isc_db_handle*,
-										  ISC_USHORT);
-
-/***********************/
-/* Ping the connection */
-/***********************/
-
-ISC_STATUS ISC_EXPORT fb_ping(ISC_STATUS*, isc_db_handle*);
-
-/********************/
-/* Object interface */
-/********************/
-
-ISC_STATUS ISC_EXPORT fb_get_database_handle(ISC_STATUS*, isc_db_handle*, void*);
-ISC_STATUS ISC_EXPORT fb_get_transaction_handle(ISC_STATUS*, isc_tr_handle*, void*);
-ISC_STATUS ISC_EXPORT fb_get_transaction_interface(ISC_STATUS*, void*, isc_tr_handle*);
-ISC_STATUS ISC_EXPORT fb_get_statement_interface(ISC_STATUS*, void*, isc_stmt_handle*);
-
-/********************************/
-/* Client information functions */
-/********************************/
-
-void ISC_EXPORT isc_get_client_version ( ISC_SCHAR  *);
-int  ISC_EXPORT isc_get_client_major_version ();
-int  ISC_EXPORT isc_get_client_minor_version ();
-
-/*******************************************/
-/* Set callback for database crypt plugins */
-/*******************************************/
-
-ISC_STATUS ISC_EXPORT fb_database_crypt_callback(ISC_STATUS*, void*);
-
-#ifdef __cplusplus
-}	/* extern "C" */
-#endif
-
-
-/***************************************************/
-/* Actions to pass to the blob filter (ctl_source) */
-/***************************************************/
-
-#define isc_blob_filter_open             0
-#define isc_blob_filter_get_segment      1
-#define isc_blob_filter_close            2
-#define isc_blob_filter_create           3
-#define isc_blob_filter_put_segment      4
-#define isc_blob_filter_alloc            5
-#define isc_blob_filter_free             6
-#define isc_blob_filter_seek             7
-
-/*******************/
-/* Blr definitions */
-/*******************/
-
-#include "./firebird/impl/blr.h"
-
-#include "./firebird/impl/consts_pub.h"
-
-/*********************************/
-/* Information call declarations */
-/*********************************/
-
-#include "./firebird/impl/inf_pub.h"
-
-#include "./iberror.h"
-
-#endif /* FIREBIRD_IBASE_H */
diff --git a/FBClient.Headers/iberror.h b/FBClient.Headers/iberror.h
deleted file mode 100644
index e227c10c..00000000
--- a/FBClient.Headers/iberror.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * The contents of this file are subject to the Interbase Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy
- * of the License at http://www.Inprise.com/IPL.html
- *
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
- * or implied. See the License for the specific language governing
- * rights and limitations under the License.
- */
-
-#ifndef FIREBIRD_IBERROR_H
-#define FIREBIRD_IBERROR_H
-
-#include "firebird/impl/msg_helper.h"
-
-#ifdef __cplusplus /* c++ definitions */
-
-const ISC_STATUS isc_facility = 20;
-const ISC_STATUS isc_base = isc_facility << 24;
-const ISC_STATUS isc_factor = 1;
-
-const ISC_STATUS isc_arg_end			= 0;	// end of argument list
-const ISC_STATUS isc_arg_gds			= 1;	// generic DSRI status value
-const ISC_STATUS isc_arg_string			= 2;	// string argument
-const ISC_STATUS isc_arg_cstring		= 3;	// count & string argument
-const ISC_STATUS isc_arg_number			= 4;	// numeric argument (long)
-const ISC_STATUS isc_arg_interpreted	= 5;	// interpreted status code (string)
-const ISC_STATUS isc_arg_vms			= 6;	// VAX/VMS status code (long)
-const ISC_STATUS isc_arg_unix			= 7;	// UNIX error code
-const ISC_STATUS isc_arg_domain			= 8;	// Apollo/Domain error code
-const ISC_STATUS isc_arg_dos			= 9;	// MSDOS/OS2 error code
-const ISC_STATUS isc_arg_mpexl			= 10;	// HP MPE/XL error code
-const ISC_STATUS isc_arg_mpexl_ipc		= 11;	// HP MPE/XL IPC error code
-const ISC_STATUS isc_arg_next_mach		= 15;	// NeXT/Mach error code
-const ISC_STATUS isc_arg_netware		= 16;	// NetWare error code
-const ISC_STATUS isc_arg_win32			= 17;	// Win32 error code
-const ISC_STATUS isc_arg_warning		= 18;	// warning argument
-const ISC_STATUS isc_arg_sql_state		= 19;	// SQLSTATE
-
-#define FB_IMPL_MSG_NO_SYMBOL(facility, number, text)
-
-#define FB_IMPL_MSG_SYMBOL(facility, number, symbol, text) \
-	const ISC_STATUS isc_##symbol = FB_IMPL_MSG_ENCODE(number, FB_IMPL_MSG_FACILITY_##facility);
-
-#define FB_IMPL_MSG(facility, number, symbol, sqlCode, sqlClass, sqlSubClass, text)	\
-	FB_IMPL_MSG_SYMBOL(facility, number, symbol, text)
-
-#include "firebird/impl/msg/all.h"
-
-#undef FB_IMPL_MSG_NO_SYMBOL
-#undef FB_IMPL_MSG_SYMBOL
-#undef FB_IMPL_MSG
-
-const ISC_STATUS isc_err_max = 0
-	#define FB_IMPL_MSG_NO_SYMBOL(facility, number, text)
-	#define FB_IMPL_MSG_SYMBOL(facility, number, symbol, text)
-	#define FB_IMPL_MSG(facility, number, symbol, sqlCode, sqlClass, sqlSubClass, text) + 1
-
-	#include "firebird/impl/msg/all.h"
-
-	#undef FB_IMPL_MSG_NO_SYMBOL
-	#undef FB_IMPL_MSG_SYMBOL
-	#undef FB_IMPL_MSG
-	;
-
-
-#else /* c definitions */
-
-#define isc_facility 20
-#define isc_base (isc_facility << 24)
-#define isc_factor 1
-
-#define isc_arg_end			0	/* end of argument list */
-#define isc_arg_gds			1	/* generic DSRI status value */
-#define isc_arg_string		2	/* string argument */
-#define isc_arg_cstring		3	/* count & string argument */
-#define isc_arg_number		4	/* numeric argument (long) */
-#define isc_arg_interpreted	5	/* interpreted status code (string) */
-#define isc_arg_vms			6	/* VAX/VMS status code (long) */
-#define isc_arg_unix		7	/* UNIX error code */
-#define isc_arg_domain		8	/* Apollo/Domain error code */
-#define isc_arg_dos			9	/* MSDOS/OS2 error code */
-#define isc_arg_mpexl		10	/* HP MPE/XL error code */
-#define isc_arg_mpexl_ipc	11	/* HP MPE/XL IPC error code */
-#define isc_arg_next_mach	15	/* NeXT/Mach error code */
-#define isc_arg_netware		16	/* NetWare error code */
-#define isc_arg_win32		17	/* Win32 error code */
-#define isc_arg_warning		18	/* warning argument */
-#define isc_arg_sql_state	19	/* SQLSTATE */
-
-#include "firebird/impl/iberror_c.h"
-
-#endif
-
-#endif /* FIREBIRD_IBERROR_H */
diff --git a/FBClient.Headers/include b/FBClient.Headers/include
deleted file mode 120000
index 945c9b46..00000000
--- a/FBClient.Headers/include
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/FBClient.Headers/perf.h b/FBClient.Headers/perf.h
deleted file mode 100644
index 6f968509..00000000
--- a/FBClient.Headers/perf.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *	PROGRAM:	JRD Access Method
- *	MODULE:		perf.h
- *	DESCRIPTION:	Peformance tool block
- *
- * The contents of this file are subject to the Interbase Public
- * License Version 1.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy
- * of the License at http://www.Inprise.com/IPL.html
- *
- * Software distributed under the License is distributed on an
- * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
- * or implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code was created by Inprise Corporation
- * and its predecessors. Portions created by Inprise Corporation are
- * Copyright (C) Inprise Corporation.
- *
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- *
- * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "OS/2" port
- *
- * 2002.10.29 Sean Leyne - Removed obsolete "Netware" port
- *
- * 2002.10.30 Sean Leyne - Removed support for obsolete "PC_PLATFORM" define
- *
- */
-
-#ifndef JRD_PERF_H
-#define JRD_PERF_H
-
-#include <stdio.h>
-
-#ifdef HAVE_TIMES
-#include <sys/types.h>
-#include <sys/times.h>
-#else
-#include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Structure returned by times()
- */
-struct tms
-{
-	time_t tms_utime;			/* user time */
-	time_t tms_stime;			/* system time */
-	time_t tms_cutime;			/* user time, children */
-	time_t tms_cstime;			/* system time, children */
-};
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* !HAVE_TIMES */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct perf
-{
-	long perf_fetches;
-	long perf_marks;
-	long perf_reads;
-	long perf_writes;
-	long perf_current_memory;
-	long perf_max_memory;
-	long perf_buffers;
-	long perf_page_size;
-	long perf_elapsed;
-	struct tms perf_times;
-} PERF;
-
-typedef struct perf64
-{
-	ISC_INT64 perf_fetches;
-	ISC_INT64 perf_marks;
-	ISC_INT64 perf_reads;
-	ISC_INT64 perf_writes;
-	ISC_INT64 perf_current_memory;
-	ISC_INT64 perf_max_memory;
-	long perf_buffers;
-	long perf_page_size;
-	long perf_elapsed;
-	struct tms perf_times;
-} PERF64;
-
-/* Letter codes controlling printing of statistics:
-
-	!f - fetches
-	!m - marks
-	!r - reads
-	!w - writes
-	!e - elapsed time (in seconds)
-	!u - user times
-	!s - system time
-	!p - page size
-	!b - number buffers
-	!d - delta memory
-	!c - current memory
-	!x - max memory
-
-*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#include "../yvalve/perf_proto.h"
-
-#endif /* JRD_PERF_H */
-
diff --git a/OdbcJdbc.dll.manifest b/FirebirdODBC.dll.manifest
similarity index 100%
rename from OdbcJdbc.dll.manifest
rename to FirebirdODBC.dll.manifest
diff --git a/Headers/SQL.H b/Headers/SQL.H
deleted file mode 100644
index e192c60d..00000000
--- a/Headers/SQL.H
+++ /dev/null
@@ -1,845 +0,0 @@
-/*****************************************************************
-** SQL.H - This is the the main include for ODBC Core functions.
-**
-** preconditions:
-**      #include "windows.h"
-**
-** (C) Copyright 1990 - 1998 By Microsoft Corp.
-**
-**      Updated 5/12/93 for 2.00 specification
-**      Updated 5/23/94 for 2.01 specification
-**      Updated 11/10/94 for 2.10 specification
-**      Updated 04/10/95 for 2.50 specification
-**      Updated 6/6/95  for 3.00 specification
-**		Updated 10/22/97 for 3.51 specification 
-*********************************************************************/
-
-
-#ifndef __SQL
-#define __SQL
-
-/*
-* ODBCVER  ODBC version number (0x0351).   To exclude
-*          definitions introduced in version 3.5 (or above)
-*          #define ODBCVER 0x0300 before #including <sql.h>
-*/
-#ifndef ODBCVER
-#define ODBCVER 0x0351
-#endif
-
-#ifndef __SQLTYPES
-#include "sqltypes.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" { 			/* Assume C declarations for C++   */
-#endif  /* __cplusplus */
-
-/* special length/indicator values */
-#define SQL_NULL_DATA             (-1)
-#define SQL_DATA_AT_EXEC          (-2)
-
-
-/* return values from functions */
-#define SQL_SUCCESS                0
-#define SQL_SUCCESS_WITH_INFO      1
-#if (ODBCVER >= 0x0300)
-#define SQL_NO_DATA              100
-#endif
-#define SQL_ERROR                 (-1)
-#define SQL_INVALID_HANDLE        (-2)
-
-#define SQL_STILL_EXECUTING        2
-#define SQL_NEED_DATA             99
-
-/* test for SQL_SUCCESS or SQL_SUCCESS_WITH_INFO */
-#define SQL_SUCCEEDED(rc) (((rc)&(~1))==0)
-
-/* flags for null-terminated string */
-#define SQL_NTS                   (-3)
-#define SQL_NTSL                  (-3L)
-
-/* maximum message length */
-#define SQL_MAX_MESSAGE_LENGTH   512
-
-/* date/time length constants */
-#if (ODBCVER >= 0x0300)
-#define SQL_DATE_LEN           10
-#define SQL_TIME_LEN            8  /* add P+1 if precision is nonzero */
-#define SQL_TIMESTAMP_LEN      19  /* add P+1 if precision is nonzero */
-#endif
-
-/* handle type identifiers */
-#if (ODBCVER >= 0x0300)
-#define SQL_HANDLE_ENV             1
-#define SQL_HANDLE_DBC             2
-#define SQL_HANDLE_STMT            3
-#define SQL_HANDLE_DESC            4
-#endif
-
-/* environment attribute */
-#if (ODBCVER >= 0x0300)
-#define SQL_ATTR_OUTPUT_NTS    10001
-#endif
-
-/* connection attributes */
-#if (ODBCVER >= 0x0300)
-#define SQL_ATTR_AUTO_IPD      10001
-#define SQL_ATTR_METADATA_ID   10014
-#endif  /* ODBCVER >= 0x0300 */
-
-/* statement attributes */
-#if (ODBCVER >= 0x0300)
-#define SQL_ATTR_APP_ROW_DESC       10010
-#define SQL_ATTR_APP_PARAM_DESC     10011
-#define SQL_ATTR_IMP_ROW_DESC       10012
-#define SQL_ATTR_IMP_PARAM_DESC     10013
-#define SQL_ATTR_CURSOR_SCROLLABLE  (-1)
-#define SQL_ATTR_CURSOR_SENSITIVITY (-2)
-#endif
-
-/* SQL_ATTR_CURSOR_SCROLLABLE values */
-#if (ODBCVER >= 0x0300)
-#define SQL_NONSCROLLABLE			0
-#define SQL_SCROLLABLE				1
-#endif  /* ODBCVER >= 0x0300 */
-
-/* identifiers of fields in the SQL descriptor */
-#if (ODBCVER >= 0x0300)
-#define SQL_DESC_COUNT                  1001
-#define SQL_DESC_TYPE                   1002
-#define SQL_DESC_LENGTH                 1003
-#define SQL_DESC_OCTET_LENGTH_PTR       1004
-#define SQL_DESC_PRECISION              1005
-#define SQL_DESC_SCALE                  1006
-#define SQL_DESC_DATETIME_INTERVAL_CODE 1007
-#define SQL_DESC_NULLABLE               1008
-#define SQL_DESC_INDICATOR_PTR          1009
-#define SQL_DESC_DATA_PTR               1010
-#define SQL_DESC_NAME                   1011
-#define SQL_DESC_UNNAMED                1012
-#define SQL_DESC_OCTET_LENGTH           1013
-#define SQL_DESC_ALLOC_TYPE             1099
-#endif
-
-/* identifiers of fields in the diagnostics area */
-#if (ODBCVER >= 0x0300)
-#define SQL_DIAG_RETURNCODE        1
-#define SQL_DIAG_NUMBER            2
-#define SQL_DIAG_ROW_COUNT         3
-#define SQL_DIAG_SQLSTATE          4
-#define SQL_DIAG_NATIVE            5
-#define SQL_DIAG_MESSAGE_TEXT      6
-#define SQL_DIAG_DYNAMIC_FUNCTION  7
-#define SQL_DIAG_CLASS_ORIGIN      8
-#define SQL_DIAG_SUBCLASS_ORIGIN   9
-#define SQL_DIAG_CONNECTION_NAME  10
-#define SQL_DIAG_SERVER_NAME      11
-#define SQL_DIAG_DYNAMIC_FUNCTION_CODE 12
-#endif
-
-/* dynamic function codes */
-#if (ODBCVER >= 0x0300)
-#define SQL_DIAG_ALTER_DOMAIN			3
-#define SQL_DIAG_ALTER_TABLE            4
-#define SQL_DIAG_CALL					7
-#define SQL_DIAG_CREATE_ASSERTION		6
-#define SQL_DIAG_CREATE_CHARACTER_SET	8
-#define SQL_DIAG_CREATE_COLLATION		10
-#define SQL_DIAG_CREATE_DOMAIN			23
-#define SQL_DIAG_CREATE_INDEX          (-1)
-#define SQL_DIAG_CREATE_SCHEMA			64
-#define SQL_DIAG_CREATE_TABLE          77
-#define SQL_DIAG_CREATE_TRANSLATION		79
-#define SQL_DIAG_CREATE_VIEW           84
-#define SQL_DIAG_DELETE_WHERE          19
-#define	SQL_DIAG_DROP_ASSERTION			24
-#define	SQL_DIAG_DROP_CHARACTER_SET		25
-#define	SQL_DIAG_DROP_COLLATION			26
-#define	SQL_DIAG_DROP_DOMAIN			27
-#define SQL_DIAG_DROP_INDEX            (-2)
-#define SQL_DIAG_DROP_SCHEMA			31
-#define SQL_DIAG_DROP_TABLE            32
-#define SQL_DIAG_DROP_TRANSLATION      33
-#define SQL_DIAG_DROP_VIEW             36
-#define SQL_DIAG_DYNAMIC_DELETE_CURSOR 38
-#define SQL_DIAG_DYNAMIC_UPDATE_CURSOR 81
-#define SQL_DIAG_GRANT                 48
-#define SQL_DIAG_INSERT                50
-#define SQL_DIAG_REVOKE                59
-#define SQL_DIAG_SELECT_CURSOR         85
-#define SQL_DIAG_UNKNOWN_STATEMENT      0
-#define SQL_DIAG_UPDATE_WHERE          82
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL data type codes */
-#define	SQL_UNKNOWN_TYPE	0
-#define SQL_CHAR            1
-#define SQL_NUMERIC         2
-#define SQL_DECIMAL         3
-#define SQL_INTEGER         4
-#define SQL_SMALLINT        5
-#define SQL_FLOAT           6
-#define SQL_REAL            7
-#define SQL_DOUBLE          8
-#if (ODBCVER >= 0x0300)
-#define SQL_DATETIME        9
-#endif
-#define SQL_VARCHAR        12
-
-/* One-parameter shortcuts for date/time data types */
-#if (ODBCVER >= 0x0300)
-#define SQL_TYPE_DATE      91
-#define SQL_TYPE_TIME      92
-#define SQL_TYPE_TIMESTAMP 93
-#endif
-
-/* Statement attribute values for cursor sensitivity */
-#if (ODBCVER >= 0x0300)
-#define SQL_UNSPECIFIED     0
-#define SQL_INSENSITIVE     1
-#define SQL_SENSITIVE       2
-#endif
-
-/* GetTypeInfo() request for all data types */
-#define SQL_ALL_TYPES       0
-
-/* Default conversion code for SQLBindCol(), SQLBindParam() and SQLGetData() */
-#if (ODBCVER >= 0x0300)
-#define SQL_DEFAULT        99
-#endif
-
-/* SQLSQLLEN GetData() code indicating that the application row descriptor
- * specifies the data type
- */
-#if (ODBCVER >= 0x0300)
-#define SQL_ARD_TYPE      (-99)
-#endif
-
-/* SQL date/time type subcodes */
-#if (ODBCVER >= 0x0300)
-#define SQL_CODE_DATE       1
-#define SQL_CODE_TIME       2
-#define SQL_CODE_TIMESTAMP  3
-#endif
-
-/* CLI option values */
-#if (ODBCVER >= 0x0300)
-#define SQL_FALSE           0
-#define SQL_TRUE            1
-#endif
-
-/* values of NULLABLE field in descriptor */
-#define SQL_NO_NULLS        0
-#define SQL_NULLABLE        1
-
-/* Value returned by SQLGetTypeInfo() to denote that it is
- * not known whether or not a data type supports null values.
- */
-#define SQL_NULLABLE_UNKNOWN  2
-
-/* Values returned by SQLGetTypeInfo() to show WHERE clause
- * supported
- */
-#if (ODBCVER >= 0x0300)
-#define SQL_PRED_NONE     0
-#define SQL_PRED_CHAR     1
-#define SQL_PRED_BASIC    2
-#endif
-
-/* values of UNNAMED field in descriptor */
-#if (ODBCVER >= 0x0300)
-#define SQL_NAMED           0
-#define SQL_UNNAMED         1
-#endif
-
-/* values of ALLOC_TYPE field in descriptor */
-#if (ODBCVER >= 0x0300)
-#define SQL_DESC_ALLOC_AUTO 1
-#define SQL_DESC_ALLOC_USER 2
-#endif
-
-/* FreeStmt() options */
-#define SQL_CLOSE           0
-#define SQL_DROP            1
-#define SQL_UNBIND          2
-#define SQL_RESET_PARAMS    3
-
-/* Codes used for FetchOrientation in SQLFetchScroll(), 
-   and in SQLDataSources() 
-*/
-#define SQL_FETCH_NEXT      1
-#define SQL_FETCH_FIRST     2
-
-/* Other codes used for FetchOrientation in SQLFetchScroll() */
-#define SQL_FETCH_LAST      3
-#define SQL_FETCH_PRIOR     4
-#define SQL_FETCH_ABSOLUTE  5
-#define SQL_FETCH_RELATIVE  6
-
-/* SQLEndTran() options */
-#define SQL_COMMIT          0
-#define SQL_ROLLBACK        1
-
-/* null handles returned by SQLAllocHandle() */
-#define SQL_NULL_HENV       0
-#define SQL_NULL_HDBC       0
-#define SQL_NULL_HSTMT      0
-#if (ODBCVER >= 0x0300)
-#define SQL_NULL_HDESC      0
-#endif
-
-/* null handle used in place of parent handle when allocating HENV */
-#if (ODBCVER >= 0x0300)
-#define SQL_NULL_HANDLE     0L
-#endif
-
-/* Values that may appear in the result set of SQLSpecialColumns() */
-#define SQL_SCOPE_CURROW    0
-#define SQL_SCOPE_TRANSACTION 1
-#define SQL_SCOPE_SESSION   2
-
-#define SQL_PC_UNKNOWN      0
-#if (ODBCVER >= 0x0300)
-#define SQL_PC_NON_PSEUDO   1
-#endif
-#define SQL_PC_PSEUDO       2
-
-/* Reserved value for the IdentifierType argument of SQLSpecialColumns() */
-#if (ODBCVER >= 0x0300)
-#define SQL_ROW_IDENTIFIER  1
-#endif
-
-/* Reserved values for UNIQUE argument of SQLStatistics() */
-#define SQL_INDEX_UNIQUE    0
-#define SQL_INDEX_ALL       1
-
-/* Values that may appear in the result set of SQLStatistics() */
-#define SQL_INDEX_CLUSTERED 1
-#define SQL_INDEX_HASHED    2
-#define SQL_INDEX_OTHER     3
-
-/* SQLGetFunctions() values to identify ODBC APIs */
-#define SQL_API_SQLALLOCCONNECT         1
-#define SQL_API_SQLALLOCENV             2
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLALLOCHANDLE       1001
-#endif
-#define SQL_API_SQLALLOCSTMT            3
-#define SQL_API_SQLBINDCOL              4
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLBINDPARAM         1002
-#endif
-#define SQL_API_SQLCANCEL               5
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLCLOSECURSOR       1003
-#define SQL_API_SQLCOLATTRIBUTE         6
-#endif
-#define SQL_API_SQLCOLUMNS             40
-#define SQL_API_SQLCONNECT              7
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLCOPYDESC          1004
-#endif
-#define SQL_API_SQLDATASOURCES         57
-#define SQL_API_SQLDESCRIBECOL          8
-#define SQL_API_SQLDISCONNECT           9
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLENDTRAN           1005
-#endif
-#define SQL_API_SQLERROR               10
-#define SQL_API_SQLEXECDIRECT          11
-#define SQL_API_SQLEXECUTE             12
-#define SQL_API_SQLFETCH               13
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLFETCHSCROLL       1021
-#endif
-#define SQL_API_SQLFREECONNECT         14
-#define SQL_API_SQLFREEENV             15
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLFREEHANDLE        1006
-#endif
-#define SQL_API_SQLFREESTMT            16
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLGETCONNECTATTR    1007
-#endif
-#define SQL_API_SQLGETCONNECTOPTION    42
-#define SQL_API_SQLGETCURSORNAME       17
-#define SQL_API_SQLGETDATA             43
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLGETDESCFIELD      1008
-#define SQL_API_SQLGETDESCREC        1009
-#define SQL_API_SQLGETDIAGFIELD      1010
-#define SQL_API_SQLGETDIAGREC        1011
-#define SQL_API_SQLGETENVATTR        1012
-#endif
-#define SQL_API_SQLGETFUNCTIONS        44
-#define SQL_API_SQLGETINFO             45
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLGETSTMTATTR       1014
-#endif
-#define SQL_API_SQLGETSTMTOPTION       46
-#define SQL_API_SQLGETTYPEINFO         47
-#define SQL_API_SQLNUMRESULTCOLS       18
-#define SQL_API_SQLPARAMDATA           48
-#define SQL_API_SQLPREPARE             19
-#define SQL_API_SQLPUTDATA             49
-#define SQL_API_SQLROWCOUNT            20
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLSETCONNECTATTR    1016
-#endif
-#define SQL_API_SQLSETCONNECTOPTION    50
-#define SQL_API_SQLSETCURSORNAME       21
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLSETDESCFIELD      1017
-#define SQL_API_SQLSETDESCREC        1018
-#define SQL_API_SQLSETENVATTR        1019
-#endif
-#define SQL_API_SQLSETPARAM            22
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLSETSTMTATTR       1020
-#endif
-#define SQL_API_SQLSETSTMTOPTION       51
-#define SQL_API_SQLSPECIALCOLUMNS      52
-#define SQL_API_SQLSTATISTICS          53
-#define SQL_API_SQLTABLES              54
-#define SQL_API_SQLTRANSACT            23
-
-/* Information requested by SQLGetInfo() */
-#if (ODBCVER >= 0x0300)
-#define SQL_MAX_DRIVER_CONNECTIONS           0
-#define SQL_MAXIMUM_DRIVER_CONNECTIONS		SQL_MAX_DRIVER_CONNECTIONS
-#define SQL_MAX_CONCURRENT_ACTIVITIES        1
-#define SQL_MAXIMUM_CONCURRENT_ACTIVITIES	SQL_MAX_CONCURRENT_ACTIVITIES
-#endif
-#define SQL_DATA_SOURCE_NAME                 2
-#define SQL_FETCH_DIRECTION                  8
-#define SQL_SERVER_NAME                     13
-#define SQL_SEARCH_PATTERN_ESCAPE           14
-#define SQL_DBMS_NAME                       17
-#define SQL_DBMS_VER                        18
-#define SQL_ACCESSIBLE_TABLES               19
-#define SQL_ACCESSIBLE_PROCEDURES        	20
-#define SQL_CURSOR_COMMIT_BEHAVIOR          23
-#define SQL_DATA_SOURCE_READ_ONLY           25
-#define SQL_DEFAULT_TXN_ISOLATION           26
-#define SQL_IDENTIFIER_CASE                 28
-#define SQL_IDENTIFIER_QUOTE_CHAR           29
-#define SQL_MAX_COLUMN_NAME_LEN             30
-#define SQL_MAXIMUM_COLUMN_NAME_LENGTH		SQL_MAX_COLUMN_NAME_LEN
-#define SQL_MAX_CURSOR_NAME_LEN             31
-#define SQL_MAXIMUM_CURSOR_NAME_LENGTH		SQL_MAX_CURSOR_NAME_LEN
-#define SQL_MAX_SCHEMA_NAME_LEN             32
-#define SQL_MAXIMUM_SCHEMA_NAME_LENGTH		SQL_MAX_SCHEMA_NAME_LEN
-#define SQL_MAX_CATALOG_NAME_LEN            34
-#define SQL_MAXIMUM_CATALOG_NAME_LENGTH		SQL_MAX_CATALOG_NAME_LEN
-#define SQL_MAX_TABLE_NAME_LEN              35
-#define SQL_SCROLL_CONCURRENCY              43
-#define SQL_TXN_CAPABLE                     46
-#define SQL_TRANSACTION_CAPABLE				SQL_TXN_CAPABLE
-#define SQL_USER_NAME                       47
-#define SQL_TXN_ISOLATION_OPTION            72
-#define SQL_TRANSACTION_ISOLATION_OPTION	SQL_TXN_ISOLATION_OPTION
-#define SQL_INTEGRITY                       73
-#define SQL_GETDATA_EXTENSIONS              81
-#define SQL_NULL_COLLATION                  85
-#define SQL_ALTER_TABLE                     86
-#define SQL_ORDER_BY_COLUMNS_IN_SELECT      90
-#define SQL_SPECIAL_CHARACTERS              94
-#define SQL_MAX_COLUMNS_IN_GROUP_BY         97
-#define SQL_MAXIMUM_COLUMNS_IN_GROUP_BY		SQL_MAX_COLUMNS_IN_GROUP_BY
-#define SQL_MAX_COLUMNS_IN_INDEX            98
-#define SQL_MAXIMUM_COLUMNS_IN_INDEX		SQL_MAX_COLUMNS_IN_INDEX
-#define SQL_MAX_COLUMNS_IN_ORDER_BY         99
-#define SQL_MAXIMUM_COLUMNS_IN_ORDER_BY		SQL_MAX_COLUMNS_IN_ORDER_BY
-#define SQL_MAX_COLUMNS_IN_SELECT          100
-#define SQL_MAXIMUM_COLUMNS_IN_SELECT	   SQL_MAX_COLUMNS_IN_SELECT
-#define SQL_MAX_COLUMNS_IN_TABLE           101
-#define SQL_MAX_INDEX_SIZE                 102
-#define SQL_MAXIMUM_INDEX_SIZE			   SQL_MAX_INDEX_SIZE
-#define SQL_MAX_ROW_SIZE                   104
-#define SQL_MAXIMUM_ROW_SIZE			   SQL_MAX_ROW_SIZE
-#define SQL_MAX_STATEMENT_LEN              105
-#define SQL_MAXIMUM_STATEMENT_LENGTH	   SQL_MAX_STATEMENT_LEN
-#define SQL_MAX_TABLES_IN_SELECT           106
-#define SQL_MAXIMUM_TABLES_IN_SELECT	   SQL_MAX_TABLES_IN_SELECT
-#define SQL_MAX_USER_NAME_LEN              107
-#define SQL_MAXIMUM_USER_NAME_LENGTH	   SQL_MAX_USER_NAME_LEN
-#if (ODBCVER >= 0x0300)
-#define SQL_OJ_CAPABILITIES                115
-#define SQL_OUTER_JOIN_CAPABILITIES		   SQL_OJ_CAPABILITIES
-#endif /* ODBCVER >= 0x0300 */
-
-#if (ODBCVER >= 0x0300)
-#define SQL_XOPEN_CLI_YEAR               10000
-#define SQL_CURSOR_SENSITIVITY           10001
-#define SQL_DESCRIBE_PARAMETER           10002
-#define SQL_CATALOG_NAME                 10003
-#define SQL_COLLATION_SEQ                10004
-#define SQL_MAX_IDENTIFIER_LEN           10005
-#define SQL_MAXIMUM_IDENTIFIER_LENGTH	 SQL_MAX_IDENTIFIER_LEN
-#endif /* ODBCVER >= 0x0300 */
-
-/* SQL_ALTER_TABLE bitmasks */
-#if (ODBCVER >= 0x0200)
-#define SQL_AT_ADD_COLUMN                   	0x00000001L
-#define SQL_AT_DROP_COLUMN                  	0x00000002L
-#endif /* ODBCVER >= 0x0200 */
-
-#if (ODBCVER >= 0x0300)
-#define SQL_AT_ADD_CONSTRAINT               	0x00000008L
-
-/* The following bitmasks are ODBC extensions and defined in sqlext.h
-*#define	SQL_AT_COLUMN_SINGLE					0x00000020L	
-*#define	SQL_AT_ADD_COLUMN_DEFAULT				0x00000040L
-*#define	SQL_AT_ADD_COLUMN_COLLATION				0x00000080L
-*#define	SQL_AT_SET_COLUMN_DEFAULT				0x00000100L
-*#define	SQL_AT_DROP_COLUMN_DEFAULT				0x00000200L
-*#define	SQL_AT_DROP_COLUMN_CASCADE				0x00000400L
-*#define	SQL_AT_DROP_COLUMN_RESTRICT				0x00000800L
-*#define SQL_AT_ADD_TABLE_CONSTRAINT				0x00001000L		
-*#define SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE		0x00002000L		
-*#define SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT		0x00004000L		
-*#define SQL_AT_CONSTRAINT_NAME_DEFINITION			0x00008000L
-*#define SQL_AT_CONSTRAINT_INITIALLY_DEFERRED		0x00010000L
-*#define SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE		0x00020000L
-*#define SQL_AT_CONSTRAINT_DEFERRABLE				0x00040000L
-*#define SQL_AT_CONSTRAINT_NON_DEFERRABLE			0x00080000L
-*/
-#endif  /* ODBCVER >= 0x0300 */
-
-
-/* SQL_ASYNC_MODE values */
-#if (ODBCVER >= 0x0300)
-#define SQL_AM_NONE                         0
-#define SQL_AM_CONNECTION                   1
-#define SQL_AM_STATEMENT                    2
-#endif
-
-/* SQL_CURSOR_COMMIT_BEHAVIOR values */
-#define SQL_CB_DELETE                       0
-#define SQL_CB_CLOSE                        1
-#define SQL_CB_PRESERVE                     2
-
-/* SQL_FETCH_DIRECTION bitmasks */
-#define SQL_FD_FETCH_NEXT                   0x00000001L
-#define SQL_FD_FETCH_FIRST                  0x00000002L
-#define SQL_FD_FETCH_LAST                   0x00000004L
-#define SQL_FD_FETCH_PRIOR                  0x00000008L
-#define SQL_FD_FETCH_ABSOLUTE               0x00000010L
-#define SQL_FD_FETCH_RELATIVE               0x00000020L
-
-/* SQL_GETDATA_EXTENSIONS bitmasks */
-#define SQL_GD_ANY_COLUMN                   0x00000001L
-#define SQL_GD_ANY_ORDER                    0x00000002L
-
-/* SQL_IDENTIFIER_CASE values */
-#define SQL_IC_UPPER                        1
-#define SQL_IC_LOWER                        2
-#define SQL_IC_SENSITIVE                    3
-#define SQL_IC_MIXED                        4
-
-/* SQL_OJ_CAPABILITIES bitmasks */
-/* NB: this means 'outer join', not what  you may be thinking */
-
-
-#if (ODBCVER >= 0x0201)
-#define SQL_OJ_LEFT                         0x00000001L
-#define SQL_OJ_RIGHT                        0x00000002L
-#define SQL_OJ_FULL                         0x00000004L
-#define SQL_OJ_NESTED                       0x00000008L
-#define SQL_OJ_NOT_ORDERED                  0x00000010L
-#define SQL_OJ_INNER                        0x00000020L
-#define SQL_OJ_ALL_COMPARISON_OPS           0x00000040L
-#endif
-
-/* SQL_SCROLL_CONCURRENCY bitmasks */
-#define SQL_SCCO_READ_ONLY                  0x00000001L
-#define SQL_SCCO_LOCK                       0x00000002L
-#define SQL_SCCO_OPT_ROWVER                 0x00000004L
-#define SQL_SCCO_OPT_VALUES                 0x00000008L
-
-/* SQL_TXN_CAPABLE values */
-#define SQL_TC_NONE                         0
-#define SQL_TC_DML                          1
-#define SQL_TC_ALL                          2
-#define SQL_TC_DDL_COMMIT                   3
-#define SQL_TC_DDL_IGNORE                   4
-
-/* SQL_TXN_ISOLATION_OPTION bitmasks */
-#define SQL_TXN_READ_UNCOMMITTED            0x00000001L
-#define SQL_TRANSACTION_READ_UNCOMMITTED	SQL_TXN_READ_UNCOMMITTED
-#define SQL_TXN_READ_COMMITTED              0x00000002L
-#define SQL_TRANSACTION_READ_COMMITTED		SQL_TXN_READ_COMMITTED
-#define SQL_TXN_REPEATABLE_READ             0x00000004L
-#define SQL_TRANSACTION_REPEATABLE_READ		SQL_TXN_REPEATABLE_READ
-#define SQL_TXN_SERIALIZABLE                0x00000008L
-#define SQL_TRANSACTION_SERIALIZABLE		SQL_TXN_SERIALIZABLE
-
-/* SQL_NULL_COLLATION values */
-#define SQL_NC_HIGH                         0
-#define SQL_NC_LOW                          1
-
-#ifndef RC_INVOKED
-
-SQLRETURN  SQL_API SQLAllocConnect(SQLHENV EnvironmentHandle,
-           SQLHDBC *ConnectionHandle);
-
-SQLRETURN  SQL_API SQLAllocEnv(SQLHENV *EnvironmentHandle);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN  SQL_API SQLAllocHandle(SQLSMALLINT HandleType,
-           SQLHANDLE InputHandle, SQLHANDLE *OutputHandle);
-#endif
-
-SQLRETURN  SQL_API SQLAllocStmt(SQLHDBC ConnectionHandle,
-           SQLHSTMT *StatementHandle);
-
-SQLRETURN  SQL_API SQLBindCol(SQLHSTMT StatementHandle, 
-		   SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, 
-		   SQLPOINTER TargetValue, SQLLEN BufferLength, 
-	   	   SQLLEN *StrLen_or_Ind);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN  SQL_API SQLBindParam(SQLHSTMT StatementHandle,
-           SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
-           SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
-           SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
-           SQLLEN *StrLen_or_Ind);
-#endif
-
-SQLRETURN  SQL_API SQLCancel(SQLHSTMT StatementHandle);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN  SQL_API SQLCloseCursor(SQLHSTMT StatementHandle);
-
-#ifdef _WIN64
-SQLRETURN  SQL_API SQLColAttribute (SQLHSTMT StatementHandle,
-           SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier,
-           SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength,
-           SQLSMALLINT *StringLength, SQLLEN *NumericAttribute);
-#else
-SQLRETURN  SQL_API SQLColAttribute (SQLHSTMT StatementHandle,
-           SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier,
-           SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength,
-           SQLSMALLINT *StringLength, SQLPOINTER NumericAttribute);
-#endif
-#endif
-
-
-SQLRETURN  SQL_API SQLColumns(SQLHSTMT StatementHandle,
-           SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
-           SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
-           SQLCHAR *TableName, SQLSMALLINT NameLength3,
-           SQLCHAR *ColumnName, SQLSMALLINT NameLength4);
-
-
-SQLRETURN  SQL_API SQLConnect(SQLHDBC ConnectionHandle,
-           SQLCHAR *ServerName, SQLSMALLINT NameLength1,
-           SQLCHAR *UserName, SQLSMALLINT NameLength2,
-           SQLCHAR *Authentication, SQLSMALLINT NameLength3);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN  SQL_API SQLCopyDesc(SQLHDESC SourceDescHandle,
-           SQLHDESC TargetDescHandle);
-#endif
-
-SQLRETURN  SQL_API SQLDataSources(SQLHENV EnvironmentHandle,
-           SQLUSMALLINT Direction, SQLCHAR *ServerName,
-           SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1,
-           SQLCHAR *Description, SQLSMALLINT BufferLength2,
-           SQLSMALLINT *NameLength2);
-
-SQLRETURN  SQL_API SQLDescribeCol(SQLHSTMT StatementHandle,
-           SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName,
-           SQLSMALLINT BufferLength, SQLSMALLINT *NameLength,
-           SQLSMALLINT *DataType, SQLULEN *ColumnSize,
-           SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable);
-
-SQLRETURN  SQL_API SQLDisconnect(SQLHDBC ConnectionHandle);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN  SQL_API SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle,
-           SQLSMALLINT CompletionType);
-#endif
-
-SQLRETURN  SQL_API SQLError(SQLHENV EnvironmentHandle,
-           SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle,
-           SQLCHAR *Sqlstate, SQLINTEGER *NativeError,
-           SQLCHAR *MessageText, SQLSMALLINT BufferLength,
-           SQLSMALLINT *TextLength);
-
-SQLRETURN  SQL_API SQLExecDirect(SQLHSTMT StatementHandle,
-           SQLCHAR *StatementText, SQLINTEGER TextLength);
-
-SQLRETURN  SQL_API SQLExecute(SQLHSTMT StatementHandle);
-
-SQLRETURN  SQL_API SQLFetch(SQLHSTMT StatementHandle);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN  SQL_API SQLFetchScroll(SQLHSTMT StatementHandle,
-           SQLSMALLINT FetchOrientation, SQLLEN FetchOffset);
-#endif
-
-SQLRETURN  SQL_API SQLFreeConnect(SQLHDBC ConnectionHandle);
-
-SQLRETURN  SQL_API SQLFreeEnv(SQLHENV EnvironmentHandle);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN  SQL_API SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle);
-#endif
-
-SQLRETURN  SQL_API SQLFreeStmt(SQLHSTMT StatementHandle,
-           SQLUSMALLINT Option);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN  SQL_API SQLGetConnectAttr(SQLHDBC ConnectionHandle,
-           SQLINTEGER Attribute, SQLPOINTER Value,
-           SQLINTEGER BufferLength, SQLINTEGER *StringLength);
-#endif
-
-SQLRETURN  SQL_API SQLGetConnectOption(SQLHDBC ConnectionHandle,
-           SQLUSMALLINT Option, SQLPOINTER Value);
-
-SQLRETURN  SQL_API SQLGetCursorName(SQLHSTMT StatementHandle,
-           SQLCHAR *CursorName, SQLSMALLINT BufferLength,
-           SQLSMALLINT *NameLength);
-
-SQLRETURN  SQL_API SQLGetData(SQLHSTMT StatementHandle,
-           SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
-           SQLPOINTER TargetValue, SQLLEN BufferLength,
-           SQLLEN *StrLen_or_Ind);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN  SQL_API SQLGetDescField(SQLHDESC DescriptorHandle,
-           SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
-           SQLPOINTER Value, SQLINTEGER BufferLength,
-           SQLINTEGER *StringLength);
-
-SQLRETURN  SQL_API SQLGetDescRec(SQLHDESC DescriptorHandle,
-           SQLSMALLINT RecNumber, SQLCHAR *Name,
-           SQLSMALLINT BufferLength, SQLSMALLINT *StringLength,
-           SQLSMALLINT *Type, SQLSMALLINT *SubType, 
-           SQLLEN     *Length, SQLSMALLINT *Precision, 
-           SQLSMALLINT *Scale, SQLSMALLINT *Nullable);
-
-SQLRETURN  SQL_API SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle,
-           SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier,
-           SQLPOINTER DiagInfo, SQLSMALLINT BufferLength,
-           SQLSMALLINT *StringLength);
-
-SQLRETURN  SQL_API SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle,
-           SQLSMALLINT RecNumber, SQLCHAR *Sqlstate,
-           SQLINTEGER *NativeError, SQLCHAR *MessageText,
-           SQLSMALLINT BufferLength, SQLSMALLINT *TextLength);
-
-SQLRETURN  SQL_API SQLGetEnvAttr(SQLHENV EnvironmentHandle,
-           SQLINTEGER Attribute, SQLPOINTER Value,
-           SQLINTEGER BufferLength, SQLINTEGER *StringLength);
-#endif  /* ODBCVER >= 0x0300 */
-
-SQLRETURN  SQL_API SQLGetFunctions(SQLHDBC ConnectionHandle,
-           SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported);
-
-SQLRETURN  SQL_API SQLGetInfo(SQLHDBC ConnectionHandle,
-           SQLUSMALLINT InfoType, SQLPOINTER InfoValue,
-           SQLSMALLINT BufferLength, SQLSMALLINT *StringLength);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN  SQL_API SQLGetStmtAttr(SQLHSTMT StatementHandle,
-           SQLINTEGER Attribute, SQLPOINTER Value,
-           SQLINTEGER BufferLength, SQLINTEGER *StringLength);
-#endif  /* ODBCVER >= 0x0300 */
-
-SQLRETURN  SQL_API SQLGetStmtOption(SQLHSTMT StatementHandle,
-           SQLUSMALLINT Option, SQLPOINTER Value);
-
-SQLRETURN  SQL_API SQLGetTypeInfo(SQLHSTMT StatementHandle,
-           SQLSMALLINT DataType);
-
-SQLRETURN  SQL_API SQLNumResultCols(SQLHSTMT StatementHandle,
-           SQLSMALLINT *ColumnCount);
-
-SQLRETURN  SQL_API SQLParamData(SQLHSTMT StatementHandle,
-           SQLPOINTER *Value);
-
-SQLRETURN  SQL_API SQLPrepare(SQLHSTMT StatementHandle,
-           SQLCHAR *StatementText, SQLINTEGER TextLength);
-
-SQLRETURN  SQL_API SQLPutData(SQLHSTMT StatementHandle,
-           SQLPOINTER Data, SQLLEN StrLen_or_Ind);
-
-SQLRETURN  SQL_API SQLRowCount(SQLHSTMT StatementHandle, 
-	   SQLLEN* RowCount);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN  SQL_API SQLSetConnectAttr(SQLHDBC ConnectionHandle,
-           SQLINTEGER Attribute, SQLPOINTER Value,
-           SQLINTEGER StringLength);
-#endif /* ODBCVER >= 0x0300 */
-
-SQLRETURN  SQL_API SQLSetConnectOption(SQLHDBC ConnectionHandle,
-           SQLUSMALLINT Option, SQLULEN Value);
-
-SQLRETURN  SQL_API SQLSetCursorName(SQLHSTMT StatementHandle,
-           SQLCHAR *CursorName, SQLSMALLINT NameLength);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN  SQL_API SQLSetDescField(SQLHDESC DescriptorHandle,
-           SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
-           SQLPOINTER Value, SQLINTEGER BufferLength);
-
-SQLRETURN  SQL_API SQLSetDescRec(SQLHDESC DescriptorHandle,
-           SQLSMALLINT RecNumber, SQLSMALLINT Type,
-           SQLSMALLINT SubType, SQLLEN Length,
-           SQLSMALLINT Precision, SQLSMALLINT Scale,
-           SQLPOINTER Data, SQLLEN *StringLength,
-           SQLLEN *Indicator);
-
-SQLRETURN  SQL_API SQLSetEnvAttr(SQLHENV EnvironmentHandle,
-           SQLINTEGER Attribute, SQLPOINTER Value,
-           SQLINTEGER StringLength);
-#endif /* ODBCVER >= 0x0300 */
-
-SQLRETURN  SQL_API SQLSetParam(SQLHSTMT StatementHandle,
-           SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
-           SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
-           SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
-           SQLLEN *StrLen_or_Ind);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN  SQL_API SQLSetStmtAttr(SQLHSTMT StatementHandle,
-           SQLINTEGER Attribute, SQLPOINTER Value,
-           SQLINTEGER StringLength);
-#endif
-
-SQLRETURN  SQL_API SQLSetStmtOption(SQLHSTMT StatementHandle,
-           SQLUSMALLINT Option, SQLULEN Value);
-
-SQLRETURN  SQL_API SQLSpecialColumns(SQLHSTMT StatementHandle,
-           SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName,
-           SQLSMALLINT NameLength1, SQLCHAR *SchemaName,
-           SQLSMALLINT NameLength2, SQLCHAR *TableName,
-           SQLSMALLINT NameLength3, SQLUSMALLINT Scope,
-           SQLUSMALLINT Nullable);
-
-SQLRETURN  SQL_API SQLStatistics(SQLHSTMT StatementHandle,
-           SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
-           SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
-           SQLCHAR *TableName, SQLSMALLINT NameLength3,
-           SQLUSMALLINT Unique, SQLUSMALLINT Reserved);
-
-SQLRETURN  SQL_API SQLTables(SQLHSTMT StatementHandle,
-           SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
-           SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
-           SQLCHAR *TableName, SQLSMALLINT NameLength3,
-           SQLCHAR *TableType, SQLSMALLINT NameLength4);
-
-SQLRETURN  SQL_API SQLTransact(SQLHENV EnvironmentHandle,
-           SQLHDBC ConnectionHandle, SQLUSMALLINT CompletionType);
-
-#endif  /* RC_INVOKED */
-
-#ifdef __cplusplus
-}                                    /* End of extern "C" { */
-#endif  /* __cplusplus */
-#endif	/* #ifndef __SQL */
diff --git a/Headers/SQLEXT.H b/Headers/SQLEXT.H
deleted file mode 100644
index 19b1ab2e..00000000
--- a/Headers/SQLEXT.H
+++ /dev/null
@@ -1,2073 +0,0 @@
-/*****************************************************************
-** SQLEXT.H - This is the include for applications using
-**             the Microsoft SQL Extensions
-**
-** (C) Copyright 1990 - 1998 By Microsoft Corp.
-**
-**      Updated 05/12/93 for 2.00 specification
-**      Updated 05/23/94 for 2.01 specification
-**      Updated 10/27/94 for 2.10 specification
-**      Updated 04/10/95 for 2.50 specification
-**		Updated 07/25/95 for 3.00 specification
-**		Updated 01/12/96 for 3.00 preliminary release 
-**		Updated 10/22/97 for 3.51 specification 
-*********************************************************************/
-
-#ifndef __SQLEXT
-#define __SQLEXT
-
-#ifndef __SQL
-#include "sql.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {                         /* Assume C declarations for C++ */
-#endif  /* __cplusplus */
-
-/* generally useful constants */
-#define SQL_SPEC_MAJOR     3     	/* Major version of specification  */
-#define SQL_SPEC_MINOR	   51     	/* Minor version of specification  */
-#define SQL_SPEC_STRING   "03.51"	/* String constant for version */
-
-#define SQL_SQLSTATE_SIZE	5	/* size of SQLSTATE */
-#define SQL_MAX_DSN_LENGTH	32	/* maximum data source name size */
-
-#define SQL_MAX_OPTION_STRING_LENGTH    256
-
-/* return code SQL_NO_DATA_FOUND is the same as SQL_NO_DATA */
-#if (ODBCVER < 0x0300)
-#define SQL_NO_DATA_FOUND	100
-#else
-#define SQL_NO_DATA_FOUND	SQL_NO_DATA
-#endif
-
-/* an end handle type */
-#if (ODBCVER >= 0x0300)
-#define	SQL_HANDLE_SENV		5
-#endif  /* ODBCVER >= 0x0300 */
-
-/* env attribute */
-#if (ODBCVER >= 0x0300)
-#define SQL_ATTR_ODBC_VERSION				200
-#define SQL_ATTR_CONNECTION_POOLING			201
-#define SQL_ATTR_CP_MATCH					202
-#endif  /* ODBCVER >= 0x0300 */
-
-#if (ODBCVER >= 0x0300)
-/* values for SQL_ATTR_CONNECTION_POOLING */
-#define SQL_CP_OFF							0UL
-#define SQL_CP_ONE_PER_DRIVER				1UL
-#define SQL_CP_ONE_PER_HENV					2UL
-#define SQL_CP_DEFAULT						SQL_CP_OFF
-
-/* values for SQL_ATTR_CP_MATCH */
-#define SQL_CP_STRICT_MATCH					0UL
-#define SQL_CP_RELAXED_MATCH				1UL
-#define SQL_CP_MATCH_DEFAULT				SQL_CP_STRICT_MATCH		
-
-/* values for SQL_ATTR_ODBC_VERSION */
-#define SQL_OV_ODBC2						2UL
-#define	SQL_OV_ODBC3						3UL
-#endif  /* ODBCVER >= 0x0300 */
-
-/* connection attributes */
-#define SQL_ACCESS_MODE                 101
-#define SQL_AUTOCOMMIT                  102
-#define SQL_LOGIN_TIMEOUT               103
-#define SQL_OPT_TRACE                   104
-#define SQL_OPT_TRACEFILE               105
-#define SQL_TRANSLATE_DLL               106
-#define SQL_TRANSLATE_OPTION            107
-#define SQL_TXN_ISOLATION               108
-#define SQL_CURRENT_QUALIFIER           109
-#define SQL_ODBC_CURSORS                110
-#define SQL_QUIET_MODE                  111
-#define SQL_PACKET_SIZE                 112
-
-/* connection attributes with new names */
-#if (ODBCVER >= 0x0300)
-#define SQL_ATTR_ACCESS_MODE		SQL_ACCESS_MODE
-#define SQL_ATTR_AUTOCOMMIT			SQL_AUTOCOMMIT
-#define SQL_ATTR_CONNECTION_TIMEOUT	113
-#define SQL_ATTR_CURRENT_CATALOG	SQL_CURRENT_QUALIFIER
-#define SQL_ATTR_DISCONNECT_BEHAVIOR	114
-#define SQL_ATTR_ENLIST_IN_DTC		1207
-#define SQL_ATTR_ENLIST_IN_XA		1208
-#define SQL_ATTR_LOGIN_TIMEOUT		SQL_LOGIN_TIMEOUT
-#define SQL_ATTR_ODBC_CURSORS		SQL_ODBC_CURSORS
-#define SQL_ATTR_PACKET_SIZE		SQL_PACKET_SIZE
-#define SQL_ATTR_QUIET_MODE			SQL_QUIET_MODE
-#define SQL_ATTR_TRACE				SQL_OPT_TRACE
-#define SQL_ATTR_TRACEFILE			SQL_OPT_TRACEFILE
-#define SQL_ATTR_TRANSLATE_LIB		SQL_TRANSLATE_DLL
-#define SQL_ATTR_TRANSLATE_OPTION	SQL_TRANSLATE_OPTION
-#define SQL_ATTR_TXN_ISOLATION		SQL_TXN_ISOLATION
-#endif  /* ODBCVER >= 0x0300 */
-
-#define SQL_ATTR_CONNECTION_DEAD	1209	/* GetConnectAttr only */
-
-#if (ODBCVER >= 0x0351)
-/*	ODBC Driver Manager sets this connection attribute to a unicode driver 
-	(which supports SQLConnectW) when the application is an ANSI application
-	(which calls SQLConnect, SQLDriverConnect, or SQLBrowseConnect). 
-	This is SetConnectAttr only and application does not set this attribute
-	This attribute was introduced because some unicode driver's some APIs may 
-	need to behave differently on ANSI or Unicode applications. A unicode 
-	driver, which  has same behavior for both ANSI or Unicode applications,
-	should return SQL_ERROR when the driver manager sets this connection 
-	attribute. When a unicode driver returns SQL_SUCCESS on this attribute,
-	the driver manager treates ANSI and Unicode connections differently in
-	connection pooling.
-*/
-#define SQL_ATTR_ANSI_APP			115
-#endif
-
-/* SQL_CONNECT_OPT_DRVR_START is not meaningful for 3.0 driver */
-#if (ODBCVER < 0x0300)
-#define SQL_CONNECT_OPT_DRVR_START      1000
-#endif  /* ODBCVER < 0x0300 */
-
-#if (ODBCVER < 0x0300)
-#define SQL_CONN_OPT_MAX                SQL_PACKET_SIZE
-#define SQL_CONN_OPT_MIN                SQL_ACCESS_MODE
-#endif /* ODBCVER < 0x0300 */
-
-/* SQL_ACCESS_MODE options */
-#define SQL_MODE_READ_WRITE             0UL
-#define SQL_MODE_READ_ONLY              1UL
-#define SQL_MODE_DEFAULT                SQL_MODE_READ_WRITE
-
-/* SQL_AUTOCOMMIT options */
-#define SQL_AUTOCOMMIT_OFF              0UL
-#define SQL_AUTOCOMMIT_ON               1UL
-#define SQL_AUTOCOMMIT_DEFAULT          SQL_AUTOCOMMIT_ON
-
-/* SQL_LOGIN_TIMEOUT options */
-#define SQL_LOGIN_TIMEOUT_DEFAULT       15UL
-
-/* SQL_OPT_TRACE options */
-#define SQL_OPT_TRACE_OFF               0UL
-#define SQL_OPT_TRACE_ON                1UL
-#define SQL_OPT_TRACE_DEFAULT           SQL_OPT_TRACE_OFF
-#define SQL_OPT_TRACE_FILE_DEFAULT      "\\SQL.LOG"
-
-/* SQL_ODBC_CURSORS options */
-#define SQL_CUR_USE_IF_NEEDED           0UL
-#define SQL_CUR_USE_ODBC                1UL
-#define SQL_CUR_USE_DRIVER              2UL
-#define SQL_CUR_DEFAULT                 SQL_CUR_USE_DRIVER
-
-#if (ODBCVER >= 0x0300)
-/* values for SQL_ATTR_DISCONNECT_BEHAVIOR */
-#define SQL_DB_RETURN_TO_POOL			0UL
-#define SQL_DB_DISCONNECT				1UL
-#define SQL_DB_DEFAULT					SQL_DB_RETURN_TO_POOL
-
-/* values for SQL_ATTR_ENLIST_IN_DTC */
-#define SQL_DTC_DONE					0L
-#endif  /* ODBCVER >= 0x0300 */
-
-/* values for SQL_ATTR_CONNECTION_DEAD */
-#define SQL_CD_TRUE					1L		/* Connection is closed/dead */
-#define SQL_CD_FALSE				0L		/* Connection is open/available */
-
-/* values for SQL_ATTR_ANSI_APP */
-#if (ODBCVER >= 0x0351)
-#define SQL_AA_TRUE					1L	/* the application is an ANSI app */
-#define SQL_AA_FALSE					0L	/* the application is a Unicode app */
-#endif
-
-/* statement attributes */
-#define SQL_QUERY_TIMEOUT		0
-#define SQL_MAX_ROWS			1
-#define SQL_NOSCAN				2
-#define SQL_MAX_LENGTH			3
-#define SQL_ASYNC_ENABLE		4	/* same as SQL_ATTR_ASYNC_ENABLE */	
-#define SQL_BIND_TYPE			5
-#define SQL_CURSOR_TYPE			6
-#define SQL_CONCURRENCY			7
-#define SQL_KEYSET_SIZE			8
-#define SQL_ROWSET_SIZE			9
-#define SQL_SIMULATE_CURSOR		10
-#define SQL_RETRIEVE_DATA		11
-#define SQL_USE_BOOKMARKS		12
-#define SQL_GET_BOOKMARK		13      /*      GetStmtOption Only */
-#define SQL_ROW_NUMBER			14      /*      GetStmtOption Only */
-
-/* statement attributes for ODBC 3.0 */
-#if (ODBCVER >= 0x0300)
-#define SQL_ATTR_ASYNC_ENABLE				4
-#define SQL_ATTR_CONCURRENCY				SQL_CONCURRENCY
-#define SQL_ATTR_CURSOR_TYPE				SQL_CURSOR_TYPE
-#define	SQL_ATTR_ENABLE_AUTO_IPD			15
-#define SQL_ATTR_FETCH_BOOKMARK_PTR			16
-#define SQL_ATTR_KEYSET_SIZE				SQL_KEYSET_SIZE
-#define SQL_ATTR_MAX_LENGTH					SQL_MAX_LENGTH
-#define SQL_ATTR_MAX_ROWS					SQL_MAX_ROWS
-#define SQL_ATTR_NOSCAN						SQL_NOSCAN
-#define SQL_ATTR_PARAM_BIND_OFFSET_PTR		17
-#define	SQL_ATTR_PARAM_BIND_TYPE			18
-#define SQL_ATTR_PARAM_OPERATION_PTR		19
-#define SQL_ATTR_PARAM_STATUS_PTR			20
-#define	SQL_ATTR_PARAMS_PROCESSED_PTR		21
-#define	SQL_ATTR_PARAMSET_SIZE				22
-#define SQL_ATTR_QUERY_TIMEOUT				SQL_QUERY_TIMEOUT
-#define SQL_ATTR_RETRIEVE_DATA				SQL_RETRIEVE_DATA
-#define SQL_ATTR_ROW_BIND_OFFSET_PTR		23
-#define	SQL_ATTR_ROW_BIND_TYPE				SQL_BIND_TYPE
-#define SQL_ATTR_ROW_NUMBER					SQL_ROW_NUMBER	  	/*GetStmtAttr*/
-#define SQL_ATTR_ROW_OPERATION_PTR			24
-#define	SQL_ATTR_ROW_STATUS_PTR				25
-#define	SQL_ATTR_ROWS_FETCHED_PTR			26
-#define SQL_ATTR_ROW_ARRAY_SIZE				27	
-#define SQL_ATTR_SIMULATE_CURSOR			SQL_SIMULATE_CURSOR
-#define SQL_ATTR_USE_BOOKMARKS				SQL_USE_BOOKMARKS	
-
-#endif  /* ODBCVER >= 0x0300 */
-
-#if (ODBCVER < 0x0300)
-#define SQL_STMT_OPT_MAX                SQL_ROW_NUMBER
-#define SQL_STMT_OPT_MIN	SQL_QUERY_TIMEOUT
-#endif    	/* ODBCVER < 0x0300 */
-
-/* New defines for SEARCHABLE column in SQLGetTypeInfo */
-
-#if (ODBCVER >= 0x0300)
-#define	SQL_COL_PRED_CHAR		SQL_LIKE_ONLY
-#define	SQL_COL_PRED_BASIC		SQL_ALL_EXCEPT_LIKE
-#endif /* ODBCVER >= 0x0300 */
-
-
-
-/* whether an attribute is a pointer or not */
-#if (ODBCVER >= 0x0300)
-#define SQL_IS_POINTER							(-4)
-#define SQL_IS_UINTEGER							(-5)
-#define SQL_IS_INTEGER							(-6)
-#define SQL_IS_USMALLINT						(-7)
-#define SQL_IS_SMALLINT							(-8)
-#endif  /* ODBCVER >= 0x0300 */
-
-/* the value of SQL_ATTR_PARAM_BIND_TYPE */
-#if (ODBCVER >= 0x0300)
-#define SQL_PARAM_BIND_BY_COLUMN			0UL
-#define SQL_PARAM_BIND_TYPE_DEFAULT			SQL_PARAM_BIND_BY_COLUMN
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_QUERY_TIMEOUT options */
-#define SQL_QUERY_TIMEOUT_DEFAULT       0UL
-
-/* SQL_MAX_ROWS options */
-#define SQL_MAX_ROWS_DEFAULT            0UL
-
-/* SQL_NOSCAN options */
-#define SQL_NOSCAN_OFF                  0UL     /*      1.0 FALSE */
-#define SQL_NOSCAN_ON                   1UL     /*      1.0 TRUE */
-#define SQL_NOSCAN_DEFAULT              SQL_NOSCAN_OFF
-
-/* SQL_MAX_LENGTH options */
-#define SQL_MAX_LENGTH_DEFAULT          0UL
-
-/* values for SQL_ATTR_ASYNC_ENABLE */
-#define SQL_ASYNC_ENABLE_OFF			0UL
-#define SQL_ASYNC_ENABLE_ON				1UL
-#define SQL_ASYNC_ENABLE_DEFAULT        SQL_ASYNC_ENABLE_OFF
-
-/* SQL_BIND_TYPE options */
-#define SQL_BIND_BY_COLUMN              0UL
-#define SQL_BIND_TYPE_DEFAULT           SQL_BIND_BY_COLUMN  /* Default value */
-
-/* SQL_CONCURRENCY options */
-#define SQL_CONCUR_READ_ONLY            1
-#define SQL_CONCUR_LOCK                 2
-#define SQL_CONCUR_ROWVER               3
-#define SQL_CONCUR_VALUES               4
-#define SQL_CONCUR_DEFAULT              SQL_CONCUR_READ_ONLY /* Default value */
-
-/* SQL_CURSOR_TYPE options */
-#define SQL_CURSOR_FORWARD_ONLY         0UL
-#define SQL_CURSOR_KEYSET_DRIVEN        1UL
-#define SQL_CURSOR_DYNAMIC              2UL
-#define SQL_CURSOR_STATIC               3UL
-#define SQL_CURSOR_TYPE_DEFAULT         SQL_CURSOR_FORWARD_ONLY /* Default value */
-
-/* SQL_ROWSET_SIZE options */
-#define SQL_ROWSET_SIZE_DEFAULT         1UL
-
-/* SQL_KEYSET_SIZE options */
-#define SQL_KEYSET_SIZE_DEFAULT         0UL
-
-/* SQL_SIMULATE_CURSOR options */
-#define SQL_SC_NON_UNIQUE               0UL
-#define SQL_SC_TRY_UNIQUE               1UL
-#define SQL_SC_UNIQUE                   2UL
-
-/* SQL_RETRIEVE_DATA options */
-#define SQL_RD_OFF                      0UL
-#define SQL_RD_ON                       1UL
-#define SQL_RD_DEFAULT                  SQL_RD_ON
-
-/* SQL_USE_BOOKMARKS options */
-#define SQL_UB_OFF                      0UL
-#define	SQL_UB_ON						01UL
-#define SQL_UB_DEFAULT                  SQL_UB_OFF
-
-/* New values for SQL_USE_BOOKMARKS attribute */
-#if (ODBCVER >= 0x0300)
-#define SQL_UB_FIXED					SQL_UB_ON
-#define SQL_UB_VARIABLE					2UL
-#endif  /* ODBCVER >= 0x0300 */
-
-/* extended descriptor field */
-#if (ODBCVER >= 0x0300)
-#define SQL_DESC_ARRAY_SIZE						20
-#define SQL_DESC_ARRAY_STATUS_PTR				21
-#define SQL_DESC_AUTO_UNIQUE_VALUE				SQL_COLUMN_AUTO_INCREMENT
-#define SQL_DESC_BASE_COLUMN_NAME				22
-#define SQL_DESC_BASE_TABLE_NAME				23
-#define SQL_DESC_BIND_OFFSET_PTR				24
-#define SQL_DESC_BIND_TYPE						25
-#define SQL_DESC_CASE_SENSITIVE					SQL_COLUMN_CASE_SENSITIVE
-#define SQL_DESC_CATALOG_NAME					SQL_COLUMN_QUALIFIER_NAME
-#define SQL_DESC_CONCISE_TYPE					SQL_COLUMN_TYPE
-#define SQL_DESC_DATETIME_INTERVAL_PRECISION	26
-#define SQL_DESC_DISPLAY_SIZE					SQL_COLUMN_DISPLAY_SIZE
-#define SQL_DESC_FIXED_PREC_SCALE				SQL_COLUMN_MONEY
-#define SQL_DESC_LABEL							SQL_COLUMN_LABEL
-#define SQL_DESC_LITERAL_PREFIX					27
-#define SQL_DESC_LITERAL_SUFFIX					28
-#define SQL_DESC_LOCAL_TYPE_NAME				29
-#define	SQL_DESC_MAXIMUM_SCALE					30
-#define SQL_DESC_MINIMUM_SCALE					31
-#define SQL_DESC_NUM_PREC_RADIX					32
-#define SQL_DESC_PARAMETER_TYPE					33
-#define SQL_DESC_ROWS_PROCESSED_PTR				34
-#if (ODBCVER >= 0x0350)
-#define SQL_DESC_ROWVER							35
-#endif /* ODBCVER >= 0x0350 */
-#define SQL_DESC_SCHEMA_NAME					SQL_COLUMN_OWNER_NAME
-#define SQL_DESC_SEARCHABLE						SQL_COLUMN_SEARCHABLE
-#define SQL_DESC_TYPE_NAME						SQL_COLUMN_TYPE_NAME
-#define SQL_DESC_TABLE_NAME						SQL_COLUMN_TABLE_NAME
-#define SQL_DESC_UNSIGNED						SQL_COLUMN_UNSIGNED
-#define SQL_DESC_UPDATABLE						SQL_COLUMN_UPDATABLE
-#endif /* ODBCVER >= 0x0300 */
-
-
-/* defines for diagnostics fields */
-#if (ODBCVER >= 0x0300)
-#define SQL_DIAG_CURSOR_ROW_COUNT			(-1249)
-#define SQL_DIAG_ROW_NUMBER					(-1248)
-#define SQL_DIAG_COLUMN_NUMBER				(-1247)	
-#endif /* ODBCVER >= 0x0300 */
-
-/* SQL extended datatypes */
-#define SQL_DATE                                9
-#if (ODBCVER >= 0x0300)
-#define SQL_INTERVAL							10
-#endif  /* ODBCVER >= 0x0300 */
-#define SQL_TIME                                10
-#define SQL_TIMESTAMP                           11
-#define SQL_LONGVARCHAR                         (-1)
-#define SQL_BINARY                              (-2)
-#define SQL_VARBINARY                           (-3)
-#define SQL_LONGVARBINARY                       (-4)
-#define SQL_BIGINT                              (-5)
-#define SQL_TINYINT                             (-6)
-#define SQL_BIT                                 (-7)
-#if (ODBCVER >= 0x0350)
-#define SQL_GUID				(-11)
-#endif  /* ODBCVER >= 0x0350 */
-
-#if (ODBCVER >= 0x0300)
-/* interval code */
-#define SQL_CODE_YEAR				1
-#define SQL_CODE_MONTH				2
-#define SQL_CODE_DAY				3
-#define SQL_CODE_HOUR				4
-#define SQL_CODE_MINUTE				5
-#define SQL_CODE_SECOND				6
-#define SQL_CODE_YEAR_TO_MONTH			7
-#define SQL_CODE_DAY_TO_HOUR			8
-#define SQL_CODE_DAY_TO_MINUTE			9
-#define SQL_CODE_DAY_TO_SECOND			10
-#define SQL_CODE_HOUR_TO_MINUTE			11
-#define SQL_CODE_HOUR_TO_SECOND			12
-#define SQL_CODE_MINUTE_TO_SECOND		13
-
-#define SQL_INTERVAL_YEAR					(100 + SQL_CODE_YEAR)
-#define SQL_INTERVAL_MONTH					(100 + SQL_CODE_MONTH)
-#define SQL_INTERVAL_DAY					(100 + SQL_CODE_DAY) 
-#define SQL_INTERVAL_HOUR					(100 + SQL_CODE_HOUR) 
-#define SQL_INTERVAL_MINUTE					(100 + SQL_CODE_MINUTE) 
-#define SQL_INTERVAL_SECOND                	(100 + SQL_CODE_SECOND) 
-#define SQL_INTERVAL_YEAR_TO_MONTH			(100 + SQL_CODE_YEAR_TO_MONTH)
-#define SQL_INTERVAL_DAY_TO_HOUR			(100 + SQL_CODE_DAY_TO_HOUR) 
-#define SQL_INTERVAL_DAY_TO_MINUTE			(100 + SQL_CODE_DAY_TO_MINUTE) 
-#define SQL_INTERVAL_DAY_TO_SECOND			(100 + SQL_CODE_DAY_TO_SECOND) 
-#define SQL_INTERVAL_HOUR_TO_MINUTE			(100 + SQL_CODE_HOUR_TO_MINUTE)
-#define SQL_INTERVAL_HOUR_TO_SECOND			(100 + SQL_CODE_HOUR_TO_SECOND) 
-#define SQL_INTERVAL_MINUTE_TO_SECOND		(100 + SQL_CODE_MINUTE_TO_SECOND) 
-
-#else
-#define SQL_INTERVAL_YEAR                       (-80)
-#define SQL_INTERVAL_MONTH                      (-81)
-#define SQL_INTERVAL_YEAR_TO_MONTH              (-82)
-#define SQL_INTERVAL_DAY                        (-83)
-#define SQL_INTERVAL_HOUR                       (-84)
-#define SQL_INTERVAL_MINUTE                     (-85)
-#define SQL_INTERVAL_SECOND                     (-86)
-#define SQL_INTERVAL_DAY_TO_HOUR                (-87)
-#define SQL_INTERVAL_DAY_TO_MINUTE              (-88)
-#define SQL_INTERVAL_DAY_TO_SECOND              (-89)
-#define SQL_INTERVAL_HOUR_TO_MINUTE             (-90)
-#define SQL_INTERVAL_HOUR_TO_SECOND             (-91)
-#define SQL_INTERVAL_MINUTE_TO_SECOND           (-92)
-#endif  /* ODBCVER >= 0x0300 */
-
-
-#if (ODBCVER <= 0x0300)
-#define SQL_UNICODE                             (-95)
-#define SQL_UNICODE_VARCHAR                     (-96)
-#define SQL_UNICODE_LONGVARCHAR                 (-97)
-#define SQL_UNICODE_CHAR                        SQL_UNICODE
-#else
-/* The previous definitions for SQL_UNICODE_ are historical and obsolete */
-
-#define	SQL_UNICODE				SQL_WCHAR
-
-#define	SQL_UNICODE_VARCHAR		SQL_WVARCHAR
-#define SQL_UNICODE_LONGVARCHAR	SQL_WLONGVARCHAR
-#define SQL_UNICODE_CHAR		SQL_WCHAR
-#endif
-
-#if (ODBCVER < 0x0300)
-#define SQL_TYPE_DRIVER_START                   SQL_INTERVAL_YEAR
-#define SQL_TYPE_DRIVER_END                     SQL_UNICODE_LONGVARCHAR
-#endif  /* ODBCVER < 0x0300 */
-
-/* C datatype to SQL datatype mapping      SQL types
-                                           ------------------- */
-#define SQL_C_CHAR    SQL_CHAR             /* CHAR, VARCHAR, DECIMAL, NUMERIC */
-#define SQL_C_LONG    SQL_INTEGER          /* INTEGER                      */
-#define SQL_C_SHORT   SQL_SMALLINT         /* SMALLINT                     */
-#define SQL_C_FLOAT   SQL_REAL             /* REAL                         */
-#define SQL_C_DOUBLE  SQL_DOUBLE           /* FLOAT, DOUBLE                */
-#if (ODBCVER >= 0x0300)
-#define	SQL_C_NUMERIC		SQL_NUMERIC
-#endif  /* ODBCVER >= 0x0300 */
-#define SQL_C_DEFAULT 99
-
-#define SQL_SIGNED_OFFSET       (-20)
-#define SQL_UNSIGNED_OFFSET     (-22)
-
-/* C datatype to SQL datatype mapping */
-#define SQL_C_DATE       SQL_DATE
-#define SQL_C_TIME       SQL_TIME
-#define SQL_C_TIMESTAMP  SQL_TIMESTAMP
-#if (ODBCVER >= 0x0300)
-#define SQL_C_TYPE_DATE					SQL_TYPE_DATE
-#define SQL_C_TYPE_TIME					SQL_TYPE_TIME
-#define SQL_C_TYPE_TIMESTAMP			SQL_TYPE_TIMESTAMP
-#define SQL_C_INTERVAL_YEAR				SQL_INTERVAL_YEAR
-#define SQL_C_INTERVAL_MONTH			SQL_INTERVAL_MONTH
-#define SQL_C_INTERVAL_DAY				SQL_INTERVAL_DAY
-#define SQL_C_INTERVAL_HOUR				SQL_INTERVAL_HOUR
-#define SQL_C_INTERVAL_MINUTE			SQL_INTERVAL_MINUTE
-#define SQL_C_INTERVAL_SECOND			SQL_INTERVAL_SECOND
-#define SQL_C_INTERVAL_YEAR_TO_MONTH	SQL_INTERVAL_YEAR_TO_MONTH
-#define SQL_C_INTERVAL_DAY_TO_HOUR		SQL_INTERVAL_DAY_TO_HOUR
-#define SQL_C_INTERVAL_DAY_TO_MINUTE	SQL_INTERVAL_DAY_TO_MINUTE
-#define SQL_C_INTERVAL_DAY_TO_SECOND	SQL_INTERVAL_DAY_TO_SECOND
-#define SQL_C_INTERVAL_HOUR_TO_MINUTE	SQL_INTERVAL_HOUR_TO_MINUTE
-#define SQL_C_INTERVAL_HOUR_TO_SECOND	SQL_INTERVAL_HOUR_TO_SECOND
-#define SQL_C_INTERVAL_MINUTE_TO_SECOND	SQL_INTERVAL_MINUTE_TO_SECOND
-#endif  /* ODBCVER >= 0x0300 */
-#define SQL_C_BINARY     SQL_BINARY
-#define SQL_C_BIT        SQL_BIT
-#if (ODBCVER >= 0x0300)
-#define SQL_C_SBIGINT	(SQL_BIGINT+SQL_SIGNED_OFFSET)	   /* SIGNED BIGINT */
-#define SQL_C_UBIGINT	(SQL_BIGINT+SQL_UNSIGNED_OFFSET)   /* UNSIGNED BIGINT */
-#endif  /* ODBCVER >= 0x0300 */
-#define SQL_C_TINYINT    SQL_TINYINT
-#define SQL_C_SLONG      (SQL_C_LONG+SQL_SIGNED_OFFSET)    /* SIGNED INTEGER  */
-#define SQL_C_SSHORT     (SQL_C_SHORT+SQL_SIGNED_OFFSET)   /* SIGNED SMALLINT */
-#define SQL_C_STINYINT   (SQL_TINYINT+SQL_SIGNED_OFFSET)   /* SIGNED TINYINT  */
-#define SQL_C_ULONG      (SQL_C_LONG+SQL_UNSIGNED_OFFSET)  /* UNSIGNED INTEGER*/
-#define SQL_C_USHORT     (SQL_C_SHORT+SQL_UNSIGNED_OFFSET) /* UNSIGNED SMALLINT*/
-#define SQL_C_UTINYINT   (SQL_TINYINT+SQL_UNSIGNED_OFFSET) /* UNSIGNED TINYINT*/
-
-#ifdef _WIN64
-#define SQL_C_BOOKMARK   SQL_C_UBIGINT                     /* BOOKMARK        */
-#else
-#define SQL_C_BOOKMARK   SQL_C_ULONG                       /* BOOKMARK        */
-#endif
-
-#if (ODBCVER >= 0x0350)
-#define SQL_C_GUID	SQL_GUID
-#endif  /* ODBCVER >= 0x0350 */
-
-#define SQL_TYPE_NULL                   0
-#if (ODBCVER < 0x0300)
-#define SQL_TYPE_MIN                    SQL_BIT
-#define SQL_TYPE_MAX                    SQL_VARCHAR
-#endif
-
-#if (ODBCVER >= 0x0300)
-#define SQL_C_VARBOOKMARK		SQL_C_BINARY
-#endif  /* ODBCVER >= 0x0300 */
-
-/* define for SQL_DIAG_ROW_NUMBER and SQL_DIAG_COLUMN_NUMBER */
-#if (ODBCVER >= 0x0300)
-#define SQL_NO_ROW_NUMBER						(-1)
-#define SQL_NO_COLUMN_NUMBER					(-1)
-#define SQL_ROW_NUMBER_UNKNOWN					(-2)
-#define SQL_COLUMN_NUMBER_UNKNOWN				(-2)
-#endif
-
-/* SQLBindParameter extensions */
-#define SQL_DEFAULT_PARAM            (-5)
-#define SQL_IGNORE                   (-6)
-#if (ODBCVER >= 0x0300)
-#define SQL_COLUMN_IGNORE			SQL_IGNORE
-#endif  /* ODBCVER >= 0x0300 */
-#define SQL_LEN_DATA_AT_EXEC_OFFSET  (-100)
-#define SQL_LEN_DATA_AT_EXEC(length) (-(length)+SQL_LEN_DATA_AT_EXEC_OFFSET)
-
-/* binary length for driver specific attributes */
-#define SQL_LEN_BINARY_ATTR_OFFSET	 (-100)
-#define SQL_LEN_BINARY_ATTR(length)	 (-(length)+SQL_LEN_BINARY_ATTR_OFFSET)
-
-/* Defines used by Driver Manager when mapping SQLSetParam to SQLBindParameter
-*/
-#define SQL_PARAM_TYPE_DEFAULT           SQL_PARAM_INPUT_OUTPUT
-#define SQL_SETPARAM_VALUE_MAX           (-1L)
-
-/* SQLColAttributes defines */
-#define SQL_COLUMN_COUNT                0
-#define SQL_COLUMN_NAME                 1
-#define SQL_COLUMN_TYPE                 2
-#define SQL_COLUMN_LENGTH               3
-#define SQL_COLUMN_PRECISION            4
-#define SQL_COLUMN_SCALE                5
-#define SQL_COLUMN_DISPLAY_SIZE         6
-#define SQL_COLUMN_NULLABLE             7
-#define SQL_COLUMN_UNSIGNED             8
-#define SQL_COLUMN_MONEY                9
-#define SQL_COLUMN_UPDATABLE            10
-#define SQL_COLUMN_AUTO_INCREMENT       11
-#define SQL_COLUMN_CASE_SENSITIVE       12
-#define SQL_COLUMN_SEARCHABLE           13
-#define SQL_COLUMN_TYPE_NAME            14
-#define SQL_COLUMN_TABLE_NAME           15
-#define SQL_COLUMN_OWNER_NAME           16
-#define SQL_COLUMN_QUALIFIER_NAME       17
-#define SQL_COLUMN_LABEL                18
-#define SQL_COLATT_OPT_MAX              SQL_COLUMN_LABEL
-#if (ODBCVER < 0x0300)
-#define SQL_COLUMN_DRIVER_START         1000
-#endif  /* ODBCVER < 0x0300 */
-
-#define SQL_COLATT_OPT_MIN              SQL_COLUMN_COUNT
-
-/* SQLColAttributes subdefines for SQL_COLUMN_UPDATABLE */
-#define SQL_ATTR_READONLY               0
-#define SQL_ATTR_WRITE                  1
-#define SQL_ATTR_READWRITE_UNKNOWN      2
-
-/* SQLColAttributes subdefines for SQL_COLUMN_SEARCHABLE */
-/* These are also used by SQLGetInfo                     */
-#define SQL_UNSEARCHABLE                0
-#define SQL_LIKE_ONLY                   1
-#define SQL_ALL_EXCEPT_LIKE             2
-#define SQL_SEARCHABLE                  3
-#define SQL_PRED_SEARCHABLE				SQL_SEARCHABLE
-
-
-/* Special return values for SQLGetData */
-#define SQL_NO_TOTAL                    (-4)
-
-/********************************************/
-/* SQLGetFunctions: additional values for   */
-/* fFunction to represent functions that    */
-/* are not in the X/Open spec.				*/
-/********************************************/
-
-#if (ODBCVER >= 0x0300)
-#define SQL_API_SQLALLOCHANDLESTD	73
-#define SQL_API_SQLBULKOPERATIONS	24
-#endif /* ODBCVER >= 0x0300 */
-#define SQL_API_SQLBINDPARAMETER    72
-#define SQL_API_SQLBROWSECONNECT    55    
-#define SQL_API_SQLCOLATTRIBUTES    6 
-#define SQL_API_SQLCOLUMNPRIVILEGES 56
-#define SQL_API_SQLDESCRIBEPARAM    58
-#define	SQL_API_SQLDRIVERCONNECT	41 
-#define SQL_API_SQLDRIVERS          71
-#define SQL_API_SQLEXTENDEDFETCH    59
-#define SQL_API_SQLFOREIGNKEYS      60
-#define SQL_API_SQLMORERESULTS      61
-#define SQL_API_SQLNATIVESQL        62
-#define SQL_API_SQLNUMPARAMS        63
-#define SQL_API_SQLPARAMOPTIONS     64
-#define SQL_API_SQLPRIMARYKEYS      65
-#define SQL_API_SQLPROCEDURECOLUMNS 66
-#define SQL_API_SQLPROCEDURES       67
-#define SQL_API_SQLSETPOS           68
-#define SQL_API_SQLSETSCROLLOPTIONS 69
-#define SQL_API_SQLTABLEPRIVILEGES  70
-
-/*-------------------------------------------*/
-/* SQL_EXT_API_LAST is not useful with ODBC  */
-/* version 3.0 because some of the values    */
-/* from X/Open are in the 10000 range.       */
-/*-------------------------------------------*/
-
-#if (ODBCVER < 0x0300)
-#define SQL_EXT_API_LAST            SQL_API_SQLBINDPARAMETER
-#define SQL_NUM_FUNCTIONS           23
-#define SQL_EXT_API_START           40
-#define SQL_NUM_EXTENSIONS (SQL_EXT_API_LAST-SQL_EXT_API_START+1)
-#endif
-
-/*--------------------------------------------*/
-/* SQL_API_ALL_FUNCTIONS returns an array     */
-/* of 'booleans' representing whether a       */
-/* function is implemented by the driver.     */
-/*                                            */
-/* CAUTION: Only functions defined in ODBC    */
-/* version 2.0 and earlier are returned, the  */
-/* new high-range function numbers defined by */
-/* X/Open break this scheme.   See the new    */
-/* method -- SQL_API_ODBC3_ALL_FUNCTIONS      */
-/*--------------------------------------------*/
-
-#define SQL_API_ALL_FUNCTIONS       0		/* See CAUTION above */
-
-/*----------------------------------------------*/
-/* 2.X drivers export a dummy function with  	*/
-/* ordinal number SQL_API_LOADBYORDINAL to speed*/
-/* loading under the windows operating system.  */
-/* 						*/
-/* CAUTION: Loading by ordinal is not supported */
-/* for 3.0 and above drivers.			*/
-/*----------------------------------------------*/
-
-#define SQL_API_LOADBYORDINAL       199		/* See CAUTION above */	
-
-/*----------------------------------------------*/
-/* SQL_API_ODBC3_ALL_FUNCTIONS                  */
-/* This returns a bitmap, which allows us to    */
-/* handle the higher-valued function numbers.   */
-/* Use  SQL_FUNC_EXISTS(bitmap,function_number) */
-/* to determine if the function exists.         */
-/*----------------------------------------------*/
-
-
-#if (ODBCVER >= 0x0300)
-#define SQL_API_ODBC3_ALL_FUNCTIONS	999
-#define	SQL_API_ODBC3_ALL_FUNCTIONS_SIZE	250		/* array of 250 words */
-
-#define SQL_FUNC_EXISTS(pfExists, uwAPI) \
-				((*(((UWORD*) (pfExists)) + ((uwAPI) >> 4)) \
-					& (1 << ((uwAPI) & 0x000F)) \
- 				 ) ? SQL_TRUE : SQL_FALSE \
-				)
-#endif  /* ODBCVER >= 0x0300 */
-
-
-/************************************************/
-/* Extended definitions for SQLGetInfo			*/
-/************************************************/
-
-/*---------------------------------*/
-/* Values in ODBC 2.0 that are not */
-/* in the X/Open spec              */
-/*---------------------------------*/
-
-#define SQL_INFO_FIRST                       0		
-#define SQL_ACTIVE_CONNECTIONS               0	/* MAX_DRIVER_CONNECTIONS */
-#define SQL_ACTIVE_STATEMENTS                1	/* MAX_CONCURRENT_ACTIVITIES */
-#define SQL_DRIVER_HDBC                      3
-#define SQL_DRIVER_HENV                      4
-#define SQL_DRIVER_HSTMT                     5
-#define SQL_DRIVER_NAME                      6
-#define SQL_DRIVER_VER                       7
-#define SQL_ODBC_API_CONFORMANCE             9
-#define SQL_ODBC_VER                        10
-#define SQL_ROW_UPDATES                     11
-#define SQL_ODBC_SAG_CLI_CONFORMANCE        12
-#define SQL_ODBC_SQL_CONFORMANCE            15
-#define SQL_PROCEDURES                      21
-#define SQL_CONCAT_NULL_BEHAVIOR            22
-#define SQL_CURSOR_ROLLBACK_BEHAVIOR        24
-#define SQL_EXPRESSIONS_IN_ORDERBY          27
-#define SQL_MAX_OWNER_NAME_LEN              32	/* MAX_SCHEMA_NAME_LEN */
-#define SQL_MAX_PROCEDURE_NAME_LEN          33
-#define SQL_MAX_QUALIFIER_NAME_LEN          34	/* MAX_CATALOG_NAME_LEN */
-#define SQL_MULT_RESULT_SETS                36
-#define SQL_MULTIPLE_ACTIVE_TXN             37
-#define SQL_OUTER_JOINS                     38
-#define SQL_OWNER_TERM                      39
-#define SQL_PROCEDURE_TERM                  40
-#define SQL_QUALIFIER_NAME_SEPARATOR        41
-#define SQL_QUALIFIER_TERM                  42
-#define SQL_SCROLL_OPTIONS                  44
-#define SQL_TABLE_TERM                      45
-#define SQL_CONVERT_FUNCTIONS               48
-#define SQL_NUMERIC_FUNCTIONS               49
-#define SQL_STRING_FUNCTIONS                50
-#define SQL_SYSTEM_FUNCTIONS                51
-#define SQL_TIMEDATE_FUNCTIONS              52
-#define SQL_CONVERT_BIGINT                  53
-#define SQL_CONVERT_BINARY                  54
-#define SQL_CONVERT_BIT                     55
-#define SQL_CONVERT_CHAR                    56
-#define SQL_CONVERT_DATE                    57
-#define SQL_CONVERT_DECIMAL                 58
-#define SQL_CONVERT_DOUBLE                  59
-#define SQL_CONVERT_FLOAT                   60
-#define SQL_CONVERT_INTEGER                 61
-#define SQL_CONVERT_LONGVARCHAR             62
-#define SQL_CONVERT_NUMERIC                 63
-#define SQL_CONVERT_REAL                    64
-#define SQL_CONVERT_SMALLINT                65
-#define SQL_CONVERT_TIME                    66
-#define SQL_CONVERT_TIMESTAMP               67
-#define SQL_CONVERT_TINYINT                 68
-#define SQL_CONVERT_VARBINARY               69
-#define SQL_CONVERT_VARCHAR                 70
-#define SQL_CONVERT_LONGVARBINARY           71
-#define SQL_ODBC_SQL_OPT_IEF                73		/* SQL_INTEGRITY */
-#define SQL_CORRELATION_NAME                74
-#define SQL_NON_NULLABLE_COLUMNS            75
-#define SQL_DRIVER_HLIB                     76
-#define SQL_DRIVER_ODBC_VER                 77
-#define SQL_LOCK_TYPES                      78
-#define SQL_POS_OPERATIONS                  79
-#define SQL_POSITIONED_STATEMENTS           80
-#define SQL_BOOKMARK_PERSISTENCE            82
-#define SQL_STATIC_SENSITIVITY              83
-#define SQL_FILE_USAGE                      84
-#define SQL_COLUMN_ALIAS                    87
-#define SQL_GROUP_BY                        88
-#define SQL_KEYWORDS                        89
-#define SQL_OWNER_USAGE                     91
-#define SQL_QUALIFIER_USAGE                 92
-#define SQL_QUOTED_IDENTIFIER_CASE          93
-#define SQL_SUBQUERIES                      95
-#define SQL_UNION                           96
-#define SQL_MAX_ROW_SIZE_INCLUDES_LONG      103
-#define SQL_MAX_CHAR_LITERAL_LEN            108
-#define SQL_TIMEDATE_ADD_INTERVALS          109
-#define SQL_TIMEDATE_DIFF_INTERVALS         110
-#define SQL_NEED_LONG_DATA_LEN              111
-#define SQL_MAX_BINARY_LITERAL_LEN          112
-#define SQL_LIKE_ESCAPE_CLAUSE              113
-#define SQL_QUALIFIER_LOCATION              114
-
-#if (ODBCVER >= 0x0201 && ODBCVER < 0x0300)
-#define SQL_OJ_CAPABILITIES         65003  /* Temp value until ODBC 3.0 */
-#endif  /* ODBCVER >= 0x0201 && ODBCVER < 0x0300 */
-
-/*----------------------------------------------*/
-/* SQL_INFO_LAST and SQL_INFO_DRIVER_START are  */
-/* not useful anymore, because  X/Open has      */
-/* values in the 10000 range.   You  			*/
-/* must contact X/Open directly to get a range	*/
-/* of numbers for driver-specific values.	    */
-/*----------------------------------------------*/
-
-#if (ODBCVER < 0x0300)
-#define SQL_INFO_LAST						SQL_QUALIFIER_LOCATION
-#define SQL_INFO_DRIVER_START				1000
-#endif /* ODBCVER < 0x0300 */
-
-/*-----------------------------------------------*/
-/* ODBC 3.0 SQLGetInfo values that are not part  */
-/* of the X/Open standard at this time.   X/Open */
-/* standard values are in sql.h.				 */
-/*-----------------------------------------------*/
-
-#if (ODBCVER >= 0x0300)
-#define SQL_ACTIVE_ENVIRONMENTS					116
-#define	SQL_ALTER_DOMAIN						117
-
-#define	SQL_SQL_CONFORMANCE						118
-#define SQL_DATETIME_LITERALS					119
-
-#define	SQL_ASYNC_MODE							10021	/* new X/Open spec */
-#define SQL_BATCH_ROW_COUNT						120
-#define SQL_BATCH_SUPPORT						121
-#define SQL_CATALOG_LOCATION					SQL_QUALIFIER_LOCATION
-#define SQL_CATALOG_NAME_SEPARATOR				SQL_QUALIFIER_NAME_SEPARATOR
-#define SQL_CATALOG_TERM						SQL_QUALIFIER_TERM
-#define SQL_CATALOG_USAGE						SQL_QUALIFIER_USAGE
-#define	SQL_CONVERT_WCHAR						122
-#define SQL_CONVERT_INTERVAL_DAY_TIME			123
-#define SQL_CONVERT_INTERVAL_YEAR_MONTH			124
-#define	SQL_CONVERT_WLONGVARCHAR				125
-#define	SQL_CONVERT_WVARCHAR					126
-#define	SQL_CREATE_ASSERTION					127
-#define	SQL_CREATE_CHARACTER_SET				128
-#define	SQL_CREATE_COLLATION					129
-#define	SQL_CREATE_DOMAIN						130
-#define	SQL_CREATE_SCHEMA						131
-#define	SQL_CREATE_TABLE						132
-#define	SQL_CREATE_TRANSLATION					133
-#define	SQL_CREATE_VIEW							134
-#define SQL_DRIVER_HDESC						135
-#define	SQL_DROP_ASSERTION						136
-#define	SQL_DROP_CHARACTER_SET					137
-#define	SQL_DROP_COLLATION						138
-#define	SQL_DROP_DOMAIN							139
-#define	SQL_DROP_SCHEMA							140
-#define	SQL_DROP_TABLE							141
-#define	SQL_DROP_TRANSLATION					142
-#define	SQL_DROP_VIEW							143
-#define SQL_DYNAMIC_CURSOR_ATTRIBUTES1			144
-#define SQL_DYNAMIC_CURSOR_ATTRIBUTES2			145
-#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1		146		
-#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2		147
-#define SQL_INDEX_KEYWORDS						148
-#define SQL_INFO_SCHEMA_VIEWS					149
-#define SQL_KEYSET_CURSOR_ATTRIBUTES1			150
-#define SQL_KEYSET_CURSOR_ATTRIBUTES2			151
-#define	SQL_MAX_ASYNC_CONCURRENT_STATEMENTS		10022	/* new X/Open spec */
-#define SQL_ODBC_INTERFACE_CONFORMANCE			152
-#define SQL_PARAM_ARRAY_ROW_COUNTS     			153
-#define SQL_PARAM_ARRAY_SELECTS     			154
-#define SQL_SCHEMA_TERM							SQL_OWNER_TERM
-#define SQL_SCHEMA_USAGE						SQL_OWNER_USAGE
-#define SQL_SQL92_DATETIME_FUNCTIONS			155
-#define SQL_SQL92_FOREIGN_KEY_DELETE_RULE		156		
-#define SQL_SQL92_FOREIGN_KEY_UPDATE_RULE		157		
-#define SQL_SQL92_GRANT							158
-#define SQL_SQL92_NUMERIC_VALUE_FUNCTIONS		159
-#define SQL_SQL92_PREDICATES					160
-#define SQL_SQL92_RELATIONAL_JOIN_OPERATORS		161
-#define SQL_SQL92_REVOKE						162
-#define SQL_SQL92_ROW_VALUE_CONSTRUCTOR			163
-#define SQL_SQL92_STRING_FUNCTIONS				164
-#define SQL_SQL92_VALUE_EXPRESSIONS				165
-#define SQL_STANDARD_CLI_CONFORMANCE			166
-#define SQL_STATIC_CURSOR_ATTRIBUTES1			167	
-#define SQL_STATIC_CURSOR_ATTRIBUTES2			168
-
-#define SQL_AGGREGATE_FUNCTIONS					169
-#define SQL_DDL_INDEX							170
-#define SQL_DM_VER								171
-#define SQL_INSERT_STATEMENT					172
-#define	SQL_CONVERT_GUID						173		
-#define SQL_UNION_STATEMENT						SQL_UNION
-#endif  /* ODBCVER >= 0x0300 */
-
-#define	SQL_DTC_TRANSITION_COST					1750
-
-/* SQL_ALTER_TABLE bitmasks */
-#if (ODBCVER >= 0x0300)
-/* the following 5 bitmasks are defined in sql.h
-*#define SQL_AT_ADD_COLUMN                   	0x00000001L
-*#define SQL_AT_DROP_COLUMN                  	0x00000002L
-*#define SQL_AT_ADD_CONSTRAINT               	0x00000008L
-*/
-#define	SQL_AT_ADD_COLUMN_SINGLE				0x00000020L	
-#define	SQL_AT_ADD_COLUMN_DEFAULT				0x00000040L
-#define	SQL_AT_ADD_COLUMN_COLLATION				0x00000080L
-#define	SQL_AT_SET_COLUMN_DEFAULT				0x00000100L
-#define	SQL_AT_DROP_COLUMN_DEFAULT				0x00000200L
-#define	SQL_AT_DROP_COLUMN_CASCADE				0x00000400L
-#define	SQL_AT_DROP_COLUMN_RESTRICT				0x00000800L
-#define SQL_AT_ADD_TABLE_CONSTRAINT				0x00001000L		
-#define SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE	0x00002000L		
-#define SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT	0x00004000L		
-#define SQL_AT_CONSTRAINT_NAME_DEFINITION		0x00008000L
-#define SQL_AT_CONSTRAINT_INITIALLY_DEFERRED	0x00010000L
-#define SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE	0x00020000L
-#define SQL_AT_CONSTRAINT_DEFERRABLE			0x00040000L
-#define SQL_AT_CONSTRAINT_NON_DEFERRABLE		0x00080000L
-#endif	/* ODBCVER >= 0x0300 */
-
-/* SQL_CONVERT_*  return value bitmasks */
-
-#define SQL_CVT_CHAR                        0x00000001L
-#define SQL_CVT_NUMERIC                     0x00000002L
-#define SQL_CVT_DECIMAL                     0x00000004L
-#define SQL_CVT_INTEGER                     0x00000008L
-#define SQL_CVT_SMALLINT                    0x00000010L
-#define SQL_CVT_FLOAT                       0x00000020L
-#define SQL_CVT_REAL                        0x00000040L
-#define SQL_CVT_DOUBLE                      0x00000080L
-#define SQL_CVT_VARCHAR                     0x00000100L
-#define SQL_CVT_LONGVARCHAR                 0x00000200L
-#define SQL_CVT_BINARY                      0x00000400L
-#define SQL_CVT_VARBINARY                   0x00000800L
-#define SQL_CVT_BIT                         0x00001000L
-#define SQL_CVT_TINYINT                     0x00002000L
-#define SQL_CVT_BIGINT                      0x00004000L
-#define SQL_CVT_DATE                        0x00008000L
-#define SQL_CVT_TIME                        0x00010000L
-#define SQL_CVT_TIMESTAMP                   0x00020000L
-#define SQL_CVT_LONGVARBINARY               0x00040000L
-#if (ODBCVER >= 0x0300)
-#define SQL_CVT_INTERVAL_YEAR_MONTH	    	0x00080000L
-#define SQL_CVT_INTERVAL_DAY_TIME	    	0x00100000L
-#define	SQL_CVT_WCHAR						0x00200000L
-#define	SQL_CVT_WLONGVARCHAR				0x00400000L
-#define	SQL_CVT_WVARCHAR					0x00800000L
-#define SQL_CVT_GUID						0x01000000L
-
-#endif  /* ODBCVER >= 0x0300 */
-
-
-/* SQL_CONVERT_FUNCTIONS functions */
-#define SQL_FN_CVT_CONVERT                  0x00000001L
-#if (ODBCVER >= 0x0300)
-#define SQL_FN_CVT_CAST						0x00000002L
-#endif  /* ODBCVER >= 0x0300 */
-
-
-/* SQL_STRING_FUNCTIONS functions */
-
-#define SQL_FN_STR_CONCAT                   0x00000001L
-#define SQL_FN_STR_INSERT                   0x00000002L
-#define SQL_FN_STR_LEFT                     0x00000004L
-#define SQL_FN_STR_LTRIM                    0x00000008L
-#define SQL_FN_STR_LENGTH                   0x00000010L
-#define SQL_FN_STR_LOCATE                   0x00000020L
-#define SQL_FN_STR_LCASE                    0x00000040L
-#define SQL_FN_STR_REPEAT                   0x00000080L
-#define SQL_FN_STR_REPLACE                  0x00000100L
-#define SQL_FN_STR_RIGHT                    0x00000200L
-#define SQL_FN_STR_RTRIM                    0x00000400L
-#define SQL_FN_STR_SUBSTRING                0x00000800L
-#define SQL_FN_STR_UCASE                    0x00001000L
-#define SQL_FN_STR_ASCII                    0x00002000L
-#define SQL_FN_STR_CHAR                     0x00004000L
-#define SQL_FN_STR_DIFFERENCE               0x00008000L
-#define SQL_FN_STR_LOCATE_2                 0x00010000L
-#define SQL_FN_STR_SOUNDEX                  0x00020000L
-#define SQL_FN_STR_SPACE                    0x00040000L
-#if (ODBCVER >= 0x0300)
-#define SQL_FN_STR_BIT_LENGTH				0x00080000L
-#define SQL_FN_STR_CHAR_LENGTH				0x00100000L
-#define SQL_FN_STR_CHARACTER_LENGTH			0x00200000L
-#define SQL_FN_STR_OCTET_LENGTH				0x00400000L
-#define SQL_FN_STR_POSITION					0x00800000L
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_SQL92_STRING_FUNCTIONS */
-#if (ODBCVER >= 0x0300)
-#define SQL_SSF_CONVERT						0x00000001L	
-#define SQL_SSF_LOWER						0x00000002L
-#define SQL_SSF_UPPER						0x00000004L
-#define SQL_SSF_SUBSTRING					0x00000008L
-#define SQL_SSF_TRANSLATE					0x00000010L
-#define SQL_SSF_TRIM_BOTH					0x00000020L
-#define SQL_SSF_TRIM_LEADING				0x00000040L
-#define SQL_SSF_TRIM_TRAILING				0x00000080L
-#endif /* ODBCVER >= 0x0300 */
-
-/* SQL_NUMERIC_FUNCTIONS functions */
-
-#define SQL_FN_NUM_ABS                      0x00000001L
-#define SQL_FN_NUM_ACOS                     0x00000002L
-#define SQL_FN_NUM_ASIN                     0x00000004L
-#define SQL_FN_NUM_ATAN                     0x00000008L
-#define SQL_FN_NUM_ATAN2                    0x00000010L
-#define SQL_FN_NUM_CEILING                  0x00000020L
-#define SQL_FN_NUM_COS                      0x00000040L
-#define SQL_FN_NUM_COT                      0x00000080L
-#define SQL_FN_NUM_EXP                      0x00000100L
-#define SQL_FN_NUM_FLOOR                    0x00000200L
-#define SQL_FN_NUM_LOG                      0x00000400L
-#define SQL_FN_NUM_MOD                      0x00000800L
-#define SQL_FN_NUM_SIGN                     0x00001000L
-#define SQL_FN_NUM_SIN                      0x00002000L
-#define SQL_FN_NUM_SQRT                     0x00004000L
-#define SQL_FN_NUM_TAN                      0x00008000L
-#define SQL_FN_NUM_PI                       0x00010000L
-#define SQL_FN_NUM_RAND                     0x00020000L
-#define SQL_FN_NUM_DEGREES                  0x00040000L
-#define SQL_FN_NUM_LOG10                    0x00080000L
-#define SQL_FN_NUM_POWER                    0x00100000L
-#define SQL_FN_NUM_RADIANS                  0x00200000L
-#define SQL_FN_NUM_ROUND                    0x00400000L
-#define SQL_FN_NUM_TRUNCATE                 0x00800000L
-
-/* SQL_SQL92_NUMERIC_VALUE_FUNCTIONS */
-#if (ODBCVER >= 0x0300)
-#define SQL_SNVF_BIT_LENGTH					0x00000001L
-#define SQL_SNVF_CHAR_LENGTH				0x00000002L
-#define SQL_SNVF_CHARACTER_LENGTH			0x00000004L
-#define SQL_SNVF_EXTRACT					0x00000008L
-#define SQL_SNVF_OCTET_LENGTH				0x00000010L
-#define SQL_SNVF_POSITION					0x00000020L
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_TIMEDATE_FUNCTIONS functions */
-
-#define SQL_FN_TD_NOW                       0x00000001L
-#define SQL_FN_TD_CURDATE                   0x00000002L
-#define SQL_FN_TD_DAYOFMONTH                0x00000004L
-#define SQL_FN_TD_DAYOFWEEK                 0x00000008L
-#define SQL_FN_TD_DAYOFYEAR                 0x00000010L
-#define SQL_FN_TD_MONTH                     0x00000020L
-#define SQL_FN_TD_QUARTER                   0x00000040L
-#define SQL_FN_TD_WEEK                      0x00000080L
-#define SQL_FN_TD_YEAR                      0x00000100L
-#define SQL_FN_TD_CURTIME                   0x00000200L
-#define SQL_FN_TD_HOUR                      0x00000400L
-#define SQL_FN_TD_MINUTE                    0x00000800L
-#define SQL_FN_TD_SECOND                    0x00001000L
-#define SQL_FN_TD_TIMESTAMPADD              0x00002000L
-#define SQL_FN_TD_TIMESTAMPDIFF             0x00004000L
-#define SQL_FN_TD_DAYNAME                   0x00008000L
-#define SQL_FN_TD_MONTHNAME                 0x00010000L
-#if (ODBCVER >= 0x0300)
-#define SQL_FN_TD_CURRENT_DATE				0x00020000L
-#define SQL_FN_TD_CURRENT_TIME				0x00040000L
-#define SQL_FN_TD_CURRENT_TIMESTAMP			0x00080000L
-#define SQL_FN_TD_EXTRACT					0x00100000L
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_SQL92_DATETIME_FUNCTIONS */
-#if (ODBCVER >= 0x0300)
-#define SQL_SDF_CURRENT_DATE				0x00000001L
-#define SQL_SDF_CURRENT_TIME				0x00000002L
-#define SQL_SDF_CURRENT_TIMESTAMP			0x00000004L
-#endif /* ODBCVER >= 0x0300 */
-
-/* SQL_SYSTEM_FUNCTIONS functions */
-
-#define SQL_FN_SYS_USERNAME                 0x00000001L
-#define SQL_FN_SYS_DBNAME                   0x00000002L
-#define SQL_FN_SYS_IFNULL                   0x00000004L
-
-/* SQL_TIMEDATE_ADD_INTERVALS and SQL_TIMEDATE_DIFF_INTERVALS functions */
-
-#define SQL_FN_TSI_FRAC_SECOND              0x00000001L
-#define SQL_FN_TSI_SECOND                   0x00000002L
-#define SQL_FN_TSI_MINUTE                   0x00000004L
-#define SQL_FN_TSI_HOUR                     0x00000008L
-#define SQL_FN_TSI_DAY                      0x00000010L
-#define SQL_FN_TSI_WEEK                     0x00000020L
-#define SQL_FN_TSI_MONTH                    0x00000040L
-#define SQL_FN_TSI_QUARTER                  0x00000080L
-#define SQL_FN_TSI_YEAR                     0x00000100L
-
-/* bitmasks for SQL_DYNAMIC_CURSOR_ATTRIBUTES1,
- * SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1, 
- * SQL_KEYSET_CURSOR_ATTRIBUTES1, and SQL_STATIC_CURSOR_ATTRIBUTES1 
- */
-#if (ODBCVER >= 0x0300)
-/* supported SQLFetchScroll FetchOrientation's */
-#define SQL_CA1_NEXT						0x00000001L
-#define SQL_CA1_ABSOLUTE					0x00000002L
-#define SQL_CA1_RELATIVE					0x00000004L
-#define SQL_CA1_BOOKMARK					0x00000008L
-
-/* supported SQLSetPos LockType's */
-#define SQL_CA1_LOCK_NO_CHANGE				0x00000040L
-#define SQL_CA1_LOCK_EXCLUSIVE				0x00000080L
-#define SQL_CA1_LOCK_UNLOCK					0x00000100L
-
-/* supported SQLSetPos Operations */
-#define SQL_CA1_POS_POSITION				0x00000200L
-#define SQL_CA1_POS_UPDATE					0x00000400L
-#define SQL_CA1_POS_DELETE					0x00000800L
-#define SQL_CA1_POS_REFRESH					0x00001000L
-
-/* positioned updates and deletes */
-#define SQL_CA1_POSITIONED_UPDATE			0x00002000L
-#define SQL_CA1_POSITIONED_DELETE			0x00004000L
-#define SQL_CA1_SELECT_FOR_UPDATE			0x00008000L
-
-/* supported SQLBulkOperations operations */
-#define SQL_CA1_BULK_ADD					0x00010000L
-#define SQL_CA1_BULK_UPDATE_BY_BOOKMARK		0x00020000L
-#define SQL_CA1_BULK_DELETE_BY_BOOKMARK		0x00040000L
-#define SQL_CA1_BULK_FETCH_BY_BOOKMARK		0x00080000L
-#endif  /* ODBCVER >= 0x0300 */
-
-/* bitmasks for SQL_DYNAMIC_CURSOR_ATTRIBUTES2,
- * SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2, 
- * SQL_KEYSET_CURSOR_ATTRIBUTES2, and SQL_STATIC_CURSOR_ATTRIBUTES2 
- */
-#if (ODBCVER >= 0x0300)
-/* supported values for SQL_ATTR_SCROLL_CONCURRENCY */
-#define SQL_CA2_READ_ONLY_CONCURRENCY		0x00000001L
-#define SQL_CA2_LOCK_CONCURRENCY			0x00000002L
-#define SQL_CA2_OPT_ROWVER_CONCURRENCY		0x00000004L
-#define SQL_CA2_OPT_VALUES_CONCURRENCY		0x00000008L
-
-/* sensitivity of the cursor to its own inserts, deletes, and updates */
-#define SQL_CA2_SENSITIVITY_ADDITIONS		0x00000010L
-#define SQL_CA2_SENSITIVITY_DELETIONS		0x00000020L
-#define SQL_CA2_SENSITIVITY_UPDATES			0x00000040L
-
-/* semantics of SQL_ATTR_MAX_ROWS */
-#define SQL_CA2_MAX_ROWS_SELECT				0x00000080L
-#define SQL_CA2_MAX_ROWS_INSERT				0x00000100L
-#define SQL_CA2_MAX_ROWS_DELETE				0x00000200L
-#define SQL_CA2_MAX_ROWS_UPDATE				0x00000400L
-#define SQL_CA2_MAX_ROWS_CATALOG			0x00000800L
-#define SQL_CA2_MAX_ROWS_AFFECTS_ALL		(SQL_CA2_MAX_ROWS_SELECT | \
-					SQL_CA2_MAX_ROWS_INSERT | SQL_CA2_MAX_ROWS_DELETE | \
-					SQL_CA2_MAX_ROWS_UPDATE | SQL_CA2_MAX_ROWS_CATALOG)
-
-/* semantics of SQL_DIAG_CURSOR_ROW_COUNT */
-#define SQL_CA2_CRC_EXACT					0x00001000L
-#define SQL_CA2_CRC_APPROXIMATE				0x00002000L
-
-/* the kinds of positioned statements that can be simulated */
-#define SQL_CA2_SIMULATE_NON_UNIQUE			0x00004000L
-#define SQL_CA2_SIMULATE_TRY_UNIQUE			0x00008000L
-#define SQL_CA2_SIMULATE_UNIQUE				0x00010000L
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_ODBC_API_CONFORMANCE values */
-
-#define SQL_OAC_NONE                        0x0000
-#define SQL_OAC_LEVEL1                      0x0001
-#define SQL_OAC_LEVEL2                      0x0002
-
-/* SQL_ODBC_SAG_CLI_CONFORMANCE values */
-
-#define SQL_OSCC_NOT_COMPLIANT              0x0000
-#define SQL_OSCC_COMPLIANT                  0x0001
-
-/* SQL_ODBC_SQL_CONFORMANCE values */
-
-#define SQL_OSC_MINIMUM                     0x0000
-#define SQL_OSC_CORE                        0x0001
-#define SQL_OSC_EXTENDED                    0x0002
-
-
-/* SQL_CONCAT_NULL_BEHAVIOR values */
-
-#define SQL_CB_NULL                         0x0000
-#define SQL_CB_NON_NULL                     0x0001
-
-/* SQL_SCROLL_OPTIONS masks */
-
-#define SQL_SO_FORWARD_ONLY                 0x00000001L
-#define SQL_SO_KEYSET_DRIVEN                0x00000002L
-#define SQL_SO_DYNAMIC                      0x00000004L
-#define SQL_SO_MIXED                        0x00000008L
-#define SQL_SO_STATIC                       0x00000010L
-
-/* SQL_FETCH_DIRECTION masks */
-
-/* SQL_FETCH_RESUME is no longer supported
-#define SQL_FD_FETCH_RESUME                 0x00000040L 
-*/
-#define SQL_FD_FETCH_BOOKMARK               0x00000080L
-
-/* SQL_TXN_ISOLATION_OPTION masks */
-/* SQL_TXN_VERSIONING is no longer supported
-#define SQL_TXN_VERSIONING                  0x00000010L
-*/
-
-/* SQL_CORRELATION_NAME values */
-
-#define SQL_CN_NONE                         0x0000
-#define SQL_CN_DIFFERENT                    0x0001
-#define SQL_CN_ANY                          0x0002
-
-/* SQL_NON_NULLABLE_COLUMNS values */
-
-#define SQL_NNC_NULL                        0x0000
-#define SQL_NNC_NON_NULL                    0x0001
-
-/* SQL_NULL_COLLATION values */
-
-#define SQL_NC_START                        0x0002
-#define SQL_NC_END                          0x0004
-
-/* SQL_FILE_USAGE values */
-
-#define SQL_FILE_NOT_SUPPORTED              0x0000
-#define SQL_FILE_TABLE                      0x0001
-#define SQL_FILE_QUALIFIER                  0x0002
-#define SQL_FILE_CATALOG					SQL_FILE_QUALIFIER	// ODBC 3.0
-
-
-/* SQL_GETDATA_EXTENSIONS values */
-
-#define SQL_GD_BLOCK                        0x00000004L
-#define SQL_GD_BOUND                        0x00000008L
-
-/* SQL_POSITIONED_STATEMENTS masks */
-
-#define SQL_PS_POSITIONED_DELETE            0x00000001L
-#define SQL_PS_POSITIONED_UPDATE            0x00000002L
-#define SQL_PS_SELECT_FOR_UPDATE            0x00000004L
-
-/* SQL_GROUP_BY values */
-
-#define SQL_GB_NOT_SUPPORTED                0x0000
-#define SQL_GB_GROUP_BY_EQUALS_SELECT       0x0001
-#define SQL_GB_GROUP_BY_CONTAINS_SELECT     0x0002
-#define SQL_GB_NO_RELATION                  0x0003
-#if (ODBCVER >= 0x0300)
-#define	SQL_GB_COLLATE						0x0004
-
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_OWNER_USAGE masks */
-
-#define SQL_OU_DML_STATEMENTS               0x00000001L
-#define SQL_OU_PROCEDURE_INVOCATION         0x00000002L
-#define SQL_OU_TABLE_DEFINITION             0x00000004L
-#define SQL_OU_INDEX_DEFINITION             0x00000008L
-#define SQL_OU_PRIVILEGE_DEFINITION         0x00000010L
-
-/* SQL_SCHEMA_USAGE masks */
-#if (ODBCVER >= 0x0300)
-#define SQL_SU_DML_STATEMENTS			SQL_OU_DML_STATEMENTS 
-#define SQL_SU_PROCEDURE_INVOCATION		SQL_OU_PROCEDURE_INVOCATION
-#define SQL_SU_TABLE_DEFINITION			SQL_OU_TABLE_DEFINITION
-#define SQL_SU_INDEX_DEFINITION			SQL_OU_INDEX_DEFINITION
-#define SQL_SU_PRIVILEGE_DEFINITION		SQL_OU_PRIVILEGE_DEFINITION
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_QUALIFIER_USAGE masks */
-
-#define SQL_QU_DML_STATEMENTS               0x00000001L
-#define SQL_QU_PROCEDURE_INVOCATION         0x00000002L
-#define SQL_QU_TABLE_DEFINITION             0x00000004L
-#define SQL_QU_INDEX_DEFINITION             0x00000008L
-#define SQL_QU_PRIVILEGE_DEFINITION         0x00000010L
-
-#if (ODBCVER >= 0x0300)
-/* SQL_CATALOG_USAGE masks */
-#define SQL_CU_DML_STATEMENTS			SQL_QU_DML_STATEMENTS
-#define SQL_CU_PROCEDURE_INVOCATION		SQL_QU_PROCEDURE_INVOCATION 
-#define SQL_CU_TABLE_DEFINITION			SQL_QU_TABLE_DEFINITION
-#define SQL_CU_INDEX_DEFINITION			SQL_QU_INDEX_DEFINITION 
-#define SQL_CU_PRIVILEGE_DEFINITION		SQL_QU_PRIVILEGE_DEFINITION 
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_SUBQUERIES masks */
-
-#define SQL_SQ_COMPARISON                   0x00000001L
-#define SQL_SQ_EXISTS                       0x00000002L
-#define SQL_SQ_IN                           0x00000004L
-#define SQL_SQ_QUANTIFIED                   0x00000008L
-#define SQL_SQ_CORRELATED_SUBQUERIES        0x00000010L
-
-/* SQL_UNION masks */
-
-#define SQL_U_UNION                         0x00000001L
-#define SQL_U_UNION_ALL                     0x00000002L
-
-/* SQL_BOOKMARK_PERSISTENCE values */
-
-#define SQL_BP_CLOSE                        0x00000001L
-#define SQL_BP_DELETE                       0x00000002L
-#define SQL_BP_DROP                         0x00000004L
-#define SQL_BP_TRANSACTION                  0x00000008L
-#define SQL_BP_UPDATE                       0x00000010L
-#define SQL_BP_OTHER_HSTMT                  0x00000020L
-#define SQL_BP_SCROLL                       0x00000040L
-
-/* SQL_STATIC_SENSITIVITY values */
-
-#define SQL_SS_ADDITIONS                    0x00000001L
-#define SQL_SS_DELETIONS                    0x00000002L
-#define SQL_SS_UPDATES                      0x00000004L
-
-/* SQL_VIEW values */
-#define	SQL_CV_CREATE_VIEW					0x00000001L
-#define	SQL_CV_CHECK_OPTION					0x00000002L
-#define	SQL_CV_CASCADED						0x00000004L
-#define	SQL_CV_LOCAL						0x00000008L
-
-/* SQL_LOCK_TYPES masks */
-
-#define SQL_LCK_NO_CHANGE                   0x00000001L
-#define SQL_LCK_EXCLUSIVE                   0x00000002L
-#define SQL_LCK_UNLOCK                      0x00000004L
-
-/* SQL_POS_OPERATIONS masks */
-
-#define SQL_POS_POSITION                    0x00000001L
-#define SQL_POS_REFRESH                     0x00000002L
-#define SQL_POS_UPDATE                      0x00000004L
-#define SQL_POS_DELETE                      0x00000008L
-#define SQL_POS_ADD                         0x00000010L
-
-/* SQL_QUALIFIER_LOCATION values */
-
-#define SQL_QL_START                        0x0001
-#define SQL_QL_END                          0x0002
-
-/* Here start return values for ODBC 3.0 SQLGetInfo */
-
-#if (ODBCVER >= 0x0300)
-/* SQL_AGGREGATE_FUNCTIONS bitmasks */
-#define SQL_AF_AVG						0x00000001L
-#define SQL_AF_COUNT					0x00000002L
-#define SQL_AF_MAX						0x00000004L
-#define SQL_AF_MIN						0x00000008L
-#define SQL_AF_SUM						0x00000010L
-#define SQL_AF_DISTINCT					0x00000020L
-#define SQL_AF_ALL						0x00000040L	
-
-/* SQL_SQL_CONFORMANCE bit masks */
-#define	SQL_SC_SQL92_ENTRY				0x00000001L
-#define	SQL_SC_FIPS127_2_TRANSITIONAL	0x00000002L
-#define	SQL_SC_SQL92_INTERMEDIATE		0x00000004L
-#define	SQL_SC_SQL92_FULL				0x00000008L
-
-/* SQL_DATETIME_LITERALS masks */
-#define SQL_DL_SQL92_DATE						0x00000001L
-#define SQL_DL_SQL92_TIME						0x00000002L
-#define SQL_DL_SQL92_TIMESTAMP					0x00000004L
-#define SQL_DL_SQL92_INTERVAL_YEAR				0x00000008L
-#define SQL_DL_SQL92_INTERVAL_MONTH				0x00000010L
-#define SQL_DL_SQL92_INTERVAL_DAY				0x00000020L
-#define SQL_DL_SQL92_INTERVAL_HOUR				0x00000040L
-#define	SQL_DL_SQL92_INTERVAL_MINUTE			0x00000080L
-#define SQL_DL_SQL92_INTERVAL_SECOND			0x00000100L
-#define SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH		0x00000200L
-#define SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR		0x00000400L
-#define SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE		0x00000800L
-#define SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND		0x00001000L
-#define SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE	0x00002000L
-#define SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND	0x00004000L
-#define SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND	0x00008000L
-
-/* SQL_CATALOG_LOCATION values */
-#define SQL_CL_START						SQL_QL_START
-#define SQL_CL_END							SQL_QL_END
-
-/* values for SQL_BATCH_ROW_COUNT */
-#define SQL_BRC_PROCEDURES			0x0000001
-#define	SQL_BRC_EXPLICIT			0x0000002
-#define	SQL_BRC_ROLLED_UP			0x0000004
-
-/* bitmasks for SQL_BATCH_SUPPORT */
-#define SQL_BS_SELECT_EXPLICIT				0x00000001L
-#define SQL_BS_ROW_COUNT_EXPLICIT			0x00000002L
-#define SQL_BS_SELECT_PROC					0x00000004L
-#define SQL_BS_ROW_COUNT_PROC				0x00000008L
-
-/* Values for SQL_PARAM_ARRAY_ROW_COUNTS getinfo */
-#define SQL_PARC_BATCH		1
-#define SQL_PARC_NO_BATCH	2
-
-/* values for SQL_PARAM_ARRAY_SELECTS */
-#define SQL_PAS_BATCH				1
-#define SQL_PAS_NO_BATCH			2		
-#define SQL_PAS_NO_SELECT			3
-
-/* Bitmasks for SQL_INDEX_KEYWORDS */
-#define SQL_IK_NONE							0x00000000L
-#define SQL_IK_ASC							0x00000001L
-#define SQL_IK_DESC							0x00000002L
-#define SQL_IK_ALL							(SQL_IK_ASC | SQL_IK_DESC)
-
-/* Bitmasks for SQL_INFO_SCHEMA_VIEWS */
-
-#define SQL_ISV_ASSERTIONS					0x00000001L
-#define SQL_ISV_CHARACTER_SETS				0x00000002L
-#define SQL_ISV_CHECK_CONSTRAINTS			0x00000004L
-#define SQL_ISV_COLLATIONS					0x00000008L
-#define SQL_ISV_COLUMN_DOMAIN_USAGE			0x00000010L
-#define SQL_ISV_COLUMN_PRIVILEGES			0x00000020L
-#define SQL_ISV_COLUMNS						0x00000040L
-#define SQL_ISV_CONSTRAINT_COLUMN_USAGE		0x00000080L
-#define SQL_ISV_CONSTRAINT_TABLE_USAGE		0x00000100L
-#define SQL_ISV_DOMAIN_CONSTRAINTS			0x00000200L
-#define SQL_ISV_DOMAINS						0x00000400L
-#define SQL_ISV_KEY_COLUMN_USAGE			0x00000800L
-#define SQL_ISV_REFERENTIAL_CONSTRAINTS		0x00001000L
-#define SQL_ISV_SCHEMATA					0x00002000L
-#define SQL_ISV_SQL_LANGUAGES				0x00004000L
-#define	SQL_ISV_TABLE_CONSTRAINTS			0x00008000L
-#define SQL_ISV_TABLE_PRIVILEGES			0x00010000L
-#define SQL_ISV_TABLES						0x00020000L
-#define SQL_ISV_TRANSLATIONS				0x00040000L
-#define SQL_ISV_USAGE_PRIVILEGES			0x00080000L
-#define SQL_ISV_VIEW_COLUMN_USAGE			0x00100000L
-#define SQL_ISV_VIEW_TABLE_USAGE			0x00200000L
-#define SQL_ISV_VIEWS						0x00400000L
-
-/* Bitmasks for SQL_ASYNC_MODE */
-
-#define	SQL_AM_NONE			0
-#define	SQL_AM_CONNECTION	1
-#define	SQL_AM_STATEMENT	2
-
-/* Bitmasks for SQL_ALTER_DOMAIN */
-#define SQL_AD_CONSTRAINT_NAME_DEFINITION			0x00000001L	
-#define	SQL_AD_ADD_DOMAIN_CONSTRAINT	 			0x00000002L
-#define	SQL_AD_DROP_DOMAIN_CONSTRAINT	 			0x00000004L
-#define	SQL_AD_ADD_DOMAIN_DEFAULT   	 			0x00000008L
-#define	SQL_AD_DROP_DOMAIN_DEFAULT   	 			0x00000010L
-#define SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED	0x00000020L
-#define SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE	0x00000040L
-#define SQL_AD_ADD_CONSTRAINT_DEFERRABLE			0x00000080L
-#define SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE		0x00000100L
-
-
-/* SQL_CREATE_SCHEMA bitmasks */
-#define	SQL_CS_CREATE_SCHEMA				0x00000001L
-#define	SQL_CS_AUTHORIZATION				0x00000002L
-#define	SQL_CS_DEFAULT_CHARACTER_SET		0x00000004L
-
-/* SQL_CREATE_TRANSLATION bitmasks */
-#define	SQL_CTR_CREATE_TRANSLATION			0x00000001L
-
-/* SQL_CREATE_ASSERTION bitmasks */
-#define	SQL_CA_CREATE_ASSERTION					0x00000001L
-#define	SQL_CA_CONSTRAINT_INITIALLY_DEFERRED	0x00000010L
-#define	SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE	0x00000020L
-#define	SQL_CA_CONSTRAINT_DEFERRABLE			0x00000040L
-#define	SQL_CA_CONSTRAINT_NON_DEFERRABLE		0x00000080L
-
-/* SQL_CREATE_CHARACTER_SET bitmasks */
-#define	SQL_CCS_CREATE_CHARACTER_SET		0x00000001L
-#define	SQL_CCS_COLLATE_CLAUSE				0x00000002L
-#define	SQL_CCS_LIMITED_COLLATION			0x00000004L
-
-/* SQL_CREATE_COLLATION bitmasks */
-#define	SQL_CCOL_CREATE_COLLATION			0x00000001L
-
-/* SQL_CREATE_DOMAIN bitmasks */
-#define	SQL_CDO_CREATE_DOMAIN					0x00000001L
-#define	SQL_CDO_DEFAULT							0x00000002L
-#define	SQL_CDO_CONSTRAINT						0x00000004L
-#define	SQL_CDO_COLLATION						0x00000008L
-#define SQL_CDO_CONSTRAINT_NAME_DEFINITION		0x00000010L
-#define SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED	0x00000020L
-#define SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE	0x00000040L
-#define SQL_CDO_CONSTRAINT_DEFERRABLE			0x00000080L
-#define SQL_CDO_CONSTRAINT_NON_DEFERRABLE		0x00000100L
-
-/* SQL_CREATE_TABLE bitmasks */
-#define	SQL_CT_CREATE_TABLE						0x00000001L
-#define	SQL_CT_COMMIT_PRESERVE					0x00000002L
-#define	SQL_CT_COMMIT_DELETE					0x00000004L
-#define	SQL_CT_GLOBAL_TEMPORARY					0x00000008L
-#define	SQL_CT_LOCAL_TEMPORARY					0x00000010L
-#define	SQL_CT_CONSTRAINT_INITIALLY_DEFERRED	0x00000020L
-#define	SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE	0x00000040L
-#define	SQL_CT_CONSTRAINT_DEFERRABLE			0x00000080L
-#define	SQL_CT_CONSTRAINT_NON_DEFERRABLE		0x00000100L
-#define SQL_CT_COLUMN_CONSTRAINT				0x00000200L
-#define SQL_CT_COLUMN_DEFAULT					0x00000400L
-#define SQL_CT_COLUMN_COLLATION					0x00000800L
-#define SQL_CT_TABLE_CONSTRAINT					0x00001000L
-#define SQL_CT_CONSTRAINT_NAME_DEFINITION		0x00002000L
-
-/* SQL_DDL_INDEX bitmasks */
-#define SQL_DI_CREATE_INDEX						0x00000001L
-#define SQL_DI_DROP_INDEX						0x00000002L
-
-/* SQL_DROP_COLLATION bitmasks */
-#define	SQL_DC_DROP_COLLATION					0x00000001L
-
-/* SQL_DROP_DOMAIN bitmasks */
-#define	SQL_DD_DROP_DOMAIN						0x00000001L
-#define	SQL_DD_RESTRICT							0x00000002L
-#define	SQL_DD_CASCADE							0x00000004L
-
-/* SQL_DROP_SCHEMA bitmasks */
-#define	SQL_DS_DROP_SCHEMA						0x00000001L
-#define SQL_DS_RESTRICT							0x00000002L
-#define	SQL_DS_CASCADE							0x00000004L
-
-/* SQL_DROP_CHARACTER_SET bitmasks */
-#define	SQL_DCS_DROP_CHARACTER_SET				0x00000001L
-
-/* SQL_DROP_ASSERTION bitmasks */
-#define	SQL_DA_DROP_ASSERTION					0x00000001L
-
-/* SQL_DROP_TABLE bitmasks */
-#define	SQL_DT_DROP_TABLE						0x00000001L
-#define	SQL_DT_RESTRICT							0x00000002L
-#define	SQL_DT_CASCADE							0x00000004L
-
-/* SQL_DROP_TRANSLATION bitmasks */
-#define	SQL_DTR_DROP_TRANSLATION				0x00000001L
-
-/* SQL_DROP_VIEW bitmasks */
-#define	SQL_DV_DROP_VIEW						0x00000001L
-#define	SQL_DV_RESTRICT							0x00000002L
-#define	SQL_DV_CASCADE							0x00000004L
-
-/* SQL_INSERT_STATEMENT bitmasks */
-#define	SQL_IS_INSERT_LITERALS					0x00000001L
-#define SQL_IS_INSERT_SEARCHED					0x00000002L
-#define SQL_IS_SELECT_INTO						0x00000004L
-
-/* SQL_ODBC_INTERFACE_CONFORMANCE values */
-#define SQL_OIC_CORE							1UL
-#define SQL_OIC_LEVEL1							2UL
-#define SQL_OIC_LEVEL2							3UL
-
-/* SQL_SQL92_FOREIGN_KEY_DELETE_RULE bitmasks */
-#define SQL_SFKD_CASCADE						0x00000001L
-#define SQL_SFKD_NO_ACTION						0x00000002L
-#define SQL_SFKD_SET_DEFAULT					0x00000004L
-#define SQL_SFKD_SET_NULL						0x00000008L
-
-/* SQL_SQL92_FOREIGN_KEY_UPDATE_RULE bitmasks */
-#define SQL_SFKU_CASCADE						0x00000001L
-#define SQL_SFKU_NO_ACTION						0x00000002L
-#define SQL_SFKU_SET_DEFAULT					0x00000004L
-#define SQL_SFKU_SET_NULL						0x00000008L
-
-/* SQL_SQL92_GRANT	bitmasks */
-#define SQL_SG_USAGE_ON_DOMAIN					0x00000001L
-#define SQL_SG_USAGE_ON_CHARACTER_SET			0x00000002L
-#define SQL_SG_USAGE_ON_COLLATION				0x00000004L
-#define SQL_SG_USAGE_ON_TRANSLATION				0x00000008L
-#define SQL_SG_WITH_GRANT_OPTION				0x00000010L
-#define SQL_SG_DELETE_TABLE						0x00000020L
-#define SQL_SG_INSERT_TABLE						0x00000040L
-#define SQL_SG_INSERT_COLUMN					0x00000080L
-#define SQL_SG_REFERENCES_TABLE					0x00000100L
-#define SQL_SG_REFERENCES_COLUMN				0x00000200L
-#define SQL_SG_SELECT_TABLE						0x00000400L
-#define SQL_SG_UPDATE_TABLE						0x00000800L
-#define SQL_SG_UPDATE_COLUMN					0x00001000L	
-
-/* SQL_SQL92_PREDICATES bitmasks */
-#define SQL_SP_EXISTS							0x00000001L
-#define SQL_SP_ISNOTNULL						0x00000002L
-#define SQL_SP_ISNULL							0x00000004L
-#define SQL_SP_MATCH_FULL						0x00000008L
-#define SQL_SP_MATCH_PARTIAL					0x00000010L
-#define SQL_SP_MATCH_UNIQUE_FULL				0x00000020L
-#define SQL_SP_MATCH_UNIQUE_PARTIAL				0x00000040L
-#define SQL_SP_OVERLAPS							0x00000080L
-#define SQL_SP_UNIQUE							0x00000100L
-#define SQL_SP_LIKE								0x00000200L
-#define SQL_SP_IN								0x00000400L
-#define SQL_SP_BETWEEN							0x00000800L
-#define SQL_SP_COMPARISON						0x00001000L
-#define SQL_SP_QUANTIFIED_COMPARISON			0x00002000L
-
-/* SQL_SQL92_RELATIONAL_JOIN_OPERATORS bitmasks */
-#define SQL_SRJO_CORRESPONDING_CLAUSE			0x00000001L
-#define SQL_SRJO_CROSS_JOIN						0x00000002L
-#define SQL_SRJO_EXCEPT_JOIN					0x00000004L
-#define SQL_SRJO_FULL_OUTER_JOIN				0x00000008L
-#define SQL_SRJO_INNER_JOIN						0x00000010L
-#define SQL_SRJO_INTERSECT_JOIN					0x00000020L
-#define SQL_SRJO_LEFT_OUTER_JOIN				0x00000040L
-#define SQL_SRJO_NATURAL_JOIN					0x00000080L
-#define SQL_SRJO_RIGHT_OUTER_JOIN				0x00000100L
-#define SQL_SRJO_UNION_JOIN						0x00000200L
-
-/* SQL_SQL92_REVOKE bitmasks */
-#define SQL_SR_USAGE_ON_DOMAIN					0x00000001L
-#define SQL_SR_USAGE_ON_CHARACTER_SET			0x00000002L
-#define SQL_SR_USAGE_ON_COLLATION				0x00000004L
-#define SQL_SR_USAGE_ON_TRANSLATION				0x00000008L
-#define SQL_SR_GRANT_OPTION_FOR					0x00000010L
-#define SQL_SR_CASCADE							0x00000020L
-#define SQL_SR_RESTRICT							0x00000040L
-#define SQL_SR_DELETE_TABLE						0x00000080L
-#define SQL_SR_INSERT_TABLE						0x00000100L
-#define SQL_SR_INSERT_COLUMN					0x00000200L
-#define SQL_SR_REFERENCES_TABLE					0x00000400L
-#define SQL_SR_REFERENCES_COLUMN				0x00000800L
-#define SQL_SR_SELECT_TABLE						0x00001000L
-#define SQL_SR_UPDATE_TABLE						0x00002000L
-#define SQL_SR_UPDATE_COLUMN					0x00004000L
-
-/* SQL_SQL92_ROW_VALUE_CONSTRUCTOR bitmasks */
-#define SQL_SRVC_VALUE_EXPRESSION				0x00000001L
-#define SQL_SRVC_NULL							0x00000002L
-#define SQL_SRVC_DEFAULT						0x00000004L
-#define SQL_SRVC_ROW_SUBQUERY					0x00000008L
-
-/* SQL_SQL92_VALUE_EXPRESSIONS bitmasks */
-#define SQL_SVE_CASE							0x00000001L
-#define SQL_SVE_CAST							0x00000002L
-#define SQL_SVE_COALESCE						0x00000004L
-#define SQL_SVE_NULLIF							0x00000008L
-
-/* SQL_STANDARD_CLI_CONFORMANCE bitmasks */
-#define SQL_SCC_XOPEN_CLI_VERSION1				0x00000001L
-#define SQL_SCC_ISO92_CLI						0x00000002L
-
-/* SQL_UNION_STATEMENT bitmasks */
-#define SQL_US_UNION							SQL_U_UNION
-#define SQL_US_UNION_ALL						SQL_U_UNION_ALL
-
-#endif  /* ODBCVER >= 0x0300 */
-
-/* SQL_DTC_TRANSITION_COST bitmasks */
-#define SQL_DTC_ENLIST_EXPENSIVE				0x00000001L
-#define SQL_DTC_UNENLIST_EXPENSIVE				0x00000002L
-
-/* additional SQLDataSources fetch directions */
-#if (ODBCVER >= 0x0300)
-#define SQL_FETCH_FIRST_USER				31
-#define SQL_FETCH_FIRST_SYSTEM				32
-#endif  /* ODBCVER >= 0x0300 */
-
-
-/* Defines for SQLSetPos */
-#define SQL_ENTIRE_ROWSET            0
-
-/* Operations in SQLSetPos */
-#define SQL_POSITION                 0               /*      1.0 FALSE */
-#define SQL_REFRESH                  1               /*      1.0 TRUE */
-#define SQL_UPDATE                   2
-#define SQL_DELETE                   3
-
-/* Operations in SQLBulkOperations */
-#define SQL_ADD                      4
-#define	SQL_SETPOS_MAX_OPTION_VALUE			SQL_ADD
-#if (ODBCVER >= 0x0300)
-#define SQL_UPDATE_BY_BOOKMARK		 5
-#define SQL_DELETE_BY_BOOKMARK		 6
-#define	SQL_FETCH_BY_BOOKMARK		 7
-
-#endif /*  ODBCVER >= 0x0300 */
-
-/* Lock options in SQLSetPos */
-#define SQL_LOCK_NO_CHANGE           0               /*      1.0 FALSE */
-#define SQL_LOCK_EXCLUSIVE           1               /*      1.0 TRUE */
-#define SQL_LOCK_UNLOCK              2
-
-#define	SQL_SETPOS_MAX_LOCK_VALUE		SQL_LOCK_UNLOCK
-
-/* Macros for SQLSetPos */
-#define SQL_POSITION_TO(hstmt,irow) SQLSetPos(hstmt,irow,SQL_POSITION,SQL_LOCK_NO_CHANGE)
-#define SQL_LOCK_RECORD(hstmt,irow,fLock) SQLSetPos(hstmt,irow,SQL_POSITION,fLock)
-#define SQL_REFRESH_RECORD(hstmt,irow,fLock) SQLSetPos(hstmt,irow,SQL_REFRESH,fLock)
-#define SQL_UPDATE_RECORD(hstmt,irow) SQLSetPos(hstmt,irow,SQL_UPDATE,SQL_LOCK_NO_CHANGE)
-#define SQL_DELETE_RECORD(hstmt,irow) SQLSetPos(hstmt,irow,SQL_DELETE,SQL_LOCK_NO_CHANGE)
-#define SQL_ADD_RECORD(hstmt,irow) SQLSetPos(hstmt,irow,SQL_ADD,SQL_LOCK_NO_CHANGE)
-
-/* Column types and scopes in SQLSpecialColumns.  */
-#define SQL_BEST_ROWID                  1
-#define SQL_ROWVER                      2
-
-/* Defines for SQLSpecialColumns (returned in the result set) 
-   SQL_PC_UNKNOWN and SQL_PC_PSEUDO are defined in sql.h */
-#define SQL_PC_NOT_PSEUDO               1
-
-/* Defines for SQLStatistics */
-#define SQL_QUICK                       0
-#define SQL_ENSURE                      1
-
-/* Defines for SQLStatistics (returned in the result set) 
-   SQL_INDEX_CLUSTERED, SQL_INDEX_HASHED, and SQL_INDEX_OTHER are
-   defined in sql.h */
-#define SQL_TABLE_STAT                  0
-
-
-/* Defines for SQLTables */
-#if (ODBCVER >= 0x0300)
-#define SQL_ALL_CATALOGS				"%"
-#define SQL_ALL_SCHEMAS					"%"
-#define SQL_ALL_TABLE_TYPES				"%"
-#endif  /* ODBCVER >= 0x0300 */
-
-/* Options for SQLDriverConnect */
-#define SQL_DRIVER_NOPROMPT             0
-#define SQL_DRIVER_COMPLETE             1
-#define SQL_DRIVER_PROMPT               2
-#define SQL_DRIVER_COMPLETE_REQUIRED    3
-
-#ifndef RC_INVOKED
-
-SQLRETURN SQL_API SQLDriverConnect(
-    SQLHDBC            hdbc,
-    SQLHWND            hwnd,
-    SQLCHAR 		  *szConnStrIn,
-    SQLSMALLINT        cbConnStrIn,
-    SQLCHAR           *szConnStrOut,
-    SQLSMALLINT        cbConnStrOutMax,
-    SQLSMALLINT 	  *pcbConnStrOut,
-    SQLUSMALLINT       fDriverCompletion);
-
-#endif /* RC_INVOKED */
-
-/* Level 2 Functions                             */
-
-/* SQLExtendedFetch "fFetchType" values */
-#define SQL_FETCH_BOOKMARK               8
-
-/* SQLExtendedFetch "rgfRowStatus" element values */
-#define SQL_ROW_SUCCESS                  0
-#define SQL_ROW_DELETED                  1
-#define SQL_ROW_UPDATED                  2
-#define SQL_ROW_NOROW                    3
-#define SQL_ROW_ADDED                    4
-#define SQL_ROW_ERROR                    5
-#if (ODBCVER >= 0x0300)
-#define SQL_ROW_SUCCESS_WITH_INFO		 6
-#define SQL_ROW_PROCEED					 0
-#define SQL_ROW_IGNORE					 1
-#endif
-
-/* value for SQL_DESC_ARRAY_STATUS_PTR */
-#if (ODBCVER >= 0x0300)
-#define SQL_PARAM_SUCCESS				0
-#define SQL_PARAM_SUCCESS_WITH_INFO		6
-#define SQL_PARAM_ERROR					5
-#define SQL_PARAM_UNUSED				7
-#define SQL_PARAM_DIAG_UNAVAILABLE		1
-
-#define SQL_PARAM_PROCEED				0
-#define SQL_PARAM_IGNORE				1
-#endif  /* ODBCVER >= 0x0300 */
-
-/* Defines for SQLForeignKeys (UPDATE_RULE and DELETE_RULE) */
-#define SQL_CASCADE                      0
-#define SQL_RESTRICT                     1
-#define SQL_SET_NULL                     2
-#if (ODBCVER >= 0x0250)
-#define SQL_NO_ACTION			 3
-#define SQL_SET_DEFAULT			 4
-#endif  /* ODBCVER >= 0x0250 */
-
-#if (ODBCVER >= 0x0300)
-/* Note that the following are in a different column of SQLForeignKeys than */
-/* the previous #defines.   These are for DEFERRABILITY.                    */
-
-#define SQL_INITIALLY_DEFERRED			5
-#define SQL_INITIALLY_IMMEDIATE			6
-#define SQL_NOT_DEFERRABLE			7
-
-#endif  /* ODBCVER >= 0x0300 */
-
-/* Defines for SQLBindParameter and
-                           SQLProcedureColumns (returned in the result set) */
-#define SQL_PARAM_TYPE_UNKNOWN           0
-#define SQL_PARAM_INPUT                  1
-#define SQL_PARAM_INPUT_OUTPUT           2
-#define SQL_RESULT_COL                   3
-#define SQL_PARAM_OUTPUT                 4
-#define SQL_RETURN_VALUE                 5
-
-/* Defines for SQLProcedures (returned in the result set) */
-#define SQL_PT_UNKNOWN                   0
-#define SQL_PT_PROCEDURE                 1
-#define SQL_PT_FUNCTION                  2
-
-#ifndef RC_INVOKED
-
-/*      This define is too large for RC */
-#define SQL_ODBC_KEYWORDS \
-"ABSOLUTE,ACTION,ADA,ADD,ALL,ALLOCATE,ALTER,AND,ANY,ARE,AS,"\
-"ASC,ASSERTION,AT,AUTHORIZATION,AVG,"\
-"BEGIN,BETWEEN,BIT,BIT_LENGTH,BOTH,BY,CASCADE,CASCADED,CASE,CAST,CATALOG,"\
-"CHAR,CHAR_LENGTH,CHARACTER,CHARACTER_LENGTH,CHECK,CLOSE,COALESCE,"\
-"COLLATE,COLLATION,COLUMN,COMMIT,CONNECT,CONNECTION,CONSTRAINT,"\
-"CONSTRAINTS,CONTINUE,CONVERT,CORRESPONDING,COUNT,CREATE,CROSS,CURRENT,"\
-"CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,"\
-"DATE,DAY,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFERRABLE,"\
-"DEFERRED,DELETE,DESC,DESCRIBE,DESCRIPTOR,DIAGNOSTICS,DISCONNECT,"\
-"DISTINCT,DOMAIN,DOUBLE,DROP,"\
-"ELSE,END,END-EXEC,ESCAPE,EXCEPT,EXCEPTION,EXEC,EXECUTE,"\
-"EXISTS,EXTERNAL,EXTRACT,"\
-"FALSE,FETCH,FIRST,FLOAT,FOR,FOREIGN,FORTRAN,FOUND,FROM,FULL,"\
-"GET,GLOBAL,GO,GOTO,GRANT,GROUP,HAVING,HOUR,"\
-"IDENTITY,IMMEDIATE,IN,INCLUDE,INDEX,INDICATOR,INITIALLY,INNER,"\
-"INPUT,INSENSITIVE,INSERT,INT,INTEGER,INTERSECT,INTERVAL,INTO,IS,ISOLATION,"\
-"JOIN,KEY,LANGUAGE,LAST,LEADING,LEFT,LEVEL,LIKE,LOCAL,LOWER,"\
-"MATCH,MAX,MIN,MINUTE,MODULE,MONTH,"\
-"NAMES,NATIONAL,NATURAL,NCHAR,NEXT,NO,NONE,NOT,NULL,NULLIF,NUMERIC,"\
-"OCTET_LENGTH,OF,ON,ONLY,OPEN,OPTION,OR,ORDER,OUTER,OUTPUT,OVERLAPS,"\
-"PAD,PARTIAL,PASCAL,PLI,POSITION,PRECISION,PREPARE,PRESERVE,"\
-"PRIMARY,PRIOR,PRIVILEGES,PROCEDURE,PUBLIC,"\
-"READ,REAL,REFERENCES,RELATIVE,RESTRICT,REVOKE,RIGHT,ROLLBACK,ROWS"\
-"SCHEMA,SCROLL,SECOND,SECTION,SELECT,SESSION,SESSION_USER,SET,SIZE,"\
-"SMALLINT,SOME,SPACE,SQL,SQLCA,SQLCODE,SQLERROR,SQLSTATE,SQLWARNING,"\
-"SUBSTRING,SUM,SYSTEM_USER,"\
-"TABLE,TEMPORARY,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,TIMEZONE_MINUTE,"\
-"TO,TRAILING,TRANSACTION,TRANSLATE,TRANSLATION,TRIM,TRUE,"\
-"UNION,UNIQUE,UNKNOWN,UPDATE,UPPER,USAGE,USER,USING,"\
-"VALUE,VALUES,VARCHAR,VARYING,VIEW,WHEN,WHENEVER,WHERE,WITH,WORK,WRITE,"\
-"YEAR,ZONE"
-
-SQLRETURN SQL_API SQLBrowseConnect(
-    SQLHDBC            hdbc,
-    SQLCHAR 		  *szConnStrIn,
-    SQLSMALLINT        cbConnStrIn,
-    SQLCHAR 		  *szConnStrOut,
-    SQLSMALLINT        cbConnStrOutMax,
-    SQLSMALLINT       *pcbConnStrOut);
-
-#if (ODBCVER >= 0x0300)
-SQLRETURN	SQL_API	SQLBulkOperations(
-	SQLHSTMT			StatementHandle,
-	SQLSMALLINT			Operation);
-#endif  /* ODBCVER >= 0x0300 */
-
-SQLRETURN SQL_API SQLColAttributes(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       icol,
-    SQLUSMALLINT       fDescType,
-    SQLPOINTER         rgbDesc,
-    SQLSMALLINT        cbDescMax,
-    SQLSMALLINT 	  *pcbDesc,
-    SQLLEN 		      * pfDesc);
-
-SQLRETURN SQL_API SQLColumnPrivileges(
-    SQLHSTMT           hstmt,
-    SQLCHAR 		  *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR 		  *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR 		  *szTableName,
-    SQLSMALLINT        cbTableName,
-    SQLCHAR 		  *szColumnName,
-    SQLSMALLINT        cbColumnName);
-
-SQLRETURN SQL_API SQLDescribeParam(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       ipar,
-    SQLSMALLINT 	  *pfSqlType,
-    SQLULEN      	  *pcbParamDef,
-    SQLSMALLINT 	  *pibScale,
-    SQLSMALLINT 	  *pfNullable);
-
-SQLRETURN SQL_API SQLExtendedFetch(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       fFetchType,
-    SQLLEN             irow,
-    SQLULEN			  *pcrow,
-    SQLUSMALLINT 	  *rgfRowStatus);
-
-SQLRETURN SQL_API SQLForeignKeys(
-    SQLHSTMT           hstmt,
-    SQLCHAR 		  *szPkCatalogName,
-    SQLSMALLINT        cbPkCatalogName,
-    SQLCHAR 		  *szPkSchemaName,
-    SQLSMALLINT        cbPkSchemaName,
-    SQLCHAR 		  *szPkTableName,
-    SQLSMALLINT        cbPkTableName,
-    SQLCHAR 		  *szFkCatalogName,
-    SQLSMALLINT        cbFkCatalogName,
-    SQLCHAR 		  *szFkSchemaName,
-    SQLSMALLINT        cbFkSchemaName,
-    SQLCHAR 		  *szFkTableName,
-    SQLSMALLINT        cbFkTableName);
-
-SQLRETURN SQL_API SQLMoreResults(
-    SQLHSTMT           hstmt);
-
-SQLRETURN SQL_API SQLNativeSql(
-    SQLHDBC            hdbc,
-    SQLCHAR 		  *szSqlStrIn,
-    SQLINTEGER         cbSqlStrIn,
-    SQLCHAR 		  *szSqlStr,
-    SQLINTEGER         cbSqlStrMax,
-    SQLINTEGER 		  *pcbSqlStr);
-
-SQLRETURN SQL_API SQLNumParams(
-    SQLHSTMT           hstmt,
-    SQLSMALLINT 	  *pcpar);
-
-SQLRETURN SQL_API SQLParamOptions(
-    SQLHSTMT           hstmt,
-    SQLULEN            crow,
-    SQLULEN			   *pirow);
-
-SQLRETURN SQL_API SQLPrimaryKeys(
-    SQLHSTMT           hstmt,
-    SQLCHAR 		  *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR 		  *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR 		  *szTableName,
-    SQLSMALLINT        cbTableName);
-
-SQLRETURN SQL_API SQLProcedureColumns(
-    SQLHSTMT           hstmt,
-    SQLCHAR 		  *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR 		  *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR 		  *szProcName,
-    SQLSMALLINT        cbProcName,
-    SQLCHAR 		  *szColumnName,
-    SQLSMALLINT        cbColumnName);
-
-SQLRETURN SQL_API SQLProcedures(
-    SQLHSTMT           hstmt,
-    SQLCHAR 		  *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR 		  *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR 		  *szProcName,
-    SQLSMALLINT        cbProcName);
-
-
-
-SQLRETURN SQL_API SQLSetPos(
-    SQLHSTMT           hstmt,
-    SQLSETPOSIROW      irow,
-    SQLUSMALLINT       fOption,
-    SQLUSMALLINT       fLock);
-
-SQLRETURN SQL_API SQLTablePrivileges(
-    SQLHSTMT           hstmt,
-    SQLCHAR 		  *szCatalogName,
-    SQLSMALLINT        cbCatalogName,
-    SQLCHAR 		  *szSchemaName,
-    SQLSMALLINT        cbSchemaName,
-    SQLCHAR 		  *szTableName,
-    SQLSMALLINT        cbTableName);
-
-SQLRETURN SQL_API SQLDrivers(
-    SQLHENV            henv,
-    SQLUSMALLINT       fDirection,
-    SQLCHAR 		  *szDriverDesc,
-    SQLSMALLINT        cbDriverDescMax,
-    SQLSMALLINT 	  *pcbDriverDesc,
-    SQLCHAR 		  *szDriverAttributes,
-    SQLSMALLINT        cbDrvrAttrMax,
-    SQLSMALLINT 	  *pcbDrvrAttr);
-
-SQLRETURN SQL_API SQLBindParameter(
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       ipar,
-    SQLSMALLINT        fParamType,
-    SQLSMALLINT        fCType,
-    SQLSMALLINT        fSqlType,
-    SQLULEN            cbColDef,
-    SQLSMALLINT        ibScale,
-    SQLPOINTER         rgbValue,
-    SQLLEN             cbValueMax,
-    SQLLEN     		   *pcbValue);
-
-
-#endif /* RC_INVOKED */
-
-/*---------------------------------------------------------*/
-/* SQLAllocHandleStd is implemented to make SQLAllocHandle */
-/* compatible with X/Open standard.	 an application should */
-/* not call SQLAllocHandleStd directly					   */ 
-/*---------------------------------------------------------*/
-#ifdef ODBC_STD
-#define SQLAllocHandle  SQLAllocHandleStd
-#define SQLAllocEnv(phenv)  SQLAllocHandleStd(SQL_HANDLE_ENV, SQL_NULL_HANDLE, phenv)
-
-/* Internal type subcodes */
-#define SQL_YEAR						SQL_CODE_YEAR
-#define SQL_MONTH						SQL_CODE_MONTH
-#define SQL_DAY							SQL_CODE_DAY
-#define SQL_HOUR						SQL_CODE_HOUR
-#define SQL_MINUTE						SQL_CODE_MINUTE
-#define SQL_SECOND						SQL_CODE_SECOND	
-#define SQL_YEAR_TO_MONTH				SQL_CODE_YEAR_TO_MONTH
-#define SQL_DAY_TO_HOUR					SQL_CODE_DAY_TO_HOUR
-#define SQL_DAY_TO_MINUTE				SQL_CODE_DAY_TO_MINUTE
-#define SQL_DAY_TO_SECOND				SQL_CODE_DAY_TO_SECOND
-#define SQL_HOUR_TO_MINUTE				SQL_CODE_HOUR_TO_MINUTE	
-#define SQL_HOUR_TO_SECOND				SQL_CODE_HOUR_TO_SECOND
-#define SQL_MINUTE_TO_SECOND			SQL_CODE_MINUTE_TO_SECOND
-#endif /* ODBC_STD */
-
-#if (ODBCVER >= 0x0300)
-#ifndef RC_INVOKED
-SQLRETURN SQL_API SQLAllocHandleStd(
-	SQLSMALLINT		fHandleType,
-	SQLHANDLE		hInput,
-	SQLHANDLE	   *phOutput);
-#endif /* RC_INVOKED */
-#endif
-
-/*      Deprecated defines from prior versions of ODBC */
-#define SQL_DATABASE_NAME               16    /* Use SQLGetConnectOption/SQL_CURRENT_QUALIFIER */
-#define SQL_FD_FETCH_PREV               SQL_FD_FETCH_PRIOR
-#define SQL_FETCH_PREV                  SQL_FETCH_PRIOR
-#define SQL_CONCUR_TIMESTAMP            SQL_CONCUR_ROWVER
-#define SQL_SCCO_OPT_TIMESTAMP          SQL_SCCO_OPT_ROWVER
-#define SQL_CC_DELETE                   SQL_CB_DELETE
-#define SQL_CR_DELETE                   SQL_CB_DELETE
-#define SQL_CC_CLOSE                    SQL_CB_CLOSE
-#define SQL_CR_CLOSE                    SQL_CB_CLOSE
-#define SQL_CC_PRESERVE                 SQL_CB_PRESERVE
-#define SQL_CR_PRESERVE                 SQL_CB_PRESERVE
-/* SQL_FETCH_RESUME is not supported by 2.0+ drivers 
-#define SQL_FETCH_RESUME                7    
-*/
-#define SQL_SCROLL_FORWARD_ONLY         0L    /*-SQL_CURSOR_FORWARD_ONLY */
-#define SQL_SCROLL_KEYSET_DRIVEN        (-1L) /*-SQL_CURSOR_KEYSET_DRIVEN */
-#define SQL_SCROLL_DYNAMIC              (-2L) /*-SQL_CURSOR_DYNAMIC */
-#define SQL_SCROLL_STATIC               (-3L) /*-SQL_CURSOR_STATIC */
-
-/*      Deprecated functions from prior versions of ODBC */
-#ifndef RC_INVOKED
-
-SQLRETURN SQL_API SQLSetScrollOptions(    /*      Use SQLSetStmtOptions */
-    SQLHSTMT           hstmt,
-    SQLUSMALLINT       fConcurrency,
-    SQLLEN             crowKeyset,
-    SQLUSMALLINT       crowRowset);
-
-/* Tracing section */
-
-#define		TRACE_VERSION	1000		/* Version of trace API */
-
-RETCODE	SQL_API TraceOpenLogFile(LPWSTR,LPWSTR,DWORD);// open a trace log file
-RETCODE	SQL_API TraceCloseLogFile();			// Request to close a trace log
-VOID	SQL_API TraceReturn(RETCODE,RETCODE);	// Processes trace after FN is called
-DWORD	SQL_API TraceVersion();					// Returns trace API version
-
-/* Functions for Visual Studio Analyzer*/
-/* to turn on/off tracing or VS events, call TraceVSControl by setting or clearing the following bits  */
-#define TRACE_ON			0x00000001L
-#define TRACE_VS_EVENT_ON	0x00000002L	
-
-RETCODE	SQL_API	TraceVSControl(DWORD);			
-
-/* Functions for setting the connection pooling failure detection code */
-/* The "TryWait" value is the time (in seconds) that the DM will wait  */
-/* between detecting that a connection is dead (using                  */
-/* SQL_ATTR_CONNECTION_DEAD) and retrying the connection.  During that */
-/* interval, connection requests will get "The server appears to be    */
-/* dead" error returns.                                                */ 
-
-
-BOOL SQL_API    ODBCSetTryWaitValue(DWORD dwValue);	/* In seconds */
-DWORD SQL_API	ODBCGetTryWaitValue();			/* In Milliseconds(!) */
-
-
-/* the flags in ODBC_VS_ARGS */
-#define ODBC_VS_FLAG_UNICODE_ARG	0x00000001L	/* the argument is unicode */
-#define	ODBC_VS_FLAG_UNICODE_COR	0x00000002L	/* the correlation is unicode */
-#define ODBC_VS_FLAG_RETCODE		0x00000004L	/* RetCode field is set */
-#define ODBC_VS_FLAG_STOP		0x00000008L	/* Stop firing visual studio analyzer events */
-
-typedef struct tagODBC_VS_ARGS {
-	const GUID	*pguidEvent;	/* the GUID for event */
-	DWORD	dwFlags;		/* flags for the call */
-	union {
-		WCHAR	*wszArg;	
-		CHAR	*szArg;
-	};
-	union {
-		WCHAR	*wszCorrelation;
-		CHAR	*szCorrelation;
-	};				
-	RETCODE	RetCode;
-} ODBC_VS_ARGS, *PODBC_VS_ARGS;
-VOID	SQL_API	FireVSDebugEvent(PODBC_VS_ARGS);
-
-#endif /* RC_INVOKED */
-
-
-#ifdef __cplusplus
-}                                     /* End of extern "C" { */
-#endif  /* __cplusplus */
-
-#if defined(WIN32) || defined(_WIN64) 
-#include "sqlucode.h"
-#endif
-
-#endif /* __SQLEXT */
diff --git a/IscDbc/CMakeLists.txt b/IscDbc/CMakeLists.txt
new file mode 100644
index 00000000..f49ab019
--- /dev/null
+++ b/IscDbc/CMakeLists.txt
@@ -0,0 +1,67 @@
+# IscDbc — Firebird database connectivity library (object library)
+# Built as OBJECT to avoid an unnecessary intermediate static archive.
+# Object files are consumed directly by the main OdbcFb target.
+
+set(ISCDBC_SOURCES
+    Attachment.cpp
+    BinaryBlob.cpp
+    Blob.cpp
+    DateTime.cpp
+    EnvShare.cpp
+    extodbc.cpp
+    IscArray.cpp
+    IscBlob.cpp
+    IscCallableStatement.cpp
+    IscColumnKeyInfo.cpp
+    IscColumnPrivilegesResultSet.cpp
+    IscColumnsResultSet.cpp
+    IscConnection.cpp
+    IscCrossReferenceResultSet.cpp
+    IscDatabaseMetaData.cpp
+    IscIndexInfoResultSet.cpp
+    IscMetaDataResultSet.cpp
+    IscOdbcStatement.cpp
+    IscPreparedStatement.cpp
+    IscPrimaryKeysResultSet.cpp
+    IscProcedureColumnsResultSet.cpp
+    IscProceduresResultSet.cpp
+    IscResultSet.cpp
+    IscResultSetMetaData.cpp
+    IscSpecialColumnsResultSet.cpp
+    IscSqlType.cpp
+    IscStatement.cpp
+    IscStatementMetaData.cpp
+    IscTablePrivilegesResultSet.cpp
+    IscTablesResultSet.cpp
+    IscUserEvents.cpp
+    JString.cpp
+    LinkedList.cpp
+    LoadFbClientDll.cpp
+    Lock.cpp
+    MultibyteConvert.cpp
+    Mutex.cpp
+    Parameter.cpp
+    ParameterEvent.cpp
+    Parameters.cpp
+    ParametersEvents.cpp
+    ServiceManager.cpp
+    Sqlda.cpp
+    SQLError.cpp
+    SqlTime.cpp
+    Stream.cpp
+    SupportFunctions.cpp
+    TimeStamp.cpp
+    TypesResultSet.cpp
+    Value.cpp
+    Values.cpp
+)
+
+# Create IscDbc object library
+add_library(IscDbc OBJECT ${ISCDBC_SOURCES})
+
+# Include directories
+target_include_directories(IscDbc PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${FIREBIRD_INCLUDE_DIR}
+)
diff --git a/IscDbc/IscDbc.exp b/IscDbc/IscDbc.exp
deleted file mode 100644
index 5d1f7500..00000000
--- a/IscDbc/IscDbc.exp
+++ /dev/null
@@ -1 +0,0 @@
-createConnection
diff --git a/IscDbc/makefile.in b/IscDbc/makefile.in
deleted file mode 100644
index 99d3c60f..00000000
--- a/IscDbc/makefile.in
+++ /dev/null
@@ -1,131 +0,0 @@
-AsciiBlob.o: AsciiBlob.cpp Engine.h JString.h AsciiBlob.h Blob.h \
- Stream.h BinaryBlob.h
-Attachment.o: Attachment.cpp IscDbc.h JString.h Attachment.h Mutex.h \
- SQLError.h SQLException.h Parameters.h Properties.h IscConnection.h \
- Connection.h Blob.h LinkedList.h
-BinaryBlob.o: BinaryBlob.cpp Engine.h JString.h BinaryBlob.h Blob.h \
- Stream.h AsciiBlob.h
-DateTime.o: DateTime.cpp Engine.h JString.h DateTime.h SQLError.h \
- SQLException.h
-Error.o: Error.cpp Engine.h JString.h Error.h SQLError.h \
- SQLException.h
-IscBlob.o: IscBlob.cpp IscDbc.h JString.h IscBlob.h BinaryBlob.h \
- Blob.h Stream.h Connection.h Properties.h SQLException.h \
- IscResultSet.h LinkedList.h Values.h DateTime.h SqlTime.h TimeStamp.h \
- IscConnection.h IscStatement.h Sqlda.h SQLError.h
-IscCallableStatement.o: IscCallableStatement.cpp IscDbc.h JString.h \
- IscCallableStatement.h Connection.h Blob.h Properties.h \
- SQLException.h IscPreparedStatement.h IscStatement.h LinkedList.h \
- Sqlda.h Values.h DateTime.h SqlTime.h TimeStamp.h IscConnection.h \
- Value.h Types.h Stream.h SQLError.h
-IscColumnsResultSet.o: IscColumnsResultSet.cpp IscDbc.h JString.h \
- IscColumnsResultSet.h IscMetaDataResultSet.h IscResultSet.h \
- Connection.h Blob.h Properties.h SQLException.h LinkedList.h Values.h \
- DateTime.h SqlTime.h TimeStamp.h IscSqlType.h IscConnection.h \
- IscDatabaseMetaData.h IscPreparedStatement.h IscStatement.h Sqlda.h \
- IscBlob.h BinaryBlob.h Stream.h
-IscConnection.o: IscConnection.cpp IscDbc.h JString.h IscConnection.h \
- Connection.h Blob.h Properties.h SQLException.h LinkedList.h \
- SQLError.h IscCallableStatement.h IscPreparedStatement.h \
- IscStatement.h Sqlda.h Values.h DateTime.h SqlTime.h TimeStamp.h \
- IscDatabaseMetaData.h Parameters.h Attachment.h Mutex.h
-IscCrossReferenceResultSet.o: IscCrossReferenceResultSet.cpp IscDbc.h \
- JString.h IscCrossReferenceResultSet.h IscMetaDataResultSet.h \
- IscResultSet.h Connection.h Blob.h Properties.h SQLException.h \
- LinkedList.h Values.h DateTime.h SqlTime.h TimeStamp.h
-IscDatabaseMetaData.o: IscDatabaseMetaData.cpp IscDbc.h JString.h \
- IscDatabaseMetaData.h Connection.h Blob.h Properties.h SQLException.h \
- LinkedList.h IscConnection.h Attachment.h Mutex.h SQLError.h \
- IscResultSet.h Values.h DateTime.h SqlTime.h TimeStamp.h \
- IscTablesResultSet.h IscMetaDataResultSet.h IscColumnsResultSet.h \
- IscSqlType.h IscIndexInfoResultSet.h IscPrimaryKeysResultSet.h \
- IscCrossReferenceResultSet.h IscProceduresResultSet.h \
- IscProcedureColumnsResultSet.h TypesResultSet.h \
- IscSpecialColumnsResultSet.h
-IscIndexInfoResultSet.o: IscIndexInfoResultSet.cpp IscDbc.h JString.h \
- IscIndexInfoResultSet.h IscMetaDataResultSet.h IscResultSet.h \
- Connection.h Blob.h Properties.h SQLException.h LinkedList.h Values.h \
- DateTime.h SqlTime.h TimeStamp.h IscDatabaseMetaData.h
-IscMetaDataResultSet.o: IscMetaDataResultSet.cpp IscDbc.h JString.h \
- IscMetaDataResultSet.h IscResultSet.h Connection.h Blob.h \
- Properties.h SQLException.h LinkedList.h Values.h DateTime.h \
- SqlTime.h TimeStamp.h IscDatabaseMetaData.h SQLError.h \
- IscConnection.h Value.h Types.h Stream.h
-IscPreparedStatement.o: IscPreparedStatement.cpp IscDbc.h JString.h \
- IscPreparedStatement.h Connection.h Blob.h Properties.h \
- SQLException.h IscStatement.h LinkedList.h Sqlda.h Values.h \
- SQLError.h IscResultSet.h DateTime.h SqlTime.h TimeStamp.h \
- IscConnection.h BinaryBlob.h Stream.h AsciiBlob.h Value.h Types.h \
- IscStatementMetaData.h
-IscPrimaryKeysResultSet.o: IscPrimaryKeysResultSet.cpp IscDbc.h \
- JString.h IscPrimaryKeysResultSet.h IscMetaDataResultSet.h \
- IscResultSet.h Connection.h Blob.h Properties.h SQLException.h \
- LinkedList.h Values.h DateTime.h SqlTime.h TimeStamp.h
-IscProcedureColumnsResultSet.o: IscProcedureColumnsResultSet.cpp \
- IscDbc.h JString.h IscProcedureColumnsResultSet.h \
- IscMetaDataResultSet.h IscResultSet.h Connection.h Blob.h \
- Properties.h SQLException.h LinkedList.h Values.h DateTime.h \
- SqlTime.h TimeStamp.h IscSqlType.h IscStatement.h Sqlda.h \
- IscConnection.h
-IscProceduresResultSet.o: IscProceduresResultSet.cpp IscDbc.h \
- JString.h IscProceduresResultSet.h IscMetaDataResultSet.h \
- IscResultSet.h Connection.h Blob.h Properties.h SQLException.h \
- LinkedList.h Values.h DateTime.h SqlTime.h TimeStamp.h
-IscResultSet.o: IscResultSet.cpp IscDbc.h JString.h IscResultSet.h \
- Connection.h Blob.h Properties.h SQLException.h LinkedList.h Values.h \
- DateTime.h SqlTime.h TimeStamp.h IscStatement.h Sqlda.h \
- IscResultSetMetaData.h IscBlob.h BinaryBlob.h Stream.h \
- IscConnection.h SQLError.h Value.h Types.h
-IscResultSetMetaData.o: IscResultSetMetaData.cpp IscDbc.h JString.h \
- IscResultSetMetaData.h Connection.h Blob.h Properties.h \
- SQLException.h IscResultSet.h LinkedList.h Values.h DateTime.h \
- SqlTime.h TimeStamp.h SQLError.h Sqlda.h
-IscSpecialColumnsResultSet.o: IscSpecialColumnsResultSet.cpp IscDbc.h \
- JString.h IscConnection.h Connection.h Blob.h Properties.h \
- SQLException.h LinkedList.h IscDatabaseMetaData.h IscResultSet.h \
- Values.h DateTime.h SqlTime.h TimeStamp.h IscPreparedStatement.h \
- IscStatement.h Sqlda.h IscBlob.h BinaryBlob.h Stream.h IscSqlType.h \
- IscSpecialColumnsResultSet.h IscMetaDataResultSet.h
-IscSqlType.o: IscSqlType.cpp IscDbc.h JString.h IscSqlType.h
-IscStatement.o: IscStatement.cpp IscDbc.h JString.h IscStatement.h \
- Connection.h Blob.h Properties.h SQLException.h LinkedList.h Sqlda.h \
- IscResultSet.h Values.h DateTime.h SqlTime.h TimeStamp.h \
- IscConnection.h Attachment.h Mutex.h IscBlob.h BinaryBlob.h Stream.h \
- SQLError.h Value.h Types.h
-IscStatementMetaData.o: IscStatementMetaData.cpp IscDbc.h JString.h \
- IscStatementMetaData.h Connection.h Blob.h Properties.h \
- SQLException.h IscPreparedStatement.h IscStatement.h LinkedList.h \
- Sqlda.h Values.h
-IscTablesResultSet.o: IscTablesResultSet.cpp IscDbc.h JString.h \
- IscTablesResultSet.h IscMetaDataResultSet.h IscResultSet.h \
- Connection.h Blob.h Properties.h SQLException.h LinkedList.h Values.h \
- DateTime.h SqlTime.h TimeStamp.h IscConnection.h \
- IscDatabaseMetaData.h IscPreparedStatement.h IscStatement.h Sqlda.h \
- IscBlob.h BinaryBlob.h Stream.h
-JString.o: JString.cpp JString.h
-LinkedList.o: LinkedList.cpp Engine.h JString.h LinkedList.h
-Lock.o: Lock.cpp Lock.h Mutex.h
-Mutex.o: Mutex.cpp Mutex.h
-Parameter.o: Parameter.cpp Parameter.h
-Parameters.o: Parameters.cpp Engine.h JString.h Parameters.h \
- Properties.h Parameter.h
-SQLError.o: SQLError.cpp Engine.h JString.h SQLError.h SQLException.h \
- Stream.h
-SqlTime.o: SqlTime.cpp SqlTime.h
-Sqlda.o: Sqlda.cpp IscDbc.h JString.h Sqlda.h SQLError.h \
- SQLException.h Value.h Types.h TimeStamp.h SqlTime.h DateTime.h \
- Stream.h Blob.h IscConnection.h Connection.h Properties.h \
- LinkedList.h IscStatement.h
-Stream.o: Stream.cpp Engine.h JString.h Stream.h SQLError.h \
- SQLException.h Blob.h
-TimeStamp.o: TimeStamp.cpp Engine.h JString.h TimeStamp.h SqlTime.h \
- DateTime.h
-TypesResultSet.o: TypesResultSet.cpp IscDbc.h JString.h \
- TypesResultSet.h IscResultSet.h Connection.h Blob.h Properties.h \
- SQLException.h LinkedList.h Values.h DateTime.h SqlTime.h TimeStamp.h \
- Types.h
-Value.o: Value.cpp Engine.h JString.h Value.h Types.h TimeStamp.h \
- SqlTime.h DateTime.h Stream.h Blob.h SQLError.h SQLException.h \
- BinaryBlob.h AsciiBlob.h
-Values.o: Values.cpp Engine.h JString.h Values.h Value.h Types.h \
- TimeStamp.h SqlTime.h DateTime.h Stream.h Blob.h
diff --git a/JdbcTest/JdbcTest.dsp b/JdbcTest/JdbcTest.dsp
deleted file mode 100644
index fef69600..00000000
--- a/JdbcTest/JdbcTest.dsp
+++ /dev/null
@@ -1,89 +0,0 @@
-# Microsoft Developer Studio Project File - Name="JdbcTest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=JdbcTest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "JdbcTest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "JdbcTest.mak" CFG="JdbcTest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "JdbcTest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "JdbcTest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "JdbcTest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../Release"
-# PROP Intermediate_Dir "../Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../IscDbc" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "JdbcTest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../Debug"
-# PROP Intermediate_Dir "../Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../IscDbc" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 IscDbc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"\OdbcJdbc\IscDbc\Debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "JdbcTest - Win32 Release"
-# Name "JdbcTest - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\Test.cpp
-# End Source File
-# End Target
-# End Project
diff --git a/JdbcTest/Test.cpp b/JdbcTest/Test.cpp
deleted file mode 100644
index 1f39cb2b..00000000
--- a/JdbcTest/Test.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <stdio.h>
-#include <Connection.h>
-
-main (int argc, char **argv)
-{
-	Connection *connection = NULL;
-
-	try
-		{
-		connection = createConnection();
-		Properties *properties = connection->allocProperties();
-                properties->putValue ("user", "sysdba");
-                properties->putValue ("password", "masterkey");
-		connection->openDatabase ("employee.gdb", properties);
-		properties->release();
-
-
-		PreparedStatement *statement = connection->prepareStatement (
-			"select first_name, last_name, emp_no from employee where first_name = ?");
-		statement->setString (1, "Robert");
-
-		ResultSet *resultSet = statement->executeQuery();
-
-		while (resultSet->next())
-			{
-			const char *firstName = resultSet->getString ("first_name");
-			const char *lastName = resultSet->getString (2);	// last name
-			short empNo = resultSet->getShort (3);					// emp-no
-			printf ("%.10s %.15s %d\n", firstName, lastName, empNo);
-			}
-
-		resultSet->release();
-		statement->release();
-		connection->release();
-		}
-	catch (SQLException& exception)
-		{
-		printf ("Query failed: %s\n", exception.getText());
-		if (connection)
-			connection->release();
-		return 1;
-		}
-
-	return 0;
-}
diff --git a/OdbcConnection.h b/OdbcConnection.h
index d171610c..343d4227 100644
--- a/OdbcConnection.h
+++ b/OdbcConnection.h
@@ -31,7 +31,7 @@
 
 #include "OdbcDesc.h"
 #include "IscDbc/JString.h"
-#include "Headers/OdbcUserEvents.h"
+#include "OdbcUserEvents.h"
 
 namespace OdbcJdbcLibrary {
 
diff --git a/OdbcJdbc.exp b/OdbcJdbc.exp
deleted file mode 100644
index 6da23d76..00000000
--- a/OdbcJdbc.exp
+++ /dev/null
@@ -1,77 +0,0 @@
-SQLAllocConnect
-SQLAllocEnv
-SQLAllocStmt
-SQLBindCol
-SQLCancel
-SQLColAttributes
-SQLConnect
-SQLDescribeCol
-SQLDisconnect
-SQLError
-SQLExecDirect
-SQLExecute
-SQLFetch
-SQLFreeConnect
-SQLFreeEnv
-SQLFreeStmt
-SQLGetCursorName
-SQLNumResultCols
-SQLPrepare
-SQLRowCount
-SQLSetCursorName
-SQLSetParam
-SQLTransact
-SQLColumns
-SQLDriverConnect
-SQLGetConnectOption
-SQLGetData
-SQLGetFunctions
-SQLGetInfo
-SQLGetStmtOption
-SQLGetTypeInfo
-SQLParamData
-SQLPutData
-SQLSetConnectOption
-SQLSetStmtOption
-SQLSpecialColumns
-SQLStatistics
-SQLTables
-SQLBrowseConnect
-SQLColumnPrivileges
-SQLDataSources
-SQLDescribeParam
-SQLExtendedFetch
-SQLForeignKeys
-SQLMoreResults
-SQLNativeSql
-SQLNumParams
-SQLParamOptions
-SQLPrimaryKeys
-SQLProcedureColumns
-SQLProcedures
-SQLSetPos
-SQLSetScrollOptions
-SQLTablePrivileges
-SQLDrivers
-SQLBindParameter
-SQLAllocHandle
-SQLBindParam
-SQLCloseCursor
-SQLColAttribute
-SQLCopyDesc
-SQLEndTran
-SQLFetchScroll
-SQLFreeHandle
-SQLGetConnectAttr
-SQLGetDescField
-SQLGetDescRec
-SQLGetDiagField
-SQLGetDiagRec
-SQLGetEnvAttr
-SQLGetStmtAttr
-SQLSetConnectAttr
-SQLSetDescField
-SQLSetDescRec
-SQLSetEnvAttr
-SQLSetStmtAttr
-SQLBulkOperations
diff --git a/OdbcJdbcMinGw.def b/OdbcJdbcMinGw.def
deleted file mode 100644
index 7e88595d..00000000
--- a/OdbcJdbcMinGw.def
+++ /dev/null
@@ -1,124 +0,0 @@
-DESCRIPTION "OdbcJdbc - IBPhoenix ODBC Driver"
-
-EXPORTS
-    SQLAllocConnect = SQLAllocConnect@8
-    SQLAllocEnv = SQLAllocEnv@4
-    SQLAllocHandle = SQLAllocHandle@12
-    SQLAllocStmt = SQLAllocStmt@8
-    SQLBindCol = SQLBindCol@24
-    SQLBindParam = SQLBindParam@32
-    SQLBindParameter = SQLBindParameter@40
-    SQLBrowseConnect = SQLBrowseConnect@24
-    SQLBulkOperations = SQLBulkOperations@8
-    SQLCancel = SQLCancel@4
-    SQLCloseCursor = SQLCloseCursor@4
-    SQLColAttribute = SQLColAttribute@28
-    SQLColAttributes = SQLColAttributes@28
-    SQLColumnPrivileges = SQLColumnPrivileges@36
-    SQLColumns = SQLColumns@36
-    SQLConnect = SQLConnect@28
-    SQLCopyDesc = SQLCopyDesc@8
-    SQLDataSources = SQLDataSources@32
-    SQLDescribeCol = SQLDescribeCol@36
-    SQLDescribeParam = SQLDescribeParam@24
-    SQLDisconnect = SQLDisconnect@4
-    SQLDriverConnect = SQLDriverConnect@32
-    SQLDrivers = SQLDrivers@32
-    SQLEndTran = SQLEndTran@12
-    SQLError = SQLError@32
-    SQLExecDirect = SQLExecDirect@12
-    SQLExecute = SQLExecute@4
-    SQLExtendedFetch = SQLExtendedFetch@20
-    SQLFetch = SQLFetch@4
-    SQLFetchScroll = SQLFetchScroll@12
-    SQLForeignKeys = SQLForeignKeys@52
-    SQLFreeConnect = SQLFreeConnect@4
-    SQLFreeEnv = SQLFreeEnv@4
-    SQLFreeHandle = SQLFreeHandle@8
-    SQLFreeStmt = SQLFreeStmt@8
-    SQLGetConnectAttr = SQLGetConnectAttr@20
-    SQLGetConnectOption = SQLGetConnectOption@12
-    SQLGetCursorName = SQLGetCursorName@16
-    SQLGetData = SQLGetData@24
-    SQLGetDescField = SQLGetDescField@24
-    SQLGetDescRec = SQLGetDescRec@44
-    SQLGetDiagField = SQLGetDiagField@28
-    SQLGetDiagRec = SQLGetDiagRec@32
-    SQLGetEnvAttr = SQLGetEnvAttr@20
-    SQLGetFunctions = SQLGetFunctions@12
-    SQLGetInfo = SQLGetInfo@20
-    SQLGetStmtAttr = SQLGetStmtAttr@20
-    SQLGetStmtOption = SQLGetStmtOption@12
-    SQLGetTypeInfo = SQLGetTypeInfo@8
-    SQLMoreResults = SQLMoreResults@4
-    SQLNativeSql = SQLNativeSql@24
-    SQLNumParams = SQLNumParams@8
-    SQLNumResultCols = SQLNumResultCols@8
-    SQLParamData = SQLParamData@8
-    SQLParamOptions = SQLParamOptions@12
-    SQLPrepare = SQLPrepare@12
-    SQLPrimaryKeys = SQLPrimaryKeys@28
-    SQLProcedureColumns = SQLProcedureColumns@36
-    SQLProcedures = SQLProcedures@28
-    SQLPutData = SQLPutData@12
-    SQLRowCount = SQLRowCount@8
-    SQLSetConnectAttr = SQLSetConnectAttr@16
-    SQLSetConnectOption = SQLSetConnectOption@12
-    SQLSetCursorName = SQLSetCursorName@12
-    SQLSetDescField = SQLSetDescField@20
-    SQLSetDescRec = SQLSetDescRec@40
-    SQLSetEnvAttr = SQLSetEnvAttr@16
-    SQLSetParam = SQLSetParam@32
-    SQLSetPos = SQLSetPos@16
-    SQLSetScrollOptions = SQLSetScrollOptions@16
-    SQLSetStmtAttr = SQLSetStmtAttr@16
-    SQLSetStmtOption = SQLSetStmtOption@12
-    SQLSpecialColumns = SQLSpecialColumns@40
-    SQLStatistics = SQLStatistics@36
-    SQLTablePrivileges = SQLTablePrivileges@28
-    SQLTables = SQLTables@36
-    SQLTransact = SQLTransact@12
-; Unicode
-    SQLGetDescFieldW = SQLGetDescFieldW@24
-    SQLSetDescFieldW = SQLSetDescFieldW@20
-    SQLBrowseConnectW = SQLBrowseConnectW@24
-    SQLColAttributeW = SQLColAttributeW@28
-    SQLColAttributesW = SQLColAttributesW@28
-    SQLColumnPrivilegesW = SQLColumnPrivilegesW@36
-    SQLColumnsW = SQLColumnsW@36
-    SQLConnectW = SQLConnectW@28
-    SQLDataSourcesW = SQLDataSourcesW@32
-    SQLDescribeColW = SQLDescribeColW@36
-    SQLDriverConnectW = SQLDriverConnectW@32
-    SQLDriversW = SQLDriversW@32
-    SQLErrorW = SQLErrorW@32
-    SQLExecDirectW = SQLExecDirectW@12
-    SQLForeignKeysW = SQLForeignKeysW@52
-    SQLGetConnectAttrW = SQLGetConnectAttrW@20
-    SQLGetConnectOptionW = SQLGetConnectOptionW@12
-    SQLGetCursorNameW = SQLGetCursorNameW@16
-    SQLGetDescRecW = SQLGetDescRecW@44
-    SQLGetDiagFieldW = SQLGetDiagFieldW@28
-    SQLGetDiagRecW = SQLGetDiagRecW@32
-    SQLGetInfoW = SQLGetInfoW@20
-    SQLGetStmtAttrW = SQLGetStmtAttrW@20
-    SQLGetTypeInfoW = SQLGetTypeInfoW@8
-    SQLNativeSqlW = SQLNativeSqlW@24
-    SQLPrepareW = SQLPrepareW@12
-    SQLPrimaryKeysW = SQLPrimaryKeysW@28
-    SQLProcedureColumnsW = SQLProcedureColumnsW@36
-    SQLProceduresW = SQLProceduresW@28
-    SQLSetConnectAttrW = SQLSetConnectAttrW@16
-    SQLSetConnectOptionW = SQLSetConnectOptionW@12
-    SQLSetCursorNameW = SQLSetCursorNameW@12
-    SQLSetStmtAttrW = SQLSetStmtAttrW@16
-    SQLSpecialColumnsW = SQLSpecialColumnsW@40
-    SQLStatisticsW = SQLStatisticsW@36
-    SQLTablePrivilegesW = SQLTablePrivilegesW@28
-    SQLTablesW = SQLTablesW@36
-; Setup
-    ConfigDSN=ConfigDSN@16
-    ConfigDriver=ConfigDriver@28
-    DllRegisterServer=DllRegisterServer@0
-    DllUnregisterServer=DllUnregisterServer@0
-    DllInstall=DllInstall@8
diff --git a/OdbcJdbcSetup/OdbcJdbcSetup.exp b/OdbcJdbcSetup/OdbcJdbcSetup.exp
deleted file mode 100644
index 52123066..00000000
--- a/OdbcJdbcSetup/OdbcJdbcSetup.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-ConfigDSN
-DllRegisterServer
-DllUnregisterServer
diff --git a/OdbcJdbcSetup/OdbcJdbcSetupMinGw.def b/OdbcJdbcSetup/OdbcJdbcSetupMinGw.def
deleted file mode 100644
index 738a04fc..00000000
--- a/OdbcJdbcSetup/OdbcJdbcSetupMinGw.def
+++ /dev/null
@@ -1,12 +0,0 @@
-; OdbcJdbcSetupMinGw.def : Declares the module parameters for the MinGw DLL.
-
-LIBRARY      "OdbcJdbcSetup"
-DESCRIPTION  'OdbcJdbcSetup Windows Dynamic Link Library'
-
-EXPORTS
-    ; Explicit exports can go here
-	ConfigDSN=ConfigDSN@16
-	ConfigDriver=ConfigDriver@28
-	DllRegisterServer=DllRegisterServer@0
-	DllUnregisterServer=DllUnregisterServer@0
-	DllInstall=DllInstall@8
diff --git a/Headers/OdbcUserEvents.h b/OdbcUserEvents.h
similarity index 100%
rename from Headers/OdbcUserEvents.h
rename to OdbcUserEvents.h
diff --git a/Test/Constraint.cpp b/Test/Constraint.cpp
deleted file mode 100644
index e4e09bb6..00000000
--- a/Test/Constraint.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *	PROGRAM:		Virtual Data Manager
- *	MODULE:			Field.cpp
- *	DESCRIPTION:	Virtual Field class
- *
- * copyright (c) 1997 by James A. Starkey for IBPhoenix.
- */
-
-#include "stdafx.h"
-#include <stdio.h>
-#include <string.h>
-#include "Table.h"
-#include "Field.h"
-//#include "Syntax.h"
-#include "Constraint.h"
-#include "Hash.h"
-//#include "SQLException.h"
-
-
-Constraint::Constraint ()
-{
-/**************************************
- *
- *		C o n s t r a i n t
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-
-table = foreignTable = NULL;
-}
-
-Constraint::~Constraint ()
-{
-/**************************************
- *
- *		~ C o n s t r a i n t
- *
- **************************************
- *
- * Functional description
- *		Get rid of it.
- *
- **************************************/
-
-}
-
-void Constraint::addOrdered (LinkedList *orderedTables)
-{
-/**************************************
- *
- *		a d d O r d e r e d
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-
-if (type != foreignKey)
-    return;
-
-foreignTable->addOrdered (orderedTables);
-}
-
-CString Constraint::gen (boolean fieldLevel)
-{
-/**************************************
- *
- *		g e n
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-CString string;
-
-if (strcmp (name, ""))
-	{
-	string = "constraint ";
-	string += name;
-	}
-
-switch (type)
-    {
-	case foreignKey:
-		if (!fieldLevel)
-			{
-			string += " FOREIGN KEY ";
-			string += genFieldList (&keys);
-			}
-		string += " REFERENCES ";
-		string += foreignTable->getName();
-		string += genFieldList (&foreignKeys);
-		break;
-
-	/***
-	case primaryKey:
-		string += " PRIMARY KEY";
-		if (!fieldLevel)
-			string += genFieldList (&keys);
-		break;
-	***/
-
-	case uniqueIndex:
-		string += " UNIQUE ";
-		if (!fieldLevel)
-			string += genFieldList (&keys);
-		break;
-
-	case checkClauseConstraint:
-		string += " CHECK (";
-		string += checkClause;
-		string += ")";
-		break;
-
-	default:
-		printf ("Constraint::gen -- not done\n");
-	}
-
-return string;
-}
-
-boolean Constraint::isKey (Field *target)
-{
-/**************************************
- *
- *		i s K e y
- *
- **************************************
- *
- * Functional description
- *		Is field a de facto key?
- *
- **************************************/
-
-switch (type)
-    {
-	//case primaryKey:
-	case uniqueIndex:
-	case foreignKey:
-		FOR_OBJECTS (Field*, field, &keys)
-			if (target == field)
-				return TRUE;
-		END_FOR;
-		break;
-	}
-
-return FALSE;
-}
-
diff --git a/Test/Constraint.h b/Test/Constraint.h
deleted file mode 100644
index b70f22bf..00000000
--- a/Test/Constraint.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *	PROGRAM:		Schema Converter
- *	MODULE:			Constraint.h
- *	DESCRIPTION:	Virtual Field class
- *
- * copyright (c) 1997 by James A. Starkey for IBPhoenix.
- */
-
-#ifndef __CONSTRAINT_H
-#define __CONSTRAINT_H
-
-#include "Gen.h"
-
-class Table;
-class CString;
-class Syntax;
-class LinkedList;
-class Hash;
-
-enum ConstraintType {
-   //primaryKey,
-   foreignKey,
-   checkClauseConstraint,
-   uniqueIndex,
-   index
-   };
-
-class Constraint : public Gen
-{
-public:
-
-	Constraint ();
-	//Constraint (Table*, Syntax*);
-	//Constraint (Field*, Table*, Syntax*);
-	~Constraint ();
-
-	void		addOrdered (LinkedList *orderedTables);
-	CString		gen (boolean fieldLevel = FALSE);
-	boolean		isKey (Field*);
-
-	ConstraintType	type;
-	CString			checkClause;
-	Table			*foreignTable;
-	LinkedList		keys, foreignKeys;
-	Table			*table;
-	CString			text;
-	int				oracleValid;
-
-protected:
-
-};
-
-#endif
\ No newline at end of file
diff --git a/Test/Database.cpp b/Test/Database.cpp
deleted file mode 100644
index 0f0692b7..00000000
--- a/Test/Database.cpp
+++ /dev/null
@@ -1,479 +0,0 @@
-// PDatabase.cpp: implementation of the Database class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#include "stdafx.h"
-//#include "MCET.h"
-#include "Database.h"
-#include "Table.h"
-//#include "StoredProcedure.h"
-#include "Odbc.h"
-//#include "Project.h"
-//include "GenHtml.h"
-//#include "GenHtmlList.h"
-#include "RString.h"
-#include "Index.h"
-#include "NetfraDatabase.h"
-#include "Print.h"
-
-#define UPCASE(c)		((c >= 'a' && c <= 'z') ? c - 'a' + 'A' : c)
-#define SQL_ANY			(UCHAR*) "%"
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char THIS_FILE[]=__FILE__;
-#define new DEBUG_NEW
-#endif
-
-static const char htmlDatabase [] = "\
-{tables}\n\
-";
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-Database::Database()
-{
-	statements = 0;
-	database = NULL;
-}
-
-Database::~Database()
-{
-	FOR_OBJECTS (Table*, object, &tables)
-		delete object;
-	END_FOR;
-
-	/***
-	FOR_OBJECTS (StoredProcedure*, object, &procedures)
-		delete object;
-	END_FOR;
-	***/
-
-	if (database)
-		delete database;
-}
-
-LinkedList* Database::getTables()
-{
-	if (!tables.isEmpty())
-		return &tables;
-
-	HSTMT	statement;
-	statement = allocStatement();
-	int retcode = SQLTables (statement, (UCHAR*) SQL_ALL_CATALOGS, SQL_NTS,	// catalog name
-									(UCHAR*) SQL_ALL_SCHEMAS, SQL_NTS,  // schema name
-									SQL_ANY, SQL_NTS,  // table name
-									(UCHAR*) "TABLE,VIEW", SQL_NTS);
-	OdbcCheckCode (retcode, statement, "SQLTables");
-	char qualifier [128], owner [128], name [128], type [32];
-	long len;
-	BIND_STRING (statement, 1, qualifier, len);
-	BIND_STRING (statement, 2, owner, len);
-	BIND_STRING (statement, 3, name, len);
-	BIND_STRING (statement, 4, type, len);
-	Print print (statement);
-	print.printHeaders();
-
-	for (;;)
-		{
-		qualifier [0] = 0;
-		owner [0] = 0;
-		retcode = SQLFetch (statement);
-		if (retcode == SQL_NO_DATA_FOUND)
-			break;
-		if (!OdbcCheckCode (retcode, statement, "SQLFetch"))
-			break;
-		print.printLine();
-		Table *table = new Table (this, qualifier, owner, name, !strcmp (type, "VIEW"));
-		tables.append (table);
-		}
-
-	freeStatement (statement);
-	memset (primaryKeys, 0, sizeof (primaryKeys));
-
-	FOR_OBJECTS (Table*, table, &tables)
-		table->getFields();
-		table->getIndexes();
-		Index *primaryKey = table->primaryKey;
-		if (primaryKey && primaryKey->fieldCount == 1)
-			{
-			Field *field = primaryKey->keyField;
-			int slot = field->hash (PK_HASH_SIZE);
-			for (Index *index = primaryKeys [slot]; index; index = index->collision)
-				if (index->keyField->name == field->name)
-					{
-					primaryKey->duplicate = index->duplicate;
-					index->duplicate = primaryKey;
-					break;
-					}
-			if (!index)
-				{
-				primaryKey->duplicate = NULL;
-				primaryKey->collision = primaryKeys [slot];
-				primaryKeys [slot] = primaryKey;
-				}
-			}
-	END_FOR;
-
-	FOR_OBJECTS (Table*, table, &tables)
-		table->findReferences();
-	END_FOR;
-
-	return &tables;
-}
-
-LinkedList* Database::getProcedures()
-{
-	if (!procedures.isEmpty())
-		return &procedures;
-
-	HSTMT	statement;
-	statement = allocStatement();
-	int retcode = SQLProcedures (statement, NULL, SQL_NTS,	// catalog name
-									NULL, SQL_NTS,  // schema name
-									NULL, SQL_NTS);  // table name
-	OdbcCheckCode (retcode, statement, "SQLColumns");
-	char qualifier [128], owner [128], name [128];
-	long len;
-	BIND_STRING (statement, 1, qualifier, len);
-	BIND_STRING (statement, 2, owner, len);
-	BIND_STRING (statement, 3, name, len);
-
-	for (;;)
-		{
-		retcode = SQLFetch (statement);
-		if (retcode == SQL_NO_DATA_FOUND)
-			break;
-		if (!OdbcCheckCode (retcode, statement, "SQLFetch"))
-			break;
-		//procedures.append (new StoredProcedure (this, qualifier, owner, name));
-		}
-
-	freeStatement (statement);
-
-	return &procedures;
-}
-
-BOOL Database::OpenEx(LPCTSTR DBconnectString, DWORD dwOptions)
-{
-	BOOL	ret;
-	CString temp;
-	DWORD	options = dwOptions;
-
-	if (!database)
-		database = new CDatabase;
-
-	if (DBconnectString)
-		{
-		temp = rewriteConnectString (DBconnectString);
-		options = CDatabase::noOdbcDialog;
-		}
-	
-	try 
-		{
-		ret = database->OpenEx (DBconnectString, options);
-		}
-	catch (CDBException *)
-		{
-		try
-			{
-			ret = database->OpenEx (temp, dwOptions);
-			}
-		catch (CDBException *exception)
-			{
-			CString text = exception->m_strStateNativeOrigin;
-			AfxMessageBox (text);
-			return false;
-			}
-		}
-
-	if (!ret)
-		return ret;
-
-	if (name == "")
-		{
-		temp = database->GetDatabaseName();
-		char c;
-		const char *p, *start;
-
-		for (p = start = temp; c = *p++;)
-			if (c == '\\' || c == ':' || c == ' ' || c == '.')
-				start = p;
-
-		name = start;
-		}
-
-	connectString = database->GetConnect();
-	primaryKeySupport = false;
-		
-	SWORD	length;
-	union {
-	    ULONG	lValue;
-		short	sValue;
-		char	string [256];
-		} info;
-
-	ret = SQLGetInfo (database->m_hdbc, SQL_ODBC_API_CONFORMANCE, &info, sizeof (info.string), &length);
-
-	if (!ret && info.sValue >= 2)
-		primaryKeySupport = true;
-
-	//countObjects();
-
-	return true;
-}
-
-void* Database::allocStatement()
-{
-	HSTMT	statement;
-
-	if (statements++)
-		AfxMessageBox ("Multiple statements");
-
-	//int retcode = SQLAllocStmt (database->m_hdbc, &statement);
-	statement = (HSTMT) 123;
-	int retcode = SQLAllocHandle (SQL_HANDLE_STMT, database->m_hdbc, &statement);
-
-	if (retcode)
-		{
-		UCHAR	sqlState [128], text [SQL_MAX_MESSAGE_LENGTH];
-		SDWORD	nativeCode;
-		SWORD	textLength;
-		int n = SQLError (SQL_NULL_HENV, database->m_hdbc, SQL_NULL_HSTMT, 
-						  sqlState, &nativeCode, 
-						  text, sizeof (text) -1, &textLength);
-		printf ("SQLAllocHandle failed: %s\n", text);
-		return NULL;
-		}
-
-	//retcode = SQLSetStmtAttr (statement, SQL_ATTR_CONCURRENCY, (SQLPOINTER) SQL_CONCUR_READ_ONLY, NULL);
-
-	return statement;
-}
-
-void Database::freeStatement(void* statement)
-{
-	//SQLFreeStmt (statement, SQL_DROP);
-
-	SQLFreeHandle (SQL_HANDLE_STMT, statement);
-	--statements;
-
-}
-
-Table* Database::findTable(const char * name)
-{
-	if (tables.isEmpty())
-		getTables();
-
-	FOR_OBJECTS (Table*, table, &tables)
-		if (!stricmp (table->getName(), name))
-		//if (table->getName() == name)
-			return table;
-	END_FOR;
-
-	return NULL;
-}
-
-CString Database::rewriteConnectString(const char * orgString)
-{
-	CString string;
-	CString dsn;
-	for (const char *p = orgString; *p;)
-		{
-		CString keyword;
-		char c;
-		while ((c = *p++) && c != '=' && c != ';')
-			keyword += c;
-		if (!c)
-			break;
-		CString option = keyword;
-		if (c == '=')
-			{
-			option += c;
-			while ((c = *p++) && c != ';')
-				option += c;
-			if (!c)
-				break;
-			}
-		option += ';';
-		keyword.MakeUpper();
-		if (keyword == "DSN")
-			dsn = option;
-		else 
-			string += option;
-		}
-	string += dsn;
-
-	return string;
-}
-
-Database::operator CDatabase *()
-{
-	return database;
-}
-
-CString Database::GetConnect()
-{
-	return database->GetConnect();
-}
-
-CString Database::getConnectOption(const char * option)
-{
-	CString	string;
-	
-	for (const char *p = connectString; *p;)
-		{
-		for (const char *q = p, *o = option; *o && UPCASE (*q) == UPCASE (*o); ++q, ++o)
-			;
-		if (!*o)
-			{
-			if (*q++ == '=')
-				while (*q && *q != ';')
-					string += *q++;
-			return string;				
-			}
-		while (*p && *p++ != ';')
-			;
-		}
-
-	return string;
-}
-
-void Database::countObjects()
-{
-	int numberTables = 0, numberFields = 0;
-	getTables();
-
-	FOR_OBJECTS (Table*, table, &tables)
-		++numberTables;
-		LinkedList *fields = table->getFields();
-		FOR_OBJECTS (Field*, field, fields)
-			++numberFields;
-		END_FOR;
-	END_FOR;
-
-	printf ("%d, %d\n", numberTables, numberFields);
-}
-
-void Database::clearReferences()
-{
-	FOR_OBJECTS (Table*, table, &tables)
-		table->clearReferences();
-	END_FOR;
-}
-
-void Database::setName(CString & newName)
-{
-	name = newName;
-}
-
-CString Database::getURL()
-{
-	return (CString) "db_" + name + ".html";
-}
-
-/***
-void Database::genDocumentation(CProject * project, CString directory)
-{
-	CString title = "Database ";
-	title += name;
-	CGenHtml page (project, directory, getURL(), title, title);
-	CRString body = project->getTemplate ("htmlDatabase", htmlDatabase);
-	CGenHtmlList list ("Tables");
-	getTables();
-
-	FOR_OBJECTS (Table*, table, &tables)
-		list.addElement (page.makeLink (table->getName(), table->getURL()));
-		table->genDocumentation (project, directory);
-	END_FOR;
-
-	body.replace ("{tables}", (CString) list);
-	page.setBody (body);
-}
-***/
-
-void Database::clearXRef()
-{
-	FOR_OBJECTS (Table*, table, &tables)
-		table->clearXRef();
-	END_FOR;
-}
-
-Index* Database::findPrimaryKey(Field * field)
-{
-	for (Index *index = primaryKeys [field->hash (PK_HASH_SIZE)]; index; index = index->collision)
-		if (index->keyField->name == field->name)
-			return index;
-
-	return NULL;
-}
-
-void Database::clear()
-{
-	FOR_OBJECTS (Table*, table, &tables)
-		table->done = false;
-	END_FOR;
-}
-
-void Database::createAll(NetfraDatabase * db)
-{
-	clear();
-	FILE *log = fopen ("mcet.log", "w");
-
-	FOR_OBJECTS (Table*, table, &tables)
-		if (!table->done)
-			{
-			LinkedList list;
-			table->findDependencies (list);
-			FOR_OBJECTS_BACKWARD (Table*, tbl, &list)
-				if (!tbl->isView && !tbl->fields.isEmpty())
-					tbl->create (db);
-			END_FOR;
-			}
-	END_FOR;
-
-	if (log)
-		fclose (log);
-}
-
-void Database::copyAll(NetfraDatabase * db)
-{
-	clear();
-	FILE *log = fopen ("mcet.log", "w");
-
-	FOR_OBJECTS (Table*, table, &tables)
-		if (!table->done)
-			{
-			LinkedList list;
-			table->findDependencies (list);
-			FOR_OBJECTS_BACKWARD (Table*, tbl, &list)
-				if (!tbl->isView && !tbl->fields.isEmpty())
-					{
-					if (tbl->populated (db))
-						tbl->done = true;
-					else
-						{
-						int count = tbl->copy (db);
-						db->commit();
-						if (log)
-							{
-							fprintf (log, "%s - %d records\n", (const char*) tbl->name, count);
-							fflush (log);
-							}
-						}
-					}
-			END_FOR;
-			}
-	END_FOR;
-
-	if (log)
-		fclose (log);
-}
-
-void Database::setTrace(const char *logFile)
-{
-	int ret = SQLSetConnectAttr (NULL, SQL_ATTR_TRACE, (SQLPOINTER) SQL_OPT_TRACE_ON, NULL);
-	ret = SQLSetConnectAttr (NULL, SQL_ATTR_TRACEFILE, (SQLPOINTER) logFile, SQL_NTS);
-}
diff --git a/Test/Database.h b/Test/Database.h
deleted file mode 100644
index abbc86bb..00000000
--- a/Test/Database.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// PDatabase.h: interface for the CPDatabase class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_PDATABASE_H__7427858B_AAF8_11D1_AB1B_0000C01D2301__INCLUDED_)
-#define AFX_PDATABASE_H__7427858B_AAF8_11D1_AB1B_0000C01D2301__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#include <afxdb.h>
-#include "LinkedList.h"	// Added by ClassView
-
-#define PK_HASH_SIZE		101
-
-class Table;
-class CProject;
-class Index;
-class Field;
-class NetfraDatabase;
-
-class Database
-{
-public:
-	void setTrace (const char *logFile);
-	void copyAll (NetfraDatabase *db);
-	void createAll (NetfraDatabase *db);
-	void clear();
-	Index* findPrimaryKey (Field *field);
-	void clearXRef();
-	void genDocumentation (CProject *project, CString directory);
-	CString getURL();
-	void*		allocStatement();
-	void		clearReferences();
-	void		countObjects();
-	Table*		findTable (const char *name);
-	void		freeStatement (void* statement);
-	CString		getConnectOption (const char *option);
-	LinkedList* getTables();
-	LinkedList* getProcedures();
-	CString		GetConnect();
-	operator	CDatabase*();
-	CString		rewriteConnectString (const char*string);
-	virtual BOOL OpenEx (LPCTSTR connectString, DWORD dwOptions=0);
-	void		setName (CString& newName);
-
-	Database();
-	virtual ~Database();
-	CString	name;
-
-	CString	connectString;
-	bool	primaryKeySupport;
-
-protected:
-	int			statements;
-	LinkedList	tables;
-	LinkedList	procedures;
-	CDatabase	*database;
-
-	Index		*primaryKeys [PK_HASH_SIZE];
-};
-
-#endif // !defined(AFX_PDATABASE_H__7427858B_AAF8_11D1_AB1B_0000C01D2301__INCLUDED_)
diff --git a/Test/Field.cpp b/Test/Field.cpp
deleted file mode 100644
index b18d8d79..00000000
--- a/Test/Field.cpp
+++ /dev/null
@@ -1,836 +0,0 @@
-/*
- *	PROGRAM:		Subschema Upgrade Utility
- *	MODULE:			Field.cpp
- *	DESCRIPTION:	Virtual Field class
- *
- * copyright (c) 1997 by James A. Starkey for IBPhoenix.
- */
-
-#include "stdafx.h"
-#include <stdio.h>
-#include <string.h>
-#include "Odbc.h"
-#include "Table.h"
-#include "Field.h"
-#include "Hash.h"
-#include "Constraint.h"
-#include "Database.h"
-#include "Index.h"
-//#include "GenHtmlTable.h"
-//#include "Class.h"
-//#include "Property.h"
-
-#define UPCASE(c)		((c >= 'a' && c <= 'z') ? c - 'a' + 'A' : c)
-
-Hash	Field::domains (101);
-
-Field::Field ()
-{
-/**************************************
- *
- *		F i e l d
- *
- **************************************
- *
- * Functional description
- *		Constructor.
- *
- **************************************/
-table = NULL;
-notNull = FALSE;
-scale = length = precision = 0;
-domain = NULL;
-primaryKey = FALSE;
-foreignKey = NULL;
-frozen = 0;
-referenceCount = 0;
-reference = NULL;
-}
-
-Field::Field (Table *tbl, const char *nam, Type typ, int len,
-			   boolean nullable, boolean pk, 
-			   const char *cmnt, Field *dom)
-{
-/**************************************
- *
- *		F i e l d
- *
- **************************************
- *
- * Functional description
- *		Constructor.
- *
- **************************************/
-
-setType (typ, len);
-foreignKey = NULL;
-table = tbl;
-name = nam;
-notNull = !nullable;
-primaryKey = pk;
-comment = cmnt;
-domain = dom;
-frozen = 0;
-referenceCount = 0;
-reference = NULL;
-
-if (domain)
-	setType (domain);
-}
-
-Field::Field (Table *tbl, FieldInfo *info)
-{
-/**************************************
- *
- *		F i e l d
- *
- **************************************
- *
- * Functional description
- *		Constructor.
- *
- **************************************/
-
-setType (info->dtype, info->precision, info->typeName);
-table = tbl;
-notNull = FALSE;
-scale = info->scale;
-length = info->length;
-domain = NULL;
-primaryKey = FALSE;
-foreignKey = NULL;
-frozen = 0;
-referenceCount = 0;
-reference = NULL;
-
-for (char *p = info->fieldName; *p; p++)
-    *p = UPCASE (*p);
-
-name = info->fieldName;
-Field::typeName = info->typeName;
-
-//type = typeFromOdbcType (info->dtype, info->typeName);
-
-}
-
-Field::~Field ()
-{
-/**************************************
- *
- *		~ F i e l d
- *
- **************************************
- *
- * Functional description
- *		Constructor.
- *
- **************************************/
-
-if (foreignKey)
-    {
-	delete foreignKey;
-	foreignKey = NULL;
-	}
-}
-
-boolean Field::changed (Field *field)
-{
-/**************************************
- *
- *		c h a n g e d
- *
- **************************************
- *
- * Functional description
- *		Determine whether field has changed characteristics.
- *
- **************************************/
-
-if (type != field->type ||
-    length != field->length ||
-	scale != field->scale ||
-	precision != field->precision ||
-	notNull != field->notNull)
-	return FALSE;
-
-return TRUE;
-}
-
-Field *Field::findDomain (const char *name)
-{
-/**************************************
- *
- *		f i n d D o m a i n 
- *
- **************************************
- *
- * Functional description
- *		Find domain if defined; otherwise return NULL.
- *
- **************************************/
-
-return (Field*) domains.lookup (name);
-}
-
-void Field::fini ()
-{
-/**************************************
- *
- *		f i n i
- *
- **************************************
- *
- * Functional description
- *		Shutdown.
- *
- **************************************/
-
-//domains->deleteAll();
-//delete domains;
-}
-
-void Field::freeze ()
-{
-/**************************************
- *
- *		f r e e z e
- *
- **************************************
- *
- * Functional description
- *		Freeze field from arbitrary update.
- *
- **************************************/
-
-++frozen;
-}
-
-CString Field::gen (boolean empty)
-{
-/**************************************
- *
- *		g e n 
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-CString	string = name;
-
-if (!strcmp (name, "START"))
-	string += "X";
-
-string += " ";
-CString typeString;
-
-if (domain)
-    {
-	type = domain->type;
-	length = domain->length;
-	precision = domain->precision;
-	scale = domain->scale;
-	}
-
-if (genType == GenGeneric && domain)
-	typeString = domain->getName();
-else
-	typeString = genSqlString();
-
-if (!strcmp (defaultValue, "SYSTEM_USER"))
-	typeString = "varchar (40)";
-
-string += typeString;
-
-if (!defaultValue.IsEmpty())
-	{
-	string += " DEFAULT (";
-	if (!strcmp (defaultValue, "SYSTEM_USER"))
-		string += "USER";
-	else
-		string += defaultValue;
-	string += ")";
-	}
-
-if (primaryKey)
-    string += " PRIMARY KEY";
-
-if (notNull && empty)
-    string += " NOT NULL";
-
-if (foreignKey)
-	{
-	string += " ";
-    string += foreignKey->gen (TRUE);
-	}
-
-return string;
-}
-
-Field *Field::getDomain ()
-{
-/**************************************
- *
- *		g e t D o m a i n
- *
- **************************************
- *
- * Functional description
- *		Get length from field or domain.
- *
- **************************************/
-
-return domain;
-}
-
-int Field::getLength ()
-{
-/**************************************
- *
- *		g e t L e n g t h
- *
- **************************************
- *
- * Functional description
- *		Get length from field or domain.
- *
- **************************************/
-
-return (domain) ? domain->getLength() : length;
-}
-
-int Field::getPrecision ()
-{
-/**************************************
- *
- *		g e t P r e c i s i o n
- *
- **************************************
- *
- * Functional description
- *		Get scale from field or domain.
- *
- **************************************/
-
-return (domain) ? domain->getPrecision() : precision;
-}
-
-int Field::getScale ()
-{
-/**************************************
- *
- *		g e t S c a l e
- *
- **************************************
- *
- * Functional description
- *		Get scale from field or domain.
- *
- **************************************/
-
-return (domain) ? domain->getScale() : scale;
-}
-
-Table *Field::getTable ()
-{
-/**************************************
- *
- *		g e t T a b l e
- *
- **************************************
- *
- * Functional description
- *		Return table if field, NULL if domain.
- *
- **************************************/
-
-return table;
-}
-
-Type Field::getType ()
-{
-/**************************************
- *
- *		g e t T y p e
- *
- **************************************
- *
- * Functional description
- *		Get type from field or domain.
- *
- **************************************/
-
-return (domain) ? domain->getType() : type;
-}
-
-boolean Field::isDeleteable ()
-{
-/**************************************
- *
- *		i s D e l e t e a b l e
- *
- **************************************
- *
- * Functional description
- *		Is field an indexed key?
- *
- **************************************/
-
-return frozen == 0;
-}
-
-boolean Field::isFrozen ()
-{
-/**************************************
- *
- *		i s F r o z e n
- *
- **************************************
- *
- * Functional description
- *		Is field an indexed key?
- *
- **************************************/
-
-return frozen > 0;
-}
-
-boolean Field::isKey ()
-{
-/**************************************
- *
- *		i s K e y
- *
- **************************************
- *
- * Functional description
- *		Is field an indexed key?
- *
- **************************************/
-
-if (primaryKey || foreignKey)
-	return TRUE;
-
-if (table)
-	return table->isKey (this);
-
-return FALSE;
-}
-
-boolean Field::isNullable ()
-{
-/**************************************
- *
- *		i s N u l l a b l e
- *
- **************************************
- *
- * Functional description
- *		Is field nullable?
- *
- **************************************/
-
-return !notNull;
-}
-
-boolean Field::isLargeObject()
-{
-/**************************************
- *
- *		i s L a r g e O b j e c t
- *
- **************************************
- *
- * Functional description
- *		Is this thing a blob/clob/long/image/text?
- *
- **************************************/
-
-return (type == TextBlob || type == BinaryBlob);
-}
-
-boolean Field::isPrimaryKey ()
-{
-/**************************************
- *
- *		i s P r i m a r y K e y
- *
- **************************************
- *
- * Functional description
- *		Is field nullable?
- *
- **************************************/
-
-return primaryKey;
-}
-
-boolean Field::modified (const char *newName, Type newType,
-						 int newLength, boolean nullable,
-						 boolean newPrimaryKey, const char *newComment,
-						 Field *newDomain)
-{
-/**************************************
- *
- *		m o d i f i e d
- *
- **************************************
- *
- * Functional description
- *		Update field attributes (maybe), indicate whether anything
- *		changed.
- *
- **************************************/
-int		changed = FALSE;
-
-if (strcmp (name, newName))
-	{
-	name = newName;
-	changed = TRUE;
-	}
-
-if (type != newType)
-    {
-	type = newType;
-	changed = TRUE;
-	}
-
-switch (type)
-    {
-	case Char:
-	case Varchar:
-		if (length != newLength)
-			{
-			length = newLength;
-			changed = TRUE;
-			}
-		break;
-
-	default:
-		if (isInteger())
-			{
-			if (newLength != precision)
-				{
-				precision = newLength;
-				changed = TRUE;
-				}
-			}
-	}
-
-if (newDomain != domain)
-	{
-	domain = newDomain;
-	changed = TRUE;
-	}
-
-if (domain)
-	{
-	type = domain->type;
-	length = domain->length;
-	precision = domain->precision;
-	scale = domain->scale;
-	}
-
-if (nullable == notNull)
-	{
-	notNull = !nullable;
-	changed = TRUE;
-	}
-
-if (primaryKey != newPrimaryKey)
-    {
-	primaryKey = newPrimaryKey;
-	changed = TRUE;
-	}
-
-if (strcmp (comment, newComment))
-	{
-	comment = newComment;
-	changed = TRUE;
-	}
-
-return changed;
-}
-
-void Field::postLoad()
-{
-/**************************************
- *
- *		p o s t L o a d
- *
- **************************************
- *
- * Functional description
- *		Finish load process.
- *
- **************************************/
-
-if (!table)
-    domains.insert (name, this);
-
-//comment = "";
-}
-
-
-void Field::thaw()
-{
-/**************************************
- *
- *		t h a w
- *
- **************************************
- *
- * Functional description
- *		Finish load process.
- *
- **************************************/
-
-if (frozen > 0)
-   --frozen;
-}
-
-
-CString Field::genSqlString()
-{
-/**************************************
- *
- *		g e n S q l S t r i n g
- *
- **************************************
- *
- * Functional description
- *		Finish load process.
- *
- **************************************/
-CString	typeString;
-
-switch (type)
-	{
-	case Char:
-		typeString.Format ("char (%d)", length);
-		break;
-
-	case Varchar:
-		typeString.Format ("varchar (%d)", length);
-		break;
-
-	case Tiny:
-		typeString = "tinyInt";
-		break;
-
-	case Short:
-		typeString = "smallInt";
-		break;
-
-	case Int:
-		typeString = "int";
-		break;
-
-	case Long:
-		//typeString.Format ("number (%d)", precision);
-		break;
-
-	case TextBlob:
-		switch (genType)
-			{
-			case GenOracle7:
-				if (table->isFirstLargeObject (this))
-					typeString = "long";
-				else
-					typeString = "varchar (2000)";
-				break;
-
-			case GenSqlServer:
-				typeString = "text";
-				break;
-
-			default:
-			case GenOracle8:
-				typeString = "clob"; //"long";
-				break;
-
-			};
-		break;
-
-	case BinaryBlob:
-		switch (genType)
-			{
-			case GenOracle7:
-				typeString = "long";
-				break;
-
-			case GenSqlServer:
-				typeString = "image";
-				break;
-
-			default:
-			case GenOracle8:
-				typeString = "blob";
-				break;
-
-			};
-		break;
-
-	case Date:
-		typeString = "date";
-		break;
-
-	case Float:
-		typeString = "float";
-		break;
-
-	case Double:
-		typeString = "double";
-		break;
-
-	default:
-		typeString = "*** genSqlString not done ***";
-		break;
-	}
-
-return typeString;
-}
-
-Database* Field::getDatabase()
-{
-	return table->database;
-}
-
-bool Field::matches(const char * string)
-{
-/**************************************
- *
- *		m a t c h e s
- *
- **************************************
- *
- * Functional description
- *		Case insensitive comparison.
- *
- **************************************/
-const char *p = name;
-const char *q = string;
-
-for (; *p; ++p, ++q)
-	if (UPCASE (*p) != UPCASE (*q))
-		return FALSE;
-
-return *q == 0;
-}
-
-
-bool Field::isUnique()
-{
-/**************************************
- *
- *		i s U n i q u e
- *
- **************************************
- *
- * Functional description
- *		Is field known to be unique in table?
- *
- **************************************/
-
-return table->isUnique (this);
-}
-
-bool Field::keyMatch(Field * field)
-{
-/**************************************
- *
- *		k e y M a t c h
- *
- **************************************
- *
- * Functional description
- *		If a field in a another relation a reason join term?
- *
- **************************************/
-
-if (name == field->name && type == field->type)
-	return true;
-
-return false;
-}
-
-
-void Field::clearReferences()
-{
-referenceCount = 0;
-}
-
-void Field::addReference()
-{
-++referenceCount;
-}
-
-void Field::deleteReference()
-{
---referenceCount;
-}
-
-/***
-void Field::genDocumentation(CGenHtmlTable * table)
-{
-	if (table->first)
-		table->addRow ("Column Name", "Data Type", "Component", "Property");
-
-	table->row();
-	table->addElement (name);
-	table->addElement (genSqlString());
-	int count = 0;
-
-	FOR_OBJECTS (CProperty*, property, &references)
-		if (count++)
-			{
-			table->endRow();
-			table->addElement ("");
-			table->addElement ("");
-			}
-		CClass *pClass = property->pClass;
-		table->addLink (pClass->name, pClass->getURL());
-		table->addElement (property->name);
-	END_FOR;
-
-	if (!count)
-		table->addSpanningElement (2, "unmapped");
-
-	table->endRow();
-}
-***/
-
-void Field::clearXRef()
-{
-	references.clear();
-}
-
-void Field::addReference(CProperty * property)
-{
-	references.append (property);
-}
-
-
-CString Field::genSql()
-{
-	CString string = getIdentifier() + " " + genSqlString();
-
-	return string;
-}
-
-Index* Field::findForeignReference(Database * database)
-{
-	int count = 0;
-
-	for (Index *index = database->findPrimaryKey (this); index; index = index->duplicate)
-		if (index->table != table)
-			{
-			++count;
-			reference = index;
-			}
-
-	if (count != 1)
-		reference = NULL;
-
-	return reference;
-}
diff --git a/Test/Field.h b/Test/Field.h
deleted file mode 100644
index 1664aa4e..00000000
--- a/Test/Field.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *	PROGRAM:		Virtual Data Manager
- *	MODULE:			Field.h
- *	DESCRIPTION:	Virtual Field class
- *
- * copyright (c) 1997 by James A. Starkey for IBPhoenix.
- */
-
-#ifndef __FIELD_H
-#define __FIELD_H
-
-#include "Gen.h"
-#include "Type.h"
-#include "LinkedList.h"
-
-class Database;
-class Table;
-class CString;
-class Syntax;
-class Constraint;
-struct FieldInfo;
-class CGenHtmlTable;
-class CProperty;
-class Index;
-
-class Field : public Gen, public CType {
-    public:
-	    Index* findForeignReference (Database *database);
-	    virtual CString genSql();
-	    void addReference (CProperty* property);
-	    void clearXRef();
-	    void genDocumentation (CGenHtmlTable *table);
-	    void deleteReference();
-	    void addReference();
-	    void clearReferences();
-		Field ();
-		Field (Table *table, FieldInfo *info);
-		Field (Table *table, const char *name, Type type, int length,
-			   boolean nullable, boolean primary_key,
-			   const char *comment, Field *domain);
-		~Field();
-
-	    bool				keyMatch (Field *field);
-	    bool				matches (const char *string);
-
-		boolean				changed (Field *field);
-		virtual void		freeze();
-		virtual void		thaw();
-	    virtual CString		genSqlString();
-		virtual CString		gen (boolean empty = TRUE);
-		Field				*getDomain();
-		Table				*getTable();
-	    Database*			getDatabase();
-		Type			getType();
-		int					getLength();
-		int					getScale();
-		int					getPrecision();
-	    //VARTYPE				getVariantType();
-		virtual boolean		isDeleteable();
-		virtual boolean		isFrozen();
-		boolean				isLargeObject();
-		boolean				isKey();
-		boolean				isNullable();
-		boolean				isPrimaryKey();
-	    bool				isUnique();
-		boolean				modified (const char *newName, Type newType,
-									  int newLength, boolean nullable,
-									  boolean primaryKey, const char *comment,
-									  Field *newDomain);
-		void				postLoad();
-
-		static Field		*findDomain (const char *name);
-		static void			fini();
-
-		CString		defaultValue;
-		int			primaryKey;
-		CString		typeName;
-		int			referenceCount;
-		Index		*reference;
-
-		//static Type		typeFromOdbcType (int type, const char *typeName);
-
-	protected:
-		//DataType	type;
-		//int			length, precision, scale;
-		Table		*table;
-		boolean		notNull;
-		Field		*domain;
-		Constraint	*foreignKey;
-		int			frozen;
-		LinkedList	references;
-
-	static Hash	domains;
-	};
-
-
-
-#endif
diff --git a/Test/Gen.cpp b/Test/Gen.cpp
deleted file mode 100644
index 2f3d9ad0..00000000
--- a/Test/Gen.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// Gen.cpp: implementation of the Gen class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#include "stdafx.h"
-//#include "MCET.h"
-#include "Gen.h"
-#include "LinkedList.h"
-#include "Field.h"
-
-#define ISLOWER(c)			(c >= 'a' && c <= 'z')
-
-GenType	genType = GenGeneric;
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char THIS_FILE[]=__FILE__;
-#define new DEBUG_NEW
-#endif
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-Gen::Gen()
-{
-
-}
-
-Gen::~Gen()
-{
-
-}
-
-CString Gen::getName()
-{
-	return name;
-}
-
-CString Gen::genFieldList(LinkedList *list)
-{
-	CString string;
-	char *sep = " (";
-
-	FOR_OBJECTS (Field*, field, list);
-		string += sep;
-		string += field->name;
-		sep = ", ";
-	END_FOR;
-
-	string += ")";
-
-	return string;
-}
-
-CString Gen::getIdentifier()
-{
-	CString string;
-	char c;
-
-	for (const char *p = name; c = *p++;)
-		if ((c >= 'a' && c <= 'z') ||
-		    (c >= 'A' && c <= 'Z') ||
-			(c >= '0' && c <= '9'))
-			string += c;
-		else
-			string += '_';
-
-	return string;
-}
-
-int Gen::hash(const char * string, int tableSize)
-{
-	int	value = 0, c;
-
-	while (c = (unsigned) *string++)
-		{
-		if (ISLOWER (c))
-			c -= 'a' - 'A';
-		value = value * 11 + c;
-		}
-
-	if (value < 0)
-		value = -value;
-
-	return value % tableSize;
-}
-
-int Gen::hash(int tableSize)
-{
-	return hash (name, tableSize);
-}
diff --git a/Test/Gen.h b/Test/Gen.h
deleted file mode 100644
index 817c108a..00000000
--- a/Test/Gen.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Gen.h: interface for the Gen class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_GEN_H__CBD41C49_EAEA_11D3_98D6_0000C01D2301__INCLUDED_)
-#define AFX_GEN_H__CBD41C49_EAEA_11D3_98D6_0000C01D2301__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#include "RString.h"
-
-class Syntax;
-class Hash;
-class LinkedList;
-class Table;
-
-typedef enum {
-	GenGeneric,
-    GenOracle7,
-	GenOracle8,
-	GenSqlServer
-	} GenType;
-
-struct GenTarget {
-    char	*name;
-	GenType	type;
-	};
-
-
-extern GenType	genType;
-
-
-class Gen  
-{
-public:
-	virtual int hash (int tableSize);
-	static int hash (const char *string, int tableSize);
-	CString getIdentifier();
-	CString genFieldList (LinkedList *linkedList);
-	virtual CString getName();
-	CString name;
-	CString comment;
-	Gen();
-	virtual ~Gen();
-
-};
-
-#endif // !defined(AFX_GEN_H__CBD41C49_EAEA_11D3_98D6_0000C01D2301__INCLUDED_)
diff --git a/Test/Hash.cpp b/Test/Hash.cpp
deleted file mode 100644
index fd226c3f..00000000
--- a/Test/Hash.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- *	PROGRAM:		Schema Converter
- *	MODULE:			Hash.h
- *	DESCRIPTION:	Hash table stuff
- *
- * copyright (c) 1997 by James A. Starkey for IBPhoenix.
- */
-
-#include <memory.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "Hash.h"
-
-Hash::Hash (int size)
-{
-/**************************************
- *
- *		H a s h
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-
-table = new HashEntry* [size];
-tableSize = size;
-memset (table, 0, sizeof (HashEntry*) * size);
-}
-
-Hash::~Hash ()
-{
-/**************************************
- *
- *		~ H a s h
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-
-for (int n = 0; n < tableSize; ++n)
-    {
-	HashEntry *entry;
-	while (entry = table [n])
-		{
-		table [n] = entry->next;
-		delete entry;
-		}
-	}
-
-delete table;
-}
-
-Hash::HashEntry::~HashEntry ()
-{
-/**************************************
- *
- *		~ H a s h E n t r y
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-
-free (string);
-}
-
-void Hash::deleteAll ()
-{
-/**************************************
- *
- *		d e l e t e A l l
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-
-for (int n = 0; n < tableSize; ++n)
-    {
-	HashEntry *entry;
-	while (entry = table [n])
-		{
-		table [n] = entry->next;
-		delete entry->object;
-		delete entry;
-		}
-	}
-}
-
-void Hash::finiWalk (void *ptr)
-{
-/**************************************
- *
- *		f i n i W a l k
- *
- **************************************
- *
- * Functional description
- *		Pick up next item.
- *
- **************************************/
-
-delete ((HashWalk*) ptr);
-}
-
-void *Hash::getObject (void *ptr)
-{
-/**************************************
- *
- *		g e t O b j e c t
- *
- **************************************
- *
- * Functional description
- *		Return string of current position in table walk.
- *
- **************************************/
-HashWalk *marker = (HashWalk*) ptr;
-
-return marker->node->object;
-}
-
-const char *Hash::getString (void *ptr)
-{
-/**************************************
- *
- *		g e t S t r i n g
- *
- **************************************
- *
- * Functional description
- *		Return string of current position in table walk.
- *
- **************************************/
-HashWalk *marker = (HashWalk*) ptr;
-
-return marker->node->string;
-}
-
-int Hash::hash (const char *string)
-{
-/**************************************
- *
- *		h a s h
- *
- **************************************
- *
- * Functional description
- *		Hash function.
- *
- **************************************/
-int	value = 0, c;
-
-while (c = (unsigned) *string++)
-   value = value * 11 + c;
-
-if (value < 0)
-    value = -value;
-
-return value % tableSize;
-}
-
-void *Hash::initWalk ()
-{
-/**************************************
- *
- *		i n i t W a l k
- *
- **************************************
- *
- * Functional description
- *		Prepare for walk thru hash table.
- *
- **************************************/
-HashWalk *marker = new HashWalk;
-marker->node = NULL;
-marker->slot = -1;
-
-return marker;
-}
-
-void Hash::insert (const char *string, void *object)
-{
-/**************************************
- *
- *		i n s e r t
- *
- **************************************
- *
- * Functional description
- *		Insert object into table.
- *
- **************************************/
-int			slot = hash (string);
-HashEntry	*entry = new HashEntry;
-
-entry->string = strdup (string);
-entry->object = object;
-entry->next = table [slot];
-table [slot] = entry;
-}
-
-void *Hash::lookup (const char *string)
-{
-/**************************************
- *
- *		l o o k u p
- *
- **************************************
- *
- * Functional description
- *		Insert object into table.
- *
- **************************************/
-int		slot = hash (string);
-
-for (HashEntry *entry = table [slot]; entry; entry = entry->next)
-    if (!strcmp (entry->string, string))
-		return entry->object;
-
-return NULL;
-}
-
-int Hash::next (void *ptr)
-{
-/**************************************
- *
- *		n e x t
- *
- **************************************
- *
- * Functional description
- *		Pick up next item.
- *
- **************************************/
-HashWalk *marker = (HashWalk*) ptr;
-
-if (marker->node && (marker->node = marker->node->next))
-	return TRUE;
-
-while (++marker->slot < tableSize)
-    {
-	if (marker->node = table [marker->slot])
-		return TRUE;
-	}
-
-return FALSE;
-}
-
-bool Hash::isFirst(const char * string)
-{
-/**************************************
- *
- *		i s F i r s t
- *
- **************************************
- *
- * Functional description
- *		If this is the first reference to string in hash table, define
- *		the string and return true.
- *
- **************************************/
-
-if (lookup (string))
-    return false;
-
-insert (string, this);
-
-return true;
-}
diff --git a/Test/Hash.h b/Test/Hash.h
deleted file mode 100644
index 312a7f7c..00000000
--- a/Test/Hash.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *	PROGRAM:		Schema Converter
- *	MODULE:			Hash.h
- *	DESCRIPTION:	Hash table stuff
- *
- * copyright (c) 1997 by James A. Starkey for IBPhoenix.
- */
-
-#ifndef __HASH_H
-#define __HASH_H
-
-#ifndef TRUE
-#define TRUE		1
-#define FALSE		0
-#endif
-
-class Hash
-    {
-	public:
-		bool isFirst (const char* string);
-		Hash (int size);
-		~Hash ();
-
-		void		deleteAll();
-		void		insert (const char *string, void *object);
-		void		*lookup (const char *string);
-
-		void		*initWalk ();
-		int			next (void *marker);
-		const char	*getString (void *marker);
-		void		*getObject (void *marker);
-		void		finiWalk (void *marker);
-
-	protected:
-		int		hash (const char *string);
-
-		struct HashEntry
-			{
-			~HashEntry();
-			char		*string;
-			void		*object;
-			HashEntry	*next;
-			};
-
-		struct HashWalk
-			{
-			int		slot;
-			HashEntry	*node;
-			};
-
-		HashEntry	**table;
-		int			tableSize;
-	};
-
-
-#endif
diff --git a/Test/Index.cpp b/Test/Index.cpp
deleted file mode 100644
index 447f3935..00000000
--- a/Test/Index.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- *	PROGRAM:		Virtual Data Manager
- *	MODULE:			Index.cpp
- *	DESCRIPTION:	Index related definitions
- *
- * copyright (c) 1997 by James A. Starkey for IBPhoenix.
- */
-
-#include "stdafx.h"
-#include <stdio.h>
-#include <string.h>
-//#include "Syntax.h"
-#include "LinkedList.h"
-#include "Table.h"
-#include "Index.h"
-#include "Field.h"
-//#include "CString.h"
-#include "Hash.h"
-//#include "SQLException.h"
-#include "Odbc.h"
-
-Hash	Index::indexes (101);
-
-
-Index::Index ()
-{
-/**************************************
- *
- *		I n d e x
- *
- **************************************
- *
- * Functional description
- *		Initialize index object.
- *
- **************************************/
-
-primaryKey = NULL;
-fieldCount = 0;
-}
-
-Index::Index (Table *tbl, const char *nam, IndexType typ)
-{
-/**************************************
- *
- *		I n d e x
- *
- **************************************
- *
- * Functional description
- *		Initialize index object.
- *
- **************************************/
-
-fieldCount = 0;
-primaryKey = NULL;
-table = tbl;
-type = typ;
-name = nam;
-table->addIndex (this);
-}
-
-Index::~Index ()
-{
-/**************************************
- *
- *		~ I n d e x
- *
- **************************************
- *
- * Functional description
- *		Get rid of it.
- *
- **************************************/
-
-}
-
-void Index::addField (Field *field)
-{
-/**************************************
- *
- *		a d d F i e l d
- *
- **************************************
- *
- * Functional description
- *		Initialize index object.
- *
- **************************************/
-
-++fieldCount;
-keyField = field;
-fields.append (field);
-}
-
-boolean Index::changed (Index *index)
-{
-/**************************************
- *
- *		c h a n g e d
- *
- **************************************
- *
- * Functional description
- *		See if index characteristics have changed.
- *
- **************************************/
-
-if (type != index->type ||
-    fieldCount != index->fieldCount)
-	return TRUE;
-
-LinkedList *pos2 = index->fields.getHead();
-
-FOR_OBJECTS (Field*, field, &fields)
-	Field *fld = (Field*) index->fields.getNext (&pos2);
-	if (strcmp (field->getName(), fld->getName()))
-		return TRUE;
-END_FOR;
-
-return FALSE;
-}
-
-void Index::drop (CDatabase *database)
-{
-/**************************************
- *
- *		d r o p
- *
- **************************************
- *
- * Functional description
- *		Drop index.
- *
- **************************************/
-char	buffer [256];
-
-sprintf (buffer, "drop index %s", name);
-OdbcExecute (database, buffer);
-}
-
-void Index::fini ()
-{
-/**************************************
- *
- *		f i n i
- *
- **************************************
- *
- * Functional description
- *		Clean up.
- *
- **************************************/
-
-//delete indexes;
-}
-
-CString Index::gen ()
-{
-/**************************************
- *
- *		g e n 
- *
- **************************************
- *
- * Functional description
- *		Drop index.
- *
- **************************************/
-CString	string;
-
-switch (type)
-    {
-	case UNIQUE_INDEX:
-		string += "upgrade unique index ";
-		break;
-
-	case SECONDARY_INDEX:
-		string += "upgrade index ";
-		break;
-	}
-
-string += table->getIdentifier() + "_" + name;
-string += " on ";
-string += table->getName();
-string += genFieldList (&fields);
-
-return string;
-}
-
-boolean Index::isDuplicate (Index *index)
-{
-/**************************************
- *
- *		i s D u p l i c a t e
- *
- **************************************
- *
- * Functional description
- *		See if index characteristics have changed.
- *
- **************************************/
-
-if (//type != index->type ||
-    fieldCount != index->fieldCount)
-	return FALSE;
-
-LinkedList *pos2 = index->fields.getHead();
-
-FOR_OBJECTS (Field*, field, &fields)
-	Field *fld = (Field*) index->fields.getNext (&pos2);
-	if (fld != field)
-		return FALSE;
-END_FOR;
-
-return TRUE;
-}
-
-boolean Index::isKey (Field *target)
-{
-/**************************************
- *
- *		i s K e y
- *
- **************************************
- *
- * Functional description
- *		Is Field an index key?
- *
- **************************************/
-
-FOR_OBJECTS (Field*, field, &fields)
-	if (target == field)
-		return TRUE;
-	return FALSE;
-END_FOR;
-
-return FALSE;
-}
-
-void Index::postLoad()
-{
-/**************************************
- *
- *		p o s t L o a d
- *
- **************************************
- *
- * Functional description
- *		Finish load process.
- *
- **************************************/
-
-indexes.insert (name, this);
-}
-
-
-LinkedList* Index::getFields()
-{
-	return &fields;
-}
-
-bool Index::isMember(Field * field)
-{
-/**************************************
- *
- *		i s M e m b e r
- *
- **************************************
- *
- * Functional description
- *		Is field part of index?
- *
- **************************************/
-
-FOR_OBJECTS (Field*, fld, &fields)
-	if (fld == field)
-		return TRUE;
-END_FOR;
-
-return FALSE;
-}
-
-CString Index::genSql()
-{
-	CString string;
-
-	if (type == UNIQUE_INDEX)
-		string = "upgrade unique index ";
-	else
-		string = "upgrade index ";
-
-	string += table->identifier + "_" + getIdentifier() + " on " + table->identifier + "(";
-	const char *sep = "";
-
-	FOR_OBJECTS (Field*, field, &fields)
-		string += sep + field->getIdentifier();
-		sep = ",";
-	END_FOR;
-
-	string += ")";
-
-	return string;
-}
diff --git a/Test/Index.h b/Test/Index.h
deleted file mode 100644
index f3ed4046..00000000
--- a/Test/Index.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *	PROGRAM:		Virtual Data Manager
- *	MODULE:			Index.h
- *	DESCRIPTION:	Index related definitions
- *
- * copyright (c) 1997 by James A. Starkey for IBPhoenix.
- */
-
-#ifndef __INDEX_H
-#define __INDEX_H
-
-#include "Gen.h"
-#include "LinkedList.h"
-
-class Table;
-class Table;
-class Field;
-class CDatabase;
-class Hash;
-
-typedef enum {
-    PRIMARY_KEY,
-	UNIQUE_INDEX,
-	FOREIGN_KEY,
-	SECONDARY_INDEX,
-	} IndexType;
-
-class Index : public Gen {
-    public:
-	    CString genSql();
-	    bool isMember (Field *field);
-	    virtual LinkedList* getFields();
-
-	Index ();
-	Index (Table *table, const char *name, IndexType type);
-	//Index (Syntax *syntax);
-	~Index();
-
-	void		addField (Field*);
-	boolean		changed (Index *index);
-	void		drop (CDatabase*);
-	static void	fini();
-	CString		gen();
-	boolean		isDuplicate (Index*);
-	boolean		isKey (Field*);
-	void		postLoad();
-
-	IndexType	type;
-	Table		*table;
-
-	LinkedList	fields, foreignKeys;
-	Field		*keyField;
-	Index		*primaryKey;
-	int			fieldCount;
-
-	Index		*collision;
-	Index		*duplicate;
-
-	static Hash	indexes;
-	};
-
-#endif
-
diff --git a/Test/JString.cpp b/Test/JString.cpp
deleted file mode 100644
index c2c1c964..00000000
--- a/Test/JString.cpp
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- *	PROGRAM:		Virtual Data Manager
- *	MODULE:			JString.cpp
- *	DESCRIPTION:	Transportable flexible string
- *
- * copyright (c) 1997 - 2000 by James A. Starkey for IBPhoenix.
- */
-
-#include <memory.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include "JString.h"
-//#include "WString.h"
-
-
-#define ISLOWER(c)			(c >= 'a' && c <= 'z')
-#define UPPER(c)			((ISLOWER (c)) ? c - 'a' + 'A' : c)
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char THIS_FILE[]=__FILE__;
-#endif
-
-
-JString::JString ()
-{
-/**************************************
- *
- *		J S t r i n g
- *
- **************************************
- *
- * Functional description
- *		Initialize string object.
- *
- **************************************/
-
-string = NULL;
-}
-
-JString::JString (const char *stuff)
-{
-/**************************************
- *
- *		J S t r i n g
- *
- **************************************
- *
- * Functional description
- *		Initialize string object.
- *
- **************************************/
-
-string = NULL;
-setString (stuff);
-}
-
-JString::JString (const JString& source)
-{
-/**************************************
- *
- *		J S t r i n g
- *
- **************************************
- *
- * Functional description
- *		Copy constructor.
- *
- **************************************/
-
-if (string = source.string)
-	++(string [-1]);
-}
-
-JString::~JString ()
-{
-/**************************************
- *
- *		~ J S t r i n g
- *
- **************************************
- *
- * Functional description
- *		Initialize string object.
- *
- **************************************/
-
-release();
-}
-
-void JString::append (const char* stuff)
-{
-/**************************************
- *
- *		a p p e n d
- *
- **************************************
- *
- * Functional description
- *		Append string.
- *
- **************************************/
-
-if (!string)
-	{
-	setString (stuff);
-	return;
-	}
-
-int l1 = strlen (string);
-int	l2 = strlen (stuff);
-char *temp = new char [l1 + l2 + 2];
-*temp++ = 1;
-
-memcpy (temp, string, l1);
-memcpy (temp + l1, stuff, l2);
-temp [l1 + l2] = 0;
-release();
-string = temp;
-}
-
-void JString::setString (const char* stuff)
-{
-/**************************************
- *
- *		s e t S t r i n g
- *
- **************************************
- *
- * Functional description
- *		Append string.
- *
- **************************************/
-
-//release();
-
-if (stuff)
-	setString (stuff, strlen (stuff));
-else
-	release();
-}
-
-void JString::Format (const char* stuff, ...)
-{
-/**************************************
- *
- *		f o r m a t
- *
- **************************************
- *
- * Functional description
- *		Append string.
- *
- **************************************/
-va_list	args;
-va_start (args, stuff);
-char	temp [1024];
-
-vsprintf (temp, stuff, args);
-setString (temp);
-}
-
-const char* JString::getString()
-{
-/**************************************
- *
- *		g e t S t r i n g
- *
- **************************************
- *
- * Functional description
- *		Append string.
- *
- **************************************/
-
-return (string) ? string : "";
-}
-
-JString::operator const char* ()
-{
-/**************************************
- *
- *		o p e r a t o r   c h a r *
- *
- **************************************
- *
- * Functional description
- *		Return string as string.
- *
- **************************************/
-
-return (string) ? string : "";
-}
-
-JString& JString::operator = (const char *stuff)
-{
-/**************************************
- *
- *		o p e r a t o r   c h a r =
- *
- **************************************
- *
- * Functional description
- *		Return string as string.
- *
- **************************************/
-
-setString (stuff);
-
-return *this;
-}
-
-JString& JString::operator = (const JString& source)
-{
-/**************************************
- *
- *		o p e r a t o r   c h a r =
- *
- **************************************
- *
- * Functional description
- *		Return string as string.
- *
- **************************************/
-
-//assign (source.string);
-release();
-
-if (string = source.string)
-    ++(string [-1]);
-
-return *this;
-}
-
-JString& JString::operator+= (const char *stuff)
-{
-/**************************************
- *
- *		o p e r a t o r   c h a r + =
- *
- **************************************
- *
- * Functional description
- *		Return string as string.
- *
- **************************************/
-
-append (stuff);
-
-return *this;
-}
-
-JString& JString::operator+= (const JString& string)
-{
-/**************************************
- *
- *		o p e r a t o r   c h a r + =
- *
- **************************************
- *
- * Functional description
- *		Return string as string.
- *
- **************************************/
-
-append (string.string);
-
-return *this;
-}
-
-JString operator + (const JString& string1, const char *string2)
-{
-/**************************************
- *
- *		o p e r a t o r   c h a r +
- *
- **************************************
- *
- * Functional description
- *		Return string as string.
- *
- **************************************/
-JString	s = string1;
-
-s.append (string2);
-
-return s;
-}
-
-void JString::release ()
-{
-/**************************************
- *
- *		r e s e t
- *
- **************************************
- *
- * Functional description
- *		Clean out string.
- *
- **************************************/
-
-if (!string)
-	return;
-
---string;
-
-if (--string [0] == 0)
-	delete [] string;
-
-string = NULL;
-}
-
-bool JString::operator ==(const char * stuff)
-{
-	if (string)
-		return strcmp (string, stuff) == 0;
-
-	return strcmp ("", stuff) == 0;
-}
-
-bool JString::operator !=(const char * stuff)
-{
-	if (string)
-		return strcmp (string, stuff) != 0;
-
-	return strcmp ("", stuff) != 0;
-}
-
-/***
-bool JString::operator !=(const char * string)
-{
-	return strcmp (start, string) != 0;
-}
-***/
-
-/***
-void JString::set(int length, const char * stuff)
-{
-	release();
-	string = new char [length + 2];
-	*string++ = 1;
-	strncpy (string, stuff, length);
-	string [length] = 0;
-}
-***/
-
-JString JString::before(char c)
-{
-	const char *p;
-
-	for (p = string; *p && *p != c;)
-		++p;
-
-	if (!*p)
-		return *this;
-
-	JString stuff;
-	stuff.setString (string, p - string);
-
-	return stuff;
-}
-
-const char* JString::after(char c)
-{
-	const char *p;
-
-	for (p = string; *p && *p++ != c;)
-		;
-
-	return p;
-}
-
-bool JString::IsEmpty()
-{
-return !string || !string [0];
-}
-
-int JString::hash(const char * string, int tableSize)
-{
-	int	value = 0, c;
-
-	while (c = (unsigned) *string++)
-		{
-		if (ISLOWER (c))
-			c -= 'a' - 'A';
-		value = value * 11 + c;
-		}
-
-	if (value < 0)
-		value = -value;
-
-	return value % tableSize;
-}
-
-int JString::hash(int tableSize)
-{
-	if (!string)
-		return 0;
-
-	return hash (string, tableSize);
-}
-
-/***
-JString::JString(const WCHAR * wString, int len)
-{
-	string = NULL;
-	setString (wString, len);
-}
-
-void JString::setString(const WCHAR * wString, int len)
-{
-	release();
-	string = new char [len + 2];
-	*string++ = 1;
-
-	for (int n = 0; n < len; ++n)
-		string [n] = (char) wString [n];
-
-	string [len] = 0;
-}
-
-JString::JString(const WCHAR * wString)
-{
-	string = NULL;
-	setString (wString, WString::length (wString));
-}
-
-JString& JString::operator =(const WCHAR * wString)
-{
-	setString (wString, WString::length (wString));
-
-	return *this;
-}
-***/
-
-void JString::setString(const char * source, int length)
-{
-	release();
-	string = new char [length + 2];
-	*string++ = 1;
-	memcpy (string, source, length);
-	string [length] = 0;
-}
-
-int JString::findSubstring(const char * string, const char * sub)
-{
-    for (const char *p = string; *p; ++p)
-		{
-		const char *s, *q;
-		for (q = p, s = sub; *s && *q == *s; ++s, ++q)
-			;
-		if (!*s)
-			return p - string;
-		}
-
-	return -1;
-}
-
-JString JString::upcase(const char * source)
-{
-	JString string;
-	int len = strlen (source);
-	string.alloc (len);
-	
-	for (int n = 0; n < len; ++n)
-		{
-		char c = source [n];
-		string.string [n] = UPPER (c);
-		}
-
-	return string;
-}
-
-void JString::alloc(int length)
-{
-	release();
-	string = new char [length + 2];
-	*string++ = 1;
-	string [length] = 0;
-}
-
-bool JString::equalsNoCase(const char * string2)
-{
-	if (!string)
-		return string2 [0] == 0;
-
-	const char *p;
-
-	for (p = string; *p && *string2; ++p, ++string2)
-		if (UPPER (*p) != UPPER (*string2))
-			return false;
-
-	return *p == *string2;
-}
-
-int JString::length()
-{
-	if (!string)
-		return 0;
-
-	const char *p;
-
-	for (p = string; *p; ++p)
-		;
-
-	return p - string;
-}
-
-JString::JString(const char * source, int length)
-{
-	string = NULL;
-	setString (source, length);
-}
-
-char* JString::getBuffer(int length)
-{
-	alloc (length);
-
-	return string;
-}
-
-void JString::releaseBuffer()
-{
-
-}
diff --git a/Test/JString.h b/Test/JString.h
deleted file mode 100644
index 4a1ba3ea..00000000
--- a/Test/JString.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *	PROGRAM:		Virtual Data Manager
- *	MODULE:			JString.h
- *	DESCRIPTION:	Transportable flexible string
- *
- * copyright (c) 1997 - 2000 by James A. Starkey for IBPhoenix.
- */
-
-#ifndef __JString_H
-#define __JString_H
-
-#define ALLOC_FUDGE		100
-
-/***
-#ifndef __ENGINE_H
-#ifdef ENGINE
-typedef unsigned short	WCHAR;
-#else
-#include <wchar.h>
-typedef wchar_t			WCHAR;
-#endif
-#endif
-***/
-
-class JString 
-{
-public:
-	void releaseBuffer ();
-	char* getBuffer (int length);
-	 JString (const char *source, int length);
-	int length();
-	bool equalsNoCase (const char *string2);
-	static JString upcase (const char *source);
-	static int findSubstring (const char *string, const char *sub);
-	//JString& operator = (const WCHAR *wString);
-	// JString (const WCHAR *wString);
-	int hash (int tableSize);
-	static int hash (const char *string, int tableSize);
-	bool IsEmpty();
-	const char* after (char c);
-	JString before (char c);
-	//void set (int length, const char *stuff);
-	bool operator == (const char *string);
-	bool operator != (const char *stuff);
-
-	//JString (const WCHAR *wString, int len);
-	JString();
-	JString (const char *string);
-	JString(const JString& stringSrc);
-	~JString();
-	
-	void		append (const char*);
-	void		setString (const char*);
-	//void		setString (const WCHAR *wString, int len);
-	void		setString (const char *source, int length);
-
-	void		Format (const char*, ...);
-	const char	*getString();
-	operator const char*();
-	JString& operator = (const char *string);
-	JString& operator = (const JString& string);
-	JString& operator+=(const char *string);
-	JString& operator+=(const JString& string);
-
-	friend JString operator + (const JString& string1, const char* string2);
-
-protected:
-	void	alloc (int length);
-	void	release();
-
-	char	*string;
-};
-
-
-#endif
-
diff --git a/Test/LinkedList.cpp b/Test/LinkedList.cpp
deleted file mode 100644
index af648d3a..00000000
--- a/Test/LinkedList.cpp
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
- *	PROGRAM:		Virtual Data Manager
- *	MODULE:			LinkedList.c
- *	DESCRIPTION:	Generic Linked List
- *
- * copyright (c) 1997 by James A. Starkey for IBPhoenix.
- */
-
-#include <stdio.h>
-//#include "Engine.h"
-#include "LinkedList.h"
-
-#ifdef _DEBUG
-static char THIS_FILE[]=__FILE__;
-#endif
-
-/***
-    FOR_OBJECTS(type,child,list) 
-		{
-		for (LinkedList *pos=(list)->getHead();
-			  (list)->more (pos);)
-		    {
-			type child = (type) (list)->getNext (&pos);
-***/
-
-LinkedList::LinkedList ()
-{
-/**************************************
- *
- *		L i n k e d L i s t
- *
- **************************************
- *
- * Functional description
- *		Constructor for both nodes and list head.
- *
- **************************************/
-
-//addressCheck (this);
-
-next = prior = NULL;
-}
-
-LinkedList::~LinkedList ()
-{
-/**************************************
- *
- *		~ L i n k e d L i s t
- *
- **************************************
- *
- * Functional description
- *		Constructor for both nodes and list head.
- *
- **************************************/
-LinkedNode *node;
-
-//addressCheck (this);
-
-while (node = next)
-    {
-	next = node->next;
-	delete node;
-	}
-
-}
-
-LinkedNode::LinkedNode (void *obj)
-{
-/**************************************
- *
- *		L i n k e d N o d e
- *
- **************************************
- *
- * Functional description
- *		Constructor for both nodes and list head.
- *
- **************************************/
-
-object = obj;
-}
-
-LinkedNode::~LinkedNode ()
-{
-/**************************************
- *
- *		~ L i n k e d N o d e
- *
- **************************************
- *
- * Functional description
- *		Constructor for both nodes and list head.
- *
- **************************************/
-
-next = prior = NULL;
-}
-
-void LinkedList::append (void *object)
-{
-/**************************************
- *
- *		a p p e n d
- *
- **************************************
- *
- * Functional description
- *		Append object/node to list.
- *
- **************************************/
-
-LinkedNode *node = new LinkedNode (object);
-addressCheck (node);
-
-if (prior)
-    {
-	prior->next = node;
-	node->prior = prior;
-	}
-else
-	next = node;
-
-prior = node;
-}
-
-int LinkedList::appendUnique (void *object)
-{
-/**************************************
- *
- *		a p p e n d U n i q u e
- *
- **************************************
- *
- * Functional description
- *		Append object/node to list.
- *
- **************************************/
-int			n;
-LinkedNode	*node;
-
-for (node = next, n = 0; node; node = node->next, n++)
-    if (node->object == object)
-		return n;
-
-append (object);
-
-return n;
-}
-
-void LinkedList::clear ()
-{
-/**************************************
- *
- *		c l e a r
- *
- **************************************
- *
- * Functional description
- *		Delete all elements of list.
- *
- **************************************/
-LinkedNode	*node;
-
-while (node = next)
-    {
-	next = node->next;
-	delete node;
-	}
-
-prior = NULL;
-}
-
-int LinkedList::count ()
-{
-/**************************************
- *
- *		c o u n t
- *
- **************************************
- *
- * Functional description
- *		Count nodes.
- *
- **************************************/
-int	n = 0;
-
-for (LinkedList *node = next; node; node = node->next)
-    ++n;
-
-return n;
-}
-
-bool LinkedList::deleteItem (void *object)
-{
-/**************************************
- *
- *		d e l e t e I t e m
- *
- **************************************
- *
- * Functional description
- *		Delete node from linked list.  Return true is the item
- *		was on the list, otherwise return false.
- *
- **************************************/
-
-for (LinkedNode *node = next; node; node = node->next)
-    if (node->object == object)
-		{
-		if (node->prior)
-			node->prior->next = node->next;
-		else
-			next = node->next;
-		if (node->next)
-			node->next->prior = node->prior;
-		else
-			prior = node->prior;
-		delete node;
-		return true;
-		}
-
-return false;
-}
-
-void *LinkedList::getElement (int position)
-{
-/**************************************
- *
- *		g e t E l e m e n t
- *
- **************************************
- *
- * Functional description
- *		Get element in list by position.
- *
- **************************************/
-int			n;
-LinkedNode	*node;
-
-for (node = next, n = 0; node; node = node->next, ++n)
-	if (n == position)
-		return node->object;
-
-return NULL;
-}
-
-#ifdef UNDEF
-LinkedList *LinkedList::getHead ()
-{
-/**************************************
- *
- *		g e t H e a d
- *
- **************************************
- *
- * Functional description
- *		Get first list node; used for iterating.
- *
- **************************************/
-
-return next;
-}
-
-void *LinkedList::getNext (LinkedList **node)
-{
-/**************************************
- *
- *		g e t N e x t
- *
- **************************************
- *
- * Functional description
- *		Return object of current node; advance pointer.
- *
- **************************************/
-
-void *object = ((LinkedNode*)(*node))->object;
-*node = (*node)->next;
-
-return object;
-}
-#endif
-
-void *LinkedList::getPrior (LinkedList **node)
-{
-/**************************************
- *
- *		g e t P r i o r
- *
- **************************************
- *
- * Functional description
- *		Return object of current node; advance pointer.
- *
- **************************************/
-//void	*object;
-
-LinkedNode *n = (*node)->prior;
-*node = n;
-//*node = (*node)->prior;
-//object = (*node)->object;
-
-return n->object;
-}
-
-LinkedList *LinkedList::getTail ()
-{
-/**************************************
- *
- *		g e t T a i l
- *
- **************************************
- *
- * Functional description
- *		Get last list node; used for iterating.
- *
- **************************************/
-
-return this;
-}
-
-bool LinkedList::isEmpty ()
-{
-/**************************************
- *
- *		i s E m p t y
- *
- **************************************
- *
- * Functional description
- *		Return whether iteration has more members to go.
- *
- **************************************/
-
-return next == NULL;
-}
-
-bool LinkedList::isMember (void *object)
-{
-/**************************************
- *
- *		i s M e m b e r
- *
- **************************************
- *
- * Functional description
- *		Is object in list?
- *
- **************************************/
-
-for (LinkedNode *node = next; node; node = node->next)
-    if (node->object == object)
-		return 1;
-
-return 0;
-}
-
-#ifdef UNDEF
-bool LinkedList::more (LinkedList *node)
-{
-/**************************************
- *
- *		m o r e
- *
- **************************************
- *
- * Functional description
- *		Return whether iteration has more members to go.
- *
- **************************************/
-
-return (node != NULL);
-}
-#endif
-
-bool LinkedList::moreBackwards (LinkedList *node)
-{
-/**************************************
- *
- *		m o r e B a c k w a r d s
- *
- **************************************
- *
- * Functional description
- *		Return whether iteration has more members to go.
- *
- **************************************/
-
-return (node->prior != NULL);
-}
-
-bool LinkedList::insertBefore(void * insertItem, void * item)
-{
-/**************************************
- *
- *		i n s e r t B e f o r e
- *
- **************************************
- *
- * Functional description
- *		Add item in middle of list.
- *
- **************************************/
-
-for (LinkedNode *node = next; node; node = node->next)
-    if (node->object == item)
-		{
-		LinkedNode *insert = new LinkedNode (insertItem);
-		if (insert->prior = node->prior)
-			insert->prior->next = insert;
-		else
-			next = insert;
-		node->prior = insert;
-		insert->next = node;
-		return true;
-		}
-
-return false;
-}
-
-void LinkedList::addressCheck(void * address)
-{
-
-	if ((long) address == 0x00CDE290 ||
-		(long) address == 0x00cdde70)
-		printf ("hit %x\n", address);
-}
diff --git a/Test/LinkedList.h b/Test/LinkedList.h
deleted file mode 100644
index 8f1aa7ba..00000000
--- a/Test/LinkedList.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *	PROGRAM:		Virtual Data Manager
- *	MODULE:			LinkedList.h
- *	DESCRIPTION:	Generic Linked List
- *
- * copyright (c) 1997 by James A. Starkey for IBPhoenix.
- */
-
-#ifndef __LINKEDLIST_H
-#define __LINKEDLIST_H
-
-#define FOR_OBJECTS(type,child,list) {for (LinkedList *pos=(list)->getHead();(list)->more (pos);){ type child = (type) (list)->getNext (&pos);
-#define FOR_OBJECTS_BACKWARD(type,child,list) {for (LinkedList *pos=(list)->getTail();(list)->moreBackwards (pos);){ type child = (type) (list)->getPrior (&pos);
-#define END_FOR						 }}
-
-#ifndef NULL
-#define NULL	0
-#endif
-
-class LinkedNode;
-
-class LinkedList
-    {
-	public:
-		void addressCheck (void *address);
-		bool insertBefore (void *insertItem, void *item);
-
-	LinkedList();
-	~LinkedList();
-
-	void		append (void *object);
-	int			appendUnique (void *object);
-	void		clear();
-	int			count ();
-	bool		deleteItem (void* object);
-
-	LinkedList	*getHead ();
-	bool		more (LinkedList *node);
-	void		*getNext(LinkedList **node);
-
-	LinkedList	*getTail ();
-	void		*getElement (int position);
-	void		*getPrior(LinkedList**);
-	bool		isEmpty();
-	bool		isMember (void *object);
-	
-	bool		moreBackwards (LinkedList*);
-
-	protected:
-	
-	LinkedNode		*next, *prior;
-	//void			*object;
-	};
-
-class LinkedNode : public LinkedList {
-	public:
-
-	LinkedNode (void *object);
-    ~LinkedNode();
-
-	void			*object;
-	};
-
-inline LinkedList *LinkedList::getHead ()
-	{
-	return (LinkedList*) next;
-	}
-
-inline bool	LinkedList::more (LinkedList *node)
-	{
-	return (node != NULL);
-	}
-
-inline void	*LinkedList::getNext(LinkedList **node)
-	{
-	void *object = ((LinkedNode*)(*node))->object;
-	*node = (*node)->next;
-
-	return object;
-	}
-
-
-#endif
-
diff --git a/Test/NetfraDatabase.cpp b/Test/NetfraDatabase.cpp
deleted file mode 100644
index d21629e8..00000000
--- a/Test/NetfraDatabase.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-// NetfraDatabase.cpp: implementation of the NetfraDatabase class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#include "stdafx.h"
-//#include "MCET.h"
-#include "NetfraDatabase.h"
-#include "Connection.h"
-//#include "ConnectDialog.h"
-//#include "CreateDialog.h"
-#include "SQLException.h"
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char THIS_FILE[]=__FILE__;
-#define new DEBUG_NEW
-#endif
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-NetfraDatabase::NetfraDatabase()
-{
-	connection = NULL;
-	savePassword = false;
-}
-
-NetfraDatabase::~NetfraDatabase()
-{
-	if (connection)
-		connection->close();	
-}
-
-void NetfraDatabase::Serialize(CArchive & ar)
-{
-	if (ar.IsStoring())
-		{
-		ar << connectString;
-		ar << account;
-		ar << savePassword;
-		if (savePassword)
-			ar << password;
-		ar << schema;
-		}
-	else
-		{
-		ar >> connectString;
-		ar >> account;
-		ar >> savePassword;
-		if (savePassword)
-			ar >> password;
-		ar >> schema;
-		attach();
-		}
-}
-
-void NetfraDatabase::attach()
-{
-	if (connection)
-		{
-		connection->close();
-		connection = NULL;
-		}
-
-	for (;; savePassword = false)
-		{
-		/***
-		if (!savePassword)
-			{
-			CConnectDialog dialog;
-			dialog.m_connect_string = connectString;
-			dialog.m_account = account;
-			dialog.m_schema = schema;
-			if (dialog.DoModal() != IDOK)
-				return;
-			connectString = dialog.m_connect_string;
-			account = dialog.m_account;
-			schema = dialog.m_schema;
-			password = dialog.m_password;
-			savePassword = dialog.m_save_passwd;
-			}
-		***/
-		try
-			{
-			connection = createConnection();
-			connection->openDatabase (connectString, account, password);
-			CString sql = "alter namespace push " + schema;
-			executeUpdate (sql);
-			return;
-			}
-		catch (SQLException& exception)
-			{
-			AfxMessageBox (exception.getText());
-			}
-		}
-}
-
-void NetfraDatabase::executeUpdate (const char * sql)
-{
-	Statement *statement = connection->createStatement();
-	statement->executeUpdate (sql);
-	statement->close();
-}
-
-void NetfraDatabase::findDatabase()
-{
-	/***
-	CConnectDialog dialog;
-	dialog.m_connect_string = connectString;
-	dialog.m_account = account;
-	dialog.m_schema = schema;
-
-	if (dialog.DoModal() == IDOK)
-		{
-		if (connection)
-			connection->close();
-		connection = createConnection();
-		connection->openDatabase (dialog.m_connect_string, dialog.m_account, dialog.m_password);
-		connectString = dialog.m_connect_string;
-		account = dialog.m_account;
-		password = dialog.m_password;
-		schema = dialog.m_schema;
-		savePassword = dialog.m_save_passwd;
-		}
-	***/
-	savePassword = false;
-	attach();
-}
-
-void NetfraDatabase::createDatabase()
-{
-	/***
-	CCreateDialog dialog;
-
-	if (dialog.DoModal() == IDOK)
-		{
-		if (connection)
-			connection->close();
-		try
-			{
-			connection = createConnection();
-			connection->createDatabase (dialog.m_host_name, dialog.m_database_name, dialog.m_file_name,
-										dialog.m_account, dialog.m_password);
-			connectString = dialog.m_database_name + "@" + dialog.m_host_name;
-			account = dialog.m_account;
-			password = dialog.m_password;
-			schema = dialog.m_schema;
-			savePassword = dialog.m_save_password;
-			CString sql = "alter namespace push " + schema;
-			executeUpdate (sql);
-			}
-		catch (SQLException *exception)
-			{
-			AfxMessageBox (exception->getText());
-			delete exception;
-			}
-		}
-	***/
-
-}
-
-void NetfraDatabase::commit()
-{
-	connection->commit();
-}
-
-void NetfraDatabase::rollback()
-{
-	connection->rollback();
-}
diff --git a/Test/NetfraDatabase.h b/Test/NetfraDatabase.h
deleted file mode 100644
index 9f09ecf2..00000000
--- a/Test/NetfraDatabase.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// NetfraDatabase.h: interface for the NetfraDatabase class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_NETFRADATABASE_H__CBD41C52_EAEA_11D3_98D6_0000C01D2301__INCLUDED_)
-#define AFX_NETFRADATABASE_H__CBD41C52_EAEA_11D3_98D6_0000C01D2301__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-class Connection;
-
-class NetfraDatabase  
-{
-public:
-	void rollback();
-	void commit();
-	void createDatabase();
-	void findDatabase();
-	void executeUpdate (const char *sql);
-	void attach();
-	void Serialize(CArchive& ar);
-	NetfraDatabase();
-	virtual ~NetfraDatabase();
-
-	Connection *connection;
-	CString		connectString;
-	CString		password;
-	CString		schema;
-	CString		account;
-	int			savePassword;
-};
-
-#endif // !defined(AFX_NETFRADATABASE_H__CBD41C52_EAEA_11D3_98D6_0000C01D2301__INCLUDED_)
diff --git a/Test/NetfraRemote.lib b/Test/NetfraRemote.lib
deleted file mode 100644
index 2fb8209b..00000000
Binary files a/Test/NetfraRemote.lib and /dev/null differ
diff --git a/Test/Odbc.cpp b/Test/Odbc.cpp
deleted file mode 100644
index 9f6442da..00000000
--- a/Test/Odbc.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *	PROGRAM:		Subschema Upgrade Utility
- *	MODULE:			Table.cpp
- *	DESCRIPTION:	Virtual Table class
- *
- * copyright (c) 1997 by James A. Starkey for IBPhoenix.
- */
-
-#ifdef _WIN32
-#include "stdafx.h"
-#endif
-
-#include <stdio.h>
-#include "JString.h"
-#include "Odbc.h"
-
-int		sw_verbose;
-int		sw_noUpdate;
-
-FILE	*logFile;
-
-int OdbcCheckCode (int retcode, SQLHANDLE handle, const char *string, int handleType)
-{
-/**************************************
- *
- *		O d b c C h e c k C o d e
- *
- **************************************
- *
- * Functional description
- *		Test driver.  Do something pretty ad hoc.
- *
- **************************************/
-UCHAR	sqlState [128], text [SQL_MAX_MESSAGE_LENGTH];
-SDWORD	nativeCode;
-SWORD	textLength;
-int		ok = false;
-char	temp [256];
-
-if (retcode == SQL_SUCCESS)
-    return true;
-
-JString message = string;
-
-if (retcode == SQL_SUCCESS_WITH_INFO)
-	message += " succeeded with information";
-else
-	message += " failed";
-
-for (int n = 1; n < 10; ++n)
-	{
-	text [0] = 0;
-	sqlState [0] = 0;
-	int ret = SQLGetDiagRec (handleType, handle, n, sqlState, &nativeCode, 
-					  text, sizeof (text) -1, &textLength);
-	if (ret < 0 || ret == SQL_NO_DATA_FOUND)
-		break;
-	sprintf (temp, "\n%s (%s)", sqlState, text);
-	message += temp;
-	if (!strcmp ((char*)sqlState, "22005"))
-		ok = true;
-	else if (!strcmp ((char*)sqlState, "22008"))
-		ok = true;
-	else if (!strcmp ((char*)sqlState, "NA000"))
-		ok = true;
-	//break;
-	}
-
-
-if (logFile)
-    fflush (logFile);
-printf ("%s\n", message.getString());
-
-#ifdef _WIN32
-OutputDebugString (message);
-OutputDebugString ("\n");
-#endif
-
-if (retcode == SQL_SUCCESS_WITH_INFO)
-	return true;
-
-return ok;
-}
diff --git a/Test/Odbc.h b/Test/Odbc.h
deleted file mode 100644
index 873229c0..00000000
--- a/Test/Odbc.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *	PROGRAM:		SQL Converter
- *	MODULE:			Odbc.h
- *	DESCRIPTION:	Help ODBC function declarations
- *
- * copyright (c) 1997 by James A. Starkey for IBPhoenix.
- */
-
-#ifdef _WIN32
-#include <afxdb.h>
-#else
-#include <sql.h>
-#include <sqlext.h>
-//#define OutputDebugString	puts
-#endif
-
-#define GET_STRING(stmt,col,data,len) OdbcCheckCode (SQLGetData(stmt, col, SQL_C_CHAR, data, sizeof (data), &len), stmt, "SQLGetData")
-#define GET_LONG(stmt,col,data,len)   OdbcCheckCode (SQLGetData(stmt, col, SQL_C_SLONG, &data, sizeof (data), &len), stmt, "SQLGetData")
-
-#define BIND_STRING(stmt,col,data,len) OdbcCheckCode (SQLBindCol(stmt, col, SQL_C_CHAR, data, sizeof (data), &len), stmt, "SQLBindData")
-#define BIND_LONG(stmt,col,data,len)   OdbcCheckCode (SQLBindCol(stmt, col, SQL_C_SLONG, &data, sizeof (data), &len), stmt, "SQLBindData")
-
-int OdbcCheckCode (int retcode, SQLHANDLE statement, const char *string, int handleType=SQL_HANDLE_STMT);
-
-/***
-void OdbcExecute (CDatabase*, const char* sql);
-int OdbcTableEmpty (CDatabase*, const char* tableName);
-***/
diff --git a/Test/Print.cpp b/Test/Print.cpp
deleted file mode 100644
index 54aaa2d6..00000000
--- a/Test/Print.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-// Print.cpp: implementation of the Print class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include "Odbc.h"
-#include "Print.h"
-
-#define MAX_COLUMN_LENGTH	26
-#define MAX(a,b)		((a) >= (b) ? (a) : (b))
-#define MIN(a,b)		((a) <= (b) ? (a) : (b))
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-Print::Print(HSTMT statementHandle)
-{
-	statement = statementHandle;
-	columns = NULL;
-	buffer = NULL;
-}
-
-Print::~Print()
-{
-	reset();
-}
-
-void Print::printHeaders()
-{
-	getDescription();
-
-	char *p = buffer;
-	Column *column, *end = columns + numberColumns;
-
-	for (column = columns; column < end; ++column)
-		{
-		char *start = buffer + column->offset + (column->length - column->headerLength) / 2;
-		while (p < start)
-			*p++ = ' ';
-		for (const char *q = column->name; *q;)
-			*p++ = *q++;
-		}
-
-	*p = 0;
-	p = buffer;
-	printf ("%s\n", buffer);
-
-	for (column = columns; column < end; ++column)
-		{
-		char *start = buffer + column->offset;
-		while (p < start)
-			*p++ = ' ';
-		for (int n = 0; n < column->length; ++n)
-			*p++ = '=';
-		}
-
-	*p = 0;
-	printf ("%s\n\n", buffer);
-}
-
-void Print::printLine()
-{
-	char *p = buffer;
-	Column *column = columns;
-
-	for (int n = 1; n <= numberColumns; ++n, ++column)
-		{
-		char *start = buffer + column->offset + (column->length - column->precision) / 2;
-		while (p < start)
-			*p++ = ' ';
-		SDWORD length;
-		*p = 0;
-		int retcode = SQLGetData (statement, n, SQL_C_CHAR, p, column->precision + 1, &length);
-		if (!OdbcCheckCode (retcode, statement, "SQLGetData"))
-			return;
-		while (*p)
-			++p;
-		}
-
-	*p = 0;
-	printf ("%s\n", buffer);
-}
-
-void Print::getDescription()
-{
-	reset();
-	SWORD	count;
-
-	RETCODE retcode = SQLNumResultCols (statement, &count);
-
-	if (!OdbcCheckCode (retcode, statement, "SQLNumResultCols"))
-		return;
-
-	numberColumns = count;
-	columns = new Column [numberColumns];
-	Column *column = columns;
-	int offset = 0;
-
-	for (int n = 1; n <= numberColumns; ++n, ++column)
-		{
-		SWORD nameLength,
-		retcode = SQLDescribeCol (statement, n, 
-					  (UCHAR*) column->name, sizeof (column->name), &nameLength,
-					  &column->sqlType, 
-					  &column->precision, 
-					  &column->scale, 
-					  &column->nullable);
-		if (!OdbcCheckCode (retcode, statement, "SQLDescribeCol"))
-			return;
-		if (column->precision > MAX_COLUMN_LENGTH)
-			column->precision = MAX_COLUMN_LENGTH;
-		column->offset = offset;
-		column->headerLength = strlen (column->name);
-		column->length = MAX ((int) column->precision, column->headerLength);
-		offset += column->length + 1;
-		}
-
-	buffer = new char [offset + 1];
-}
-
-void Print::reset()
-{
-	if (columns)
-		{
-		delete [] columns;
-		columns = NULL;
-		}
-
-	if (buffer)
-		{
-		delete [] buffer;
-		buffer = NULL;
-		}
-}
-
-void Print::skip()
-{
-	printf ("\n");
-}
-
-void Print::execute()
-{
-	int ret = SQLExecute (statement);
-
-	if (!OdbcCheckCode (ret, statement, "SQLExecute"))
-		return;
-
-	printAll();
-}
-
-void Print::printAll()
-{
-	printHeaders();
-
-	for (;;)
-		{
-		int retcode = SQLFetch (statement);
-		if (retcode == SQL_NO_DATA_FOUND)
-			break;
-		if (!OdbcCheckCode (retcode, statement, "SQLFetch"))
-			break;
-		printLine();
-		}
-}
diff --git a/Test/Print.h b/Test/Print.h
deleted file mode 100644
index 51999abc..00000000
--- a/Test/Print.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Print.h: interface for the Print class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_PRINT_H__34310C02_2C14_11D4_98E0_0000C01D2301__INCLUDED_)
-#define AFX_PRINT_H__34310C02_2C14_11D4_98E0_0000C01D2301__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-struct Column
-{
-	char	name [32];
-	SWORD	sqlType;
-	DWORD	precision;
-	SWORD	scale;
-	SWORD	nullable;
-	int		length;					// max (column name, precision)
-	int		headerLength;
-	int		offset;					// offset in print line
-public:
-	void reset();
-};
-
-class Print  
-{
-public:
-	void printAll();
-	void execute();
-	void skip();
-	void reset();
-	void getDescription();
-	void printLine();
-	void printHeaders();
-	Print(HSTMT statementHandle);
-	virtual ~Print();
-
-	HSTMT	statement;
-	int		numberColumns;
-	Column	*columns;
-	char	*buffer;
-};
-
-#endif // !defined(AFX_PRINT_H__34310C02_2C14_11D4_98E0_0000C01D2301__INCLUDED_)
diff --git a/Test/RString.cpp b/Test/RString.cpp
deleted file mode 100644
index c186187b..00000000
--- a/Test/RString.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-// RString.cpp: implementation of the CRString class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include "stdafx.h"
-//#include "Map.h"
-#include "RString.h"
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char THIS_FILE[]=__FILE__;
-#define new DEBUG_NEW
-#endif
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-CRString::CRString()
-{
-	repeat = NULL;
-}
-
-CRString::~CRString()
-{
-	CRepeat *next;
-
-	while (next = repeat)
-		{
-		repeat = next->next;
-		delete next;
-		}
-}
-
-CRString::CRString(const char *string) : CString (string)
-{
-	repeat = NULL;
-}
-
-void CRString::replace(const char * pattern, const char * text)
-{
-	CRString string;
-	const char *t, *q, *start = *this, *startOfLine = start;
-
-	for (; *start;)
-		{
-		// Look for a pattern string or end of source string
-		for (const char *p = start; *p; ++p)
-			{
-			if (*p == '\n')
-				startOfLine = p + 1;
-			if (*p == pattern [0])
-				{
-				for (q = p + 1, t = pattern + 1; *t && *t == *q; ++t, ++q)
-					;
-				if (!*t)
-					break;
-				}
-			}
-		// Append everything up to pattern or end to output string
-		string.ConcatInPlace (p - start, start);
-		if (!*p)
-			break;
-		// We've got a substitution -- prepare indentation string, if necessary
-		CString indent;// (startOfLine, p - startOfLine);
-		for (t = startOfLine; t < p; ++t)
-			indent += (*t == '\t') ? *t : ' ';
-		start = q;
-		for (t = text; *t;)
-			{
-			for (q = t; *q && *q != '\n' && *q != '\r'; ++q)
-				;
-			if (*q == '\n')
-				{
-				++q;
-				string.ConcatInPlace (q - t, t);
-				string += indent;
-				}
-			else if (*q == '\r')
-				{
-				++q;
-				string.ConcatInPlace (q - t - 1, t);
-				string += '\n';
-				//string += indent;
-				}
-			else
-				string.ConcatInPlace (q - t, t);
-			t = q;
-			}
-		}
-
-	//*this = (const char*) string;
-	CRepeat *rpt = repeat;
-	*this = (CString) string;
-	repeat = rpt;
-}
-
-CRString::CRString(CString string) : CString (string)
-{
-	repeat = NULL;
-}
-
-void CRString::replace(const char * pattern, int value)
-{
-	char buffer [16];
-	sprintf (buffer, "%d", value);
-	replace (pattern, buffer);
-}
-
-CString CRString::getCRLFstring()
-{
-	CRString string;
-	const char *start = *this;
-
-	for (; *start;)
-		{
-		for (const char *p = start; *p && *p != '\n'; ++p)
-			;
-		// Append everything up to pattern or end to output string
-		string.ConcatInPlace (p - start, start);
-		if (!*p)
-			break;
-		string += "\r\n";
-		start = p + 1;
-		}
-
-	return string;
-}
-
-CString CRString::getCRstring()
-{
-	CRString string;
-	const char *start = *this;
-
-	for (; *start;)
-		{
-		for (const char *p = start; *p && !(p [0] == '\r' && p [1] == '\n'); ++p)
-			;
-		// Append everything up to pattern or end to output string
-		string.ConcatInPlace (p - start, start);
-		if (!*p)
-			break;
-		string += '\n';
-		start = p + 2;
-		}
-
-	return string;
-}
-
-const char* CRString::apply()
-{
-	CRepeat *next;
-
-	while (next = repeat)
-		{
-		repeat = next->next;
-		replace (next->pattern, next->string);
-		delete next;
-		}
-
-	return *this;
-}
-
-CRString::CRepeat::CRepeat(CRepeat *prior, const char *pat, const char *what)
-{
-	next = prior;
-	pattern = pat;
-	string = what;
-}
-
-void CRString::CRepeat::append(const char *what, const char *separator)
-{
-	if (string != "")
-		string += separator;
-
-	string += what;
-}
-
-void CRString::append(const char * pattern, const char * string, const char * separator)
-{
-	for (CRepeat *next = repeat; next; next = next->next)
-		if (next->pattern == pattern)
-			{
-			next->append (string, separator);
-			return;
-			}
-
-	repeat = new CRepeat (repeat, pattern, string);
-}
diff --git a/Test/RString.h b/Test/RString.h
deleted file mode 100644
index e9347670..00000000
--- a/Test/RString.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// RString.h: interface for the CRString class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_RSTRING_H__11F793EC_AF83_11D1_AB1B_0000C01D2301__INCLUDED_)
-#define AFX_RSTRING_H__11F793EC_AF83_11D1_AB1B_0000C01D2301__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-class CRString : public CString  
-{
-	class CRepeat
-		{
-		public:
-			void append (const char *what, const char *separator);
-			CRepeat(CRepeat *prior, const char *pattern, const char *what);
-			CString pattern;
-			CString string;
-			CRepeat	*next;
-		};
-			
-public:
-	void append (const char *pattern, const char *string, const char *separator = "");
-	const char* apply();
-	CString getCRstring();
-	CString getCRLFstring();
-	void replace (const char* pattern, int value);
-	 CRString (CString string);
-	void replace (const char* pattern, const char* text);
-	 CRString (const char*);
-	CRString();
-	virtual ~CRString();
-	CRepeat	*repeat;
-};
-
-#endif // !defined(AFX_RSTRING_H__11F793EC_AF83_11D1_AB1B_0000C01D2301__INCLUDED_)
diff --git a/Test/SimpleTest.cpp b/Test/SimpleTest.cpp
deleted file mode 100644
index b59e330e..00000000
--- a/Test/SimpleTest.cpp
+++ /dev/null
@@ -1,577 +0,0 @@
-#include <stdio.h>
-#include "Odbc.h"
-#include "Print.h"
-
-
-static HENV env;
-static SQLHWND hWnd;
-
-static HDBC testConnect (const char *);
-static void test1 (HDBC);
-static void test2 (HDBC);
-static void test3 (HDBC);
-static void test4 (HDBC);
-static void test5 (HDBC);
-static void test6 (HDBC);
-static void test7 (HDBC);
-static void test8 (HDBC);
-static void testDisconnect (HDBC);
-
-
-int main (int argc, const char **argv)
-    {
-    const char **end = argv + argc;
-//    const char *connectString = "ODBC;DSN=FireBirdOdbc;DRIVER=OdbcJdbc;ROLE=cinnamon";
-    const char *connectString = "DSN=FireBirdOdbc";
-
-    for (++argv; argv < end;)
-        {
-        const char *p = *argv++;
-        if (p [0] == '-')
-            switch (p [1])
-                {
-                case 'i':
-                    //install();
-                    break;
-
-                case 'c':
-                    connectString = *argv++;
-                    break;
-
-                default:
-                    printf ("Don't understand switch '%s'\n", p);
-                    return 1;
-                }
-        }
-    if (HDBC connection = testConnect (connectString))
-	{
-	test1 (connection);
-//	test2 (connection);
-//	test3 (connection);
-//	test4 (connection);
-//	test5 (connection);
-//	test6 (connection);
-	test7 (connection);
-//	test8 (connection);
-
-	testDisconnect (connection);
-	}
-
-    return 0;
-    }
-
-
-
-HDBC testConnect (const char *connectString)
-    {
-    int ret = SQLAllocHandle (SQL_HANDLE_ENV, NULL, &env);
-    ret = SQLSetEnvAttr (env, SQL_ATTR_ODBC_VERSION, (SQLPOINTER) SQL_OV_ODBC3, SQL_IS_UINTEGER);
-    if (!OdbcCheckCode (ret, env, "SQLSetEnvAttr", SQL_HANDLE_ENV))
-        return NULL;
-
-    HDBC connection;
-    ret = SQLAllocHandle (SQL_HANDLE_DBC, env, &connection);
-    if (!OdbcCheckCode (ret, env, "SQLAllocHandle", SQL_HANDLE_ENV))
-        return NULL;
-
-    //ret = SQLAllocConnect (env, &connection);
-    ret = SQLSetConnectAttr (connection, SQL_ATTR_ODBC_CURSORS, (SQLPOINTER) SQL_CUR_USE_ODBC, 0);
-    if (!OdbcCheckCode (ret, connection, "SQLConnectAttr", SQL_HANDLE_DBC))
-        return NULL;
-    
-    UCHAR buffer [128];
-    SWORD bufferLength;
-    ret = SQLDriverConnect (connection, hWnd, 
-                            (UCHAR*) connectString, SQL_NTS,
-                            buffer, sizeof (buffer), &bufferLength,
-                            SQL_DRIVER_NOPROMPT);
-
-    if (!OdbcCheckCode (ret, connection, "SQLDriverConnect", SQL_HANDLE_DBC))
-        return NULL;
-
-//    ret = SQLConnect (connection, (UCHAR*) "FireBird", SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS);
-    if (!OdbcCheckCode (ret, connection, "SQLConnect", SQL_HANDLE_DBC))
-       return NULL;
-
-    ret = SQLSetConnectAttr (connection, SQL_ATTR_AUTOCOMMIT, (SQLPOINTER) SQL_AUTOCOMMIT_OFF, 0);
-    if (!OdbcCheckCode (ret, connection, "SQLSetConnectAttr", SQL_HANDLE_DBC))
-        return NULL;
-    
-    return connection;
-
-    }
-
-
-
-void test1 (HDBC connection)
-    {
-    HSTMT statement;
-    int ret = SQLAllocHandle (SQL_HANDLE_STMT, connection, &statement);
-    if (!OdbcCheckCode (ret, connection, "SQLAllocHandle", SQL_HANDLE_DBC))
-        return;
-
-    Print print (statement);
-    /*
-     * Try a ordinary retrieval
-     */
-
-    ret = SQLCloseCursor (statement);
-    if (!OdbcCheckCode (ret, statement, "SQLCloseCursor"))
-        return;
-
-    ret = SQLSetStmtAttr (statement, SQL_ATTR_CURSOR_SCROLLABLE, (void*) SQL_SCROLLABLE, 0);
-    if (!OdbcCheckCode (ret, statement, "SQLSetStmtAttr SQL_ATTR_CURSOR_SCROLLABLE, SQL_SCROLLABLE"))
-        return;
-
-    ret = SQLSetStmtAttr (statement, SQL_ATTR_CURSOR_TYPE, (void*) SQL_CURSOR_STATIC, 0);
-    if (!OdbcCheckCode (ret, statement, "SQLSetStmtAttr SQL_ATTR_CURSOR_TYPE, SQL_CURSOR_STATIC"))
-        return;
-
-    ret = SQLPrepare (statement, (UCHAR*) 
-                "SELECT first_name, last_name, hire_date, salary FROM EMPLOYEE "
-                "WHERE FIRST_NAME=?", SQL_NTS);
-
-    if (!OdbcCheckCode (ret, statement, "SQLPrepare"))
-        return;
-
-    SWORD   type;
-    UDWORD  precision;
-    SWORD   scale;
-    SWORD   nullable;
-
-    ret = SQLDescribeParam (statement, 1, &type, &precision, &scale, &nullable);
-    if (!OdbcCheckCode (ret, statement, "SQLDescribeParam"))
-        return;
-
-    char  robert[] = "Robert";
-    ret = SQLBindParameter (statement, 1, SQL_PARAM_INPUT, 
-                            SQL_C_CHAR, type, precision, scale, robert, 0, NULL);
-    if (!OdbcCheckCode (ret, statement, "SQLBindParameter"))
-        return;
-
-    ret = SQLExecute (statement);
-    if (!OdbcCheckCode (ret, statement, "SQLExecute"))
-        return;
-
-    UCHAR firstName [30];
-    SQLINTEGER firstNameLength;
-    tagDATE_STRUCT hireDate;
-
-    ret = SQLBindCol (statement, 1, SQL_C_CHAR, firstName, sizeof (firstName), &firstNameLength);
-    if (!OdbcCheckCode (ret, statement, "SQLBindCol"))
-        return;
-
-    ret = SQLBindCol (statement, 3, SQL_C_DATE, &hireDate, sizeof (hireDate), NULL);
-    if (!OdbcCheckCode (ret, statement, "SQLBindCol"))
-        return;
-
-    print.printHeaders();
-
-    for (;;)
-        {
-        //SQLUINTEGER rowCount;
-        //SQLUSMALLINT rowStatusArray;
-        ret = SQLFetch (statement);
-        //ret = SQLExtendedFetch (statement, SQL_FETCH_FIRST, 0, &rowCount, &rowStatusArray);
-        //ret = SQLFetchScroll (statement, SQL_FETCH_NEXT, 0);
-        if (ret == SQL_NO_DATA_FOUND)
-            break;
-        if (!OdbcCheckCode (ret, statement, "SQLFetch"))
-            break;
-        print.printLine();
-        tagTIMESTAMP_STRUCT date;
-        ret = SQLGetData (statement, 3, SQL_C_TIMESTAMP, &date, 0, NULL);
-        OdbcCheckCode (ret, statement, "SQLGetData");
-        char salary [32];
-        ret = SQLGetData (statement, 4, SQL_C_CHAR, salary, sizeof (salary), NULL);
-        OdbcCheckCode (ret, statement, "SQLGetData");
-        }
-
-    ret = SQLFreeHandle (SQL_HANDLE_STMT, statement);
-    if (!OdbcCheckCode (ret, statement, "SQLFreeHandle (statement"))
-        return;
-
-    }
-
-void test2 (HDBC connection)
-    {
-    HSTMT statement;
-    int ret = SQLAllocHandle (SQL_HANDLE_STMT, connection, &statement);
-    if (!OdbcCheckCode (ret, connection, "SQLAllocHandle", SQL_HANDLE_DBC))
-        return;
-
-    Print print (statement);
-
-    /*
-     * Try an intentional error
-     */
-
-    ret = SQLExecDirect (statement, (UCHAR*) "select * from xyzzy", SQL_NTS);
-    OdbcCheckCode (ret, statement, "SQLExecDirect w/ error");
-
-    }
-
-void test3 (HDBC connection)
-    {
-    HSTMT statement;
-    int ret = SQLAllocHandle (SQL_HANDLE_STMT, connection, &statement);
-    if (!OdbcCheckCode (ret, connection, "SQLAllocHandle", SQL_HANDLE_DBC))
-        return;
-
-    Print print (statement);
-
-
-    /*
-     * Try creating, populating, and delete a table
-     */
-
-    ret = SQLExecDirect (statement, (UCHAR*) "drop table bar", SQL_NTS);
-    ret = SQLExecDirect (statement, (UCHAR*) "drop table foo", SQL_NTS);
-    ret = SQLExecDirect (statement, 
-    (UCHAR*) "create table foo (f1 smallint not null primary key, c2 decimal (18,5))", SQL_NTS);
-    //(UCHAR*) "create table foo (f1 numeric (8,2) not null primary key)", SQL_NTS);
-
-    if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-    return;
-
-    ret = SQLExecDirect (statement, 
-    (UCHAR*) "create table bar (f1 smallint references foo)", SQL_NTS);
-    if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-    return;
-
-    ret = SQLExecDirect (statement, 
-    //(UCHAR*) "insert into foo values (123)", SQL_NTS);
-    (UCHAR*) "insert into foo values (123, 8734402384571.45)", SQL_NTS);
-    if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-    return;
-
-    ret = SQLExecDirect (statement, 
-    //(UCHAR*) "insert into foo values (123)", SQL_NTS);
-    (UCHAR*) "insert into foo values (456, 0.00012)", SQL_NTS);
-    if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-    return;
-
-    ret = SQLExecDirect (statement, (UCHAR*) "select * from foo", SQL_NTS);
-    if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-    return;
-
-
-    ret = SQLExecDirect (statement, (UCHAR*) "drop table bar", SQL_NTS);
-    if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-    return;
-
-    ret = SQLExecDirect (statement, (UCHAR*) "drop table foo", SQL_NTS);
-    if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-    return;
-
-    }
-
-void test4 (HDBC connection)
-    {
-    HSTMT statement;
-    int ret = SQLAllocHandle (SQL_HANDLE_STMT, connection, &statement);
-    if (!OdbcCheckCode (ret, connection, "SQLAllocHandle", SQL_HANDLE_DBC))
-        return;
-
-    Print print (statement);
-
-    /*
-     * Try some meta-data retrievals
-     */
-
-    ret = SQLTables (statement, 
-                         NULL, SQL_NTS, 
-                         (UCHAR*) NULL, SQL_NTS, 
-                         (UCHAR*) "%", SQL_NTS,
-                         (UCHAR*) "TABLE, 'VIEW'", SQL_NTS);
-    if (!OdbcCheckCode (ret, statement, "SQLProcedures"))
-        return;
-    print.printAll();
-
-    ret = SQLProcedures (statement, 
-                         NULL, SQL_NTS, 
-                         NULL, SQL_NTS, 
-                         (UCHAR*) "%", SQL_NTS);
-    if (!OdbcCheckCode (ret, statement, "SQLProcedures"))
-        return;
-    print.printAll();
-
-    ret = SQLProcedureColumns (statement, 
-                         (UCHAR*)"aBC", SQL_NTS, 
-                         (UCHAR*)"DEF", SQL_NTS, 
-                         (UCHAR*) "%", SQL_NTS,
-                         (UCHAR*) "%", SQL_NTS);
-    if (!OdbcCheckCode (ret, statement, "SQLProcedureColumns"))
-        return;
-    print.printAll();
-
-
-    ret = SQLStatistics (statement, 
-                         (UCHAR*)"%", SQL_NTS, 
-                         (UCHAR*)"%", SQL_NTS, 
-                         (UCHAR*) "%", SQL_NTS,
-                         SQL_INDEX_ALL,
-                         SQL_QUICK);
-    if (!OdbcCheckCode (ret, statement, "SQLStatistics"))
-        return;
-    print.printAll();
-    
-    
-    ret = SQLGetTypeInfo (statement, SQL_ALL_TYPES);
-    if (!OdbcCheckCode (ret, statement, "SQLGetTypeInfo"))
-        return;
-    print.printAll();
-
-    
-    ret = SQLColumns (statement, 
-                         (UCHAR*)"%", SQL_NTS, 
-                         (UCHAR*)"%", SQL_NTS, 
-                         (UCHAR*) "EMPLOYEE", SQL_NTS,
-                         (UCHAR*) "%", SQL_NTS);
-    if (!OdbcCheckCode (ret, statement, "SQLProcedureColumns"))
-        return;
-    print.printHeaders();
-
-    for (;;)
-        {
-        ret = SQLFetch (statement);
-        if (ret == SQL_NO_DATA_FOUND)
-            break;
-        if (!OdbcCheckCode (ret, statement, "SQLFetch"))
-            break;
-        //print.printLine();
-        short nullable;
-        int retcode = SQLGetData (statement, 11, SQL_C_SHORT, &nullable, 0, NULL);
-        OdbcCheckCode (retcode, statement, "SQLGetData");
-        }
-
-
-}
-
-void test5 (HDBC connection)
-    {
-    HSTMT statement;
-    int ret = SQLAllocHandle (SQL_HANDLE_STMT, connection, &statement);
-    if (!OdbcCheckCode (ret, connection, "SQLAllocHandle", SQL_HANDLE_DBC))
-        return;
-
-    Print print (statement);
-    /*
-     * Try storing a blob.
-     */
-
-    ret = SQLExecDirect (statement, (UCHAR*) "drop table blobs", SQL_NTS);
-    ret = SQLExecDirect (statement, (UCHAR*) "create table blobs (stuff blob)", SQL_NTS);
-    if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-        return;
-
-    char *blobString = "This is blob content.";
-    ret = SQLBindParameter (statement, 1, SQL_PARAM_INPUT, 
-                            SQL_C_CHAR, SQL_LONGVARBINARY, 50, 0, blobString, strlen (blobString) + 1, NULL);
-    if (!OdbcCheckCode (ret, statement, "SQLBindParameter"))
-        return;
-
-    ret = SQLExecDirect (statement, (UCHAR*) "insert into blobs values (?)", SQL_NTS);
-    if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-        return;
-
-    ret = SQLFreeStmt (statement, SQL_RESET_PARAMS);
-    if (!OdbcCheckCode (ret, statement, "SQLFreeStmt SQL_RESET_PARAMS"))
-        return;
-
-    ret = SQLExecDirect (statement, (UCHAR*) "select * from blobs", SQL_NTS);
-    if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-        return;
-
-    print.printAll();
-
-    }
-
-void test6 (HDBC connection)
-    {
-    HSTMT statement;
-    int ret = SQLAllocHandle (SQL_HANDLE_STMT, connection, &statement);
-    if (!OdbcCheckCode (ret, connection, "SQLAllocHandle", SQL_HANDLE_DBC))
-        return;
-
-    Print print (statement);
-    /*
-    * Try a store procedure
-    */
-
-    long count;
-    int parameter = 1;
-    /***
-    ret = SQLBindParameter (statement, parameter++, SQL_PARAM_INPUT, 
-                            SQL_C_CHAR, SQL_CHAR, 3, 0, "623", 0, NULL);
-    if (!OdbcCheckCode (ret, statement, "SQLBindParameter"))
-        return;
-    ***/
-
-    ret = SQLBindParameter (statement, parameter++, SQL_PARAM_OUTPUT, 
-                            SQL_C_SLONG, SQL_INTEGER, 8, 0, &count, 0, NULL);
-    if (!OdbcCheckCode (ret, statement, "SQLBindParameter"))
-        return;
-
-    ret = SQLExecDirect (statement, (UCHAR*) "{ call count_employees (623)}", SQL_NTS);
-    if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-        return;
-
-    printf ("\nNumber of employees: %d\n\n", count);
-    }
-
-void test7 (HDBC connection)
-    {
-    HSTMT statement;
-    int ret = SQLAllocHandle (SQL_HANDLE_STMT, connection, &statement);
-    if (!OdbcCheckCode (ret, connection, "SQLAllocHandle", SQL_HANDLE_DBC))
-        return;
-
-    Print print (statement);
-    /*
-     * Try a ordinary retrieval
-     */
-
-    ret = SQLCloseCursor (statement);
-    if (!OdbcCheckCode (ret, statement, "SQLCloseCursor"))
-        return;
-
-    ret = SQLSetStmtAttr (statement, SQL_ATTR_CURSOR_SCROLLABLE, (void*) SQL_SCROLLABLE, 0);
-    if (!OdbcCheckCode (ret, statement, "SQLSetStmtAttr SQL_ATTR_CURSOR_SCROLLABLE, SQL_SCROLLABLE"))
-        return;
-
-    ret = SQLSetStmtAttr (statement, SQL_ATTR_CURSOR_TYPE, (void*) SQL_CURSOR_STATIC, 0);
-    if (!OdbcCheckCode (ret, statement, "SQLSetStmtAttr SQL_ATTR_CURSOR_TYPE, SQL_CURSOR_STATIC"))
-        return;
-
-    ret = SQLPrepare  (statement, (UCHAR*) 
-	"SELECT foodate, foots, footime, food from foo where foodate > '31 DEC 69' order by foodate", 
-	    SQL_NTS);
-
-    if (!OdbcCheckCode (ret, statement, "SQLPrepare"))
-        return;
-
-    ret = SQLExecute (statement);
-    if (!OdbcCheckCode (ret, statement, "SQLExecute"))
-        return;
-
-    tagTIMESTAMP_STRUCT fooDate;
-
-    ret = SQLBindCol (statement, 1, SQL_C_TIMESTAMP, &fooDate, sizeof (fooDate), NULL);
-    if (!OdbcCheckCode (ret, statement, "SQLBindCol"))
-        return;
-    
-    tagTIMESTAMP_STRUCT fooTS;
-
-    ret = SQLBindCol (statement, 2, SQL_C_TIMESTAMP, &fooTS, sizeof (fooTS), NULL);
-    if (!OdbcCheckCode (ret, statement, "SQLBindCol"))
-        return;
-
-    tagTIME_STRUCT fooTime;
-
-    ret = SQLBindCol (statement, 3, SQL_C_TIME, &fooTime, sizeof (fooTime), NULL);
-    if (!OdbcCheckCode (ret, statement, "SQLBindCol"))
-        return;
-
-    tagDATE_STRUCT fooD;
-
-    ret = SQLBindCol (statement, 4, SQL_C_DATE, &fooD, sizeof (fooD), NULL);
-    if (!OdbcCheckCode (ret, statement, "SQLBindCol"))
-        return;
-
-    print.printHeaders();
-
-    for (;;)
-        {
-        //SQLUINTEGER rowCount;
-        //SQLUSMALLINT rowStatusArray;
-        ret = SQLFetch (statement);
-        //ret = SQLExtendedFetch (statement, SQL_FETCH_FIRST, 0, &rowCount, &rowStatusArray);
-        //ret = SQLFetchScroll (statement, SQL_FETCH_NEXT, 0);
-        if (ret == SQL_NO_DATA_FOUND)
-            break;
-        if (!OdbcCheckCode (ret, statement, "SQLFetch"))
-            break;
-        print.printLine();
-
-	tagTIMESTAMP_STRUCT datetime1;
-        tagTIMESTAMP_STRUCT datetime2;
-	tagDATE_STRUCT date;
-	tagTIME_STRUCT time;
-
-        ret = SQLGetData (statement, 0, SQL_C_DATE, &datetime1, 0, NULL);
-        OdbcCheckCode (ret, statement, "SQLGetData");
-        ret = SQLGetData (statement, 2, SQL_C_TIMESTAMP, &datetime2, 0, NULL);
-        OdbcCheckCode (ret, statement, "SQLGetData");
-        ret = SQLGetData (statement, 3, SQL_C_TIME, &time, 0, NULL);
-        OdbcCheckCode (ret, statement, "SQLGetData");
-        ret = SQLGetData (statement, 4, SQL_C_DATE, &date, 0, NULL);
-        OdbcCheckCode (ret, statement, "SQLGetData");
-      }
-
-    ret = SQLFreeHandle (SQL_HANDLE_STMT, statement);
-    if (!OdbcCheckCode (ret, statement, "SQLFreeHandle (statement"))
-        return;
-
-    }
-
-
-
-void test8 (HDBC connection)
-    {
-    HSTMT statement;
-    int ret = SQLAllocHandle (SQL_HANDLE_STMT, connection, &statement);
-    if (!OdbcCheckCode (ret, connection, "SQLAllocHandle", SQL_HANDLE_DBC))
-        return;
-
-    Print print (statement);
-    /*
-     * Try a ordinary retrieval
-     */
-
-    ret = SQLCloseCursor (statement);
-    if (!OdbcCheckCode (ret, statement, "SQLCloseCursor"))
-        return;
-
-
-    ret = SQLPrepare  (statement, (UCHAR*) 
-          "INSERT INTO foo (foodate, foots, food, footime) \
-	  values ('24 Feb 2001', '24 Feb 2001 18:05:04', '24 Feb 2001', '18:05:04' ) ", SQL_NTS);
-
-    if (!OdbcCheckCode (ret, statement, "SQLPrepare"))
-        return;
-
-    ret = SQLExecute (statement);
-    if (!OdbcCheckCode (ret, statement, "SQLExecute"))
-        return;
-
-
-    ret = SQLFreeHandle (SQL_HANDLE_STMT, statement);
-    if (!OdbcCheckCode (ret, statement, "SQLFreeHandle (statement"))
-        return;
-
-    }
-
-
-
-void testDisconnect (HDBC connection)
-    {
-
-    int ret = SQLEndTran (SQL_HANDLE_DBC, connection, SQL_COMMIT);
-	if (!OdbcCheckCode (ret, connection, "SQLEndTrans"))
-		return;
-
-    ret = SQLDisconnect (connection);
-    if (!OdbcCheckCode (ret, connection, "SQLDisconnect", SQL_HANDLE_DBC))
-    	return;
-
-    ret = SQLFreeHandle (SQL_HANDLE_DBC, connection);
-    if (!OdbcCheckCode (ret, connection, "SQLFreeHandle (connection)", SQL_HANDLE_DBC))
-    	return;
-
-    ret = SQLFreeHandle (SQL_HANDLE_ENV, env);
-    if (!OdbcCheckCode (ret, env, "SQLFreeHandle (env)", SQL_HANDLE_ENV))
-	return;
-
-
-    }
diff --git a/Test/StdAfx.h b/Test/StdAfx.h
deleted file mode 100644
index 4fee9259..00000000
--- a/Test/StdAfx.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// stdafx.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
-
-#if !defined(AFX_STDAFX_H__CBD41C39_EAEA_11D3_98D6_0000C01D2301__INCLUDED_)
-#define AFX_STDAFX_H__CBD41C39_EAEA_11D3_98D6_0000C01D2301__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
-
-#include <afxwin.h>         // MFC core and standard components
-#include <afxext.h>         // MFC extensions
-#include <afxcview.h>
-#include <afxdisp.h>        // MFC OLE automation classes
-
-#ifndef _AFX_NO_DB_SUPPORT
-#include <afxdb.h>			// MFC ODBC database classes
-#endif // _AFX_NO_DB_SUPPORT
-
-#ifndef _AFX_NO_DAO_SUPPORT
-#include <afxdao.h>			// MFC DAO database classes
-#endif // _AFX_NO_DAO_SUPPORT
-
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>			// MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
-
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__CBD41C39_EAEA_11D3_98D6_0000C01D2301__INCLUDED_)
diff --git a/Test/Table.cpp b/Test/Table.cpp
deleted file mode 100644
index f173ed5a..00000000
--- a/Test/Table.cpp
+++ /dev/null
@@ -1,1285 +0,0 @@
-/*
- *	PROGRAM:		Subschema Upgrade Utility
- *	MODULE:			Table.cpp
- *	DESCRIPTION:	Virtual Table class
- *
- * copyright (c) 1997 by James A. Starkey for IBPhoenix.
- */
-
-#include "stdafx.h"
-#include <string.h>
-#include <stdio.h>
-#include "Odbc.h"
-#include "Database.h"
-#include "Table.h"
-#include "Field.h"
-#include "Constraint.h"
-#include "Hash.h"
-#include "Index.h"
-#include "NetfraDatabase.h"
-#include "SQLException.h"
-#include "Connection.h"
-#include "Print.h"
-
-static const char htmlTable [] = "\
-{columns}\n\
-";
-
-Hash	Table::tables (101);
-
-Table::Table ()
-{
-/**************************************
- *
- *		T a b l e
- *
- **************************************
- *
- * Functional description
- *		Constructor.
- *
- **************************************/
-
-entered = FALSE;
-current = NULL;
-frozen = 0;
-primaryKey = NULL;
-}
-
-Table::Table (Database *db, const char *qual, const char* own, const char *nam, bool view)
-{
-/**************************************
- *
- *		T a b l e
- *
- **************************************
- *
- * Functional description
- *		Build table from database.
- *
- **************************************/
-
-database = db;
-name = nam;
-identifier = getIdentifier();
-owner = own;
-qualifier = qual;
-entered = FALSE;
-current = NULL;
-frozen = 0;
-isView = view;
-primaryKey = NULL;
-}
-
-Table::~Table ()
-{
-/**************************************
- *
- *		 ~ T a b l e
- *
- **************************************
- *
- * Functional description
- *		Get rid of it.
- *
- **************************************/
-
-if (current)
-    {
-	delete current;
-	current = NULL;
-	}
-
-FOR_OBJECTS (Field*, field, &fields)
-	delete field;
-END_FOR;
-
-FOR_OBJECTS (Index*, index, &indexes)
-    delete index;
-END_FOR;
-
-FOR_OBJECTS (Constraint*, constraint, &constraints)
-    delete constraint;
-END_FOR;
-}
-
-Field *Table::addField (const char *name, Type type, int length,
-						boolean nullable, boolean primary_key,
-						const char *comment, Field *domain)
-{
-/**************************************
- *
- *		a d d F i e l d
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-Field *field = new Field (this, name, type, length, nullable, 
-						  primary_key, comment, domain);
-fields.append (field);
-
-return field;
-}
-
-boolean Table::addIndex (Index *index)
-{
-/**************************************
- *
- *		a d d I n d e x
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-
-FOR_OBJECTS (Index*, idx, &indexes)
-    if (index->isDuplicate (idx))
-		{
-		printf ("Ignoring duplicate index %s on %s\n",
-				(const char*) index->getName(), (const char*) name);
-		return FALSE;
-		}
-END_FOR;
-
-indexes.append (index);
-
-return TRUE;
-}
-
-void Table::addOrdered (LinkedList *orderedTables)
-{
-/**************************************
- *
- *		a d d O r d e r e d
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-
-if (entered)
-    return;
-
-entered = TRUE;
-
-FOR_OBJECTS (Constraint*, constraint, &constraints)
-    constraint->addOrdered (orderedTables);
-END_FOR;
-
-orderedTables->append (this);
-}
-
-void Table::deleteChild (Index *child)
-{
-/**************************************
- *
- *		d e l e t e C h i l d
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-
-indexes.deleteItem (child);
-}
-
-void Table::deleteChild (Field *child)
-{
-/**************************************
- *
- *		d e l e t e C h i l d
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-
-fields.deleteItem (child);
-}
-
-Field* Table::findField (const char* name)
-{
-/**************************************
- *
- *		f i n d F i e l d
- *
- **************************************
- *
- * Functional description
- *		Look up field.
- *
- **************************************/
-
-if (fields.isEmpty())
-    getFields();
-
-FOR_OBJECTS (Field*, field, &fields)
-	if (field->matches (name))
-    //if (!strcmp (field->getName(), name))
-		return field;
-END_FOR;
-
-return NULL;
-}
-
-Index* Table::findIndex (const char* name)
-{
-/**************************************
- *
- *		f i n d I n d e x
- *
- **************************************
- *
- * Functional description
- *		Look up field.
- *
- **************************************/
-
-FOR_OBJECTS (Index*, index, &indexes)
-    if (!strcmp (index->getName(), name))
-		return index;
-END_FOR;
-
-return NULL;
-}
-
-Table* Table::findTable (const char* name)
-{
-/**************************************
- *
- *		f i n d T a b l e
- *
- **************************************
- *
- * Functional description
- *		Look up table.
- *
- **************************************/
-
-return (Table*) tables.lookup (name);
-}
-
-void Table::fini ()
-{
-/**************************************
- *
- *		f i n i
- *
- **************************************
- *
- * Functional description
- *		Shutdown.
- *
- **************************************/
-
-//delete tables;
-}
-
-void Table::freeze ()
-{
-/**************************************
- *
- *		f r e e z e
- *
- **************************************
- *
- * Functional description
- *		Shutdown.
- *
- **************************************/
-
-++frozen;
-}
-
-CString Table::gen (boolean empty)
-{
-/**************************************
- *
- *		g e n
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-
-CString	string = "create table ";
-string += name;
-char *sep = " (\n    ";
-
-FOR_OBJECTS (Field*, field, &fields)
-    string += sep;
-	string += field->gen (empty);
-	sep = ",\n    ";
-END_FOR;
-
-
-FOR_OBJECTS (Constraint*, constraint, &constraints)
-//	if (constraint->oracleValid)
-		{
-		string += sep;
-		string += constraint->gen();
-		sep = ",\n    ";
-		}
-END_FOR;
-
-string += ");";
-
-return string;
-}
-
-CString Table::genUpgrade ()
-{
-/**************************************
- *
- *		g e n U p g r a d e
- *
- **************************************
- *
- * Functional description
- *
- **************************************/
-CString	string;
-boolean	change = FALSE, add = FALSE, mod = FALSE, drop = FALSE;
-
-if (current)
-	{
-	FOR_OBJECTS (Field*, field, &fields)
-		Field *prior = current->findField (field->getName());
-		if (!prior)
-			{
-			change = add = TRUE;
-			break;
-			}
-		else if (field->changed (prior))
-			{
-			change = mod = TRUE;
-			break;
-			}
-	END_FOR;
-	FOR_OBJECTS (Field*, field, &current->fields)
-		if (!findField (field->getName()))
-			{
-			//change = TRUE;
-			drop = TRUE;
-			printf ("Field %s.%s dropped\n", name, (const char*) (field->getName()));
-			}
-	END_FOR;
-	}
-else
-	change = TRUE;
-
-if (!change)
-    return string;
-
-if (!current)
-	{
-	string = "create table ";
-	string += name;
-	char *sep = " (\n    ";
-	FOR_OBJECTS (Field*, field, &fields)
-		string += sep;
-		string += field->gen();
-		sep = ",\n    ";
-	END_FOR;
-	FOR_OBJECTS (Constraint*, constraint, &constraints)
-		if (constraint->oracleValid)
-			{
-			string += sep;
-			string += constraint->gen ();
-			sep = ",\n    ";
-			}
-	END_FOR;
-	string += ")";
-	return string;
-	}
-
-boolean empty = OdbcTableEmpty ((CDatabase*) database, name);
-string = "alter table ";
-string += name;
-
-if (add)
-	{
-	char *sep = " ADD (\n    ";
-	FOR_OBJECTS (Field*, field, &fields)
-		if (!current->findField (field->getName()))
-			{
-			string += sep;
-			string += field->gen (empty);
-			sep = ",\n    ";
-			}
-	END_FOR;
-	string += ")\n";
-	}
-
-if (mod)
-    {
-	char *sep = " MOD (\n    ";
-	FOR_OBJECTS (Field*, field, &fields)
-		Field *prior = current->findField (field->getName());
-		if (prior && field->changed (prior))
-			{
-			string += sep;
-			string += field->gen (empty);
-			sep = ",\n    ";
-			}
-	END_FOR;
-	string += ")\n";
-	}
-
-/***
-FOR_OBJECTS (Constraint*, constraint, constraints)
-	if (constraint->oracleValid)
-		{
-		string += sep;
-		string += constraint->genOracle();
-		sep = ",\n    ";
-		}
-END_FOR;
-***/
-
-return string;
-}
-
-void Table::genUpgradeIndexes ()
-{
-/**************************************
- *
- *		g e n U p g r a d e I n d e x e s
- *
- **************************************
- *
- * Functional description
- *		Rebuild any necessary indexes.
- *
- **************************************/
-int		hit = FALSE;
-
-FOR_OBJECTS (Index*, index, &indexes)
-	if (index->type == PRIMARY_KEY)
-		continue;
-	hit = TRUE;
-	break;
-END_FOR;
-
-if (!hit)
-    return;
-
-FOR_OBJECTS (Index*, index, &indexes)
-    if (index->type == PRIMARY_KEY)
-		continue;
-	if (current)
-		{
-		Index *prior = current->findIndex (index->getName());
-		if (prior && !index->changed (prior))
-			continue;
-		if (prior)
-			prior->drop ((CDatabase*) database);
-		}
-	CString sql = index->gen();
-	OdbcExecute ((CDatabase*) database, sql);
-END_FOR;
-}
-
-#ifdef UNDEF
-void Table::getCurrent ()
-{
-/**************************************
- *
- *		g e t C u r r e n t
- *
- **************************************
- *
- * Functional description
- *		Pick up current definition from database.
- *
- **************************************/
-char	tableName [128], owner [128], qualifier [128];
-long	len;
-
-HSTMT	statement;
-statement = database->allocStatement();
-int retcode = SQLTables(statement, NULL, SQL_NTS, 
-								NULL, SQL_NTS, 
-								(UCHAR*) (const char*) name, SQL_NTS, 
-								(UCHAR*) "TABLE", SQL_NTS);
-OdbcCheckCode (retcode, statement, "SQLTables");
-
-for (;;)
-    {
-	retcode = SQLFetch (statement);
-	if (retcode == SQL_NO_DATA_FOUND)
-		break;
-	if (!OdbcCheckCode (retcode, statement, "SQLFetch"))
-		break;
-	qualifier [0] = owner [0] = tableName [0] = 0;
-	GET_STRING (statement, 1, qualifier, len); 
-	GET_STRING (statement, 2, owner, len); 
-	GET_STRING (statement, 3, tableName, len); 
-	current = new Table (database, 
-						(qualifier [0]) ? qualifier : NULL, 
-						owner, name);
-	}
-
-database->freeStatement (statement);
-
-if (current)
-	current->getIndexes ();
-}
-#endif
-
-CString Table::getFullName ()
-{
-/**************************************
- *
- *		g e t F u l l N a m e
- *
- **************************************
- *
- * Functional description
- *		Pick up full name, optionally qualified by owner.
- *
- **************************************/
-CString	string;
-
-if (strcmp (owner, ""))
-	{
-	string += owner;
-	string += ".";
-	}
-
-string += name;
-
-return string;
-}
-
-LinkedList *Table::getIndexes ()
-{
-/**************************************
- *
- *		T a b l e
- *
- **************************************
- *
- * Functional description
- *		Get existing indexes.
- *
- **************************************/
-char	keyName [128], fieldName [128], currentKey [128];
-long	sequence, len;
-const char *own = (owner == "") ? NULL : (const char*) owner;
-int		retcode;
-
-if (!indexes.isEmpty())
-    return &indexes;
-
-getFields();
-
-/* Pick up primary keys */
-
-HSTMT statement = database->allocStatement();
-
-//if (database->primaryKeySupport)
-	{
-	retcode = SQLPrimaryKeys (statement, (UCHAR*) (const char*) qualifier, SQL_NTS, 
-									(UCHAR*) own, SQL_NTS, 
-									(UCHAR*)(const char*) name, SQL_NTS);
-
-	if (OdbcCheckCode (retcode, statement, "SQLPrimaryKeys"))
-		{
-		BIND_STRING (statement, 4, fieldName, len);
-		BIND_LONG (statement, 5, sequence, len);
-		BIND_STRING (statement, 6, keyName, len);
-
-		currentKey [0] = 0;
-		Index *index;
-
-		for (;;)
-			{
-			retcode = SQLFetch (statement);
-			if (retcode == SQL_NO_DATA_FOUND)
-				break;
-			if (!OdbcCheckCode (retcode, statement, "SQLFetch"))
-				break;
-			if (strcmp (currentKey, keyName))
-				{
-				primaryKey = index = new Index (this, keyName, PRIMARY_KEY);
-				strcpy (currentKey, keyName);
-				}
-			Field *field = findField (fieldName);
-			if (field)
-				index->addField (field);
-			else
-				AfxMessageBox ("can't find field in index");
-			}
-		}
-
-	/* Pick up foreign keys */
-
-	SQLFreeStmt (statement, SQL_UNBIND);
-	SQLFreeStmt (statement, SQL_CLOSE);
-	retcode = SQLForeignKeys (statement, NULL, SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS,
-									(UCHAR*)(const char*) qualifier, SQL_NTS, 
-									(UCHAR*) own , SQL_NTS, 
-									(UCHAR*)(const char*) name, SQL_NTS);
-
-	if (OdbcCheckCode (retcode, statement, "SQLForeignKeys"))
-		{
-		currentKey [0] = 0;
-
-		BIND_STRING (statement, 8, fieldName, len);
-		BIND_LONG (statement, 9, sequence, len);
-		BIND_STRING (statement, 12, keyName, len);
-
-		Index *index;
-		for (;;)
-			{
-			retcode = SQLFetch (statement);
-			if (retcode == SQL_NO_DATA_FOUND)
-				break;
-			if (!OdbcCheckCode (retcode, statement, "SQLFetch"))
-				break;
-			if (strcmp (currentKey, keyName))
-				{
-				index = new Index (this, keyName, FOREIGN_KEY);
-				strcpy (currentKey, keyName);
-				}
-			Field *field = findField (fieldName);
-			if (field)
-				index->addField (field);
-			else
-				AfxMessageBox ("can't find field in index");
-			}
-		}
-	}
-
-/* Pick up other indexes keys */
-
-SQLFreeStmt (statement, SQL_UNBIND);
-SQLFreeStmt (statement, SQL_CLOSE);
-
-if (!isView)
-	{
-	retcode = SQLStatistics (statement, 
-							 (UCHAR*)(const char*) qualifier, SQL_NTS, 
-							 (UCHAR*)(const char*) own, SQL_NTS, 
-							 (UCHAR*)(const char*) name, SQL_NTS,
-							 SQL_INDEX_ALL, SQL_QUICK);
-
-	OdbcCheckCode (retcode, statement, "SQLStatistics");
-	currentKey [0] = 0;
-	long indexType, indexNonUnique;
-	Index *index = NULL;
-
-	BIND_LONG (statement, 4, indexNonUnique, len);
-	BIND_STRING (statement, 6, keyName, len);
-	BIND_LONG (statement, 7, indexType, len);
-	BIND_LONG (statement, 8, sequence, len);
-	BIND_STRING (statement, 9, fieldName, len);
-
-	for (;;)
-		{
-		retcode = SQLFetch (statement);
-		if (retcode == SQL_NO_DATA_FOUND)
-			break;
-		if (!OdbcCheckCode (retcode, statement, "SQLFetch"))
-			break;
-		if (indexType == SQL_TABLE_STAT)
-			continue;
-		if (strcmp (currentKey, keyName))
-			{
-			strcpy (currentKey, keyName);
-			if (findIndex (keyName))
-				{
-				index = NULL;
-				continue;
-				}
-			IndexType indexType = (indexNonUnique) ? SECONDARY_INDEX : UNIQUE_INDEX;
-			if (!indexNonUnique && !primaryKey && !strcmp (keyName, "PrimaryKey"))
-				indexType = PRIMARY_KEY;
-			index = new Index (this, keyName, indexType);
-			if (indexType == PRIMARY_KEY)
-				primaryKey = index;
-			}
-		if (index)
-			{
-			Field *field = findField (fieldName);
-			if (field)
-				index->addField (field);
-			else
-				AfxMessageBox ("can't find field in index");
-			}
-		}
-	}
-
-database->freeStatement (statement);
-
-return &indexes;
-}
-
-boolean Table::isKey (Field *target)
-{
-/**************************************
- *
- *		i s K e y
- *
- **************************************
- *
- * Functional description
- *		Is Field an index key?
- *
- **************************************/
-
-FOR_OBJECTS (Index*, index, &indexes)
-	if (index->isKey (target))
-		return TRUE;
-END_FOR;
-
-FOR_OBJECTS (Constraint*, constraint, &constraints)
-	if (constraint->isKey (target))
-		return TRUE;
-END_FOR;
-
-return FALSE;
-}
-
-boolean Table::isDeleteable ()
-{
-/**************************************
- *
- *		i s D e l e t e a b l e
- *
- **************************************
- *
- * Functional description
- *		Can object be decently deleted?
- *
- **************************************/
-
-return frozen == 0;
-}
-
-boolean Table::isFirstLargeObject (Field *target)
-{
-/**************************************
- *
- *		i s F i r s t L a r g e O b j e c t
- *
- **************************************
- *
- * Functional description
- *		Is field the first blob?  (Used to hack around the
- *		Oracle7 restriction of one blob per table).
- *
- **************************************/
-
-FOR_OBJECTS (Field*, field, &fields)
-    if (field == target)
-		return TRUE;
-	if (field->isLargeObject())
-		return FALSE;
-END_FOR;
-
-return FALSE;
-}
-
-boolean Table::isFrozen ()
-{
-/**************************************
- *
- *		i s F r o z e n
- *
- **************************************
- *
- * Functional description
- *		Can object be decently deleted?
- *
- **************************************/
-
-return frozen > 0;
-}
-
-void Table::postLoad()
-{
-/**************************************
- *
- *		p o s t L o a d
- *
- **************************************
- *
- * Functional description
- *		Finish load process.
- *
- **************************************/
-
-tables.insert (name, this);
-
-FOR_OBJECTS (Index*, index, &indexes)
-    index->postLoad();
-END_FOR;
-
-FOR_OBJECTS (Field*, field, &fields)
-	field->postLoad();
-END_FOR;
-}
-
-void Table::resetOrdered()
-{
-/**************************************
- *
- *		r e s e t O r d e r e d
- *
- **************************************
- *
- * Functional description
- *		Reset flag used for building an ordered list of tables.
- *
- **************************************/
-
-entered = FALSE;
-}
-
-void Table::thaw ()
-{
-/**************************************
- *
- *		t h a w
- *
- **************************************
- *
- * Functional description
- *		Shutdown.
- *
- **************************************/
-
-if (frozen > 0)
-	--frozen;
-}
-
-
-LinkedList* Table::getFields()
-{
-/**************************************
- *
- *		g e t F i e l d s
- *
- **************************************
- *
- * Functional description
- *		Shutdown.
- *
- **************************************/
-
-if (!fields.isEmpty())
-	return &fields;
-
-printf ("Fields for %s:\n", (const char*) name);
-HSTMT statement = database->allocStatement();
-const char *own = (owner == "") ? NULL : (const char*) owner;
-
-int retcode = SQLColumns(statement, (UCHAR*)(const char*) qualifier, SQL_NTS, 
-								(UCHAR*) own, SQL_NTS, 
-								(UCHAR*)(const char*) name, SQL_NTS, 
-								NULL, SQL_NTS);
-
-OdbcCheckCode (retcode, statement, "SQLColumns");
-FieldInfo	info;
-long		len;
-BIND_STRING (statement, 4, info.fieldName, len);
-BIND_LONG (statement, 5, info.dtype, len);
-BIND_STRING (statement, 6, info.typeName, len); 
-BIND_LONG (statement, 7, info.precision, len); 
-BIND_LONG (statement, 8,info.length, len); 
-BIND_LONG (statement, 9, info.scale, len); 
-BIND_LONG (statement, 11, info.nullable, len); 
-
-Print print (statement);
-print.printHeaders();
-
-for (;;)
-    {
-	retcode = SQLFetch (statement);
-	if (retcode == SQL_NO_DATA_FOUND)
-		break;
-	if (!OdbcCheckCode (retcode, statement, "SQLFetch"))
-		break;
-	print.printLine();
-	info.print ("    ");
-	bool hit = false;
-	FOR_OBJECTS (Field*, field, &fields)
-		if (field->matches (info.fieldName))
-			hit = true;
-	END_FOR;
-	if (!hit)
-		fields.append (new Field (this, &info));
-	}
-
-print.skip();
-database->freeStatement (statement);
-
-return &fields;
-}
-
-bool Table::isUnique(Field * field)
-{
-/**************************************
- *
- *		i s U n i q u e
- *
- **************************************
- *
- * Functional description
- *		Is field unique with respect to table?
- *
- **************************************/
-
-getIndexes();
-
-FOR_OBJECTS (Index*, index, &indexes)
-    if ((index->type == PRIMARY_KEY || index->type == UNIQUE_INDEX) &&
-	    index->fieldCount == 1 && index->isKey (field))
-		return true;
-END_FOR;
-
-return false;
-}
-
-Field *Table::findPrimaryKey (Field * field)
-{
-	getIndexes();
-
-	FOR_OBJECTS (Index*, index, &indexes)
-		if (index->type == FOREIGN_KEY)
-			FOR_OBJECTS (Index*, foreignKey, &index->foreignKeys)
-				if (field->getTable() == foreignKey->table)
-					{
-					LinkedList *fldPos=(&index->fields)->getHead();
-					FOR_OBJECTS (Field*, key, &foreignKey->fields)
-						Field *primaryKey = (Field*) (&index->fields)->getNext (&fldPos);
-						if (key == field)
-							return primaryKey;
-					END_FOR;
-					}
-			END_FOR;
-	END_FOR;
-
-	if (database->primaryKeySupport)
-		return NULL;
-
-	FOR_OBJECTS (Index*, index, &indexes)
-		if (index->type == PRIMARY_KEY || index->type == UNIQUE_INDEX)
-			FOR_OBJECTS (Field*, key, &index->fields)
-				if (field->keyMatch (key))
-					return key;				
-			END_FOR;
-	END_FOR;
-
-	return NULL;
-}
-
-Field* Table::findIndexField(Field * field)
-{
-	getIndexes();
-
-	FOR_OBJECTS (Index*, index, &indexes)
-		//if (index->type == PRIMARY_KEY || index->type == UNIQUE_INDEX)
-			FOR_OBJECTS (Field*, key, &index->fields)
-				if (field->keyMatch (key))
-					return key;				
-			END_FOR;
-	END_FOR;
-
-	return NULL;
-}
-
-void Table::clearReferences()
-{
-	FOR_OBJECTS (Field*, field, &fields)
-		field->clearReferences();
-	END_FOR;
-}
-
-CString Table::getURL()
-{
-	return (CString) "tbl_" + name + ".html";
-}
-
-/***
-void Table::genDocumentation(CProject *project, CString directory)
-{
-	CString title = "Table ";
-	title += name;
-	CGenHtml page (project, directory, getURL(), title, title);
-	CRString body = project->getTemplate ("htmlTable", htmlTable);
-	CGenHtmlTable table (project, "Columns");
-	getFields();
-
-	FOR_OBJECTS (Field*, field, &fields)
-		field->genDocumentation (&table);
-	END_FOR;
-
-	body.replace ("{columns}", (CString) table);
-	page.setBody (body);
-}
-***/
-
-void Table::clearXRef()
-{
-	FOR_OBJECTS (Field*, field, &fields)
-		field->clearXRef();
-	END_FOR;
-}
-
-CString Table::genSql()
-{
-	getFields();
-	getIndexes();
-	CString string = "upgrade table " + getIdentifier();
-	const char *sep = "(\n    ";
-
-	FOR_OBJECTS (Field*, field, &fields)
-		string += sep + field->genSql();
-		if (primaryKey && primaryKey->fieldCount == 1 && primaryKey->isMember (field))
-			string += " primary key";
-		else if (field->reference)
-			string += " references " + field->reference->table->getIdentifier();
-		sep = ",\n    ";
-	END_FOR;
-
-	string += ")";
-
-	return string;
-}
-
-void Table::findReferences()
-{
-	FOR_OBJECTS (Field*, field, &fields)
-		if (!primaryKey || primaryKey->keyField != field)
-			field->findForeignReference (database);
-	END_FOR;
-}
-
-void Table::findDependencies(LinkedList & list)
-{
-	if (done)
-		return;
-
-	if (list.isMember (this))
-		{
-		CString msg = "Dependency cycle:";
-		FOR_OBJECTS (Table*, table, &list)
-			msg += " " + table->name;
-		END_FOR;
-		AfxMessageBox (msg);
-		return;
-		}
-
-	list.append (this);
-
-	FOR_OBJECTS (Field*, field, &fields)
-		if (field->reference)
-			field->reference->table->findDependencies(list);
-	END_FOR;
-}
-
-int Table::copy(NetfraDatabase * db)
-{
-	done = true;
-	int numberRecords = 0;
-	CString insert = "insert into " + getIdentifier() + " (";
-	CString values;
-	CString select = "select ";
-	const char *sep = "";
-
-	FOR_OBJECTS (Field*, field, &fields)
-		insert += sep + field->getIdentifier();
-		select += sep;
-		select += "\"" + field->name + "\"";
-		values += sep;
-		values += "?";
-		sep = ",";
-	END_FOR;
-
-	PreparedStatement *insertStatement = NULL;
-	SQLHSTMT handle = database->allocStatement();
-
-	try
-		{
-		insert += ") values (" + values + ")";
-		insertStatement = db->connection->prepareStatement (insert);
-		select += " from \"" + name + "\"";
-
-		SQLRETURN retcode = SQLPrepare (handle, (SQLCHAR*)(const char*) select, SQL_NTS);
-		OdbcCheckCode (retcode, handle, "SQLPrepare");
-		retcode = SQLExecute (handle);
-		OdbcCheckCode (retcode, handle, "SQLExecute");
-
-		char buffer [10000];
-		long value, len;
-		double dbl;
-		TIMESTAMP_STRUCT	odbcDate;
-		struct tm time;
-		long date;
-
-		while (!retcode)
-			{
-			retcode = SQLFetch (handle);
-			if (retcode == SQL_NO_DATA_FOUND)
-				break;
-			if (!OdbcCheckCode (retcode, handle, "SQLFetch"))
-				break;
-			int n = 1;
-			FOR_OBJECTS (Field*, field, &fields)
-				switch (field->type)
-					{
-					case Tiny:
-					case Short:
-					case Int:
-						GET_LONG (handle, n, value, len);
-						insertStatement->setInt (n, value);
-						break;
-
-					case Char:
-					case Varchar:
-					case TextBlob:
-						GET_STRING (handle, n, buffer, len);
-						if (len > field->length)
-							AfxMessageBox ("field overflow!");
-						else if (len <= 0)
-							insertStatement->setNull (n, 0);
-						else
-							insertStatement->setString (n, buffer);
-						break;
-
-					case Date:
-						retcode = SQLGetData (handle, n, SQL_C_TIMESTAMP, &odbcDate, sizeof (odbcDate), &len);
-						OdbcCheckCode (retcode, handle, "SQLGetData");
-						if (len <= 0)
-							insertStatement->setNull (n, 0);
-						else
-							{
-							memset (&time, 0, sizeof (time));
-							time.tm_mday = odbcDate.day;
-							time.tm_mon = odbcDate.month - 1;
-							time.tm_year = odbcDate.year - 1900;
-							time.tm_isdst = -1;
-							date = mktime (&time);
-							insertStatement->setInt (n, date);
-							}
-						break;
-
-					case BinaryBlob:
-						retcode = SQLGetData (handle, n, SQL_C_BINARY, buffer, sizeof (buffer), &len);
-						insertStatement->setNull (n, 0);
-						/***
-						OdbcCheckCode (retcode, handle, "SQLGetData");
-						if (len <= 0)
-							insertStatement->setNull (n, 0);
-						else
-							insertStatement->setBytes (n, len, buffer);
-						***/
-						break;
-
-					case Double:
-						retcode = SQLGetData (handle, n, SQL_C_DOUBLE, &dbl, sizeof (dbl), &len);
-						OdbcCheckCode (retcode, handle, "SQLGetData");
-						if (len <= 0)
-							insertStatement->setNull (n, 0);
-						else
-							insertStatement->setDouble (n, dbl);
-						break;
-
-					default:
-						AfxMessageBox ("data type unsupported");
-					}
-				++n;
-			END_FOR;
-			insertStatement->executeUpdate();
-			++numberRecords;
-			}
-		}
-	catch (SQLException& exception)
-		{
-		AfxMessageBox (exception.getText());
-		}
-
-	if (insertStatement)
-		insertStatement->close();
-
-	database->freeStatement (handle);
-
-	return numberRecords;
-}
-
-void Table::create(NetfraDatabase * db)
-{
-	CString sql = genSql();
-
-	try
-		{
-		done = true;
-		db->executeUpdate (sql);
-		FOR_OBJECTS (Index*, index, &indexes)
-			if (primaryKey && !index->isDuplicate (primaryKey))
-				{
-				sql = index->genSql();
-				db->executeUpdate (sql);
-				}
-		END_FOR;
-		FOR_OBJECTS (Field*, field, &fields)
-			if (field->reference)
-				{
-				sql.Format ("upgrade index %s_%s on %s (%s)",
-							(const char*) name,
-							(const char*) field->name,
-							(const char*) name,
-							(const char*) field->name);
-				db->executeUpdate (sql);
-				}
-		END_FOR;
-		}
-	catch (SQLException& exception)
-		{
-		CRString msg = exception.getText();
-		AfxMessageBox (msg.getCRLFstring());
-		}
-}
-
-bool Table::populated(NetfraDatabase * db)
-{
-	bool result = false;
-	PreparedStatement *statement = NULL;
-
-	try
-		{
-		CString string = "select * from ";
-		string += getIdentifier();
-		statement = db->connection->prepareStatement (string);
-		ResultSet *resultSet = statement->executeQuery();
-		if (resultSet->next())
-			result = true;
-		resultSet->close();
-		}
-	catch (SQLException& exception)
-		{
-		CRString msg = exception.getText();
-		AfxMessageBox (msg.getCRLFstring());
-		}
-
-	if (statement)
-		statement->close();
-
-	return result;
-}
-
-void FieldInfo::print(const char * prefix)
-{
-	printf ("%s%s type %s (%d), length %d, scale %d, nullable %d\n",
-			prefix, fieldName, typeName, dtype, precision, length, nullable);
-}
diff --git a/Test/Table.h b/Test/Table.h
deleted file mode 100644
index 7434adef..00000000
--- a/Test/Table.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *	PROGRAM:		Virtual Data Manager
- *	MODULE:			Table.h
- *	DESCRIPTION:	Virtual Table class
- *
- * copyright (c) 1997 by James A. Starkey for IBPhoenix.
- */
-
-#ifndef __TABLE_H
-#define __TABLE_H
-
-#include "Gen.h"
-#include "LinkedList.h"
-#include "Field.h"
-
-class Index;
-class Database;
-class Peer;
-class Database;
-class CProject;
-class NetfraDatabase;
-
-struct FieldInfo {
-	char	fieldName [128];
-	char	typeName [128];
-	long	length;
-	long	dtype;
-	long	nullable;
-	long	precision;
-	long	scale;
-public:
-	void print (const char *prefix);
-    };
-
-class Table : public Gen
-	{
-    public:
-	    bool populated (NetfraDatabase *db);
-	    void create (NetfraDatabase *db);
-	    int copy (NetfraDatabase *db);
-	    void findDependencies (LinkedList &list);
-	    void findReferences();
-	    virtual CString genSql();
-	    void clearXRef();
-	    void genDocumentation (CProject*, CString directory);
-	    CString getURL();
-	    void clearReferences();
-	    Field* findIndexField (Field *field);
-	    Field *findPrimaryKey (Field *field);
-	    bool isUnique (Field *field);
-	    LinkedList* getFields();
-		LinkedList*	getIndexes ();
-
-	Table ();
-	//Table (Syntax*);
-	Table (Database*, const char *qualifier, const char* owner, const char *name, bool view);
-	~Table();
-
-	Field			*addField (const char *name, Type type, int length,
-							   boolean nullable, boolean primary_key,
-							   const char *comment, Field *domain);
-	void			addOrdered (LinkedList *orderedTables);
-	boolean			addIndex (Index*);
-	void			deleteChild (Index*);
-	void			deleteChild (Field*);
-    virtual Field	*findField (const char *name);
-    //virtual Field	*findField (Syntax *syntax);
-    Index			*findIndex (const char *name);
-
-	static Table	*findTable (const char *name);
-	static Table	*findTable (Syntax *syntax);
-	static void		fini();
-
-	virtual void	freeze();
-	virtual CString	gen (boolean empty = TRUE);
-	virtual CString	genUpgrade ();
-	void			genUpgradeIndexes ();
-	//void			getCurrent ();
-	CString			getFullName ();
-	virtual boolean	isDeleteable();
-	boolean			isFirstLargeObject (Field*);
-	virtual boolean	isFrozen();
-	boolean			isKey (Field*);
-	void			postLoad();
-	void			resetOrdered();
-	virtual void	thaw();
-
-	CString		owner;
-	CString		qualifier;
-	CString		identifier;
-	LinkedList	fields;
-	LinkedList	indexes;
-	LinkedList	constraints;
-	int			entered;
-	Table		*current;
-	int			frozen;
-	Database	*database;
-	Index		*primaryKey;
-	bool		isView;
-	bool		done;
-
-	static Hash	tables;
-	};
-
-#endif
diff --git a/Test/Test.001 b/Test/Test.001
deleted file mode 100644
index 8f5225f1..00000000
--- a/Test/Test.001
+++ /dev/null
@@ -1,140 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Test - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "Test.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Test.mak" CFG="Test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "Test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "d:\Netfrastructure\Remote" /I "d:\Netfrastructure\Engine" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 NetfraRemote.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"d:\netfrastructure\Remote\Debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "Test - Win32 Release"
-# Name "Test - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\netfrastructure\Engine\JString.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\netfrastructure\Engine\JString.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\LinkedList.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\LinkedList.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Odbc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Odbc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Print.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Print.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\RString.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\RString.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SimpleTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\netfrastructure\Engine\SQLException.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Type.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Type.h
-# End Source File
-# End Target
-# End Project
diff --git a/Test/Test.cpp b/Test/Test.cpp
deleted file mode 100644
index da4a6f6a..00000000
--- a/Test/Test.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "Odbc.h"
-#include "Print.h"
-
-
-static HENV env;
-static SQLHWND hWnd;
-
-static HDBC testConnect (const char *);
-static void test1 (HDBC);
-static void test2 (HDBC);
-static void test3 (HDBC);
-static void test4 (HDBC);
-static void test5 (HDBC);
-static void test6 (HDBC);
-static void test7 (HDBC);
-static void test8 (HDBC);
-static void testDisconnect (HDBC);
-
-
-int main (int argc, const char **argv)
-    {
-    const char **end = argv + argc;
-//    const char *connectString = "ODBC;DSN=FireBirdOdbc;DRIVER=OdbcJdbc;ROLE=cinnamon";
-//    const char *connectString = "ODBC;DSN=Test;UID=SYSDBA;PWD=masterkey;DBNAME=/OdbcJdbc/employee.gdb";
-    const char *connectString = "Test";
-
-    for (++argv; argv < end;)
-        {
-        const char *p = *argv++;
-        if (p [0] == '-')
-            switch (p [1])
-                {
-                case 'i':
-                    //install();
-                    break;
-
-                case 'c':
-                    connectString = *argv++;
-                    break;
-
-                default:
-                    printf ("Don't understand switch '%s'\n", p);
-                    return 1;
-                }
-        }
-    HDBC connection1 = testConnect (connectString);
-    
-    if (HDBC connection = testConnect (connectString))
-	{
-	test1 (connection);
-	test2 (connection);
-
-	testDisconnect (connection);
-	}
-
-    return 0;
-}
-
-HDBC testConnect (const char *connectString)
-{
-    int ret = SQLAllocHandle (SQL_HANDLE_ENV, NULL, &env);
-//    int ret = SQLAllocEnv (&env);
-    if (!OdbcCheckCode (ret, env, "SQLSetEnvAttr", SQL_HANDLE_ENV))
-        return NULL;
-
-    ret = SQLSetEnvAttr (env, SQL_ATTR_ODBC_VERSION, (SQLPOINTER) SQL_OV_ODBC3, SQL_IS_UINTEGER);
-    if (!OdbcCheckCode (ret, env, "SQLSetEnvAttr", SQL_HANDLE_ENV))
-        return NULL;
-
-    HDBC connection;
-//    ret = SQLAllocConnect (env, &connection);
-    ret = SQLAllocHandle (SQL_HANDLE_DBC, env, &connection);
-    if (!OdbcCheckCode (ret, env, "SQLAllocHandle", SQL_HANDLE_ENV))
-        return NULL;
-
-
-/*    äÌÑ Linux ÎÅ ÎÕÖÎÏ
-    ret = SQLSetConnectAttr (connection, SQL_ATTR_ODBC_CURSORS, (SQLPOINTER) SQL_CUR_USE_ODBC, 0);
-    if (!OdbcCheckCode (ret, connection, "SQLConnectAttr", SQL_HANDLE_DBC))
-        return NULL;
-*/
-/*    
-    UCHAR buffer [128];
-    SWORD bufferLength;
-    ret = SQLDriverConnect (connection, hWnd, 
-                            (UCHAR*) connectString, SQL_NTS,
-                            buffer, sizeof (buffer), &bufferLength,
-                            SQL_DRIVER_NOPROMPT);
-    if (!OdbcCheckCode (ret, connection, "SQLDriverConnect", SQL_HANDLE_DBC))
-        return NULL;
-
-*/
-    
-    ret = SQLConnect (connection, (UCHAR*)connectString, SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS);
-		
-    if (!OdbcCheckCode (ret, connection, "SQLConnect", SQL_HANDLE_DBC))
-       return NULL;
-/*
-    ret = SQLSetConnectAttr (connection, SQL_ATTR_AUTOCOMMIT, (SQLPOINTER) SQL_AUTOCOMMIT_OFF, 0);
-    if (!OdbcCheckCode (ret, connection, "SQLSetConnectAttr", SQL_HANDLE_DBC))
-        return NULL;
-*/    
-    return connection;
-
-}
-
-
-void test1 (HDBC connection)
-{
-
-    printf("\n\nTest1\n\n");
-
-    HSTMT statement;
-    int ret = SQLAllocHandle (SQL_HANDLE_STMT, connection, &statement);
-    if (!OdbcCheckCode (ret, connection, "SQLAllocHandle", SQL_HANDLE_DBC))
-        return;
-
-    Print print (statement);
-    /*
-     * Try a ordinary retrieval
-     */
-
-//    ret = SQLCloseCursor (statement);
-//    if (!OdbcCheckCode (ret, statement, "SQLCloseCursor"))
-//        return;
-
-    ret = SQLSetStmtAttr (statement, SQL_ATTR_CURSOR_SCROLLABLE, (void*) SQL_SCROLLABLE, 0);
-    if (!OdbcCheckCode (ret, statement, "SQLSetStmtAttr SQL_ATTR_CURSOR_SCROLLABLE, SQL_SCROLLABLE"))
-        return;
-
-    ret = SQLSetStmtAttr (statement, SQL_ATTR_CURSOR_TYPE, (void*) SQL_CURSOR_STATIC, 0);
-    if (!OdbcCheckCode (ret, statement, "SQLSetStmtAttr SQL_ATTR_CURSOR_TYPE, SQL_CURSOR_STATIC"))
-        return;
-
-    ret = SQLPrepare (statement, (UCHAR*) 
-                "SELECT first_name, last_name, hire_date, salary FROM EMPLOYEE "
-                "WHERE FIRST_NAME=?", SQL_NTS);
-
-    if (!OdbcCheckCode (ret, statement, "SQLPrepare"))
-        return;
-
-    SWORD   type;
-    UDWORD  precision;
-    SWORD   scale;
-    SWORD   nullable;
-
-    ret = SQLDescribeParam (statement, 1, &type, &precision, &scale, &nullable);
-    if (!OdbcCheckCode (ret, statement, "SQLDescribeParam"))
-        return;
-
-    char  robert[] = "Robert";
-    ret = SQLBindParameter (statement, 1, SQL_PARAM_INPUT, 
-                            SQL_C_CHAR, type, precision, scale, robert, 0, NULL);
-    if (!OdbcCheckCode (ret, statement, "SQLBindParameter"))
-        return;
-
-    ret = SQLExecute (statement);
-    if (!OdbcCheckCode (ret, statement, "SQLExecute"))
-        return;
- 
-    UCHAR firstName [30]="My";
-    SQLINTEGER firstNameLength=0;
-    tagDATE_STRUCT hireDate;
-
-    ret = SQLBindCol (statement, 1, SQL_C_CHAR, firstName, sizeof (firstName), &firstNameLength);
-    if (!OdbcCheckCode (ret, statement, "SQLBindCol"))
-        return;
-
-    ret = SQLBindCol (statement, 3, SQL_C_DATE, &hireDate, sizeof (hireDate), NULL);
-    if (!OdbcCheckCode (ret, statement, "SQLBindCol"))
-        return;
-
-//    UDWORD rowCount;
-//    UWORD rowStatusArray;
-
-    print.printHeaders();
-
-
-    for (;;)
-    {
-        //SQLUINTEGER rowCount;
-        //SQLUSMALLINT rowStatusArray;
-
-        ret = SQLFetch (statement);
-	
-//        ret = SQLExtendedFetch (statement, SQL_FETCH_NEXT, 0, &rowCount, &rowStatusArray);
-        //ret = SQLFetchScroll (statement, SQL_FETCH_NEXT, 0);
-        if (ret == SQL_NO_DATA_FOUND)
-            break;
-        if (!OdbcCheckCode (ret, statement, "SQLFetch"))
-            break;
-        print.printLine();
-	
-        tagTIMESTAMP_STRUCT date;
-        ret = SQLGetData (statement, 3, SQL_C_TIMESTAMP, &date, 0, NULL);
-        OdbcCheckCode (ret, statement, "SQLGetData");
-        char salary [32];
-        ret = SQLGetData (statement, 4, SQL_C_CHAR, salary, sizeof (salary), NULL);
-        OdbcCheckCode (ret, statement, "SQLGetData");
-    }
-
-    ret = SQLFreeHandle (SQL_HANDLE_STMT, statement);
-    if (!OdbcCheckCode (ret, statement, "SQLFreeHandle (statement"))
-        return;
-
-}
-
-void test2 (HDBC connection)
-    {
-
-    printf("\n\nTest2\n\n");
-
-    HSTMT statement;
-    int ret = SQLAllocHandle (SQL_HANDLE_STMT, connection, &statement);
-    if (!OdbcCheckCode (ret, connection, "SQLAllocHandle", SQL_HANDLE_DBC))
-        return;
-
-    Print print (statement);
-
-    /*
-     * Try an intentional error
-     */
-
-    ret = SQLExecDirect (statement, (UCHAR*) "SELECT first 10 first_name, last_name, hire_date, salary FROM EMPLOYEE", SQL_NTS);
-    OdbcCheckCode (ret, statement, "SQLExecDirect w/ error");
-
-    print.printHeaders();
-
-    for (;;)
-        {
-        ret = SQLFetch (statement);
-        if (ret == SQL_NO_DATA_FOUND)
-            break;
-        if (!OdbcCheckCode (ret, statement, "SQLFetch"))
-            break;
-        print.printLine();
-        }
-
-    ret = SQLFreeHandle (SQL_HANDLE_STMT, statement);
-    if (!OdbcCheckCode (ret, statement, "SQLFreeHandle (statement"))
-        return;
-    }
-
-
-void testDisconnect (HDBC connection)
-    {
-    int ret;
-
-
-    ret = SQLEndTran (SQL_HANDLE_DBC, connection, SQL_COMMIT);
-	if (!OdbcCheckCode (ret, connection, "SQLEndTrans"))
-		return;
-		
-    ret = SQLDisconnect (connection);
-    if (!OdbcCheckCode (ret, connection, "SQLDisconnect", SQL_HANDLE_DBC))
-    	return;
-	
-
-    ret = SQLFreeHandle (SQL_HANDLE_DBC, connection);
-    if (!OdbcCheckCode (ret, connection, "SQLFreeHandle (connection)", SQL_HANDLE_DBC))
-    	return;
-
-    ret = SQLFreeHandle (SQL_HANDLE_ENV, env);
-    if (!OdbcCheckCode (ret, env, "SQLFreeHandle (env)", SQL_HANDLE_ENV))
-	return;
-
-}
diff --git a/Test/Test.dsp b/Test/Test.dsp
deleted file mode 100644
index 607016e4..00000000
--- a/Test/Test.dsp
+++ /dev/null
@@ -1,141 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Test - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "Test.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Test.mak" CFG="Test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "Test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(FIREBIRD)\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "Test - Win32 Release"
-# Name "Test - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\JString.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JString.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\LinkedList.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\LinkedList.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Odbc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Odbc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Print.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Print.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\RString.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\RString.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\SimpleTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\netfrastructure\Engine\SQLException.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Type.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Type.h
-# End Source File
-# End Target
-# End Project
diff --git a/Test/Test.dsw b/Test/Test.dsw
deleted file mode 100644
index d4e2b943..00000000
--- a/Test/Test.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "Test"=.\Test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/Test/Test.ncb b/Test/Test.ncb
deleted file mode 100644
index 954d0534..00000000
--- a/Test/Test.ncb
+++ /dev/null
@@ -1 +0,0 @@
-Microsoft C/C++ program database 2.00
diff --git a/Test/Test.opt b/Test/Test.opt
deleted file mode 100644
index 3599f1b0..00000000
--- a/Test/Test.opt
+++ /dev/null
@@ -1 +0,0 @@
-ÐÏࡱ
\ No newline at end of file
diff --git a/Test/Type.cpp b/Test/Type.cpp
deleted file mode 100644
index 4f36dbd5..00000000
--- a/Test/Type.cpp
+++ /dev/null
@@ -1,372 +0,0 @@
-// Type.cpp: implementation of the CType class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#include "stdafx.h"
-#include <ole2.h>
-#include <string.h>
-#include "Odbc.h"
-//#include "MCET.h"
-#include "Type.h"
-#include "RString.h"
-
-#ifndef NOT_YET_SUPPORTED
-#define NOT_YET_SUPPORTED(msg)	OutputDebugString (msg)
-#endif
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char THIS_FILE[]=__FILE__;
-#define new DEBUG_NEW
-#endif
-
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-CType::CType()
-{
-	length = scale = precision = indirectCount = 0;
-}
-
-CType::~CType()
-{
-
-}
-
-bool CType::isLargeObject()
-{
-	return type == TextBlob || type == BinaryBlob;
-}
-
-
-VARTYPE CType::getVariantType()
-{
-	switch (type)
-		{
-		case Char:			return VT_I4;
-		case Varchar:		return VT_BSTR;
-		case Tiny:			return VT_I1;
-		case Short:			return VT_I2;
-		case Int:			return VT_I4;
-		case Long:			return VT_I8;
-		case Float:			return VT_R4;
-		case Double:		return VT_R8;
-		case Date:			return VT_DATE;
-		case TextBlob:
-		case BinaryBlob:	return VT_BLOB;
-		}
-
-	return VT_I4;	
-}
-
-void CType::setType(CType * t)
-{
-	type = t->type;
-	length = t->length;
-	scale = t->scale;
-	precision = t->precision;
-}
-
-void CType::setType(Type typ, int len)
-{
-	type = typ;
-	length = len;
-
-	if (isInteger())
-		precision = length;
-}
-
-bool CType::isInteger()
-{
-	switch (type)
-		{
-		case Tiny:
-		case Short:
-		case Int:
-		case Long:
-			return true;
-		}
-
-	return false;
-}
-
-int CType::getPrecision()
-{
-	if (precision)
-		return precision;
-
-	switch (type)
-		{
-		case Tiny:		return 2;
-		case Short:		return 5;
-		case Int:		return 9;
-		case Long:		return 17;
-		}
-
-	return 0;
-}
-
-void CType::setType(long odbcType, long prec, const char * typeName)
-{
-	precision = prec;
-
-	switch (odbcType)
-		{
-		case SQL_VARCHAR:	type = Varchar;	break;
-		case SQL_CHAR:		type = Char;	break;
-		case SQL_FLOAT:		type = Float;	break;
-		case SQL_DOUBLE:	type = Double;	break;
-		case SQL_REAL:		type = Float;	break;
-
-		case SQL_TYPE_TIMESTAMP:
-		case SQL_TIMESTAMP:	
-			type = Date;	
-			break;
-
-		case SQL_NUMERIC:
-		case SQL_DECIMAL:
-			if (precision == 0)
-				type = Int;
-			else if (precision <= 2)
-				type = Tiny;
-			else if (precision <= 5)
-				type = Short;
-			else
-				type = Int;
-			/***
-			else if (precision <= 9)
-				type = Int;
-			else
-				type = Long;
-			***/
-			break;
-
-		case SQL_BINARY:
-		case SQL_INTEGER:	type = Int;		break;
-		case SQL_SMALLINT:	type = Short;	break;
-
-		case SQL_LONGVARBINARY:	type = BinaryBlob; break;
-		case SQL_LONGVARCHAR:	type = TextBlob; break;
-
-
-
-		default:
-			if (!strcmp (typeName, "LONG"))
-				type = BinaryBlob;
-			else if (!strcmp (typeName, "LONGTEXT"))
-				type = TextBlob;
-			else if (!strcmp (typeName, "BIT"))
-				type = Int;
-			else
-				{
-				CString msg;
-				msg.Format ("Field::typeFromOdbcType -- don't understand type %d (%s)\n", 
-						odbcType, typeName);
-				AfxMessageBox (msg);
-				type = Int;
-				}
-		}
-}
-
-int CType::getBoundary(CharWidth charWidth)
-{
-	switch (type)
-		{
-		case Char:
-		case Varchar:
-			return (charWidth == oneByte) ? 1 : 2;
-
-		case Tiny:			return sizeof (char);
-		case Short:			return sizeof (short);
-		case Int:			return sizeof (long);
-		case Long:			return 8;
-		case Float:			return sizeof (float);
-		case Double:		return sizeof (double);
-		case Date:			return sizeof (DATE);
-
-		case TextBlob:
-		case BinaryBlob:	return sizeof (IUnknown*);
-		}
-
-	return sizeof (int);	
-}
-
-int CType::getCLength(CharWidth charWidth)
-{
-	int len = getLength();
-
-	switch (type)
-		{
-		case Varchar:
-		case Char:
-			if (charWidth == oneByte)
-				return length + 1;
-			return 2 * (length + 1);
-		
-		}
-
-	return len;	
-}
-
-CString CType::getCDeclaration(const char * name, CharWidth charWidth)
-{
-	CRString cType;
-
-	switch (type)
-		{
-		case Char:
-		case Varchar:
-			cType.Format ((charWidth == oneByte) ? "char\t<name>" : "WCHAR\t<name> [%d]", length + 1);
-			break;
-
-		case Tiny:
-			cType = "char\t<name>";
-			break;
-
-		case Short:
-			cType = "short\t<name>";
-			break;
-
-		case Int:
-			cType = "LONG\t<name>";
-			break;
-
-		case Long:
-			cType = "__int64\t<name>";
-			break;
-
-		case Date:
-			cType = "DATE\t<name>";
-			break;
-
-		case Double:
-			cType = "double\t<name>";
-			break;
-
-		case Float:
-			cType = "float\t<name>";
-			break;
-
-		case TextBlob:
-			cType = "IUnknown*\t<name>";
-			break;
-
-		default:
-			NOT_YET_SUPPORTED ("CType::getCDeclaration\n");
-		}
-
-	cType.replace ("<name>", name);
-
-	return cType;
-}
-
-CString CType::getOleDbBindType()
-{
-	switch (type)
-		{
-		case Char:
-		case Varchar:
-			return "DBTYPE_WSTR";
-
-		case Tiny:
-			return "DBTYPE_I1";
-
-		case Short:
-			return "DBTYPE_I2";
-
-		case Int:
-			return "DBTYPE_I4";
-
-		case Long:
-			return "DBTYPE_I8";
-
-		case Date:
-			return "DBTYPE_DATE";
-
-		case Double:
-			return "DBTYPE_R8";
-
-		case Float:
-			return "DBTYPE_R4";
-
-		case TextBlob:
-			return "DBTYPE_IUNKNOWN";
-
-		default:
-			NOT_YET_SUPPORTED ("CType::getOleDbBindType");
-		}
-
-	return "*** unknown type ***";
-}
-
-CString CType::getJavaType()
-{
-	switch (type)
-		{
-		case Varchar:	return "String";
-		case Float	:	return "Float";
-		case Double:	return "Double";
-		case Date:		return "Date";
-		case Tiny:		return "byte";
-		case Short:		return "short";
-		case Int:		return "int";
-		case Long:		return "long";
-		case TextBlob:	return "UnicodeStream";
-		case BinaryBlob:	return "BinaryStream";
-
-		default:
-			NOT_YET_SUPPORTED ("CType::getjavaType");
-		}
-
-	return "*** unknown type ***";
-}
-
-int CType::getLength()
-{
-	switch (type)
-		{
-		case Varchar:
-		case Char:			return length;
-		case Tiny:			return sizeof (char);
-		case Short:			return sizeof (short);
-		case Int:			return sizeof (long);
-		case Long:			return 8;
-		case Float:			return sizeof (float);
-		case Double:		return sizeof (double);
-		case Date:			return sizeof (DATE);
-		case TextBlob:
-		case BinaryBlob:	return sizeof (IUnknown*);
-		}
-
-	return sizeof (int);	
-
-}
-
-bool CType::isCharacter()
-{
-	return type == Char || type == Varchar;
-}
-
-CString CType::getJdbcType()
-{
-	switch (type)
-		{
-		case Varchar:	return "String";
-		case Float	:	return "Float";
-		case Double:	return "Double";
-		case Date:		return "Date";
-		case Tiny:		return "Byte";
-		case Short:		return "Short";
-		case Int:		return "Int";
-		case Long:		return "Long";
-		case TextBlob:	return "UnicodeStream";
-		case BinaryBlob:	return "BinaryStream";
-
-		default:
-			NOT_YET_SUPPORTED ("CType::getjavaType");
-		}
-
-	return "*** unknown type ***";
-}
diff --git a/Test/Type.h b/Test/Type.h
deleted file mode 100644
index 98a8d48e..00000000
--- a/Test/Type.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Type.h: interface for the CType class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_TYPE_H__52063CA1_54A0_11D2_AB3B_0000C01D2301__INCLUDED_)
-#define AFX_TYPE_H__52063CA1_54A0_11D2_AB3B_0000C01D2301__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-enum CharWidth {
-	oneByte,
-	twoByte
-	};
-
-enum  Type {
-    Unknown,
-	Char,
-	Varchar,
-	Tiny,			// 8 bit int
-	Short,			// 16 bit int
-	Int,			// 32 bit int
-	Long,			// 64 bit int
-	Float,
-	Double,
-	Date,
-	TextBlob,
-	BinaryBlob,
-	DispatchObject,
-	Domain,			// fields only
-	};
-
-
-class CType  
-{
-public:
-	CString getJdbcType();
-	bool isCharacter();
-	int getLength();
-	CString getJavaType();
-	CString getOleDbBindType();
-	CString getCDeclaration (const char *name, CharWidth charWidth);
-	int getCLength (CharWidth charWidth);
-	int getBoundary (CharWidth charWidth);
-	void setType (long dtodbcTypeype, long precision, const char *typeName);
-	int getPrecision();
-	bool isInteger();
-	void setType (Type typ, int len);
-	void setType (CType *type);
-	VARTYPE getVariantType();
-	bool isLargeObject();
-	CType();
-	virtual ~CType();
-
-	Type	type;
-	long	precision;
-	long	length;
-	long	scale;
-	long	indirectCount;			
-};
-
-#endif // !defined(AFX_TYPE_H__52063CA1_54A0_11D2_AB3B_0000C01D2301__INCLUDED_)
diff --git a/Test/scrambledTest.cpp b/Test/scrambledTest.cpp
deleted file mode 100644
index 1aa2ae10..00000000
--- a/Test/scrambledTest.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-#include <stdio.h>
-#include "Odbc.h"
-#include "Print.h"
-
-static void test1 (const char *connectString);
-static void test2 (const char *connectString);
-static bool SimpleRetrieval ();
-
-main (int argc, const char **argv)
-{
-	const char **end = argv + argc;
-	const char *connectString = "ODBC;DSN=FireBird;DRIVER=OdbcJdbc";
-	Print print;
-
-	for (++argv; argv < end;)
-		{
-		const char *p = *argv++;
-		if (p [0] == '-')
-			switch (p [1])
-				{
-				case 'i':
-					//install();
-					break;
-
-				case 'c':
-					connectString = *argv++;
-					break;
-
-				default:
-					printf ("Don't understand switch '%s'\n", p);
-					return 1;
-				}
-		}
-
-	test1 (connectString);
-
-	return 0;
-}
-
-void test1 (const char *connectString)
-{
-	HENV env;
-	int ret = SQLAllocHandle (SQL_HANDLE_ENV, NULL, &env);
-	ret = SQLSetEnvAttr (env, SQL_ATTR_ODBC_VERSION, (SQLPOINTER) SQL_OV_ODBC3, SQL_IS_UINTEGER);
-	if (!OdbcCheckCode (ret, env, "SQLSetEnvAttr", SQL_HANDLE_ENV))
-		return;
-
-	HDBC connection;
-	ret = SQLAllocHandle (SQL_HANDLE_DBC, env, &connection);
-	if (!OdbcCheckCode (ret, env, "SQLAllocHandle", SQL_HANDLE_ENV))
-		return;
-
-	//ret = SQLAllocConnect (env, &connection);
-
-	/***
-	UCHAR buffer [128];
-	SWORD bufferLength;
-	ret = SQLDriverConnect (connection, NULL, 
-							(UCHAR*) connectString,	SQL_NTS,
-							buffer, sizeof (buffer), &bufferLength,
-							SQL_DRIVER_NOPROMPT);
-
-	if (!OdbcCheckCode (ret, connection, "SQLDriverConnect", SQL_HANDLE_DBC))
-		return;
-	***/
-
-	ret = SQLSetConnectAttr (connection, SQL_ATTR_ODBC_CURSORS, (SQLPOINTER) SQL_CUR_USE_ODBC, 0);
-	if (!OdbcCheckCode (ret, connection, "SQLConnect", SQL_HANDLE_DBC))
-		return;
-
-	ret = SQLConnect (connection, (UCHAR*) "FireBird", SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS);
-	if (!OdbcCheckCode (ret, connection, "SQLConnect", SQL_HANDLE_DBC))
-		return;
-
-	ret = SQLSetConnectAttr (connection, SQL_ATTR_AUTOCOMMIT, (SQLPOINTER) SQL_AUTOCOMMIT_OFF, 0);
-	if (!OdbcCheckCode (ret, connection, "SQLSetConnectAttr", SQL_HANDLE_DBC))
-		return;
-
-	HSTMT statement;
-	ret = SQLAllocHandle (SQL_HANDLE_STMT, connection, &statement);
-	if (!OdbcCheckCode (ret, connection, "SQLAllocHandle", SQL_HANDLE_DBC))
-		return;
-
-    if (!SimpleRetrieval ())
-	    return;
-	/*
-	 * Try an intentional error
-	 */
-
-	ret = SQLExecDirect (statement, (UCHAR*) "select * from xyzzy", SQL_NTS);
-	OdbcCheckCode (ret, statement, "SQLExecDirect w/ error");
-
-	/*
-	 * Try creating, populating, and delete a table
-	 */
-
-	ret = SQLExecDirect (statement, (UCHAR*) "drop table bar", SQL_NTS);
-	ret = SQLExecDirect (statement, (UCHAR*) "drop table foo", SQL_NTS);
-	ret = SQLExecDirect (statement, 
-		(UCHAR*) "create table foo (f1 smallint not null primary key, c2 decimal (18,5))", SQL_NTS);
-		//(UCHAR*) "create table foo (f1 numeric (8,2) not null primary key)", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-		return;
-
-	ret = SQLExecDirect (statement, 
-		(UCHAR*) "create table bar (f1 smallint references foo)", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-		return;
-
-	ret = SQLExecDirect (statement, 
-		//(UCHAR*) "insert into foo values (123)", SQL_NTS);
-		(UCHAR*) "insert into foo values (123, 8734402384571.45)", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-		return;
-
-	ret = SQLExecDirect (statement, 
-		//(UCHAR*) "insert into foo values (123)", SQL_NTS);
-		(UCHAR*) "insert into foo values (456, 0.00012)", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-		return;
-
-	ret = SQLExecDirect (statement, (UCHAR*) "select * from foo", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-		return;
-
-	print.printAll();
-
-	ret = SQLExecDirect (statement, (UCHAR*) "drop table bar", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-		return;
-
-	ret = SQLExecDirect (statement, (UCHAR*) "drop table foo", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-		return;
-
-
-	/*
-	 * Try some meta-data retrievals
-	 */
-
-	ret = SQLTables (statement, 
-						 NULL, SQL_NTS, 
-						 (UCHAR*) NULL, SQL_NTS, 
-						 (UCHAR*) "%", SQL_NTS,
-						 (UCHAR*) "TABLE, 'VIEW'", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLProcedures"))
-		return;
-	print.printAll();
-
-	ret = SQLProcedures (statement, 
-						 NULL, SQL_NTS, 
-						 NULL, SQL_NTS, 
-						 (UCHAR*) "%", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLProcedures"))
-		return;
-	print.printAll();
-
-	ret = SQLProcedureColumns (statement, 
-						 (UCHAR*)"aBC", SQL_NTS, 
-						 (UCHAR*)"DEF", SQL_NTS, 
-						 (UCHAR*) "%", SQL_NTS,
-						 (UCHAR*) "%", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLProcedureColumns"))
-		return;
-	print.printAll();
-
-	ret = SQLStatistics (statement, 
-						 (UCHAR*)"%", SQL_NTS, 
-						 (UCHAR*)"%", SQL_NTS, 
-						 (UCHAR*) "%", SQL_NTS,
-						 SQL_INDEX_ALL,
-						 SQL_QUICK);
-	if (!OdbcCheckCode (ret, statement, "SQLProcedureColumns"))
-		return;
-	print.printAll();
-
-	
-	ret = SQLGetTypeInfo (statement, SQL_ALL_TYPES);
-	if (!OdbcCheckCode (ret, statement, "SQLGetTypeInfo"))
-		return;
-	print.printAll();
-
-	
-	ret = SQLColumns (statement, 
-						 (UCHAR*)"%", SQL_NTS, 
-						 (UCHAR*)"%", SQL_NTS, 
-						 (UCHAR*) "EMPLOYEE", SQL_NTS,
-						 (UCHAR*) "%", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLProcedureColumns"))
-		return;
-	print.printHeaders();
-
-	for (;;)
-		{
-		ret = SQLFetch (statement);
-		if (ret == SQL_NO_DATA_FOUND)
-			break;
-		if (!OdbcCheckCode (ret, statement, "SQLFetch"))
-			break;
-		//print.printLine();
-		short nullable;
-		int retcode = SQLGetData (statement, 11, SQL_C_SHORT, &nullable, 0, NULL);
-		OdbcCheckCode (retcode, statement, "SQLGetData");
-		}
-
-	/*
-	 * Try storing a blob.
-	 */
-
-	ret = SQLExecDirect (statement, (UCHAR*) "drop table blobs", SQL_NTS);
-	ret = SQLExecDirect (statement, (UCHAR*) "create table blobs (stuff blob)", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-		return;
-
-	char *blobString = "This is blob content.";
-	ret = SQLBindParameter (statement, 1, SQL_PARAM_INPUT, 
-						    SQL_C_CHAR, SQL_LONGVARBINARY, 50, 0, blobString, strlen (blobString) + 1, NULL);
-	if (!OdbcCheckCode (ret, statement, "SQLBindParameter"))
-		return;
-
-	ret = SQLExecDirect (statement, (UCHAR*) "insert into blobs values (?)", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-		return;
-
-	ret = SQLFreeStmt (statement, SQL_RESET_PARAMS);
-	if (!OdbcCheckCode (ret, statement, "SQLFreeStmt SQL_RESET_PARAMS"))
-		return;
-
-	ret = SQLExecDirect (statement, (UCHAR*) "select * from blobs", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-		return;
-
-	print.printAll();
-
-	/*
-	 * Try a store procedure
-	 */
-
-	long count;
-	int parameter = 1;
-	/***
-	ret = SQLBindParameter (statement, parameter++, SQL_PARAM_INPUT, 
-						    SQL_C_CHAR, SQL_CHAR, 3, 0, "623", 0, NULL);
-	if (!OdbcCheckCode (ret, statement, "SQLBindParameter"))
-		return;
-	***/
-
-	ret = SQLBindParameter (statement, parameter++, SQL_PARAM_OUTPUT, 
-						    SQL_C_SLONG, SQL_INTEGER, 8, 0, &count, 0, NULL);
-	if (!OdbcCheckCode (ret, statement, "SQLBindParameter"))
-		return;
-
-	ret = SQLExecDirect (statement, (UCHAR*) "{ call count_employees (623)}", SQL_NTS);
-	if (!OdbcCheckCode (ret, statement, "SQLExecDirect"))
-		return;
-
-	printf ("\nNumber of employees: %d\n\n", count);
-
-	/*
-	 * Try a ordinary retrieval
-	 */
-
-	ret = SQLCloseCursor (statement);
-	if (!OdbcCheckCode (ret, statement, "SQLCloseCursor"))
-		return;
-
-	ret = SQLSetStmtAttr (statement, SQL_ATTR_CURSOR_SCROLLABLE, (void*) SQL_SCROLLABLE, 0);
-	if (!OdbcCheckCode (ret, statement, "SQLSetStmtAttr SQL_ATTR_CURSOR_SCROLLABLE, SQL_SCROLLABLE"))
-		return;
-
-	ret = SQLSetStmtAttr (statement, SQL_ATTR_CURSOR_TYPE, (void*) SQL_CURSOR_STATIC, 0);
-	if (!OdbcCheckCode (ret, statement, "SQLSetStmtAttr SQL_ATTR_CURSOR_TYPE, SQL_CURSOR_STATIC"))
-		return;
-
-	ret = SQLPrepare (statement, (UCHAR*) 
-				"SELECT first_name, last_name, hire_date, salary FROM EMPLOYEE "
-				"WHERE FIRST_NAME=?", SQL_NTS);
-
-	if (!OdbcCheckCode (ret, statement, "SQLPrepare"))
-		return;
-
-	SWORD	type;
-	UDWORD	precision;
-	SWORD	scale;
-	SWORD	nullable;
-
-	ret = SQLDescribeParam (statement, 1, &type, &precision, &scale, &nullable);
-	if (!OdbcCheckCode (ret, statement, "SQLDescribeParam"))
-		return;
-
-	ret = SQLBindParameter (statement, 1, SQL_PARAM_INPUT, 
-						    SQL_C_CHAR, type, precision, scale, "Robert", 0, NULL);
-	if (!OdbcCheckCode (ret, statement, "SQLBindParameter"))
-		return;
-
-	ret = SQLExecute (statement);
-	if (!OdbcCheckCode (ret, statement, "SQLExecute"))
-		return;
-
-	UCHAR firstName [30];
-	SQLINTEGER firstNameLength;
-	tagDATE_STRUCT hireDate;
-
-	ret = SQLBindCol (statement, 1, SQL_C_CHAR, firstName, sizeof (firstName), &firstNameLength);
-	if (!OdbcCheckCode (ret, statement, "SQLBindCol"))
-		return;
-
-	ret = SQLBindCol (statement, 3, SQL_C_DATE, &hireDate, sizeof (hireDate), NULL);
-	if (!OdbcCheckCode (ret, statement, "SQLBindCol"))
-		return;
-
-	print.printHeaders();
-
-	for (;;)
-		{
-		//SQLUINTEGER rowCount;
-		//SQLUSMALLINT rowStatusArray;
-		//ret = SQLFetch (statement);
-		//ret = SQLExtendedFetch (statement, SQL_FETCH_FIRST, 0, &rowCount, &rowStatusArray);
-		ret = SQLFetchScroll (statement, SQL_FETCH_NEXT, 0);
-		if (ret == SQL_NO_DATA_FOUND)
-			break;
-		if (!OdbcCheckCode (ret, statement, "SQLFetch"))
-			break;
-		print.printLine();
-		tagTIMESTAMP_STRUCT date;
-		ret = SQLGetData (statement, 3, SQL_C_TIMESTAMP, &date, 0, NULL);
-		OdbcCheckCode (ret, statement, "SQLGetData");
-		char salary [32];
-		ret = SQLGetData (statement, 4, SQL_C_CHAR, salary, sizeof (salary), NULL);
-		OdbcCheckCode (ret, statement, "SQLGetData");
-		}
-
-	ret = SQLFreeHandle (SQL_HANDLE_STMT, statement);
-	if (!OdbcCheckCode (ret, statement, "SQLFreeHandle (statement"))
-		return;
-
-    ret = SQLEndTran (SQL_HANDLE_DBC, connection, SQL_COMMIT);
-	if (!OdbcCheckCode (ret, statement, "SQLEndTrans"))
-		return;
-
-    ret = SQLDisconnect (connection);
-	if (!OdbcCheckCode (ret, connection, "SQLDisconnect", SQL_HANDLE_DBC))
-		return;
-
-	ret = SQLFreeHandle (SQL_HANDLE_DBC, connection);
-	if (!OdbcCheckCode (ret, connection, "SQLFreeHandle (connection)", SQL_HANDLE_DBC))
-		return;
-
-	ret = SQLFreeHandle (SQL_HANDLE_ENV, env);
-	if (!OdbcCheckCode (ret, env, "SQLFreeHandle (env)", SQL_HANDLE_ENV))
-		return;
-
-
-bool	SimpleRetrieval ()
-	{
-					/*
-	 * Try a ordinary retrieval
-	 */
-
-	ret = SQLCloseCursor (statement);
-	if (!OdbcCheckCode (ret, statement, "SQLCloseCursor"))
-		return FALSE;
-
-	ret = SQLSetStmtAttr (statement, SQL_ATTR_CURSOR_SCROLLABLE, (void*) SQL_SCROLLABLE, 0);
-	if (!OdbcCheckCode (ret, statement, "SQLSetStmtAttr SQL_ATTR_CURSOR_SCROLLABLE, SQL_SCROLLABLE"))
-		return FALSE;
-
-	ret = SQLSetStmtAttr (statement, SQL_ATTR_CURSOR_TYPE, (void*) SQL_CURSOR_STATIC, 0);
-	if (!OdbcCheckCode (ret, statement, "SQLSetStmtAttr SQL_ATTR_CURSOR_TYPE, SQL_CURSOR_STATIC"))
-		return FALSE;
-
-	ret = SQLPrepare (statement, (UCHAR*) 
-				"SELECT first_name, last_name, hire_date, salary FROM EMPLOYEE "
-				"WHERE FIRST_NAME=?", SQL_NTS);
-
-	if (!OdbcCheckCode (ret, statement, "SQLPrepare"))
-		return FALSE;
-
-	SWORD	type;
-	UDWORD	precision;
-	SWORD	scale;
-	SWORD	nullable;
-
-	ret = SQLDescribeParam (statement, 1, &type, &precision, &scale, &nullable);
-	if (!OdbcCheckCode (ret, statement, "SQLDescribeParam"))
-		return FALSE;
-
-	ret = SQLBindParameter (statement, 1, SQL_PARAM_INPUT, 
-						    SQL_C_CHAR, type, precision, scale, "Robert", 0, NULL);
-	if (!OdbcCheckCode (ret, statement, "SQLBindParameter"))
-		return FALSE;
-
-	ret = SQLExecute (statement);
-	if (!OdbcCheckCode (ret, statement, "SQLExecute"))
-		return FALSE;
-
-	UCHAR firstName [30];
-	SQLINTEGER firstNameLength;
-	tagDATE_STRUCT hireDate;
-
-	ret = SQLBindCol (statement, 1, SQL_C_CHAR, firstName, sizeof (firstName), &firstNameLength);
-	if (!OdbcCheckCode (ret, statement, "SQLBindCol"))
-		return FALSE;
-
-	ret = SQLBindCol (statement, 3, SQL_C_DATE, &hireDate, sizeof (hireDate), NULL);
-	if (!OdbcCheckCode (ret, statement, "SQLBindCol"))
-		return FALSE;
-
-	print.printHeaders();
-
-	for (;;)
-		{
-		//SQLUINTEGER rowCount;
-		//SQLUSMALLINT rowStatusArray;
-		//ret = SQLFetch (statement);
-		//ret = SQLExtendedFetch (statement, SQL_FETCH_FIRST, 0, &rowCount, &rowStatusArray);
-		ret = SQLFetchScroll (statement, SQL_FETCH_NEXT, 0);
-		if (ret == SQL_NO_DATA_FOUND)
-			break;
-		if (!OdbcCheckCode (ret, statement, "SQLFetch"))
-			break;
-		print.printLine();
-		tagTIMESTAMP_STRUCT date;
-		ret = SQLGetData (statement, 3, SQL_C_TIMESTAMP, &date, 0, NULL);
-		OdbcCheckCode (ret, statement, "SQLGetData");
-		char salary [32];
-		ret = SQLGetData (statement, 4, SQL_C_CHAR, salary, sizeof (salary), NULL);
-		OdbcCheckCode (ret, statement, "SQLGetData");
-		}
-
-	ret = SQLFreeHandle (SQL_HANDLE_STMT, statement);
-	if (!OdbcCheckCode (ret, statement, "SQLFreeHandle (statement"))
-		return FALSE;
-
-	Print print (statement);
-    return TRUE;
-    }
-}
-
-
-void test2 ()
-
-
-
-}
diff --git a/Test/statistics.cpp b/Test/statistics.cpp
deleted file mode 100644
index c6e14b3d..00000000
--- a/Test/statistics.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-#include <stdio.h>
-#include "Odbc.h"
-#include "Print.h"
-
-
-static HENV env;
-static SQLHWND hWnd;
-
-static HDBC testConnect (const char *);
-static void test4 (HDBC);
-static void testDisconnect (HDBC);
-
-
-main (int argc, const char **argv)
-    {
-    const char **end = argv + argc;
-//    const char *connectString = "ODBC;DSN=FireBirdOdbc;DRIVER=OdbcJdbc;ROLE=cinnamon";
-    const char *connectString = "DSN=FireBirdOdbc";
-
-int n;
-const char  *buf = "2000 \"c:\\harrison\\\"";
-int size;
-char dir_name [120];
-
-n = sscanf(buf,  "%ld \"%[^\"]", &size, dir_name);
-if (n == 2)
-	printf ("%ld, %s\n", size, dir_name);
-
-
-    for (++argv; argv < end;)
-        {
-        const char *p = *argv++;
-        if (p [0] == '-')
-            switch (p [1])
-                {
-                case 'i':
-                    //install();
-                    break;
-
-                case 'c':
-                    connectString = *argv++;
-                    break;
-
-                default:
-                    printf ("Don't understand switch '%s'\n", p);
-                    return 1;
-                }
-        }
-    if (HDBC connection = testConnect (connectString))
-	{
-//	test1 (connection);
-//	test2 (connection);
-//	test3 (connection);
-	test4 (connection);
-//	test5 (connection);
-//	test6 (connection);
-//	test7 (connection);
-//	test8 (connection);
-
-	testDisconnect (connection);
-	}
-
-    return 0;
-    }
-
-
-
-HDBC testConnect (const char *connectString)
-    {
-    int ret = SQLAllocHandle (SQL_HANDLE_ENV, NULL, &env);
-    ret = SQLSetEnvAttr (env, SQL_ATTR_ODBC_VERSION, (SQLPOINTER) SQL_OV_ODBC3, SQL_IS_UINTEGER);
-    if (!OdbcCheckCode (ret, env, "SQLSetEnvAttr", SQL_HANDLE_ENV))
-        return NULL;
-
-    HDBC connection;
-    ret = SQLAllocHandle (SQL_HANDLE_DBC, env, &connection);
-    if (!OdbcCheckCode (ret, env, "SQLAllocHandle", SQL_HANDLE_ENV))
-        return NULL;
-
-    //ret = SQLAllocConnect (env, &connection);
-    ret = SQLSetConnectAttr (connection, SQL_ATTR_ODBC_CURSORS, (SQLPOINTER) SQL_CUR_USE_ODBC, 0);
-    if (!OdbcCheckCode (ret, connection, "SQLConnectAttr", SQL_HANDLE_DBC))
-        return NULL;
-    
-    UCHAR buffer [128];
-    SWORD bufferLength;
-    ret = SQLDriverConnect (connection, hWnd, 
-                            (UCHAR*) connectString, SQL_NTS,
-                            buffer, sizeof (buffer), &bufferLength,
-                            SQL_DRIVER_NOPROMPT);
-
-    if (!OdbcCheckCode (ret, connection, "SQLDriverConnect", SQL_HANDLE_DBC))
-        return NULL;
-
-//    ret = SQLConnect (connection, (UCHAR*) "FireBird", SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS);
-    if (!OdbcCheckCode (ret, connection, "SQLConnect", SQL_HANDLE_DBC))
-       return NULL;
-
-    ret = SQLSetConnectAttr (connection, SQL_ATTR_AUTOCOMMIT, (SQLPOINTER) SQL_AUTOCOMMIT_OFF, 0);
-    if (!OdbcCheckCode (ret, connection, "SQLSetConnectAttr", SQL_HANDLE_DBC))
-        return NULL;
-    
-    return connection;
-
-    }
-
-
-
-
-
-void test4 (HDBC connection)
-    {
-    HSTMT statement;
-	short	count, numberColumns;
-	Column *columns;
-	char	* buffer;
-
-    int ret = SQLAllocHandle (SQL_HANDLE_STMT, connection, &statement);
-    if (!OdbcCheckCode (ret, connection, "SQLAllocHandle", SQL_HANDLE_DBC))
-        return;
-
-    Print print (statement);
-
-
-
-    ret = SQLStatistics (statement, 
-                         (UCHAR*)"%", SQL_NTS, 
-                         (UCHAR*)"%", SQL_NTS, 
-                         (UCHAR*) "%", SQL_NTS,
-                         SQL_INDEX_ALL,
-                         SQL_QUICK);
-    if (!OdbcCheckCode (ret, statement, "SQLStatistics"))
-        return;
-	
-	RETCODE retcode = SQLNumResultCols (statement, &count);
-
-	if (!OdbcCheckCode (retcode, statement, "SQLNumResultCols"))
-		return;
-
-	numberColumns = count;
-	columns = new Column [numberColumns];
-	Column *column = columns;
-	int offset = 0;
-
-	for (int n = 1; n <= numberColumns; ++n, ++column)
-		{
-		SWORD nameLength,
-		retcode = SQLDescribeCol (statement, n, 
-					  (UCHAR*) column->name, sizeof (column->name), &nameLength,
-					  &column->sqlType, 
-					  &column->precision, 
-					  &column->scale, 
-					  &column->nullable);
-		if (!OdbcCheckCode (retcode, statement, "SQLDescribeCol"))
-			return;
-		if (column->precision > 350)
-			column->precision = 350;
-		column->offset = offset;
-		column->headerLength = strlen (column->name);
-		column->length = ((int) column->precision > column->headerLength) ? 
-				column->precision : column->headerLength;
-		offset += column->length + 1;
-		}
-
-	buffer = new char [offset + 1];
-
-	char p1 [3];
-	long p1_len;
-
-	retcode = SQLBindCol (statement, 1, 
-			SQL_C_CHAR,&p1, sizeof (p1), &p1_len);
-	if (!OdbcCheckCode (retcode, statement, "SQLBindCol1"))
-			return;
-
-	char p2 [3];
-	long p2_len;
-
-	retcode = SQLBindCol (statement, 2, 
-			SQL_C_CHAR,&p2, sizeof (p2), &p2_len);
-	if (!OdbcCheckCode (retcode, statement, "SQLDescribeCol"))
-			return;
-
-	char p3 [33];
-	long p3_len;
-
-	retcode = SQLBindCol (statement, 3, 
-			SQL_C_CHAR,&p3, sizeof (p3), &p3_len);
-	if (!OdbcCheckCode (retcode, statement, "SQLDescribeCol"))
-			return;
-
-
-	short p4;
-	long p4_len;
-
-	retcode = SQLBindCol (statement, 4, 
-			SQL_C_SHORT,&p4, sizeof (p4), &p4_len);
-	if (!OdbcCheckCode (retcode, statement, "SQLDescribeCol"))
-			return;
-
-	char p5 [3];
-	long p5_len;
-
-	retcode = SQLBindCol (statement, 5, 
-			SQL_C_CHAR,&p5, sizeof (p5), &p5_len);
-	if (!OdbcCheckCode (retcode, statement, "SQLDescribeCol"))
-			return;
-
-
-	char p6 [33];
-	long p6_len;
-
-	retcode = SQLBindCol (statement, 6, 
-			SQL_C_CHAR,&p6, sizeof (p6), &p6_len);
-	if (!OdbcCheckCode (retcode, statement, "SQLDescribeCol"))
-			return;
-
-
-	long p7;
-	long p7_len;
-
-	retcode = SQLBindCol (statement, 7, 
-			SQL_C_LONG,&p7, sizeof (p7), &p7_len);
-	if (!OdbcCheckCode (retcode, statement, "SQLDescribeCol"))
-			return;
-
-	short p8;
-	long p8_len;
-
-	retcode = SQLBindCol (statement, 8, 
-			SQL_C_SHORT,&p8, sizeof (p8), &p8_len);
-	if (!OdbcCheckCode (retcode, statement, "SQLDescribeCol"))
-			return;
-
-
-	char p9 [33];
-	long p9_len;
-
-	retcode = SQLBindCol (statement, 9, 
-			SQL_C_CHAR,&p9, sizeof (p9), &p9_len);
-	if (!OdbcCheckCode (retcode, statement, "SQLDescribeCol"))
-			return;
-
-
-	short p10;
-	long p10_len;
-
-	retcode = SQLBindCol (statement, 10, 
-			SQL_C_SHORT,&p10, sizeof (p10), &p10_len);
-	if (!OdbcCheckCode (retcode, statement, "SQLDescribeCol"))
-			return;
-
-	double p11;
-	long p11_len;
-
-	retcode = SQLBindCol (statement, 11, 
-			SQL_C_DOUBLE,&p11, sizeof (p11), &p11_len);
-	if (!OdbcCheckCode (retcode, statement, "SQLbind11"))
-			return;
-
-	char p12 [3];
-	long p12_len;
-
-	retcode = SQLBindCol (statement, 12, 
-			SQL_C_CHAR,&p12, sizeof (p12), &p12_len);
-	if (!OdbcCheckCode (retcode, statement, "SQLbind12"))
-			return;
-
-
-
-	char p13 [3];
-	long p13_len;
-
-	retcode = SQLBindCol (statement, 13, 
-			SQL_C_CHAR,&p13, sizeof (p13), &p13_len);
-	if (!OdbcCheckCode (retcode, statement, "SQLbind13"))
-			return;
-
-	retcode = SQLFetch (statement);
-	if (!OdbcCheckCode (retcode, statement, "SQLFetch"))
-			return;
-}
-
-
-
-void testDisconnect (HDBC connection)
-    {
-
-    int ret = SQLEndTran (SQL_HANDLE_DBC, connection, SQL_COMMIT);
-	if (!OdbcCheckCode (ret, connection, "SQLEndTrans"))
-		return;
-
-    ret = SQLDisconnect (connection);
-    if (!OdbcCheckCode (ret, connection, "SQLDisconnect", SQL_HANDLE_DBC))
-    	return;
-
-    ret = SQLFreeHandle (SQL_HANDLE_DBC, connection);
-    if (!OdbcCheckCode (ret, connection, "SQLFreeHandle (connection)", SQL_HANDLE_DBC))
-    	return;
-
-    ret = SQLFreeHandle (SQL_HANDLE_ENV, env);
-    if (!OdbcCheckCode (ret, env, "SQLFreeHandle (env)", SQL_HANDLE_ENV))
-	return;
-
-
-    }
diff --git a/TestInstall/TestInstall.cpp b/TestInstall/TestInstall.cpp
deleted file mode 100644
index a0ec2c07..00000000
--- a/TestInstall/TestInstall.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "stdafx.h"
-#include <odbcinst.h>
-
-extern BOOL INSTAPI ConfigDSN(HWND		hWnd,
-			   WORD		fRequest,
-			   LPCSTR	lpszDriver,
-			   LPCSTR	lpszAttributes);
-
-int main (int argc, char **argv)
-{
-	ConfigDSN (NULL, ODBC_CONFIG_DSN, "Firebird ODBC driver", "");
-	
-	return 0;
-}
\ No newline at end of file
diff --git a/TestInstall/TestInstall.dsp b/TestInstall/TestInstall.dsp
deleted file mode 100644
index 48205acf..00000000
--- a/TestInstall/TestInstall.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TestInstall" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=TestInstall - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "TestInstall.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "TestInstall.mak" CFG="TestInstall - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "TestInstall - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "TestInstall - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "TestInstall - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\OdbcJdbcSetup" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\Release/TestInstall.exe" /libpath:"..\OdbcJdbcSetup\Release"
-
-!ELSEIF  "$(CFG)" == "TestInstall - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 1
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\OdbcJdbcSetup" /I "c:\program files\Interbase\SDK\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 OdbcJdbcSetup.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\Debug/TestInstall.exe" /pdbtype:sept /libpath:"..\OdbcJdbcSetup\Debug"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "TestInstall - Win32 Release"
-# Name "TestInstall - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\TestInstall.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/cmake/FetchFirebirdHeaders.cmake b/cmake/FetchFirebirdHeaders.cmake
new file mode 100644
index 00000000..65a12221
--- /dev/null
+++ b/cmake/FetchFirebirdHeaders.cmake
@@ -0,0 +1,41 @@
+# FetchFirebirdHeaders.cmake
+#
+# Downloads the Firebird public C/C++ API headers from the official
+# FirebirdSQL/firebird GitHub repository at a pinned release tag.
+#
+# After including this module the variable FIREBIRD_INCLUDE_DIR points
+# to the directory that contains both the legacy compatibility stubs
+# (ibase.h, iberror.h) and the firebird/ sub-tree with the modern API
+# (Interface.h, IdlFbInterfaces.h, Message.h, impl/, …).
+#
+# Usage:
+#   include(cmake/FetchFirebirdHeaders.cmake)
+#   target_include_directories(MyTarget PRIVATE ${FIREBIRD_INCLUDE_DIR})
+
+include(FetchContent)
+
+# Pin to Firebird 5.0.2 – bump when upgrading the target engine version.
+set(FIREBIRD_VERSION "5.0.2" CACHE STRING "Firebird version to fetch headers for")
+set(FIREBIRD_TAG     "v${FIREBIRD_VERSION}")
+
+FetchContent_Declare(
+    firebird_headers
+    URL      "https://github.com/FirebirdSQL/firebird/archive/refs/tags/${FIREBIRD_TAG}.zip"
+    # The full source archive is ~40 MB compressed.  CMake caches the
+    # download in the build tree so it is only fetched once.
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+    # Point SOURCE_SUBDIR to a path without a CMakeLists.txt so that
+    # FetchContent_MakeAvailable downloads the archive but does NOT try
+    # to configure the full Firebird build system as a sub-project.
+    SOURCE_SUBDIR src/include
+)
+
+FetchContent_MakeAvailable(firebird_headers)
+
+# The public headers live under src/include/ inside the archive.
+# That directory contains the legacy stubs (ibase.h → firebird/ibase.h)
+# *and* the firebird/ sub-tree.
+set(FIREBIRD_INCLUDE_DIR "${firebird_headers_SOURCE_DIR}/src/include"
+    CACHE PATH "Firebird public header include directory" FORCE)
+
+message(STATUS "Firebird headers (${FIREBIRD_TAG}): ${FIREBIRD_INCLUDE_DIR}")
diff --git a/cmake/GetVersionFromGit.cmake b/cmake/GetVersionFromGit.cmake
new file mode 100644
index 00000000..b2c6d72b
--- /dev/null
+++ b/cmake/GetVersionFromGit.cmake
@@ -0,0 +1,110 @@
+# GetVersionFromGit.cmake
+# Extracts version information from git tags in v<MAJOR>.<MINOR>.<PATCH> format.
+#
+# Sets the following variables in the parent scope:
+#   ODBC_VERSION_MAJOR   - Major version number
+#   ODBC_VERSION_MINOR   - Minor version number
+#   ODBC_VERSION_PATCH   - Patch version number
+#   ODBC_VERSION_TWEAK   - Build number (0 for tagged releases, commits-since-tag + 1 for dev builds)
+#   ODBC_VERSION_STRING  - Full version string "MAJOR.MINOR.PATCH.TWEAK"
+#   ODBC_VERSION_IS_RELEASE - TRUE if building from an exact tag (no extra commits)
+
+find_package(Git QUIET)
+
+if(NOT GIT_FOUND)
+    message(WARNING "Git not found, using fallback version 0.0.0.0")
+    set(ODBC_VERSION_MAJOR 0)
+    set(ODBC_VERSION_MINOR 0)
+    set(ODBC_VERSION_PATCH 0)
+    set(ODBC_VERSION_TWEAK 0)
+    set(ODBC_VERSION_STRING "0.0.0.0")
+    set(ODBC_VERSION_IS_RELEASE FALSE)
+    return()
+endif()
+
+# Try to find the latest semver tag matching v<MAJOR>.<MINOR>.<PATCH>
+# We use --match to only consider tags in vX.Y.Z format (not rc, temp, etc.)
+execute_process(
+    COMMAND ${GIT_EXECUTABLE} describe --tags --match "v[0-9]*.[0-9]*.[0-9]*"
+            --exclude "*-*" --long --always
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_VARIABLE GIT_DESCRIBE_ERROR
+    RESULT_VARIABLE GIT_DESCRIBE_RESULT
+)
+
+if(NOT GIT_DESCRIBE_RESULT EQUAL 0)
+    # No matching tag found at all, try without --exclude
+    execute_process(
+        COMMAND ${GIT_EXECUTABLE} describe --tags --match "v[0-9]*.[0-9]*.[0-9]*"
+                --long --always
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_VARIABLE GIT_DESCRIBE_ERROR
+        RESULT_VARIABLE GIT_DESCRIBE_RESULT
+    )
+endif()
+
+if(NOT GIT_DESCRIBE_RESULT EQUAL 0)
+    message(WARNING "git describe failed: ${GIT_DESCRIBE_ERROR}")
+    message(WARNING "Using fallback version 0.0.0.0")
+    set(ODBC_VERSION_MAJOR 0)
+    set(ODBC_VERSION_MINOR 0)
+    set(ODBC_VERSION_PATCH 0)
+    set(ODBC_VERSION_TWEAK 0)
+    set(ODBC_VERSION_STRING "0.0.0.0")
+    set(ODBC_VERSION_IS_RELEASE FALSE)
+    return()
+endif()
+
+message(STATUS "Git describe: ${GIT_DESCRIBE_OUTPUT}")
+
+# Parse the output: v<MAJOR>.<MINOR>.<PATCH>-<COMMITS_SINCE_TAG>-g<HASH>
+# Example: v3.0.0-0-gabcdef1  (exactly on tag)
+# Example: v3.0.0-5-gabcdef1  (5 commits after tag)
+if(GIT_DESCRIBE_OUTPUT MATCHES "^v([0-9]+)\\.([0-9]+)\\.([0-9]+)-([0-9]+)-g[0-9a-f]+$")
+    set(ODBC_VERSION_MAJOR ${CMAKE_MATCH_1})
+    set(ODBC_VERSION_MINOR ${CMAKE_MATCH_2})
+    set(ODBC_VERSION_PATCH ${CMAKE_MATCH_3})
+    set(_commits_since_tag ${CMAKE_MATCH_4})
+else()
+    message(WARNING "Could not parse git describe output: ${GIT_DESCRIBE_OUTPUT}")
+    message(WARNING "Using fallback version 0.0.0.0")
+    set(ODBC_VERSION_MAJOR 0)
+    set(ODBC_VERSION_MINOR 0)
+    set(ODBC_VERSION_PATCH 0)
+    set(ODBC_VERSION_TWEAK 0)
+    set(ODBC_VERSION_STRING "0.0.0.0")
+    set(ODBC_VERSION_IS_RELEASE FALSE)
+    return()
+endif()
+
+# Determine the 4th version component (tweak/build number):
+#   - Official releases (CI, triggered by a tag push): always 0
+#   - Local/dev builds: commits_since_tag + 1 (so that on-tag dev builds = 1, next commit = 2, etc.)
+#
+# CI is detected via the ODBC_OFFICIAL_RELEASE CMake variable or the CI environment variable.
+if(ODBC_OFFICIAL_RELEASE OR DEFINED ENV{CI})
+    set(ODBC_VERSION_TWEAK 0)
+    set(ODBC_VERSION_IS_RELEASE TRUE)
+else()
+    if(_commits_since_tag EQUAL 0)
+        # Sitting exactly on a tag, but building locally → tweak = 1
+        # This distinguishes a local build from the official tagged release
+        set(ODBC_VERSION_TWEAK 1)
+    else()
+        math(EXPR ODBC_VERSION_TWEAK "${_commits_since_tag} + 1")
+    endif()
+    set(ODBC_VERSION_IS_RELEASE FALSE)
+endif()
+
+set(ODBC_VERSION_STRING "${ODBC_VERSION_MAJOR}.${ODBC_VERSION_MINOR}.${ODBC_VERSION_PATCH}.${ODBC_VERSION_TWEAK}")
+
+message(STATUS "Firebird ODBC Driver version: ${ODBC_VERSION_STRING}")
+message(STATUS "  Major: ${ODBC_VERSION_MAJOR}")
+message(STATUS "  Minor: ${ODBC_VERSION_MINOR}")
+message(STATUS "  Patch: ${ODBC_VERSION_PATCH}")
+message(STATUS "  Tweak: ${ODBC_VERSION_TWEAK}")
+message(STATUS "  Release: ${ODBC_VERSION_IS_RELEASE}")
diff --git a/cmake/Version.h.in b/cmake/Version.h.in
new file mode 100644
index 00000000..41e20d15
--- /dev/null
+++ b/cmake/Version.h.in
@@ -0,0 +1,12 @@
+// Auto-generated by CMake — do not edit manually.
+// Source: cmake/Version.h.in
+#pragma once
+
+#define ODBC_VERSION_MAJOR  @ODBC_VERSION_MAJOR@
+#define ODBC_VERSION_MINOR  @ODBC_VERSION_MINOR@
+#define ODBC_VERSION_PATCH  @ODBC_VERSION_PATCH@
+#define ODBC_VERSION_TWEAK  @ODBC_VERSION_TWEAK@
+
+#define ODBC_VERSION_STRING "@ODBC_VERSION_STRING@"
+#define ODBC_COMPANY_NAME   "Firebird Foundation"
+#define ODBC_COPYRIGHT      "Copyright \xA9 2000-2026 Firebird Foundation"
diff --git a/makefile.in b/makefile.in
deleted file mode 100644
index fad1533b..00000000
--- a/makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-DateTime.o: IscDbc/DateTime.cpp IscDbc/Engine.h IscDbc/JString.h \
- IscDbc/DateTime.h IscDbc/SQLError.h IscDbc/SQLException.h
-DescRecord.o: DescRecord.cpp OdbcDesc.h OdbcObject.h OdbcJdbc.h \
- IscDbc/JString.h DescRecord.h
-JString.o: IscDbc/JString.cpp IscDbc/JString.h
-Main.o: Main.cpp OdbcEnv.h OdbcObject.h OdbcJdbc.h IscDbc/JString.h \
- OdbcConnection.h OdbcDesc.h OdbcStatement.h
-OdbcConnection.o: OdbcConnection.cpp OdbcJdbc.h OdbcConnection.h \
- OdbcDesc.h OdbcObject.h IscDbc/JString.h OdbcEnv.h SetupAttributes.h \
- IscDbc/Connection.h IscDbc/Blob.h IscDbc/Properties.h \
- IscDbc/SQLException.h OdbcStatement.h InfoItems.h
-OdbcDateTime.o: OdbcDateTime.cpp OdbcDateTime.h IscDbc/Connection.h \
- IscDbc/Blob.h IscDbc/Properties.h IscDbc/SQLException.h \
- IscDbc/TimeStamp.h IscDbc/SqlTime.h IscDbc/DateTime.h OdbcStatement.h \
- OdbcObject.h OdbcJdbc.h IscDbc/JString.h
-OdbcDesc.o: OdbcDesc.cpp OdbcDesc.h OdbcObject.h OdbcJdbc.h \
- IscDbc/JString.h OdbcConnection.h DescRecord.h
-OdbcEnv.o: OdbcEnv.cpp OdbcJdbc.h OdbcEnv.h OdbcObject.h \
- IscDbc/JString.h OdbcConnection.h OdbcDesc.h
-OdbcError.o: OdbcError.cpp OdbcJdbc.h OdbcError.h IscDbc/JString.h
-OdbcObject.o: OdbcObject.cpp OdbcObject.h OdbcJdbc.h IscDbc/JString.h \
- OdbcError.h IscDbc/SQLException.h
-OdbcStatement.o: OdbcStatement.cpp OdbcStatement.h OdbcObject.h \
- OdbcJdbc.h IscDbc/JString.h OdbcConnection.h OdbcDesc.h OdbcError.h \
- IscDbc/Connection.h IscDbc/Blob.h IscDbc/Properties.h \
- IscDbc/SQLException.h OdbcDateTime.h IscDbc/TimeStamp.h \
- IscDbc/SqlTime.h IscDbc/DateTime.h
-SQLError.o: IscDbc/SQLError.cpp IscDbc/Engine.h IscDbc/JString.h \
- IscDbc/SQLError.h IscDbc/SQLException.h IscDbc/Stream.h
-SqlTime.o: IscDbc/SqlTime.cpp IscDbc/SqlTime.h
-TimeStamp.o: IscDbc/TimeStamp.cpp IscDbc/Engine.h IscDbc/JString.h \
- IscDbc/TimeStamp.h IscDbc/SqlTime.h IscDbc/DateTime.h
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 24eb325f..7adf498b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,31 +1,40 @@
 # Firebird ODBC Driver — Test Suite
 #
-# Standalone CMake project for the Google Test-based test suite.
 # Tests the driver through the standard ODBC API (via the Driver Manager).
 #
-# Prerequisites:
-#   - The Firebird ODBC driver must be pre-built and registered as an ODBC
-#     data source (or referenced via a Driver= connection string).
-#   - A Firebird database must be running and accessible.
-#   - The FIREBIRD_ODBC_CONNECTION environment variable must be set.
-#   - Google Test must be installed (e.g., via vcpkg: vcpkg install gtest)
+# This file is included from the root CMakeLists.txt via add_subdirectory().
+# It can also be built standalone for quick iteration:
 #
-# Build and run:
-#   cmake -B build-tests -S tests
+#   cmake -B build-tests -S tests -DCMAKE_PREFIX_PATH=<vcpkg-root>/installed/x64-windows
 #   cmake --build build-tests --config Release
-#   set FIREBIRD_ODBC_CONNECTION=Driver={Firebird ODBC Driver};Dbname=localhost:C:\path\to\test.fdb;Uid=SYSDBA;Pwd=masterkey;
+#   set FIREBIRD_ODBC_CONNECTION=Driver={Firebird ODBC Driver};...
 #   ctest --test-dir build-tests --output-on-failure
 
-cmake_minimum_required(VERSION 3.14)
-project(FirebirdOdbcTests LANGUAGES CXX)
-
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+# When built standalone (no parent project), set up the project and standards.
+if(NOT CMAKE_PROJECT_NAME OR CMAKE_PROJECT_NAME STREQUAL "FirebirdOdbcTests")
+    cmake_minimum_required(VERSION 3.14)
+    project(FirebirdOdbcTests LANGUAGES CXX)
+    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
 
 # ---------------------------------------------------------------------------
-# Find Google Test
+# Google Test — prefer FetchContent (integrated build), fall back to find_package
 # ---------------------------------------------------------------------------
-find_package(GTest CONFIG REQUIRED)
+include(FetchContent)
+FetchContent_Declare(
+    googletest
+    URL https://github.com/google/googletest/archive/refs/tags/v1.14.0.zip
+    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+)
+# Prevent GTest from overriding parent project settings
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
+# Build GTest as a static library (the test exe doesn't need a separate DLL)
+set(BUILD_SHARED_LIBS_SAVED ${BUILD_SHARED_LIBS})
+set(BUILD_SHARED_LIBS OFF)
+FetchContent_MakeAvailable(googletest)
+set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_SAVED})
 
 # ---------------------------------------------------------------------------
 # Find ODBC
@@ -36,7 +45,9 @@ find_package(ODBC REQUIRED)
 # Enable CTest
 # ---------------------------------------------------------------------------
 include(GoogleTest)
-enable_testing()
+if(NOT CMAKE_PROJECT_NAME OR CMAKE_PROJECT_NAME STREQUAL "FirebirdOdbcTests")
+    enable_testing()
+endif()
 
 # ---------------------------------------------------------------------------
 # Test executable
@@ -87,7 +98,7 @@ add_executable(firebird_odbc_tests
 # ---------------------------------------------------------------------------
 # Link against Google Test and the ODBC Driver Manager
 # ---------------------------------------------------------------------------
-target_link_libraries(firebird_odbc_tests PRIVATE GTest::gtest ODBC::ODBC)
+target_link_libraries(firebird_odbc_tests PRIVATE gtest ODBC::ODBC)
 
 # ---------------------------------------------------------------------------
 # Discover tests for CTest