From 3be0180445eaed554bf001d59e2cfa4389f94c10 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 17 Jul 2012 15:17:09 +0200 Subject: Use __ifelse__ instead of m4_ifelse --- boost/mssql/template/Makefile.am | 2 +- boost/mssql/template/template-vc10.vcxproj | 6 +++--- boost/mssql/template/template-vc10.vcxproj.filters | 4 ++-- boost/mssql/template/template-vc9.vcproj | 4 ++-- boost/mysql/template/Makefile.am | 2 +- boost/mysql/template/template-vc10.vcxproj | 6 +++--- boost/mysql/template/template-vc10.vcxproj.filters | 4 ++-- boost/mysql/template/template-vc9.vcproj | 4 ++-- boost/oracle/template/Makefile.am | 2 +- boost/oracle/template/template-vc10.vcxproj | 6 +++--- boost/oracle/template/template-vc10.vcxproj.filters | 4 ++-- boost/oracle/template/template-vc9.vcproj | 4 ++-- boost/pgsql/template/Makefile.am | 2 +- boost/pgsql/template/template-vc10.vcxproj | 6 +++--- boost/pgsql/template/template-vc10.vcxproj.filters | 4 ++-- boost/pgsql/template/template-vc9.vcproj | 4 ++-- boost/sqlite/template/Makefile.am | 2 +- boost/sqlite/template/template-vc10.vcxproj | 6 +++--- boost/sqlite/template/template-vc10.vcxproj.filters | 4 ++-- boost/sqlite/template/template-vc9.vcproj | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) (limited to 'boost') diff --git a/boost/mssql/template/Makefile.am b/boost/mssql/template/Makefile.am index f450bb0..5f194a7 100644 --- a/boost/mssql/template/Makefile.am +++ b/boost/mssql/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/boost/mssql/template/template-vc10.vcxproj b/boost/mssql/template/template-vc10.vcxproj index b1e2e37..dcb625e 100644 --- a/boost/mssql/template/template-vc10.vcxproj +++ b/boost/mssql/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/boost/mssql/template/template-vc10.vcxproj.filters b/boost/mssql/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/boost/mssql/template/template-vc10.vcxproj.filters +++ b/boost/mssql/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/boost/mssql/template/template-vc9.vcproj b/boost/mssql/template/template-vc9.vcproj index 520a143..422fbd7 100644 --- a/boost/mssql/template/template-vc9.vcproj +++ b/boost/mssql/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/boost/mysql/template/Makefile.am b/boost/mysql/template/Makefile.am index 10e80d3..c7305cc 100644 --- a/boost/mysql/template/Makefile.am +++ b/boost/mysql/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/boost/mysql/template/template-vc10.vcxproj b/boost/mysql/template/template-vc10.vcxproj index 29e53be..3137abc 100644 --- a/boost/mysql/template/template-vc10.vcxproj +++ b/boost/mysql/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/boost/mysql/template/template-vc10.vcxproj.filters b/boost/mysql/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/boost/mysql/template/template-vc10.vcxproj.filters +++ b/boost/mysql/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/boost/mysql/template/template-vc9.vcproj b/boost/mysql/template/template-vc9.vcproj index 99551c1..b60c7e2 100644 --- a/boost/mysql/template/template-vc9.vcproj +++ b/boost/mysql/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/boost/oracle/template/Makefile.am b/boost/oracle/template/Makefile.am index 9853f57..3eec093 100644 --- a/boost/oracle/template/Makefile.am +++ b/boost/oracle/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/boost/oracle/template/template-vc10.vcxproj b/boost/oracle/template/template-vc10.vcxproj index 8aa5256..0c93020 100644 --- a/boost/oracle/template/template-vc10.vcxproj +++ b/boost/oracle/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/boost/oracle/template/template-vc10.vcxproj.filters b/boost/oracle/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/boost/oracle/template/template-vc10.vcxproj.filters +++ b/boost/oracle/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/boost/oracle/template/template-vc9.vcproj b/boost/oracle/template/template-vc9.vcproj index 2a7448a..a3061ee 100644 --- a/boost/oracle/template/template-vc9.vcproj +++ b/boost/oracle/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/boost/pgsql/template/Makefile.am b/boost/pgsql/template/Makefile.am index ec9e43b..24a0206 100644 --- a/boost/pgsql/template/Makefile.am +++ b/boost/pgsql/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/boost/pgsql/template/template-vc10.vcxproj b/boost/pgsql/template/template-vc10.vcxproj index 9f41ede..7bc0243 100644 --- a/boost/pgsql/template/template-vc10.vcxproj +++ b/boost/pgsql/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/boost/pgsql/template/template-vc10.vcxproj.filters b/boost/pgsql/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/boost/pgsql/template/template-vc10.vcxproj.filters +++ b/boost/pgsql/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/boost/pgsql/template/template-vc9.vcproj b/boost/pgsql/template/template-vc9.vcproj index 34a8582..db49496 100644 --- a/boost/pgsql/template/template-vc9.vcproj +++ b/boost/pgsql/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, diff --git a/boost/sqlite/template/Makefile.am b/boost/sqlite/template/Makefile.am index 0168a12..ba7b102 100644 --- a/boost/sqlite/template/Makefile.am +++ b/boost/sqlite/template/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)' TESTS=$(top_builddir)/tester TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir; -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, # ODB compilation. # diff --git a/boost/sqlite/template/template-vc10.vcxproj b/boost/sqlite/template/template-vc10.vcxproj index 5224c7f..f94df08 100644 --- a/boost/sqlite/template/template-vc10.vcxproj +++ b/boost/sqlite/template/template-vc10.vcxproj @@ -154,7 +154,7 @@ true -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, m4_dnl __custom_build_entry__( @@ -164,14 +164,14 @@ odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFI test-odb.hxx;test-odb.ixx;test-odb.cxx) ) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_entry__(test-odb.hxx) __header_entry__(test-odb.ixx)) __header_entries__(extra_headers) __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) diff --git a/boost/sqlite/template/template-vc10.vcxproj.filters b/boost/sqlite/template/template-vc10.vcxproj.filters index 951015b..8ac18a3 100644 --- a/boost/sqlite/template/template-vc10.vcxproj.filters +++ b/boost/sqlite/template/template-vc10.vcxproj.filters @@ -11,7 +11,7 @@ -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __header_filter_entry__(test.hxx) __header_filter_entry__(test-odb.hxx) __header_filter_entry__(test-odb.ixx)) @@ -19,7 +19,7 @@ __header_filter_entries__(extra_headers) __source_filter_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) __source_filter_entries__(extra_sources) \ No newline at end of file diff --git a/boost/sqlite/template/template-vc9.vcproj b/boost/sqlite/template/template-vc9.vcproj index 93e9ba2..32fb152 100644 --- a/boost/sqlite/template/template-vc9.vcproj +++ b/boost/sqlite/template/template-vc9.vcproj @@ -337,7 +337,7 @@ UniqueIdentifier="{__uuid__()}" > __source_entry__(driver.cxx) -m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) __source_entries__(extra_sources) -m4_ifelse(__value__(odb_options),,, +__ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, -- cgit v1.1