BIND 10 trac2117, updated. 249bcc81835a1e1ef7cdc7220c22c149ff5731b8 ISC_LIBxxx_{API, EXPORT} -> B10_LIB...
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Aug 20 14:14:00 UTC 2012
The branch, trac2117 has been updated
via 249bcc81835a1e1ef7cdc7220c22c149ff5731b8 (commit)
from f466fd981273ec9f09b3761da1fc30eb9e325598 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 249bcc81835a1e1ef7cdc7220c22c149ff5731b8
Author: Francis Dupont <fdupont at isc.org>
Date: Mon Aug 20 16:13:22 2012 +0200
ISC_LIBxxx_{API,EXPORT} -> B10_LIB...
-----------------------------------------------------------------------
Summary of changes:
src/lib/acl/dll.h | 8 ++--
src/lib/acl/dns.cc | 4 +-
src/lib/acl/dns.h | 8 ++--
src/lib/acl/ip_check.cc | 6 +--
src/lib/acl/ip_check.h | 6 +--
src/lib/acl/loader.cc | 4 +-
src/lib/acl/loader.h | 8 ++--
src/lib/acl/logic_check.h | 13 +-----
src/lib/asiodns/dll.h | 8 ++--
src/lib/asiodns/dns_answer.h | 2 +-
src/lib/asiodns/dns_lookup.h | 2 +-
src/lib/asiodns/dns_server.h | 2 +-
src/lib/asiodns/dns_service.cc | 6 +--
src/lib/asiodns/dns_service.h | 8 ++--
src/lib/asiodns/io_fetch.cc | 2 +-
src/lib/asiodns/io_fetch.h | 2 +-
src/lib/asiodns/logger.cc | 2 +-
src/lib/asiodns/sync_udp_server.cc | 2 +-
src/lib/asiodns/sync_udp_server.h | 2 +-
src/lib/asiodns/tcp_server.cc | 2 +-
src/lib/asiodns/tcp_server.h | 2 +-
src/lib/asiodns/udp_server.cc | 2 +-
src/lib/asiodns/udp_server.h | 2 +-
src/lib/asiolink/dll.h | 8 ++--
src/lib/asiolink/dummy_io_cb.cc | 4 +-
src/lib/asiolink/dummy_io_cb.h | 2 +-
src/lib/asiolink/interval_timer.cc | 2 +-
src/lib/asiolink/interval_timer.h | 2 +-
src/lib/asiolink/io_address.cc | 2 +-
src/lib/asiolink/io_address.h | 2 +-
src/lib/asiolink/io_asio_socket.h | 8 ++--
src/lib/asiolink/io_endpoint.cc | 4 +-
src/lib/asiolink/io_endpoint.h | 4 +-
src/lib/asiolink/io_error.cc | 10 ++---
src/lib/asiolink/io_error.h | 2 +-
src/lib/asiolink/io_message.cc | 4 +-
src/lib/asiolink/io_message.h | 2 +-
src/lib/asiolink/io_service.cc | 2 +-
src/lib/asiolink/io_service.h | 2 +-
src/lib/asiolink/io_socket.cc | 2 +-
src/lib/asiolink/io_socket.h | 2 +-
src/lib/asiolink/simple_callback.cc | 4 +-
src/lib/asiolink/simple_callback.h | 2 +-
src/lib/asiolink/tcp_endpoint.h | 2 +-
src/lib/asiolink/tcp_socket.h | 2 +-
src/lib/asiolink/udp_endpoint.h | 2 +-
src/lib/bench/benchmark_util.cc | 6 +--
src/lib/bench/benchmark_util.h | 8 ++--
src/lib/bench/dll.h | 8 ++--
src/lib/cache/cache_entry_key.cc | 6 +--
src/lib/cache/cache_entry_key.h | 4 +-
src/lib/cache/dll.h | 8 ++--
src/lib/cache/local_zone_data.cc | 2 +-
src/lib/cache/local_zone_data.h | 2 +-
src/lib/cache/logger.cc | 2 +-
src/lib/cache/message_cache.cc | 2 +-
src/lib/cache/message_cache.h | 2 +-
src/lib/cache/message_entry.cc | 2 +-
src/lib/cache/message_entry.h | 4 +-
src/lib/cache/message_utility.cc | 2 +-
src/lib/cache/resolver_cache.cc | 2 +-
src/lib/cache/resolver_cache.h | 8 ++--
src/lib/cache/rrset_cache.cc | 2 +-
src/lib/cache/rrset_cache.h | 4 +-
src/lib/cache/rrset_copy.cc | 4 +-
src/lib/cache/rrset_copy.h | 2 +-
src/lib/cache/rrset_entry.cc | 2 +-
src/lib/cache/rrset_entry.h | 2 +-
src/lib/cc/data.cc | 16 ++++----
src/lib/cc/data.h | 36 ++++++++---------
src/lib/cc/dll.h | 8 ++--
src/lib/cc/logger.cc | 2 +-
src/lib/cc/session.cc | 2 +-
src/lib/cc/session.h | 8 ++--
src/lib/config/ccsession.cc | 20 +++++-----
src/lib/config/ccsession.h | 24 +++++------
src/lib/config/config_data.cc | 2 +-
src/lib/config/config_data.h | 4 +-
src/lib/config/config_log.cc | 2 +-
src/lib/config/dll.h | 8 ++--
src/lib/config/module_spec.cc | 2 +-
src/lib/config/module_spec.h | 8 ++--
src/lib/cryptolink/crypto_hmac.cc | 10 ++---
src/lib/cryptolink/crypto_hmac.h | 8 ++--
src/lib/cryptolink/cryptolink.cc | 11 +----
src/lib/cryptolink/cryptolink.h | 14 +++----
src/lib/cryptolink/dll.h | 8 ++--
src/lib/datasrc/cache.cc | 2 +-
src/lib/datasrc/cache.h | 10 ++---
src/lib/datasrc/client.h | 4 +-
src/lib/datasrc/client_list.cc | 2 +-
src/lib/datasrc/client_list.h | 10 ++---
src/lib/datasrc/data_source.cc | 2 +-
src/lib/datasrc/data_source.h | 28 ++++++-------
src/lib/datasrc/database.cc | 2 +-
src/lib/datasrc/database.h | 4 +-
src/lib/datasrc/dll.h | 8 ++--
src/lib/datasrc/factory.cc | 2 +-
src/lib/datasrc/factory.h | 8 ++--
src/lib/datasrc/iterator.h | 2 +-
src/lib/datasrc/logger.cc | 2 +-
src/lib/datasrc/memory_datasrc.cc | 2 +-
src/lib/datasrc/memory_datasrc.h | 20 +++++-----
src/lib/datasrc/memory_datasrc_link.cc | 8 ++--
src/lib/datasrc/query.cc | 2 +-
src/lib/datasrc/query.h | 6 +--
src/lib/datasrc/rbnode_rrset.h | 4 +-
src/lib/datasrc/sqlite3_accessor.cc | 2 +-
src/lib/datasrc/sqlite3_accessor.h | 20 +++++-----
src/lib/datasrc/sqlite3_accessor_link.cc | 6 +--
src/lib/datasrc/sqlite3_datasrc.cc | 4 +-
src/lib/datasrc/sqlite3_datasrc.h | 18 ++++-----
src/lib/datasrc/static_datasrc.cc | 2 +-
src/lib/datasrc/static_datasrc.h | 12 +++---
src/lib/datasrc/static_datasrc_link.cc | 6 +--
src/lib/datasrc/tests/cache_unittest.cc | 2 +-
src/lib/datasrc/tests/client_list_unittest.cc | 2 +-
src/lib/datasrc/tests/client_unittest.cc | 2 +-
src/lib/datasrc/tests/database_unittest.cc | 2 +-
src/lib/datasrc/tests/datasrc_unittest.cc | 2 +-
src/lib/datasrc/tests/factory_unittest.cc | 2 +-
src/lib/datasrc/tests/faked_nsec3.cc | 2 +-
src/lib/datasrc/tests/logger_unittest.cc | 2 +-
src/lib/datasrc/tests/memory_datasrc_unittest.cc | 2 +-
src/lib/datasrc/tests/query_unittest.cc | 2 +-
src/lib/datasrc/tests/rbnode_rrset_unittest.cc | 2 +-
src/lib/datasrc/tests/rbtree_unittest.cc | 2 +-
src/lib/datasrc/tests/sqlite3_accessor_unittest.cc | 2 +-
src/lib/datasrc/tests/sqlite3_unittest.cc | 2 +-
src/lib/datasrc/tests/static_unittest.cc | 2 +-
src/lib/datasrc/tests/test_client.cc | 2 +-
src/lib/datasrc/tests/test_datasrc.cc | 2 +-
.../datasrc/tests/zone_finder_context_unittest.cc | 2 +-
src/lib/datasrc/tests/zonetable_unittest.cc | 2 +-
src/lib/datasrc/zone.h | 10 ++---
src/lib/datasrc/zone_finder_context.cc | 2 +-
src/lib/datasrc/zonetable.cc | 2 +-
src/lib/datasrc/zonetable.h | 6 +--
src/lib/dhcp/dll.h | 8 ++--
src/lib/dhcp/iface_mgr.cc | 2 +-
src/lib/dhcp/iface_mgr.h | 4 +-
src/lib/dhcp/iface_mgr_bsd.cc | 2 +-
src/lib/dhcp/iface_mgr_linux.cc | 2 +-
src/lib/dhcp/iface_mgr_sun.cc | 2 +-
src/lib/dhcp/iface_mgr_windows.cc | 2 +-
src/lib/dhcp/libdhcp++.cc | 2 +-
src/lib/dhcp/libdhcp++.h | 2 +-
src/lib/dhcp/option.cc | 2 +-
src/lib/dhcp/option.h | 4 +-
src/lib/dhcp/option4_addrlst.cc | 2 +-
src/lib/dhcp/option4_addrlst.h | 2 +-
src/lib/dhcp/option6_addrlst.cc | 2 +-
src/lib/dhcp/option6_addrlst.h | 2 +-
src/lib/dhcp/option6_ia.cc | 2 +-
src/lib/dhcp/option6_ia.h | 2 +-
src/lib/dhcp/option6_iaaddr.cc | 2 +-
src/lib/dhcp/option6_iaaddr.h | 2 +-
src/lib/dhcp/pkt4.cc | 2 +-
src/lib/dhcp/pkt4.h | 2 +-
src/lib/dhcp/pkt6.cc | 2 +-
src/lib/dhcp/pkt6.h | 2 +-
src/lib/dns/character_string.cc | 2 +-
src/lib/dns/character_string.h | 4 +-
src/lib/dns/dll.h | 8 ++--
src/lib/dns/edns.cc | 2 +-
src/lib/dns/edns.h | 22 +++++-----
src/lib/dns/exceptions.cc | 2 +-
src/lib/dns/exceptions.h | 8 ++--
src/lib/dns/gen-rdatacode.py.in | 2 +-
src/lib/dns/gen-rdatacode.py.win32 | 2 +-
src/lib/dns/labelsequence.cc | 2 +-
src/lib/dns/labelsequence.h | 2 +-
src/lib/dns/masterload.cc | 6 +--
src/lib/dns/masterload.h | 10 ++---
src/lib/dns/message.cc | 4 +-
src/lib/dns/message.h | 30 +++++++-------
src/lib/dns/messagerenderer.cc | 2 +-
src/lib/dns/messagerenderer.h | 6 +--
src/lib/dns/name.cc | 4 +-
src/lib/dns/name.h | 26 ++++++------
src/lib/dns/nsec3hash.cc | 4 +-
src/lib/dns/nsec3hash.h | 16 ++++----
src/lib/dns/opcode.cc | 4 +-
src/lib/dns/opcode.h | 4 +-
src/lib/dns/python/dll.h | 10 ++---
src/lib/dns/python/edns_python.cc | 10 ++---
src/lib/dns/python/edns_python.h | 8 ++--
src/lib/dns/python/message_python.cc | 12 +++---
src/lib/dns/python/message_python.h | 10 ++---
src/lib/dns/python/messagerenderer_python.cc | 8 ++--
src/lib/dns/python/messagerenderer_python.h | 6 +--
src/lib/dns/python/name_python.cc | 30 +++++++-------
src/lib/dns/python/name_python.h | 28 ++++++-------
src/lib/dns/python/nsec3hash_python.cc | 8 ++--
src/lib/dns/python/nsec3hash_python.h | 6 +--
src/lib/dns/python/opcode_python.cc | 10 ++---
src/lib/dns/python/opcode_python.h | 8 ++--
src/lib/dns/python/pydnspp.cc | 2 +-
src/lib/dns/python/pydnspp_common.cc | 12 +++---
src/lib/dns/python/pydnspp_common.h | 10 ++---
src/lib/dns/python/question_python.cc | 10 ++---
src/lib/dns/python/question_python.h | 10 ++---
src/lib/dns/python/rcode_python.cc | 10 ++---
src/lib/dns/python/rcode_python.h | 8 ++--
src/lib/dns/python/rdata_python.cc | 16 ++++----
src/lib/dns/python/rdata_python.h | 14 +++----
src/lib/dns/python/rrclass_python.cc | 14 +++----
src/lib/dns/python/rrclass_python.h | 12 +++---
src/lib/dns/python/rrset_python.cc | 14 +++----
src/lib/dns/python/rrset_python.h | 12 +++---
src/lib/dns/python/rrttl_python.cc | 14 +++----
src/lib/dns/python/rrttl_python.h | 12 +++---
src/lib/dns/python/rrtype_python.cc | 14 +++----
src/lib/dns/python/rrtype_python.h | 12 +++---
src/lib/dns/python/serial_python.cc | 10 ++---
src/lib/dns/python/serial_python.h | 8 ++--
src/lib/dns/python/tsig_python.cc | 10 ++---
src/lib/dns/python/tsig_python.h | 8 ++--
src/lib/dns/python/tsig_rdata_python.cc | 10 ++---
src/lib/dns/python/tsig_rdata_python.h | 8 ++--
src/lib/dns/python/tsigerror_python.cc | 6 +--
src/lib/dns/python/tsigerror_python.h | 4 +-
src/lib/dns/python/tsigkey_python.cc | 14 +++----
src/lib/dns/python/tsigkey_python.h | 12 +++---
src/lib/dns/python/tsigrecord_python.cc | 10 ++---
src/lib/dns/python/tsigrecord_python.h | 8 ++--
src/lib/dns/question.cc | 4 +-
src/lib/dns/question.h | 12 +++---
src/lib/dns/rcode.cc | 4 +-
src/lib/dns/rcode.h | 4 +-
src/lib/dns/rdata.cc | 12 +++---
src/lib/dns/rdata.h | 34 ++++++++--------
src/lib/dns/rdata/any_255/tsig_250.h | 4 +-
src/lib/dns/rdata/ch_3/a_1.h | 2 +-
src/lib/dns/rdata/generic/afsdb_18.h | 2 +-
src/lib/dns/rdata/generic/cname_5.h | 2 +-
.../dns/rdata/generic/detail/nsec3param_common.cc | 2 +-
src/lib/dns/rdata/generic/detail/nsec_bitmap.cc | 2 +-
src/lib/dns/rdata/generic/dlv_32769.h | 2 +-
src/lib/dns/rdata/generic/dname_39.h | 2 +-
src/lib/dns/rdata/generic/dnskey_48.h | 2 +-
src/lib/dns/rdata/generic/ds_43.h | 2 +-
src/lib/dns/rdata/generic/hinfo_13.h | 2 +-
src/lib/dns/rdata/generic/minfo_14.h | 2 +-
src/lib/dns/rdata/generic/mx_15.h | 2 +-
src/lib/dns/rdata/generic/naptr_35.h | 2 +-
src/lib/dns/rdata/generic/ns_2.h | 2 +-
src/lib/dns/rdata/generic/nsec3_50.h | 2 +-
src/lib/dns/rdata/generic/nsec3param_51.h | 2 +-
src/lib/dns/rdata/generic/nsec_47.h | 2 +-
src/lib/dns/rdata/generic/opt_41.h | 2 +-
src/lib/dns/rdata/generic/ptr_12.h | 2 +-
src/lib/dns/rdata/generic/rp_17.h | 2 +-
src/lib/dns/rdata/generic/rrsig_46.h | 2 +-
src/lib/dns/rdata/generic/soa_6.h | 2 +-
src/lib/dns/rdata/generic/spf_99.h | 2 +-
src/lib/dns/rdata/generic/sshfp_44.h | 2 +-
src/lib/dns/rdata/generic/txt_16.h | 2 +-
src/lib/dns/rdata/hs_4/a_1.h | 2 +-
src/lib/dns/rdata/in_1/a_1.h | 2 +-
src/lib/dns/rdata/in_1/aaaa_28.h | 2 +-
src/lib/dns/rdata/in_1/dhcid_49.h | 2 +-
src/lib/dns/rdata/in_1/srv_33.h | 2 +-
src/lib/dns/rdata/template.h | 2 +-
src/lib/dns/rdatafields.cc | 2 +-
src/lib/dns/rdatafields.h | 8 ++--
src/lib/dns/rrclass-placeholder.h | 14 +++----
src/lib/dns/rrclass.cc | 4 +-
src/lib/dns/rrparamregistry-placeholder.cc | 2 +-
src/lib/dns/rrparamregistry.h | 8 ++--
src/lib/dns/rrset.cc | 4 +-
src/lib/dns/rrset.h | 32 +++++++--------
src/lib/dns/rrsetlist.cc | 2 +-
src/lib/dns/rrsetlist.h | 4 +-
src/lib/dns/rrttl.cc | 4 +-
src/lib/dns/rrttl.h | 14 +++----
src/lib/dns/rrtype-placeholder.h | 14 +++----
src/lib/dns/rrtype.cc | 4 +-
src/lib/dns/serial.cc | 4 +-
src/lib/dns/serial.h | 4 +-
src/lib/dns/tests/message_unittest.cc | 2 +-
src/lib/dns/tests/tsig_unittest.cc | 2 +-
src/lib/dns/tsig.cc | 2 +-
src/lib/dns/tsig.h | 4 +-
src/lib/dns/tsigerror.cc | 4 +-
src/lib/dns/tsigerror.h | 4 +-
src/lib/dns/tsigkey.cc | 2 +-
src/lib/dns/tsigkey.h | 6 +--
src/lib/dns/tsigrecord.cc | 4 +-
src/lib/dns/tsigrecord.h | 8 ++--
src/lib/log/dll.h | 8 ++--
src/lib/log/dummylog.cc | 8 ++--
src/lib/log/dummylog.h | 6 +--
src/lib/log/log_formatter.cc | 6 +--
src/lib/log/log_formatter.h | 8 ++--
src/lib/log/log_messages.cc | 42 ++++++++++----------
src/lib/log/log_messages.h | 40 +++++++++----------
src/lib/log/logger.cc | 2 +-
src/lib/log/logger.h | 6 +--
src/lib/log/logger_impl.cc | 2 +-
src/lib/log/logger_level.cc | 4 +-
src/lib/log/logger_level.h | 2 +-
src/lib/log/logger_level_impl.cc | 2 +-
src/lib/log/logger_level_impl.h | 2 +-
src/lib/log/logger_manager.cc | 2 +-
src/lib/log/logger_manager.h | 4 +-
src/lib/log/logger_manager_impl.cc | 2 +-
src/lib/log/logger_manager_impl.h | 4 +-
src/lib/log/logger_name.cc | 8 ++--
src/lib/log/logger_name.h | 6 +--
src/lib/log/logger_specification.h | 2 +-
src/lib/log/logger_support.cc | 8 ++--
src/lib/log/logger_support.h | 6 +--
src/lib/log/logger_unittest_support.cc | 10 ++---
src/lib/log/logger_unittest_support.h | 8 ++--
src/lib/log/logimpl_messages.cc | 8 ++--
src/lib/log/logimpl_messages.h | 6 +--
src/lib/log/message_dictionary.cc | 2 +-
src/lib/log/message_dictionary.h | 2 +-
src/lib/log/message_exception.h | 2 +-
src/lib/log/message_initializer.cc | 2 +-
src/lib/log/message_initializer.h | 2 +-
src/lib/log/message_reader.cc | 2 +-
src/lib/log/message_reader.h | 2 +-
src/lib/log/message_types.h | 2 +-
src/lib/log/output_option.cc | 2 +-
src/lib/log/output_option.h | 6 +--
src/lib/nsas/address_entry.cc | 2 +-
src/lib/nsas/address_entry.h | 2 +-
src/lib/nsas/address_request_callback.h | 2 +-
src/lib/nsas/dll.h | 8 ++--
src/lib/nsas/fetchable.h | 2 +-
src/lib/nsas/glue_hints.cc | 2 +-
src/lib/nsas/glue_hints.h | 2 +-
src/lib/nsas/hash.cc | 2 +-
src/lib/nsas/hash.h | 4 +-
src/lib/nsas/hash_key.cc | 2 +-
src/lib/nsas/hash_key.h | 2 +-
src/lib/nsas/nameserver_address.cc | 2 +-
src/lib/nsas/nameserver_address.h | 8 ++--
src/lib/nsas/nameserver_address_store.cc | 2 +-
src/lib/nsas/nameserver_address_store.h | 10 ++---
src/lib/nsas/nameserver_entry.cc | 2 +-
src/lib/nsas/nameserver_entry.h | 12 +++---
src/lib/nsas/nsas_entry.h | 2 +-
src/lib/nsas/nsas_log.cc | 2 +-
src/lib/nsas/zone_entry.cc | 2 +-
src/lib/nsas/zone_entry.h | 6 +--
src/lib/resolve/dll.h | 16 ++++----
src/lib/resolve/recursive_query.cc | 6 +--
src/lib/resolve/recursive_query.h | 4 +-
src/lib/resolve/resolve.cc | 10 ++---
src/lib/resolve/resolve.h | 8 ++--
src/lib/resolve/resolve_log.cc | 2 +-
src/lib/resolve/resolver_callback.cc | 2 +-
src/lib/resolve/resolver_callback.h | 2 +-
src/lib/resolve/resolver_interface.h | 2 +-
src/lib/resolve/response_classifier.cc | 2 +-
src/lib/resolve/response_classifier.h | 2 +-
src/lib/server_common/client.cc | 4 +-
src/lib/server_common/client.h | 10 ++---
src/lib/server_common/dll.h | 8 ++--
src/lib/server_common/keyring.cc | 8 ++--
src/lib/server_common/keyring.h | 6 +--
src/lib/server_common/logger.cc | 2 +-
src/lib/server_common/portconfig.cc | 6 +--
src/lib/server_common/portconfig.h | 4 +-
src/lib/server_common/socket_request.cc | 10 ++---
src/lib/server_common/socket_request.h | 18 ++++-----
src/lib/statistics/counter.cc | 2 +-
src/lib/statistics/counter.h | 2 +-
src/lib/statistics/counter_dict.cc | 18 ++++-----
src/lib/statistics/counter_dict.h | 18 ++++-----
src/lib/statistics/dll.h | 8 ++--
src/lib/testutils/dll.h | 8 ++--
src/lib/testutils/dnsmessage_test.cc | 16 ++++----
src/lib/testutils/dnsmessage_test.h | 20 +++++-----
src/lib/testutils/mockups.h | 8 ++--
src/lib/testutils/socket_request.cc | 4 +-
src/lib/testutils/socket_request.h | 2 +-
src/lib/testutils/srv_test.cc | 6 +--
src/lib/testutils/srv_test.h | 26 ++++++------
src/lib/util/buffer.cc | 6 +--
src/lib/util/buffer.h | 6 +--
src/lib/util/dll.h | 8 ++--
src/lib/util/encode/base32hex.h | 4 +-
src/lib/util/encode/base64.h | 4 +-
src/lib/util/encode/base_n.cc | 14 +++----
src/lib/util/encode/hex.h | 4 +-
src/lib/util/filename.cc | 2 +-
src/lib/util/filename.h | 2 +-
src/lib/util/hash/sha1.cc | 10 ++---
src/lib/util/hash/sha1.h | 10 ++---
src/lib/util/interprocess_sync.h | 6 +--
src/lib/util/interprocess_sync_file.cc | 2 +-
src/lib/util/interprocess_sync_file.h | 4 +-
src/lib/util/interprocess_sync_null.cc | 2 +-
src/lib/util/interprocess_sync_null.h | 2 +-
src/lib/util/io/dll.h | 8 ++--
src/lib/util/io/fd.cc | 10 ++---
src/lib/util/io/fd.h | 12 +++---
src/lib/util/io/fd_share.cc | 10 ++---
src/lib/util/io/fd_share.h | 4 +-
src/lib/util/io/socketsession.cc | 2 +-
src/lib/util/io/socketsession.h | 10 ++---
src/lib/util/locks.h | 6 +--
src/lib/util/pyunittests/pyunittests_util.cc | 2 +-
src/lib/util/random/qid_gen.cc | 2 +-
src/lib/util/random/qid_gen.h | 2 +-
src/lib/util/random/random_number_generator.cc | 6 +--
src/lib/util/random/random_number_generator.h | 10 ++---
src/lib/util/strutil.cc | 12 +++---
src/lib/util/strutil.h | 12 +++---
src/lib/util/tests/time_utilities_unittest.cc | 2 +-
src/lib/util/time_utilities.cc | 14 +++----
src/lib/util/time_utilities.h | 12 +++---
src/lib/util/unittests/dll.h | 8 ++--
src/lib/util/unittests/fork.cc | 14 +++----
src/lib/util/unittests/fork.h | 6 +--
src/lib/util/unittests/newhook.cc | 6 +--
src/lib/util/unittests/newhook.h | 4 +-
src/lib/util/unittests/resource.cc | 4 +-
src/lib/util/unittests/resource.h | 2 +-
src/lib/util/unittests/run_all.cc | 4 +-
src/lib/util/unittests/run_all.h | 2 +-
src/lib/util/unittests/testdata.cc | 4 +-
src/lib/util/unittests/testdata.h | 4 +-
src/lib/xfr/dll.h | 8 ++--
src/lib/xfr/xfrout_client.cc | 2 +-
src/lib/xfr/xfrout_client.h | 6 +--
430 files changed, 1279 insertions(+), 1297 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/acl/dll.h b/src/lib/acl/dll.h
index 994efba..3f594bf 100644
--- a/src/lib/acl/dll.h
+++ b/src/lib/acl/dll.h
@@ -16,12 +16,12 @@
#define __LIBACL_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBACL_API
+#define B10_LIBACL_API
#else
-#ifdef ISC_LIBACL_EXPORT
-#define ISC_LIBACL_API __declspec(dllexport)
+#ifdef B10_LIBACL_EXPORT
+#define B10_LIBACL_API __declspec(dllexport)
#else
-#define ISC_LIBACL_API __declspec(dllimport)
+#define B10_LIBACL_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/acl/dns.cc b/src/lib/acl/dns.cc
index d825de5..e192475 100644
--- a/src/lib/acl/dns.cc
+++ b/src/lib/acl/dns.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBACL_EXPORT
+#define B10_LIBACL_EXPORT
#include <memory>
#include <string>
@@ -106,7 +106,7 @@ internal::RequestCheckCreator::create(const string& name,
}
}
-ISC_LIBACL_API RequestLoader&
+B10_LIBACL_API RequestLoader&
getRequestLoader() {
static RequestLoader* loader(NULL);
if (loader == NULL) {
diff --git a/src/lib/acl/dns.h b/src/lib/acl/dns.h
index 8115357..ea236b1 100644
--- a/src/lib/acl/dns.h
+++ b/src/lib/acl/dns.h
@@ -29,7 +29,7 @@
namespace isc {
namespace dns {
-class ISC_LIBACL_API TSIGRecord;
+class B10_LIBACL_API TSIGRecord;
}
namespace acl {
namespace dns {
@@ -64,7 +64,7 @@ namespace dns {
* are the local (destination) IP address, the remote and local port numbers,
* various fields of the DNS request (e.g. a particular header flag value).
*/
-struct ISC_LIBACL_API RequestContext {
+struct B10_LIBACL_API RequestContext {
/// The constructor
///
/// This is a trivial constructor that perform straightforward
@@ -117,7 +117,7 @@ typedef acl::Loader<RequestContext> RequestLoader;
* one is enough, this one will have registered default checks and it
* is known one, so any plugins can registrer additional checks as well.
*/
-ISC_LIBACL_API RequestLoader& getRequestLoader();
+B10_LIBACL_API RequestLoader& getRequestLoader();
// The following is essentially private to the implementation and could
// be hidden in the implementation file. But it's visible via this header
@@ -130,7 +130,7 @@ namespace internal {
typedef isc::acl::IPCheck<RequestContext> RequestIPCheck;
typedef isc::acl::dns::NameCheck<RequestContext> RequestKeyCheck;
-class ISC_LIBACL_API RequestCheckCreator :
+class B10_LIBACL_API RequestCheckCreator :
public acl::Loader<RequestContext>::CheckCreator {
public:
virtual std::vector<std::string> names() const;
diff --git a/src/lib/acl/ip_check.cc b/src/lib/acl/ip_check.cc
index cad9437..2c4d6de 100644
--- a/src/lib/acl/ip_check.cc
+++ b/src/lib/acl/ip_check.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBACL_EXPORT
+#define B10_LIBACL_EXPORT
#ifndef _WIN32
#include <sys/types.h>
@@ -32,7 +32,7 @@ namespace isc {
namespace acl {
namespace internal {
-ISC_LIBACL_API uint8_t
+B10_LIBACL_API uint8_t
createMask(size_t prefixlen) {
if (prefixlen == 0) {
@@ -67,7 +67,7 @@ createMask(size_t prefixlen) {
isc_throw(isc::OutOfRange, "prefixlen argument must be between 0 and 8");
}
-ISC_LIBACL_API pair<string, int>
+B10_LIBACL_API pair<string, int>
splitIPAddress(const string& ipprefix) {
// Split string into its components - an address and a prefix length.
diff --git a/src/lib/acl/ip_check.h b/src/lib/acl/ip_check.h
index 34dc631..4514475 100644
--- a/src/lib/acl/ip_check.h
+++ b/src/lib/acl/ip_check.h
@@ -60,7 +60,7 @@ namespace internal {
///
/// \exception OutOfRange prefixlen is too large for the data type.
-ISC_LIBACL_API uint8_t createMask(size_t prefixlen);
+B10_LIBACL_API uint8_t createMask(size_t prefixlen);
/// \brief Split IP Address Prefix
///
@@ -81,7 +81,7 @@ ISC_LIBACL_API uint8_t createMask(size_t prefixlen);
///
/// \exception InvalidParameter Address prefix not of the expected syntax
-ISC_LIBACL_API std::pair<std::string, int>
+B10_LIBACL_API std::pair<std::string, int>
splitIPAddress(const std::string& ipprefix);
} // namespace internal
@@ -111,7 +111,7 @@ splitIPAddress(const std::string& ipprefix);
///
/// In future, we may introduce the default constructor to further improve
/// reusability.
-struct ISC_LIBACL_API IPAddress {
+struct B10_LIBACL_API IPAddress {
/// The constructor from socket address structure.
///
/// This constructor set up the internal data based on the actual type
diff --git a/src/lib/acl/loader.cc b/src/lib/acl/loader.cc
index 3a6b6ff..b93b493 100644
--- a/src/lib/acl/loader.cc
+++ b/src/lib/acl/loader.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBACL_EXPORT
+#define B10_LIBACL_EXPORT
#include "loader.h"
@@ -21,7 +21,7 @@ using namespace std;
namespace isc {
namespace acl {
-ISC_LIBACL_API BasicAction
+B10_LIBACL_API BasicAction
defaultActionLoader(data::ConstElementPtr actionEl) {
try {
const string action(actionEl->stringValue());
diff --git a/src/lib/acl/loader.h b/src/lib/acl/loader.h
index aca7c0e..5af9e8f 100644
--- a/src/lib/acl/loader.h
+++ b/src/lib/acl/loader.h
@@ -26,8 +26,8 @@
namespace isc {
namespace acl {
-class ISC_LIBACL_API AnyOfSpec;
-class ISC_LIBACL_API AllOfSpec;
+class B10_LIBACL_API AnyOfSpec;
+class B10_LIBACL_API AllOfSpec;
template<typename Mode, typename Context> class LogicOperator;
/**
@@ -41,7 +41,7 @@ template<typename Mode, typename Context> class LogicOperator;
*
* Checks may subclass this exception for similar errors if they see it fit.
*/
-class ISC_LIBACL_API LoaderError : public BadValue {
+class B10_LIBACL_API LoaderError : public BadValue {
private:
const data::ConstElementPtr element_;
public:
@@ -86,7 +86,7 @@ public:
* and contain one of "ACCEPT", "REJECT" or "DROP.
* \note We could define different names or add aliases if needed.
*/
-ISC_LIBACL_API BasicAction defaultActionLoader(data::ConstElementPtr action);
+B10_LIBACL_API BasicAction defaultActionLoader(data::ConstElementPtr action);
/**
* \brief Loader of ACLs.
diff --git a/src/lib/acl/logic_check.h b/src/lib/acl/logic_check.h
index b906c25..808a72a 100644
--- a/src/lib/acl/logic_check.h
+++ b/src/lib/acl/logic_check.h
@@ -15,11 +15,6 @@
#ifndef ACL_LOGIC_CHECK_H
#define ACL_LOGIC_CHECK_H
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable: 4512)
-#endif
-
#include <acl/dll.h>
#include "check.h"
#include "loader.h"
@@ -28,7 +23,7 @@ namespace isc {
namespace acl {
/// \brief Constants for the AnyOf implementation
-class ISC_LIBACL_API AnyOfSpec {
+class B10_LIBACL_API AnyOfSpec {
public:
static bool start() { return (false); }
static bool terminate(const bool another) {
@@ -37,7 +32,7 @@ public:
};
/// \brief Constants for the AllOf implementation
-class ISC_LIBACL_API AllOfSpec {
+class B10_LIBACL_API AllOfSpec {
public:
static bool start() { return (true); }
static bool terminate(const bool another) {
@@ -289,8 +284,4 @@ public:
}
}
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
#endif
diff --git a/src/lib/asiodns/dll.h b/src/lib/asiodns/dll.h
index f0860c9..d8ab693 100644
--- a/src/lib/asiodns/dll.h
+++ b/src/lib/asiodns/dll.h
@@ -16,12 +16,12 @@
#define __LIBASIODNS_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBASIODNS_API
+#define B10_LIBASIODNS_API
#else
-#ifdef ISC_LIBASIODNS_EXPORT
-#define ISC_LIBASIODNS_API __declspec(dllexport)
+#ifdef B10_LIBASIODNS_EXPORT
+#define B10_LIBASIODNS_API __declspec(dllexport)
#else
-#define ISC_LIBASIODNS_API __declspec(dllimport)
+#define B10_LIBASIODNS_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/asiodns/dns_answer.h b/src/lib/asiodns/dns_answer.h
index 09471f2..e1f2d70 100644
--- a/src/lib/asiodns/dns_answer.h
+++ b/src/lib/asiodns/dns_answer.h
@@ -36,7 +36,7 @@ namespace asiodns {
/// from a DNS Lookup provider functon and readies it to be sent to the
/// client. After it has run, the OutputBuffer object passed to it should
/// contain the answer to the query rendered into wire format.
-class ISC_LIBASIODNS_API DNSAnswer {
+class B10_LIBASIODNS_API DNSAnswer {
///
/// \name Constructors and Destructor
///
diff --git a/src/lib/asiodns/dns_lookup.h b/src/lib/asiodns/dns_lookup.h
index f7ce154..9cad867 100644
--- a/src/lib/asiodns/dns_lookup.h
+++ b/src/lib/asiodns/dns_lookup.h
@@ -37,7 +37,7 @@ namespace asiodns {
/// a DNS query (e.g., from authoritative data source, cache, or upstream
/// query). After it has run, the OutputBuffer object passed to it
/// should contain the answer to the query, in an internal representation.
-class ISC_LIBASIODNS_API DNSLookup {
+class B10_LIBASIODNS_API DNSLookup {
///
/// \name Constructors and Destructor
///
diff --git a/src/lib/asiodns/dns_server.h b/src/lib/asiodns/dns_server.h
index ca53024..c198704 100644
--- a/src/lib/asiodns/dns_server.h
+++ b/src/lib/asiodns/dns_server.h
@@ -46,7 +46,7 @@ namespace asiodns {
///
/// Because these objects are frequently copied, it is recommended
/// that derived classes be kept small to reduce copy overhead.
-class ISC_LIBASIODNS_API DNSServer {
+class B10_LIBASIODNS_API DNSServer {
protected:
///
/// \name Constructors and destructors
diff --git a/src/lib/asiodns/dns_service.cc b/src/lib/asiodns/dns_service.cc
index d5243d6..cda1e48 100644
--- a/src/lib/asiodns/dns_service.cc
+++ b/src/lib/asiodns/dns_service.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIODNS_EXPORT
+#define B10_LIBASIODNS_EXPORT
#include <config.h>
@@ -39,8 +39,8 @@ using namespace isc::asiolink;
namespace isc {
namespace asiodns {
-class ISC_LIBASIODNS_API DNSLookup;
-class ISC_LIBASIODNS_API DNSAnswer;
+class B10_LIBASIODNS_API DNSLookup;
+class B10_LIBASIODNS_API DNSAnswer;
class DNSServiceImpl {
public:
diff --git a/src/lib/asiodns/dns_service.h b/src/lib/asiodns/dns_service.h
index 2aa0b98..11e6473 100644
--- a/src/lib/asiodns/dns_service.h
+++ b/src/lib/asiodns/dns_service.h
@@ -25,8 +25,8 @@
namespace isc {
namespace asiodns {
-class ISC_LIBASIODNS_API DNSLookup;
-class ISC_LIBASIODNS_API DNSAnswer;
+class B10_LIBASIODNS_API DNSLookup;
+class B10_LIBASIODNS_API DNSAnswer;
class DNSServiceImpl;
/// \brief A base class for common \c DNSService interfaces.
@@ -40,7 +40,7 @@ class DNSServiceImpl;
/// For this reason most of the detailed description are given in the
/// \c DNSService class. See that for further details of specific methods
/// and class behaviors.
-class ISC_LIBASIODNS_API DNSServiceBase {
+class B10_LIBASIODNS_API DNSServiceBase {
protected:
/// \brief Default constructor.
///
@@ -102,7 +102,7 @@ public:
/// logic that is shared between the authoritative and the recursive
/// server implementations. As such, it handles asio, including config
/// updates (through the 'Checkinprovider'), and listening sockets.
-class ISC_LIBASIODNS_API DNSService : public DNSServiceBase {
+class B10_LIBASIODNS_API DNSService : public DNSServiceBase {
///
/// \name Constructors and Destructor
///
diff --git a/src/lib/asiodns/io_fetch.cc b/src/lib/asiodns/io_fetch.cc
index ed38003..615bb31 100644
--- a/src/lib/asiodns/io_fetch.cc
+++ b/src/lib/asiodns/io_fetch.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIODNS_EXPORT
+#define B10_LIBASIODNS_EXPORT
#include <config.h>
#include <stdint.h>
diff --git a/src/lib/asiodns/io_fetch.h b/src/lib/asiodns/io_fetch.h
index 8bb799a..4141ec8 100644
--- a/src/lib/asiodns/io_fetch.h
+++ b/src/lib/asiodns/io_fetch.h
@@ -44,7 +44,7 @@ struct IOFetchData;
///
/// \param E Endpoint type to use.
-class ISC_LIBASIODNS_API IOFetch : public coroutine {
+class B10_LIBASIODNS_API IOFetch : public coroutine {
public:
/// \brief Protocol to use on the fetch
enum Protocol {
diff --git a/src/lib/asiodns/logger.cc b/src/lib/asiodns/logger.cc
index f843f20..0b8ec43 100644
--- a/src/lib/asiodns/logger.cc
+++ b/src/lib/asiodns/logger.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIODNS_EXPORT
+#define B10_LIBASIODNS_EXPORT
#include <asiodns/logger.h>
diff --git a/src/lib/asiodns/sync_udp_server.cc b/src/lib/asiodns/sync_udp_server.cc
index 1734a25..4baf1c3 100644
--- a/src/lib/asiodns/sync_udp_server.cc
+++ b/src/lib/asiodns/sync_udp_server.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIODNS_EXPORT
+#define B10_LIBASIODNS_EXPORT
#include <config.h>
diff --git a/src/lib/asiodns/sync_udp_server.h b/src/lib/asiodns/sync_udp_server.h
index 027bbe2..18e5fd2 100644
--- a/src/lib/asiodns/sync_udp_server.h
+++ b/src/lib/asiodns/sync_udp_server.h
@@ -41,7 +41,7 @@ namespace asiodns {
/// That means, the lookup handler must provide the answer right away.
/// This allows for implementation with less overhead, compared with
/// the UDPClass.
-class ISC_LIBASIODNS_API SyncUDPServer :
+class B10_LIBASIODNS_API SyncUDPServer :
public DNSServer, public boost::noncopyable {
public:
/// \brief Constructor
diff --git a/src/lib/asiodns/tcp_server.cc b/src/lib/asiodns/tcp_server.cc
index cfcbde8..457a3cd 100644
--- a/src/lib/asiodns/tcp_server.cc
+++ b/src/lib/asiodns/tcp_server.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIODNS_EXPORT
+#define B10_LIBASIODNS_EXPORT
#include <config.h>
#include <stdint.h>
diff --git a/src/lib/asiodns/tcp_server.h b/src/lib/asiodns/tcp_server.h
index 540c79d..43826a2 100644
--- a/src/lib/asiodns/tcp_server.h
+++ b/src/lib/asiodns/tcp_server.h
@@ -36,7 +36,7 @@ namespace asiodns {
///
/// This class inherits from both \c DNSServer and from \c coroutine,
/// defined in coroutine.h.
-class ISC_LIBASIODNS_API TCPServer :
+class B10_LIBASIODNS_API TCPServer :
public virtual DNSServer, public virtual coroutine {
public:
/// \brief Constructor
diff --git a/src/lib/asiodns/udp_server.cc b/src/lib/asiodns/udp_server.cc
index d0dbdf9..b4e68e9 100644
--- a/src/lib/asiodns/udp_server.cc
+++ b/src/lib/asiodns/udp_server.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIODNS_EXPORT
+#define B10_LIBASIODNS_EXPORT
#include <config.h>
#include <stdint.h>
diff --git a/src/lib/asiodns/udp_server.h b/src/lib/asiodns/udp_server.h
index dbbf969..ecf5411 100644
--- a/src/lib/asiodns/udp_server.h
+++ b/src/lib/asiodns/udp_server.h
@@ -38,7 +38,7 @@ namespace asiodns {
/// DNS query event. As such, it is both a \c DNSServer and
/// a \c coroutine
///
-class ISC_LIBASIODNS_API UDPServer :
+class B10_LIBASIODNS_API UDPServer :
public virtual DNSServer, public virtual coroutine {
public:
/// \brief Constructor
diff --git a/src/lib/asiolink/dll.h b/src/lib/asiolink/dll.h
index 2e8cab5..6b90e0a 100644
--- a/src/lib/asiolink/dll.h
+++ b/src/lib/asiolink/dll.h
@@ -16,12 +16,12 @@
#define __LIBASIOLINK_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBASIOLINK_API
+#define B10_LIBASIOLINK_API
#else
-#ifdef ISC_LIBASIOLINK_EXPORT
-#define ISC_LIBASIOLINK_API __declspec(dllexport)
+#ifdef B10_LIBASIOLINK_EXPORT
+#define B10_LIBASIOLINK_API __declspec(dllexport)
#else
-#define ISC_LIBASIOLINK_API __declspec(dllimport)
+#define B10_LIBASIOLINK_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/asiolink/dummy_io_cb.cc b/src/lib/asiolink/dummy_io_cb.cc
index 062b0fe..7bb0a8c 100644
--- a/src/lib/asiolink/dummy_io_cb.cc
+++ b/src/lib/asiolink/dummy_io_cb.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIOLINK_EXPORT
+#define B10_LIBASIOLINK_EXPORT
#include <config.h>
@@ -20,7 +20,7 @@
// Instantiate class
-class ISC_LIBASIOLINK_API DummyIOCallback;
+class B10_LIBASIOLINK_API DummyIOCallback;
// Local Variables:
// mode: c++
diff --git a/src/lib/asiolink/dummy_io_cb.h b/src/lib/asiolink/dummy_io_cb.h
index d88b4f9..2f82ece 100644
--- a/src/lib/asiolink/dummy_io_cb.h
+++ b/src/lib/asiolink/dummy_io_cb.h
@@ -35,7 +35,7 @@ namespace asiolink {
/// template parameter. This is the reason for this class - it is the dummy
/// template parameter.
-class ISC_LIBASIOLINK_API DummyIOCallback {
+class B10_LIBASIOLINK_API DummyIOCallback {
public:
/// \brief Asynchronous I/O callback method
diff --git a/src/lib/asiolink/interval_timer.cc b/src/lib/asiolink/interval_timer.cc
index bba9819..cb760f5 100644
--- a/src/lib/asiolink/interval_timer.cc
+++ b/src/lib/asiolink/interval_timer.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIOLINK_EXPORT
+#define B10_LIBASIOLINK_EXPORT
#include <config.h>
diff --git a/src/lib/asiolink/interval_timer.h b/src/lib/asiolink/interval_timer.h
index 9ffb267..555df73 100644
--- a/src/lib/asiolink/interval_timer.h
+++ b/src/lib/asiolink/interval_timer.h
@@ -56,7 +56,7 @@ class IntervalTimerImpl;
/// intervalTimer.setup(function_to_call_back, interval_in_milliseconds);
/// io_service.run();
/// \endcode
-class ISC_LIBASIOLINK_API IntervalTimer {
+class B10_LIBASIOLINK_API IntervalTimer {
public:
/// \name The type of timer callback function
typedef boost::function<void()> Callback;
diff --git a/src/lib/asiolink/io_address.cc b/src/lib/asiolink/io_address.cc
index 5382db7..44d67fc 100644
--- a/src/lib/asiolink/io_address.cc
+++ b/src/lib/asiolink/io_address.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIOLINK_EXPORT
+#define B10_LIBASIOLINK_EXPORT
#include <config.h>
diff --git a/src/lib/asiolink/io_address.h b/src/lib/asiolink/io_address.h
index 264a344..5209804 100644
--- a/src/lib/asiolink/io_address.h
+++ b/src/lib/asiolink/io_address.h
@@ -43,7 +43,7 @@ namespace asiolink {
/// agnostic)
///
/// This class is a wrapper for the ASIO \c ip::address class.
-class ISC_LIBASIOLINK_API IOAddress {
+class B10_LIBASIOLINK_API IOAddress {
public:
///
/// \name Constructors and Destructor
diff --git a/src/lib/asiolink/io_asio_socket.h b/src/lib/asiolink/io_asio_socket.h
index cb7c161..af95fa5 100644
--- a/src/lib/asiolink/io_asio_socket.h
+++ b/src/lib/asiolink/io_asio_socket.h
@@ -40,7 +40,7 @@ namespace asiolink {
/// \brief Socket not open
///
/// Thrown on an attempt to do read/write to a socket that is not open.
-class ISC_LIBASIOLINK_API SocketNotOpen : public IOError {
+class B10_LIBASIOLINK_API SocketNotOpen : public IOError {
public:
SocketNotOpen(const char* file, size_t line, const char* what) :
IOError(file, line, what) {}
@@ -49,7 +49,7 @@ public:
/// \brief Error setting socket options
///
/// Thrown if attempt to change socket options fails.
-class ISC_LIBASIOLINK_API SocketSetError : public IOError {
+class B10_LIBASIOLINK_API SocketSetError : public IOError {
public:
SocketSetError(const char* file, size_t line, const char* what) :
IOError(file, line, what) {}
@@ -59,14 +59,14 @@ public:
///
/// Thrown if an attempt is made to receive into an area beyond the end of
/// the receive data buffer.
-class ISC_LIBASIOLINK_API BufferOverflow : public IOError {
+class B10_LIBASIOLINK_API BufferOverflow : public IOError {
public:
BufferOverflow(const char* file, size_t line, const char* what) :
IOError(file, line, what) {}
};
/// Forward declaration of an IOEndpoint
-class ISC_LIBASIOLINK_API IOEndpoint;
+class B10_LIBASIOLINK_API IOEndpoint;
/// \brief I/O Socket with asynchronous operations
diff --git a/src/lib/asiolink/io_endpoint.cc b/src/lib/asiolink/io_endpoint.cc
index b81a7cd..99cad7d 100644
--- a/src/lib/asiolink/io_endpoint.cc
+++ b/src/lib/asiolink/io_endpoint.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIOLINK_EXPORT
+#define B10_LIBASIOLINK_EXPORT
#include <config.h>
@@ -68,7 +68,7 @@ IOEndpoint::operator!=(const IOEndpoint& other) const {
return (!operator==(other));
}
-ISC_LIBASIOLINK_API ostream&
+B10_LIBASIOLINK_API ostream&
operator<<(ostream& os, const IOEndpoint& endpoint) {
if (endpoint.getFamily() == AF_INET6) {
os << "[" << endpoint.getAddress().toText() << "]";
diff --git a/src/lib/asiolink/io_endpoint.h b/src/lib/asiolink/io_endpoint.h
index 894f5ce..4aa3cff 100644
--- a/src/lib/asiolink/io_endpoint.h
+++ b/src/lib/asiolink/io_endpoint.h
@@ -45,7 +45,7 @@ namespace asiolink {
/// Derived class implementations are completely hidden within the
/// implementation. User applications only get access to concrete
/// \c IOEndpoint objects via the abstract interfaces.
-class ISC_LIBASIOLINK_API IOEndpoint {
+class B10_LIBASIOLINK_API IOEndpoint {
///
/// \name Constructors and Destructor
///
@@ -183,7 +183,7 @@ public:
/// operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBASIOLINK_API std::ostream&
+B10_LIBASIOLINK_API std::ostream&
operator<<(std::ostream& os, const IOEndpoint& endpoint);
} // namespace asiolink
} // namespace isc
diff --git a/src/lib/asiolink/io_error.cc b/src/lib/asiolink/io_error.cc
index 41120d0..92f5357 100644
--- a/src/lib/asiolink/io_error.cc
+++ b/src/lib/asiolink/io_error.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIOLINK_EXPORT
+#define B10_LIBASIOLINK_EXPORT
#include <config.h>
@@ -23,10 +23,10 @@
// Instantiate classes
-class ISC_LIBASIOLINK_API SocketNotOpen;
-class ISC_LIBASIOLINK_API SocketSetError;
-class ISC_LIBASIOLINK_API BufferOverflow;
-class ISC_LIBASIOLINK_API BufferTooLarge;
+class B10_LIBASIOLINK_API SocketNotOpen;
+class B10_LIBASIOLINK_API SocketSetError;
+class B10_LIBASIOLINK_API BufferOverflow;
+class B10_LIBASIOLINK_API BufferTooLarge;
// Local Variables:
// mode: c++
diff --git a/src/lib/asiolink/io_error.h b/src/lib/asiolink/io_error.h
index 7fb2732..210bd30 100644
--- a/src/lib/asiolink/io_error.h
+++ b/src/lib/asiolink/io_error.h
@@ -25,7 +25,7 @@ namespace asiolink {
/// \brief An exception that is thrown if an error occurs within the IO
/// module. This is mainly intended to be a wrapper exception class for
/// ASIO specific exceptions.
-class ISC_LIBASIOLINK_API IOError : public isc::Exception {
+class B10_LIBASIOLINK_API IOError : public isc::Exception {
public:
IOError(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
diff --git a/src/lib/asiolink/io_message.cc b/src/lib/asiolink/io_message.cc
index aad8642..e0a48fe 100644
--- a/src/lib/asiolink/io_message.cc
+++ b/src/lib/asiolink/io_message.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIOLINK_EXPORT
+#define B10_LIBASIOLINK_EXPORT
#include <config.h>
@@ -20,7 +20,7 @@
// Instantiate class
-class ISC_LIBASIOLINK_API IOMessage;
+class B10_LIBASIOLINK_API IOMessage;
// Local Variables:
// mode: c++
diff --git a/src/lib/asiolink/io_message.h b/src/lib/asiolink/io_message.h
index e2409f6..45c1108 100644
--- a/src/lib/asiolink/io_message.h
+++ b/src/lib/asiolink/io_message.h
@@ -46,7 +46,7 @@ namespace asiolink {
/// It only provides a minimal level of support that is necessary for
/// the current implementation of the authoritative server.
/// A future version of this class will definitely support more.
-class ISC_LIBASIOLINK_API IOMessage {
+class B10_LIBASIOLINK_API IOMessage {
///
/// \name Constructors and Destructor
///
diff --git a/src/lib/asiolink/io_service.cc b/src/lib/asiolink/io_service.cc
index 1c6bc23..0e58b2d 100644
--- a/src/lib/asiolink/io_service.cc
+++ b/src/lib/asiolink/io_service.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIOLINK_EXPORT
+#define B10_LIBASIOLINK_EXPORT
#include <config.h>
diff --git a/src/lib/asiolink/io_service.h b/src/lib/asiolink/io_service.h
index 04a66e9..cfe5b2d 100644
--- a/src/lib/asiolink/io_service.h
+++ b/src/lib/asiolink/io_service.h
@@ -29,7 +29,7 @@ class IOServiceImpl;
/// \brief The \c IOService class is a wrapper for the ASIO \c io_service
/// class.
///
-class ISC_LIBASIOLINK_API IOService {
+class B10_LIBASIOLINK_API IOService {
///
/// \name Constructors and Destructor
///
diff --git a/src/lib/asiolink/io_socket.cc b/src/lib/asiolink/io_socket.cc
index 5e699c0..39efd1c 100644
--- a/src/lib/asiolink/io_socket.cc
+++ b/src/lib/asiolink/io_socket.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIOLINK_EXPORT
+#define B10_LIBASIOLINK_EXPORT
#include <config.h>
diff --git a/src/lib/asiolink/io_socket.h b/src/lib/asiolink/io_socket.h
index 7ca37cc..cc06b69 100644
--- a/src/lib/asiolink/io_socket.h
+++ b/src/lib/asiolink/io_socket.h
@@ -47,7 +47,7 @@ namespace asiolink {
/// modules use it. Also, at that point we may define a separate (visible)
/// derived class for testing purposes rather than providing factory methods
/// (i.e., getDummy variants below).
-class ISC_LIBASIOLINK_API IOSocket {
+class B10_LIBASIOLINK_API IOSocket {
///
/// \name Constructors and Destructor
///
diff --git a/src/lib/asiolink/simple_callback.cc b/src/lib/asiolink/simple_callback.cc
index 51427de..0e704a8 100644
--- a/src/lib/asiolink/simple_callback.cc
+++ b/src/lib/asiolink/simple_callback.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBASIOLINK_EXPORT
+#define B10_LIBASIOLINK_EXPORT
#include <config.h>
@@ -20,7 +20,7 @@
// Instantiate class
-class ISC_LIBASIOLINK_API SimpleCallback;
+class B10_LIBASIOLINK_API SimpleCallback;
// Local Variables:
// mode: c++
diff --git a/src/lib/asiolink/simple_callback.h b/src/lib/asiolink/simple_callback.h
index 77218be..cb47397 100644
--- a/src/lib/asiolink/simple_callback.h
+++ b/src/lib/asiolink/simple_callback.h
@@ -35,7 +35,7 @@ namespace asiolink {
/// The \c SimpleCallback is expected to be used for basic, generic
/// tasks such as checking for configuration changes. It may also be
/// used for testing purposes.
-class ISC_LIBASIOLINK_API SimpleCallback {
+class B10_LIBASIOLINK_API SimpleCallback {
///
/// \name Constructors and Destructor
///
diff --git a/src/lib/asiolink/tcp_endpoint.h b/src/lib/asiolink/tcp_endpoint.h
index ec205a9..e2253c2 100644
--- a/src/lib/asiolink/tcp_endpoint.h
+++ b/src/lib/asiolink/tcp_endpoint.h
@@ -29,7 +29,7 @@ namespace asiolink {
/// \c IOEndpoint that represents an endpoint of a TCP packet.
///
/// Other notes about \c TCPEndpoint applies to this class, too.
-class ISC_LIBASIOLINK_API TCPEndpoint : public IOEndpoint {
+class B10_LIBASIOLINK_API TCPEndpoint : public IOEndpoint {
public:
///
/// \name Constructors and Destructor.
diff --git a/src/lib/asiolink/tcp_socket.h b/src/lib/asiolink/tcp_socket.h
index 7132014..63ef535 100644
--- a/src/lib/asiolink/tcp_socket.h
+++ b/src/lib/asiolink/tcp_socket.h
@@ -50,7 +50,7 @@ namespace asiolink {
/// \brief Buffer Too Large
///
/// Thrown on an attempt to send a buffer > 64k
-class ISC_LIBASIOLINK_API BufferTooLarge : public IOError {
+class B10_LIBASIOLINK_API BufferTooLarge : public IOError {
public:
BufferTooLarge(const char* file, size_t line, const char* what) :
IOError(file, line, what) {}
diff --git a/src/lib/asiolink/udp_endpoint.h b/src/lib/asiolink/udp_endpoint.h
index 672afe2..d7dbf5c 100644
--- a/src/lib/asiolink/udp_endpoint.h
+++ b/src/lib/asiolink/udp_endpoint.h
@@ -29,7 +29,7 @@ namespace asiolink {
/// \c IOEndpoint that represents an endpoint of a UDP packet.
///
/// Other notes about \c TCPEndpoint applies to this class, too.
-class ISC_LIBASIOLINK_API UDPEndpoint : public IOEndpoint {
+class B10_LIBASIOLINK_API UDPEndpoint : public IOEndpoint {
public:
///
/// \name Constructors and Destructor.
diff --git a/src/lib/bench/benchmark_util.cc b/src/lib/bench/benchmark_util.cc
index 54226ac..0fa6e08 100644
--- a/src/lib/bench/benchmark_util.cc
+++ b/src/lib/bench/benchmark_util.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBBENCH_EXPORT
+#define B10_LIBBENCH_EXPORT
#include <fstream>
#include <iostream>
@@ -41,7 +41,7 @@ using namespace isc::util;
namespace isc {
namespace bench {
-ISC_LIBBENCH_API void
+B10_LIBBENCH_API void
loadQueryData(const char* const input_file, BenchQueries& queries,
const RRClass& qclass, const bool strict)
{
@@ -56,7 +56,7 @@ loadQueryData(const char* const input_file, BenchQueries& queries,
ifs.close();
}
-ISC_LIBBENCH_API void
+B10_LIBBENCH_API void
loadQueryData(istream& input, BenchQueries& queries, const RRClass& qclass,
const bool strict)
{
diff --git a/src/lib/bench/benchmark_util.h b/src/lib/bench/benchmark_util.h
index 7c27be1..6bf706d 100644
--- a/src/lib/bench/benchmark_util.h
+++ b/src/lib/bench/benchmark_util.h
@@ -35,13 +35,13 @@
namespace isc {
namespace dns {
-class ISC_LIBBENCH_API RRClass;
+class B10_LIBBENCH_API RRClass;
}
namespace bench {
/// \brief An exception that is thrown if an error occurs within the benchmark
/// module.
-class ISC_LIBBENCH_API BenchMarkError : public Exception {
+class B10_LIBBENCH_API BenchMarkError : public Exception {
public:
BenchMarkError(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -109,7 +109,7 @@ typedef std::vector<std::vector<unsigned char> > BenchQueries;
/// is used for all queries.
/// \param strict If \c true, apply stricter validation on the query name and
/// query RR types; otherwise invalid inputs will be ignored.
-ISC_LIBBENCH_API void
+B10_LIBBENCH_API void
loadQueryData(const char* const input_file, BenchQueries& queries,
const isc::dns::RRClass& qclass, const bool strict = false);
@@ -138,7 +138,7 @@ loadQueryData(const char* const input_file, BenchQueries& queries,
/// is used for all queries.
/// \param strict If \c true, apply stricter validation on the query name and
/// query RR types; otherwise invalid inputs will be ignored.
-ISC_LIBBENCH_API void
+B10_LIBBENCH_API void
loadQueryData(std::istream& input, BenchQueries& queries,
const isc::dns::RRClass& qclass, const bool strict = false);
}
diff --git a/src/lib/bench/dll.h b/src/lib/bench/dll.h
index cd8d183..3018e67 100644
--- a/src/lib/bench/dll.h
+++ b/src/lib/bench/dll.h
@@ -16,12 +16,12 @@
#define __LIBBENCH_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBBENCH_API
+#define B10_LIBBENCH_API
#else
-#ifdef ISC_LIBBENCH_EXPORT
-#define ISC_LIBBENCH_API __declspec(dllexport)
+#ifdef B10_LIBBENCH_EXPORT
+#define B10_LIBBENCH_API __declspec(dllexport)
#else
-#define ISC_LIBBENCH_API __declspec(dllimport)
+#define B10_LIBBENCH_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/cache/cache_entry_key.cc b/src/lib/cache/cache_entry_key.cc
index 942be00..35df7ea 100644
--- a/src/lib/cache/cache_entry_key.cc
+++ b/src/lib/cache/cache_entry_key.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCACHE_EXPORT
+#define B10_LIBCACHE_EXPORT
#include <sstream>
#include "cache_entry_key.h"
@@ -21,7 +21,7 @@ using namespace std;
namespace isc {
namespace cache {
-ISC_LIBCACHE_API const std::string
+B10_LIBCACHE_API const std::string
genCacheEntryName(const isc::dns::Name& name, const isc::dns::RRType& type) {
std::string keystr = name.toText();
ostringstream stream;
@@ -30,7 +30,7 @@ genCacheEntryName(const isc::dns::Name& name, const isc::dns::RRType& type) {
return (keystr);
}
-ISC_LIBCACHE_API const std::string
+B10_LIBCACHE_API const std::string
genCacheEntryName(const std::string& namestr, const uint16_t type) {
std::string keystr = namestr;
ostringstream stream;
diff --git a/src/lib/cache/cache_entry_key.h b/src/lib/cache/cache_entry_key.h
index aa59c15..53772c7 100644
--- a/src/lib/cache/cache_entry_key.h
+++ b/src/lib/cache/cache_entry_key.h
@@ -37,7 +37,7 @@ namespace cache {
/// \param name The Name to create a text entry for
/// \param type The RRType to create a text entry for
/// \return return the entry name.
-ISC_LIBCACHE_API const std::string
+B10_LIBCACHE_API const std::string
genCacheEntryName(const isc::dns::Name& name, const isc::dns::RRType& type);
///
@@ -45,7 +45,7 @@ genCacheEntryName(const isc::dns::Name& name, const isc::dns::RRType& type);
///
/// \param namestr A string representation of a DNS Name
/// \param type The value of a DNS RRType
-ISC_LIBCACHE_API const std::string
+B10_LIBCACHE_API const std::string
genCacheEntryName(const std::string& namestr, const uint16_t type);
} // namespace cache
diff --git a/src/lib/cache/dll.h b/src/lib/cache/dll.h
index 14032c3..3fc247f 100644
--- a/src/lib/cache/dll.h
+++ b/src/lib/cache/dll.h
@@ -16,12 +16,12 @@
#define __LIBCACHE_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBCACHE_API
+#define B10_LIBCACHE_API
#else
-#ifdef ISC_LIBCACHE_EXPORT
-#define ISC_LIBCACHE_API __declspec(dllexport)
+#ifdef B10_LIBCACHE_EXPORT
+#define B10_LIBCACHE_API __declspec(dllexport)
#else
-#define ISC_LIBCACHE_API __declspec(dllimport)
+#define B10_LIBCACHE_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/cache/local_zone_data.cc b/src/lib/cache/local_zone_data.cc
index bda4e42..d753103 100644
--- a/src/lib/cache/local_zone_data.cc
+++ b/src/lib/cache/local_zone_data.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCACHE_EXPORT
+#define B10_LIBCACHE_EXPORT
#include <dns/rrset.h>
#include "local_zone_data.h"
diff --git a/src/lib/cache/local_zone_data.h b/src/lib/cache/local_zone_data.h
index a0eba5b..2459986 100644
--- a/src/lib/cache/local_zone_data.h
+++ b/src/lib/cache/local_zone_data.h
@@ -28,7 +28,7 @@ namespace cache {
/// The object of LocalZoneData represents the data of one
/// local zone. It provides the interface for lookup the rrsets
/// in the zone.
-class ISC_LIBCACHE_API LocalZoneData {
+class B10_LIBCACHE_API LocalZoneData {
public:
LocalZoneData(uint16_t rrset_class) : class_(rrset_class)
{}
diff --git a/src/lib/cache/logger.cc b/src/lib/cache/logger.cc
index 3fd1cb1..182c638 100644
--- a/src/lib/cache/logger.cc
+++ b/src/lib/cache/logger.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCACHE_EXPORT
+#define B10_LIBCACHE_EXPORT
#include <cache/logger.h>
diff --git a/src/lib/cache/message_cache.cc b/src/lib/cache/message_cache.cc
index 5bf4c15..a9473ee 100644
--- a/src/lib/cache/message_cache.cc
+++ b/src/lib/cache/message_cache.cc
@@ -13,7 +13,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCACHE_EXPORT
+#define B10_LIBCACHE_EXPORT
#include <config.h>
diff --git a/src/lib/cache/message_cache.h b/src/lib/cache/message_cache.h
index 09e46f8..b52d6df 100644
--- a/src/lib/cache/message_cache.h
+++ b/src/lib/cache/message_cache.h
@@ -33,7 +33,7 @@ namespace cache {
///
/// \todo The message cache class should provide the interfaces for
/// loading, dumping and resizing.
-class ISC_LIBCACHE_API MessageCache {
+class B10_LIBCACHE_API MessageCache {
// Noncopyable
private:
MessageCache(const MessageCache& source);
diff --git a/src/lib/cache/message_entry.cc b/src/lib/cache/message_entry.cc
index c085f31..42cf77e 100644
--- a/src/lib/cache/message_entry.cc
+++ b/src/lib/cache/message_entry.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCACHE_EXPORT
+#define B10_LIBCACHE_EXPORT
#include <config.h>
diff --git a/src/lib/cache/message_entry.h b/src/lib/cache/message_entry.h
index 46d40e0..2956b4c 100644
--- a/src/lib/cache/message_entry.h
+++ b/src/lib/cache/message_entry.h
@@ -28,13 +28,13 @@ using namespace isc::nsas;
namespace isc {
namespace cache {
-class ISC_LIBCACHE_API RRsetEntry;
+class B10_LIBCACHE_API RRsetEntry;
/// \brief Message Entry
///
/// The object of MessageEntry represents one response message
/// answered to the resolver client.
-class ISC_LIBCACHE_API MessageEntry : public NsasEntry<MessageEntry> {
+class B10_LIBCACHE_API MessageEntry : public NsasEntry<MessageEntry> {
// Noncopyable
private:
MessageEntry(const MessageEntry& source);
diff --git a/src/lib/cache/message_utility.cc b/src/lib/cache/message_utility.cc
index 4c95d4e..99ccd06 100644
--- a/src/lib/cache/message_utility.cc
+++ b/src/lib/cache/message_utility.cc
@@ -14,7 +14,7 @@
// $Id$
-#define ISC_LIBCACHE_EXPORT
+#define B10_LIBCACHE_EXPORT
#include "message_utility.h"
#include <dns/rcode.h>
diff --git a/src/lib/cache/resolver_cache.cc b/src/lib/cache/resolver_cache.cc
index 5fc7c63..b67f36b 100644
--- a/src/lib/cache/resolver_cache.cc
+++ b/src/lib/cache/resolver_cache.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCACHE_EXPORT
+#define B10_LIBCACHE_EXPORT
#include <config.h>
diff --git a/src/lib/cache/resolver_cache.h b/src/lib/cache/resolver_cache.h
index 4514039..64d963d 100644
--- a/src/lib/cache/resolver_cache.h
+++ b/src/lib/cache/resolver_cache.h
@@ -38,7 +38,7 @@ class RRsetCache;
/// \brief Cache Size Information.
///
/// Used to initialize the size of class-specific rrset/message cache.
-struct ISC_LIBCACHE_API CacheSizeInfo
+struct B10_LIBCACHE_API CacheSizeInfo
{
public:
/// \brief Constructor
@@ -63,7 +63,7 @@ public:
///
/// Thrown if the given message has no question section when looking up
/// the message in cache.
-class ISC_LIBCACHE_API MessageNoQuestionSection : public isc::Exception {
+class B10_LIBCACHE_API MessageNoQuestionSection : public isc::Exception {
public:
MessageNoQuestionSection(const char*file, size_t line, const char*what) :
isc::Exception(file, line, what)
@@ -80,7 +80,7 @@ public:
///
/// \todo The resolver cache class should provide the interfaces for
/// loading, dumping and resizing.
-class ISC_LIBCACHE_API ResolverClassCache {
+class B10_LIBCACHE_API ResolverClassCache {
public:
/// \brief Default Constructor.
///
@@ -200,7 +200,7 @@ private:
RRsetCachePtr negative_soa_cache_;
};
-class ISC_LIBCACHE_API ResolverCache {
+class B10_LIBCACHE_API ResolverCache {
public:
/// \brief Default Constructor.
///
diff --git a/src/lib/cache/rrset_cache.cc b/src/lib/cache/rrset_cache.cc
index 0d1ed3a..0349555 100644
--- a/src/lib/cache/rrset_cache.cc
+++ b/src/lib/cache/rrset_cache.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCACHE_EXPORT
+#define B10_LIBCACHE_EXPORT
#include <config.h>
diff --git a/src/lib/cache/rrset_cache.h b/src/lib/cache/rrset_cache.h
index 6bc354c..f9e515a 100644
--- a/src/lib/cache/rrset_cache.h
+++ b/src/lib/cache/rrset_cache.h
@@ -27,7 +27,7 @@ using namespace isc::nsas;
namespace isc {
namespace cache {
-class ISC_LIBCACHE_API RRsetEntry;
+class B10_LIBCACHE_API RRsetEntry;
/// \brief RRset Cache
/// The object of RRsetCache represented the cache for class-specific
@@ -35,7 +35,7 @@ class ISC_LIBCACHE_API RRsetEntry;
///
/// \todo The rrset cache class should provide the interfaces for
/// loading, dumping and resizing.
-class ISC_LIBCACHE_API RRsetCache{
+class B10_LIBCACHE_API RRsetCache{
///
/// \name Constructors and Destructor
///
diff --git a/src/lib/cache/rrset_copy.cc b/src/lib/cache/rrset_copy.cc
index 7cc9364..ea6104d 100644
--- a/src/lib/cache/rrset_copy.cc
+++ b/src/lib/cache/rrset_copy.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCACHE_EXPORT
+#define B10_LIBCACHE_EXPORT
#include "rrset_copy.h"
@@ -21,7 +21,7 @@ using namespace isc::dns;
namespace isc {
namespace cache {
-ISC_LIBCACHE_API void
+B10_LIBCACHE_API void
rrsetCopy(const isc::dns::AbstractRRset& src, isc::dns::AbstractRRset& dst) {
RdataIteratorPtr rdata_itor = src.getRdataIterator();
rdata_itor->first();
diff --git a/src/lib/cache/rrset_copy.h b/src/lib/cache/rrset_copy.h
index 845b591..8a32652 100644
--- a/src/lib/cache/rrset_copy.h
+++ b/src/lib/cache/rrset_copy.h
@@ -33,7 +33,7 @@ namespace cache {
/// doing RRset copy. But in cache's code, sometime
/// we have to do the copy.
-ISC_LIBCACHE_API void
+B10_LIBCACHE_API void
rrsetCopy(const isc::dns::AbstractRRset& src, isc::dns::AbstractRRset& dst);
} // namespace cache
diff --git a/src/lib/cache/rrset_entry.cc b/src/lib/cache/rrset_entry.cc
index 48c0293..da4a572 100644
--- a/src/lib/cache/rrset_entry.cc
+++ b/src/lib/cache/rrset_entry.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCACHE_EXPORT
+#define B10_LIBCACHE_EXPORT
#include <config.h>
diff --git a/src/lib/cache/rrset_entry.h b/src/lib/cache/rrset_entry.h
index 502e47a..111b716 100644
--- a/src/lib/cache/rrset_entry.h
+++ b/src/lib/cache/rrset_entry.h
@@ -61,7 +61,7 @@ enum RRsetTrustLevel {
/// The object of RRsetEntry represents one cached RRset.
/// Each RRset entry may be refered using shared_ptr by several message
/// entries.
-class ISC_LIBCACHE_API RRsetEntry : public NsasEntry<RRsetEntry>
+class B10_LIBCACHE_API RRsetEntry : public NsasEntry<RRsetEntry>
{
///
/// \name Constructors and Destructor
diff --git a/src/lib/cc/data.cc b/src/lib/cc/data.cc
index 5b321f3..508d5bb 100644
--- a/src/lib/cc/data.cc
+++ b/src/lib/cc/data.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCC_EXPORT
+#define B10_LIBCC_EXPORT
#include <config.h>
@@ -189,17 +189,17 @@ throwJSONError(const std::string& error, const std::string& file, int line,
}
}
-ISC_LIBCC_API std::ostream&
+B10_LIBCC_API std::ostream&
operator<<(std::ostream &out, const Element& e) {
return (out << e.str());
}
-ISC_LIBCC_API bool
+B10_LIBCC_API bool
operator==(const Element& a, const Element& b) {
return (a.equals(b));
}
-ISC_LIBCC_API bool
+B10_LIBCC_API bool
operator!=(const Element& a, const Element& b) {
return (!a.equals(b));
};
@@ -914,12 +914,12 @@ MapElement::equals(const Element& other) const {
}
}
-ISC_LIBCC_API bool
+B10_LIBCC_API bool
isNull(ConstElementPtr p) {
return (!p);
}
-ISC_LIBCC_API void
+B10_LIBCC_API void
removeIdentical(ElementPtr a, ConstElementPtr b) {
if (!b) {
return;
@@ -943,7 +943,7 @@ removeIdentical(ElementPtr a, ConstElementPtr b) {
}
}
-ISC_LIBCC_API ConstElementPtr
+B10_LIBCC_API ConstElementPtr
removeIdentical(ConstElementPtr a, ConstElementPtr b) {
ElementPtr result = Element::createMap();
@@ -967,7 +967,7 @@ removeIdentical(ConstElementPtr a, ConstElementPtr b) {
return (result);
}
-ISC_LIBCC_API void
+B10_LIBCC_API void
merge(ElementPtr element, ConstElementPtr other) {
if (element->getType() != Element::map ||
other->getType() != Element::map) {
diff --git a/src/lib/cc/data.h b/src/lib/cc/data.h
index ebdcb53..3e179ce 100644
--- a/src/lib/cc/data.h
+++ b/src/lib/cc/data.h
@@ -30,7 +30,7 @@
namespace isc { namespace data {
-class ISC_LIBCC_API Element;
+class B10_LIBCC_API Element;
// todo: describe the rationale behind ElementPtr?
typedef boost::shared_ptr<Element> ElementPtr;
typedef boost::shared_ptr<const Element> ConstElementPtr;
@@ -40,7 +40,7 @@ typedef boost::shared_ptr<const Element> ConstElementPtr;
/// is called for an Element that has a wrong type (e.g. int_value on a
/// ListElement)
///
-class ISC_LIBCC_API TypeError : public isc::Exception {
+class B10_LIBCC_API TypeError : public isc::Exception {
public:
TypeError(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -53,7 +53,7 @@ public:
// i'd like to use Exception here but we need one that is derived from
// runtime_error (as this one is directly based on external data, and
// i want to add some values to any static data string that is provided)
-class ISC_LIBCC_API JSONError : public isc::Exception {
+class B10_LIBCC_API JSONError : public isc::Exception {
public:
JSONError(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -76,7 +76,7 @@ public:
/// raising a \c TypeError for functions that are not supported for
/// the type in question.
///
-class ISC_LIBCC_API Element {
+class B10_LIBCC_API Element {
private:
// technically the type could be omitted; is it useful?
@@ -377,7 +377,7 @@ public:
//@}
};
-class ISC_LIBCC_API IntElement : public Element {
+class B10_LIBCC_API IntElement : public Element {
long int i;
public:
@@ -391,7 +391,7 @@ public:
bool equals(const Element& other) const;
};
-class ISC_LIBCC_API DoubleElement : public Element {
+class B10_LIBCC_API DoubleElement : public Element {
double d;
public:
@@ -405,7 +405,7 @@ public:
bool equals(const Element& other) const;
};
-class ISC_LIBCC_API BoolElement : public Element {
+class B10_LIBCC_API BoolElement : public Element {
bool b;
public:
@@ -419,14 +419,14 @@ public:
bool equals(const Element& other) const;
};
-class ISC_LIBCC_API NullElement : public Element {
+class B10_LIBCC_API NullElement : public Element {
public:
NullElement() : Element(null) {};
void toJSON(std::ostream& ss) const;
bool equals(const Element& other) const;
};
-class ISC_LIBCC_API StringElement : public Element {
+class B10_LIBCC_API StringElement : public Element {
std::string s;
public:
@@ -440,7 +440,7 @@ public:
bool equals(const Element& other) const;
};
-class ISC_LIBCC_API ListElement : public Element {
+class B10_LIBCC_API ListElement : public Element {
std::vector<ConstElementPtr> l;
public:
@@ -470,7 +470,7 @@ public:
bool equals(const Element& other) const;
};
-class ISC_LIBCC_API MapElement : public Element {
+class B10_LIBCC_API MapElement : public Element {
std::map<std::string, ConstElementPtr> m;
public:
@@ -521,7 +521,7 @@ public:
/// Checks whether the given ElementPtr is a NULL pointer
/// \param p The ElementPtr to check
/// \return true if it is NULL, false if not.
-ISC_LIBCC_API bool isNull(ConstElementPtr p);
+B10_LIBCC_API bool isNull(ConstElementPtr p);
///
/// \brief Remove all values from the first ElementPtr that are
@@ -530,14 +530,14 @@ ISC_LIBCC_API bool isNull(ConstElementPtr p);
/// only contains new and changed values (for ModuleCCSession and
/// configuration update handlers)
/// Raises a TypeError if a or b are not MapElements
-ISC_LIBCC_API void removeIdentical(ElementPtr a, ConstElementPtr b);
+B10_LIBCC_API void removeIdentical(ElementPtr a, ConstElementPtr b);
/// \brief Create a new ElementPtr from the first ElementPtr, removing all
/// values that are equal in the second. Both ElementPtrs MUST be MapElements.
/// The returned ElementPtr will be a MapElement that only contains new and
/// changed values (for ModuleCCSession and configuration update handlers).
/// Raises a TypeError if a or b are not MapElements
-ISC_LIBCC_API ConstElementPtr
+B10_LIBCC_API ConstElementPtr
removeIdentical(ConstElementPtr a, ConstElementPtr b);
/// \brief Merges the data from other into element.
@@ -552,7 +552,7 @@ removeIdentical(ConstElementPtr a, ConstElementPtr b);
/// configuration data (which would then result in reverting back
/// to the default).
/// Raises a TypeError if either ElementPtr is not a MapElement
-ISC_LIBCC_API void merge(ElementPtr element, ConstElementPtr other);
+B10_LIBCC_API void merge(ElementPtr element, ConstElementPtr other);
///
/// \brief Insert the Element as a string into stream.
@@ -569,11 +569,11 @@ ISC_LIBCC_API void merge(ElementPtr element, ConstElementPtr other);
/// \param e The \c ElementPtr object to insert.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c out after the insertion operation.
-ISC_LIBCC_API std::ostream&
+B10_LIBCC_API std::ostream&
operator<<(std::ostream& out, const Element& e);
-ISC_LIBCC_API bool operator==(const Element& a, const Element& b);
-ISC_LIBCC_API bool operator!=(const Element& a, const Element& b);
+B10_LIBCC_API bool operator==(const Element& a, const Element& b);
+B10_LIBCC_API bool operator!=(const Element& a, const Element& b);
} }
#ifdef _MSC_VER
diff --git a/src/lib/cc/dll.h b/src/lib/cc/dll.h
index ee9bc31..daf46f6 100644
--- a/src/lib/cc/dll.h
+++ b/src/lib/cc/dll.h
@@ -16,12 +16,12 @@
#define __LIBCC_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBCC_API
+#define B10_LIBCC_API
#else
-#ifdef ISC_LIBCC_EXPORT
-#define ISC_LIBCC_API __declspec(dllexport)
+#ifdef B10_LIBCC_EXPORT
+#define B10_LIBCC_API __declspec(dllexport)
#else
-#define ISC_LIBCC_API __declspec(dllimport)
+#define B10_LIBCC_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/cc/logger.cc b/src/lib/cc/logger.cc
index 0db7117..2f38a9c 100644
--- a/src/lib/cc/logger.cc
+++ b/src/lib/cc/logger.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCC_EXPORT
+#define B10_LIBCC_EXPORT
#include <cc/logger.h>
diff --git a/src/lib/cc/session.cc b/src/lib/cc/session.cc
index ded9210..59552c0 100644
--- a/src/lib/cc/session.cc
+++ b/src/lib/cc/session.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCC_EXPORT
+#define B10_LIBCC_EXPORT
#include <config.h>
#include <cc/session_config.h>
diff --git a/src/lib/cc/session.h b/src/lib/cc/session.h
index 7e83acb..71b2b85 100644
--- a/src/lib/cc/session.h
+++ b/src/lib/cc/session.h
@@ -33,7 +33,7 @@ namespace isc {
namespace cc {
class SessionImpl;
- class ISC_LIBCC_API SessionError : public isc::Exception {
+ class B10_LIBCC_API SessionError : public isc::Exception {
public:
SessionError(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -42,7 +42,7 @@ namespace isc {
/// \brief A standard Exception class that is thrown when a
/// blocking readData call does not read the given number of
/// bytes before the timeout expires
- class ISC_LIBCC_API SessionTimeout : public isc::Exception {
+ class B10_LIBCC_API SessionTimeout : public isc::Exception {
public:
SessionTimeout(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -56,7 +56,7 @@ namespace isc {
/// For simplicity we only define the methods that are necessary for
/// existing test cases that use this base class. Eventually we'll
/// probably have to extend them.
- class ISC_LIBCC_API AbstractSession {
+ class B10_LIBCC_API AbstractSession {
///
/// \name Constructors, Assignment Operator and Destructor.
///
@@ -109,7 +109,7 @@ namespace isc {
virtual size_t getTimeout() const = 0;
};
- class ISC_LIBCC_API Session : public AbstractSession {
+ class B10_LIBCC_API Session : public AbstractSession {
private:
SessionImpl* impl_;
diff --git a/src/lib/config/ccsession.cc b/src/lib/config/ccsession.cc
index 5d65970..191a2bd 100644
--- a/src/lib/config/ccsession.cc
+++ b/src/lib/config/ccsession.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCONFIG_EXPORT
+#define B10_LIBCONFIG_EXPORT
#include <config.h>
@@ -62,7 +62,7 @@ namespace isc {
namespace config {
/// Creates a standard config/command protocol answer message
-ISC_LIBCONFIG_API ConstElementPtr
+B10_LIBCONFIG_API ConstElementPtr
createAnswer() {
ElementPtr answer = Element::fromJSON("{\"result\": [] }");
ElementPtr answer_content = Element::createList();
@@ -72,7 +72,7 @@ createAnswer() {
return (answer);
}
-ISC_LIBCONFIG_API ConstElementPtr
+B10_LIBCONFIG_API ConstElementPtr
createAnswer(const int rcode, ConstElementPtr arg) {
if (rcode != 0 && (!arg || arg->getType() != Element::string)) {
isc_throw(CCSessionError, "Bad or no argument for rcode != 0");
@@ -86,7 +86,7 @@ createAnswer(const int rcode, ConstElementPtr arg) {
return (answer);
}
-ISC_LIBCONFIG_API ConstElementPtr
+B10_LIBCONFIG_API ConstElementPtr
createAnswer(const int rcode, const std::string& arg) {
ElementPtr answer = Element::fromJSON("{\"result\": [] }");
ElementPtr answer_content = Element::createList();
@@ -97,7 +97,7 @@ createAnswer(const int rcode, const std::string& arg) {
return (answer);
}
-ISC_LIBCONFIG_API ConstElementPtr
+B10_LIBCONFIG_API ConstElementPtr
parseAnswer(int &rcode, ConstElementPtr msg) {
if (msg &&
msg->getType() == Element::map &&
@@ -127,12 +127,12 @@ parseAnswer(int &rcode, ConstElementPtr msg) {
}
}
-ISC_LIBCONFIG_API ConstElementPtr
+B10_LIBCONFIG_API ConstElementPtr
createCommand(const std::string& command) {
return (createCommand(command, ElementPtr()));
}
-ISC_LIBCONFIG_API ConstElementPtr
+B10_LIBCONFIG_API ConstElementPtr
createCommand(const std::string& command, ConstElementPtr arg) {
ElementPtr cmd = Element::createMap();
ElementPtr cmd_parts = Element::createList();
@@ -144,7 +144,7 @@ createCommand(const std::string& command, ConstElementPtr arg) {
return (cmd);
}
-ISC_LIBCONFIG_API std::string
+B10_LIBCONFIG_API std::string
parseCommand(ConstElementPtr& arg, ConstElementPtr command) {
if (command &&
command->getType() == Element::map &&
@@ -312,7 +312,7 @@ copyLogger(ConstElementPtr& cur_logger, const std::string& new_name) {
} // end anonymous namespace
-ISC_LIBCONFIG_API ConstElementPtr
+B10_LIBCONFIG_API ConstElementPtr
getRelatedLoggers(ConstElementPtr loggers) {
// Keep a list of names for easier lookup later
std::set<std::string> our_names;
@@ -377,7 +377,7 @@ getRelatedLoggers(ConstElementPtr loggers) {
return (result);
}
-ISC_LIBCONFIG_API void
+B10_LIBCONFIG_API void
default_logconfig_handler(const std::string& module_name,
ConstElementPtr new_config,
const ConfigData& config_data) {
diff --git a/src/lib/config/ccsession.h b/src/lib/config/ccsession.h
index 0723e38..9c7295e 100644
--- a/src/lib/config/ccsession.h
+++ b/src/lib/config/ccsession.h
@@ -33,7 +33,7 @@ namespace config {
/// \brief Creates a standard config/command level success answer message
/// (i.e. of the form { "result": [ 0 ] }
/// \return Standard command/config success answer message
-ISC_LIBCONFIG_API isc::data::ConstElementPtr createAnswer();
+B10_LIBCONFIG_API isc::data::ConstElementPtr createAnswer();
///
/// \brief Creates a standard config/command level answer message
@@ -45,7 +45,7 @@ ISC_LIBCONFIG_API isc::data::ConstElementPtr createAnswer();
/// Element type. For rcode == 1, this argument is mandatory,
/// and must be a StringElement containing an error description
/// \return Standard command/config answer message
-ISC_LIBCONFIG_API isc::data::ConstElementPtr
+B10_LIBCONFIG_API isc::data::ConstElementPtr
createAnswer(const int rcode, isc::data::ConstElementPtr arg);
///
@@ -55,7 +55,7 @@ createAnswer(const int rcode, isc::data::ConstElementPtr arg);
/// \param rcode The return code (0 for success)
/// \param arg A string to put into the StringElement argument
/// \return Standard command/config answer message
-ISC_LIBCONFIG_API isc::data::ConstElementPtr
+B10_LIBCONFIG_API isc::data::ConstElementPtr
createAnswer(const int rcode, const std::string& arg);
///
@@ -67,7 +67,7 @@ createAnswer(const int rcode, const std::string& arg);
/// \return The optional argument in the message, or an empty ElementPtr
/// if there was no argument. If rcode != 0, this contains a
/// StringElement with the error description.
-ISC_LIBCONFIG_API isc::data::ConstElementPtr
+B10_LIBCONFIG_API isc::data::ConstElementPtr
parseAnswer(int &rcode, isc::data::ConstElementPtr msg);
///
@@ -76,7 +76,7 @@ parseAnswer(int &rcode, isc::data::ConstElementPtr msg);
///
/// \param command The command string
/// \return The created message
-ISC_LIBCONFIG_API isc::data::ConstElementPtr
+B10_LIBCONFIG_API isc::data::ConstElementPtr
createCommand(const std::string& command);
///
@@ -87,7 +87,7 @@ createCommand(const std::string& command);
/// \param arg The optional argument for the command. This can be of
/// any Element type, but it should conform to the .spec file.
/// \return The created message
-ISC_LIBCONFIG_API isc::data::ConstElementPtr
+B10_LIBCONFIG_API isc::data::ConstElementPtr
createCommand(const std::string& command, isc::data::ConstElementPtr arg);
///
@@ -124,7 +124,7 @@ createCommand(const std::string& command, isc::data::ConstElementPtr arg);
/// \param command The command message containing the command (as made
/// by createCommand()
/// \return The command name
-ISC_LIBCONFIG_API std::string
+B10_LIBCONFIG_API std::string
parseCommand(isc::data::ConstElementPtr& arg,
isc::data::ConstElementPtr command);
@@ -134,7 +134,7 @@ parseCommand(isc::data::ConstElementPtr& arg,
/// is there is a problem with one of the messages
///
// todo: include types and called function in the exception
-class ISC_LIBCONFIG_API CCSessionError : public isc::Exception {
+class B10_LIBCONFIG_API CCSessionError : public isc::Exception {
public:
CCSessionError(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -143,7 +143,7 @@ public:
///
/// \brief This exception is thrown if the constructor fails
///
-class ISC_LIBCONFIG_API CCSessionInitError : public isc::Exception {
+class B10_LIBCONFIG_API CCSessionInitError : public isc::Exception {
public:
CCSessionInitError(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -154,7 +154,7 @@ public:
/// holds configuration information, and handles messages from
/// the command channel
///
-class ISC_LIBCONFIG_API ModuleCCSession : public ConfigData {
+class B10_LIBCONFIG_API ModuleCCSession : public ConfigData {
public:
/**
* Initialize a config/command session
@@ -542,7 +542,7 @@ private:
/// \param new_config The modified configuration values
/// \param config_data The full config data for the (remote) logging
/// module.
-ISC_LIBCONFIG_API void
+B10_LIBCONFIG_API void
default_logconfig_handler(const std::string& module_name,
isc::data::ConstElementPtr new_config,
const ConfigData& config_data);
@@ -576,7 +576,7 @@ default_logconfig_handler(const std::string& module_name,
/// \param loggers the original 'loggers' config list
/// \return ListElement containing only loggers relevant for this
/// module, where * is replaced by the root logger name
-ISC_LIBCONFIG_API isc::data::ConstElementPtr
+B10_LIBCONFIG_API isc::data::ConstElementPtr
getRelatedLoggers(isc::data::ConstElementPtr loggers);
} // namespace config
diff --git a/src/lib/config/config_data.cc b/src/lib/config/config_data.cc
index 353620d..dbe0d23 100644
--- a/src/lib/config/config_data.cc
+++ b/src/lib/config/config_data.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCONFIG_EXPORT
+#define B10_LIBCONFIG_EXPORT
#include <config/config_data.h>
diff --git a/src/lib/config/config_data.h b/src/lib/config/config_data.h
index bc5a99c..fe40545 100644
--- a/src/lib/config/config_data.h
+++ b/src/lib/config/config_data.h
@@ -28,13 +28,13 @@ namespace config {
/// This exception is thrown when the caller is trying to access
/// data that doesn't exist (i.e. with an identifier that does not
/// point to anything defined in the .spec file)
-class ISC_LIBCONFIG_API DataNotFoundError : public isc::Exception {
+class B10_LIBCONFIG_API DataNotFoundError : public isc::Exception {
public:
DataNotFoundError(const char* file, size_t line, const std::string& what) :
isc::Exception(file, line, what) {}
};
-class ISC_LIBCONFIG_API ConfigData {
+class B10_LIBCONFIG_API ConfigData {
public:
/// Constructs a ConfigData option with no specification and an
/// empty configuration.
diff --git a/src/lib/config/config_log.cc b/src/lib/config/config_log.cc
index 1cd8663..aeab5e4 100644
--- a/src/lib/config/config_log.cc
+++ b/src/lib/config/config_log.cc
@@ -14,7 +14,7 @@
/// Defines the logger used by the config lib
-#define ISC_LIBCONFIG_EXPORT
+#define B10_LIBCONFIG_EXPORT
#include "config/config_log.h"
diff --git a/src/lib/config/dll.h b/src/lib/config/dll.h
index 7178070..0be0d9b 100644
--- a/src/lib/config/dll.h
+++ b/src/lib/config/dll.h
@@ -16,12 +16,12 @@
#define __LIBCONFIG_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBCONFIG_API
+#define B10_LIBCONFIG_API
#else
-#ifdef ISC_LIBCONFIG_EXPORT
-#define ISC_LIBCONFIG_API __declspec(dllexport)
+#ifdef B10_LIBCONFIG_EXPORT
+#define B10_LIBCONFIG_API __declspec(dllexport)
#else
-#define ISC_LIBCONFIG_API __declspec(dllimport)
+#define B10_LIBCONFIG_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/config/module_spec.cc b/src/lib/config/module_spec.cc
index d94e86b..64d2dd4 100644
--- a/src/lib/config/module_spec.cc
+++ b/src/lib/config/module_spec.cc
@@ -13,7 +13,7 @@
// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCONFIG_EXPORT
+#define B10_LIBCONFIG_EXPORT
#include <config/module_spec.h>
diff --git a/src/lib/config/module_spec.h b/src/lib/config/module_spec.h
index 945a6c4..ad9010f 100644
--- a/src/lib/config/module_spec.h
+++ b/src/lib/config/module_spec.h
@@ -32,7 +32,7 @@ namespace isc { namespace config {
/// A standard ModuleSpec exception that is thrown when a
/// specification is not in the correct form.
///
- class ISC_LIBCONFIG_API ModuleSpecError : public isc::Exception {
+ class B10_LIBCONFIG_API ModuleSpecError : public isc::Exception {
public:
ModuleSpecError(const char* file, size_t line,
const char* what = "Module specification is invalid") :
@@ -49,7 +49,7 @@ namespace isc { namespace config {
///
/// The form of the specification is described in doc/ (TODO)
///
- class ISC_LIBCONFIG_API ModuleSpec {
+ class B10_LIBCONFIG_API ModuleSpec {
public:
ModuleSpec() {};
/// Create a \c ModuleSpec instance with the given data as
@@ -190,7 +190,7 @@ namespace isc { namespace config {
/// \param file_name The file to be opened and parsed
/// \param check If true, the module specification in the file
/// is checked to be of the correct form
- ISC_LIBCONFIG_API ModuleSpec
+ B10_LIBCONFIG_API ModuleSpec
moduleSpecFromFile(const std::string& file_name, const bool check = true)
throw(isc::data::JSONError, ModuleSpecError);
@@ -202,7 +202,7 @@ namespace isc { namespace config {
/// \param in The std::istream containing the .spec file data
/// \param check If true, the module specification is checked
/// to be of the correct form
- ISC_LIBCONFIG_API ModuleSpec
+ B10_LIBCONFIG_API ModuleSpec
moduleSpecFromFile(std::ifstream& in, const bool check = true)
throw(isc::data::JSONError, ModuleSpecError);
} }
diff --git a/src/lib/cryptolink/crypto_hmac.cc b/src/lib/cryptolink/crypto_hmac.cc
index a5f77d0..c4ccab9 100644
--- a/src/lib/cryptolink/crypto_hmac.cc
+++ b/src/lib/cryptolink/crypto_hmac.cc
@@ -12,11 +12,11 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCRYPTOLINK_EXPORT
+#define B10_LIBCRYPTOLINK_EXPORT
#ifdef _MSC_VER
#pragma warning(push)
-#pragma warning(disable: 4290 4512)
+#pragma warning(disable: 4290)
#endif
#include <cryptolink.h>
@@ -254,7 +254,7 @@ HMAC::verify(const void* sig, const size_t len) {
return (impl_->verify(sig, len));
}
-ISC_LIBCRYPTOLINK_API void
+B10_LIBCRYPTOLINK_API void
signHMAC(const void* data, const size_t data_len, const void* secret,
size_t secret_len, const HashAlgorithm hash_algorithm,
isc::util::OutputBuffer& result, size_t len)
@@ -268,7 +268,7 @@ signHMAC(const void* data, const size_t data_len, const void* secret,
}
-ISC_LIBCRYPTOLINK_API bool
+B10_LIBCRYPTOLINK_API bool
verifyHMAC(const void* data, const size_t data_len, const void* secret,
size_t secret_len, const HashAlgorithm hash_algorithm,
const void* sig, const size_t sig_len)
@@ -281,7 +281,7 @@ verifyHMAC(const void* data, const size_t data_len, const void* secret,
return (hmac->verify(sig, sig_len));
}
-ISC_LIBCRYPTOLINK_API void
+B10_LIBCRYPTOLINK_API void
deleteHMAC(HMAC* hmac) {
delete hmac;
}
diff --git a/src/lib/cryptolink/crypto_hmac.h b/src/lib/cryptolink/crypto_hmac.h
index 820c299..ad1159e 100644
--- a/src/lib/cryptolink/crypto_hmac.h
+++ b/src/lib/cryptolink/crypto_hmac.h
@@ -33,7 +33,7 @@ class HMACImpl;
/// This class is used to create and verify HMAC signatures. Instances
/// can be created with CryptoLink::createHMAC()
///
-class ISC_LIBCRYPTOLINK_API HMAC : private boost::noncopyable {
+class B10_LIBCRYPTOLINK_API HMAC : private boost::noncopyable {
private:
/// \brief Constructor from a secret and a hash algorithm
///
@@ -158,7 +158,7 @@ private:
/// \param result The signature will be appended to this buffer
/// \param len If this is non-zero and less than the output size,
/// the result will be truncated to len bytes
-ISC_LIBCRYPTOLINK_API
+B10_LIBCRYPTOLINK_API
void signHMAC(const void* data,
const size_t data_len,
const void* secret,
@@ -193,7 +193,7 @@ void signHMAC(const void* data,
/// \param sig The signature to verify
/// \param sig_len The length of the signature
/// \return True if the signature verifies, false if not
-ISC_LIBCRYPTOLINK_API
+B10_LIBCRYPTOLINK_API
bool verifyHMAC(const void* data,
const size_t data_len,
const void* secret,
@@ -203,7 +203,7 @@ bool verifyHMAC(const void* data,
const size_t sig_len);
/// \brief Delete an HMAC object
-ISC_LIBCRYPTOLINK_API void deleteHMAC(HMAC* hmac);
+B10_LIBCRYPTOLINK_API void deleteHMAC(HMAC* hmac);
} // namespace cryptolink
} // namespace isc
diff --git a/src/lib/cryptolink/cryptolink.cc b/src/lib/cryptolink/cryptolink.cc
index 51771d5..a023b1b 100644
--- a/src/lib/cryptolink/cryptolink.cc
+++ b/src/lib/cryptolink/cryptolink.cc
@@ -12,12 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBCRYPTOLINK_EXPORT
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable: 4290 4512)
-#endif
+#define B10_LIBCRYPTOLINK_EXPORT
#include <cryptolink/cryptolink.h>
#include <cryptolink/crypto_hmac.h>
@@ -73,7 +68,3 @@ CryptoLink::createHMAC(const void* secret, size_t secret_len,
} // namespace cryptolink
} // namespace isc
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
diff --git a/src/lib/cryptolink/cryptolink.h b/src/lib/cryptolink/cryptolink.h
index 3bf6032..4582f08 100644
--- a/src/lib/cryptolink/cryptolink.h
+++ b/src/lib/cryptolink/cryptolink.h
@@ -47,11 +47,11 @@ enum HashAlgorithm {
};
// Forward declaration for createHMAC()
-class ISC_LIBCRYPTOLINK_API HMAC;
+class B10_LIBCRYPTOLINK_API HMAC;
/// General exception class that is the base for all crypto-related
/// exceptions
-class ISC_LIBCRYPTOLINK_API CryptoLinkError : public Exception {
+class B10_LIBCRYPTOLINK_API CryptoLinkError : public Exception {
public:
CryptoLinkError(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -59,7 +59,7 @@ public:
/// This exception is thrown if there was a problem initializing the
/// crypto library
-class ISC_LIBCRYPTOLINK_API InitializationError : public CryptoLinkError {
+class B10_LIBCRYPTOLINK_API InitializationError : public CryptoLinkError {
public:
InitializationError(const char* file, size_t line, const char* what) :
CryptoLinkError(file, line, what) {}
@@ -67,7 +67,7 @@ public:
/// This exception is thrown when a cryptographic action is requested
/// for an algorithm that is not supported by the underlying library.
-class ISC_LIBCRYPTOLINK_API UnsupportedAlgorithm : public CryptoLinkError {
+class B10_LIBCRYPTOLINK_API UnsupportedAlgorithm : public CryptoLinkError {
public:
UnsupportedAlgorithm(const char* file, size_t line, const char* what) :
CryptoLinkError(file, line, what) {}
@@ -75,7 +75,7 @@ public:
/// This exception is thrown when the underlying library could not
/// handle the key data.
-class ISC_LIBCRYPTOLINK_API BadKey : public CryptoLinkError {
+class B10_LIBCRYPTOLINK_API BadKey : public CryptoLinkError {
public:
BadKey(const char* file, size_t line, const char* what) :
CryptoLinkError(file, line, what) {}
@@ -85,7 +85,7 @@ public:
/// specifically caught is thrown by the underlying library. It
/// is replaced by this one so as not have 'external' exceptions
/// bubbling up
-class ISC_LIBCRYPTOLINK_API LibraryError : public CryptoLinkError {
+class B10_LIBCRYPTOLINK_API LibraryError : public CryptoLinkError {
public:
LibraryError(const char* file, size_t line, const char* what) :
CryptoLinkError(file, line, what) {}
@@ -132,7 +132,7 @@ class CryptoLinkImpl;
///
// Internal note: we can use this class later to initialize and manage
// dynamic (PKCS#11) libs
-class ISC_LIBCRYPTOLINK_API CryptoLink : private boost::noncopyable {
+class B10_LIBCRYPTOLINK_API CryptoLink : private boost::noncopyable {
public:
/// \brief Returns a reference to the singleton instance
///
diff --git a/src/lib/cryptolink/dll.h b/src/lib/cryptolink/dll.h
index b2bfda7..d3b430e 100644
--- a/src/lib/cryptolink/dll.h
+++ b/src/lib/cryptolink/dll.h
@@ -16,12 +16,12 @@
#define __LIBCRYPTOLINK_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBCRYPTOLINK_API
+#define B10_LIBCRYPTOLINK_API
#else
-#ifdef ISC_LIBCRYPTOLINK_EXPORT
-#define ISC_LIBCRYPTOLINK_API __declspec(dllexport)
+#ifdef B10_LIBCRYPTOLINK_EXPORT
+#define B10_LIBCRYPTOLINK_API __declspec(dllexport)
#else
-#define ISC_LIBCRYPTOLINK_API __declspec(dllimport)
+#define B10_LIBCRYPTOLINK_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/datasrc/cache.cc b/src/lib/datasrc/cache.cc
index 447fc8f..56424c5 100644
--- a/src/lib/datasrc/cache.cc
+++ b/src/lib/datasrc/cache.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <stdint.h>
diff --git a/src/lib/datasrc/cache.h b/src/lib/datasrc/cache.h
index 355c4b4..236bb58 100644
--- a/src/lib/datasrc/cache.h
+++ b/src/lib/datasrc/cache.h
@@ -24,14 +24,14 @@
namespace isc {
namespace dns {
-class ISC_LIBDATASRC_API Name;
-class ISC_LIBDATASRC_API RRClass;
-class ISC_LIBDATASRC_API RRType;
+class B10_LIBDATASRC_API Name;
+class B10_LIBDATASRC_API RRClass;
+class B10_LIBDATASRC_API RRType;
}
namespace datasrc {
-class ISC_LIBDATASRC_API CacheNode;
+class B10_LIBDATASRC_API CacheNode;
typedef boost::shared_ptr<CacheNode> CacheNodePtr;
typedef boost::shared_ptr<const CacheNode> ConstCacheNodePtr;
@@ -81,7 +81,7 @@ class HotCacheImpl;
/// does not currently use threads, but if it ever does (or if libdatasrc
/// is ever used by a threaded application), this will need to be
/// revisited.
-class ISC_LIBDATASRC_API HotCache {
+class B10_LIBDATASRC_API HotCache {
private:
/// \name Static definitions
//@{
diff --git a/src/lib/datasrc/client.h b/src/lib/datasrc/client.h
index 2dcb995..a77d397 100644
--- a/src/lib/datasrc/client.h
+++ b/src/lib/datasrc/client.h
@@ -70,7 +70,7 @@ namespace isc {
namespace datasrc {
// The iterator.h is not included on purpose, most application won't need it
-class ISC_LIBDATASRC_API ZoneIterator;
+class B10_LIBDATASRC_API ZoneIterator;
typedef boost::shared_ptr<ZoneIterator> ZoneIteratorPtr;
/// \brief The base class of data source clients.
@@ -129,7 +129,7 @@ typedef boost::shared_ptr<ZoneIterator> ZoneIteratorPtr;
///
/// \todo This class is still not complete. It will need more factory methods,
/// e.g. for (re)loading a zone.
-class ISC_LIBDATASRC_API DataSourceClient : boost::noncopyable {
+class B10_LIBDATASRC_API DataSourceClient : boost::noncopyable {
public:
/// \brief A helper structure to represent the search result of
/// \c find().
diff --git a/src/lib/datasrc/client_list.cc b/src/lib/datasrc/client_list.cc
index 19c1ba8..d6515d9 100644
--- a/src/lib/datasrc/client_list.cc
+++ b/src/lib/datasrc/client_list.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <config.h>
diff --git a/src/lib/datasrc/client_list.h b/src/lib/datasrc/client_list.h
index b8612c7..76f1d0d 100644
--- a/src/lib/datasrc/client_list.h
+++ b/src/lib/datasrc/client_list.h
@@ -27,11 +27,11 @@
namespace isc {
namespace datasrc {
-class ISC_LIBDATASRC_API ZoneFinder;
+class B10_LIBDATASRC_API ZoneFinder;
typedef boost::shared_ptr<ZoneFinder> ZoneFinderPtr;
-class ISC_LIBDATASRC_API DataSourceClient;
+class B10_LIBDATASRC_API DataSourceClient;
typedef boost::shared_ptr<DataSourceClient> DataSourceClientPtr;
-class ISC_LIBDATASRC_API DataSourceClientContainer;
+class B10_LIBDATASRC_API DataSourceClientContainer;
typedef boost::shared_ptr<DataSourceClientContainer>
DataSourceClientContainerPtr;
@@ -48,7 +48,7 @@ typedef boost::shared_ptr<DataSourceClientContainer>
/// have it to allow easy testing. It is possible to create a mock-up class
/// instead of creating a full-blown configuration. The real implementation
/// is the ConfigurableClientList.
-class ISC_LIBDATASRC_API ClientList : public boost::noncopyable {
+class B10_LIBDATASRC_API ClientList : public boost::noncopyable {
protected:
/// \brief Constructor.
///
@@ -184,7 +184,7 @@ typedef boost::shared_ptr<const ClientList> ConstClientListPtr;
///
/// While it is possible to inherit this class, it is not expected to be
/// inherited except for tests.
-class ISC_LIBDATASRC_API ConfigurableClientList : public ClientList {
+class B10_LIBDATASRC_API ConfigurableClientList : public ClientList {
public:
/// \brief Exception thrown when there's an error in configuration.
class ConfigurationError : public Exception {
diff --git a/src/lib/datasrc/data_source.cc b/src/lib/datasrc/data_source.cc
index 3cfaa88..d1bf4bd 100644
--- a/src/lib/datasrc/data_source.cc
+++ b/src/lib/datasrc/data_source.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <config.h>
diff --git a/src/lib/datasrc/data_source.h b/src/lib/datasrc/data_source.h
index a705434..3795d47 100644
--- a/src/lib/datasrc/data_source.h
+++ b/src/lib/datasrc/data_source.h
@@ -35,24 +35,24 @@
namespace isc {
namespace dns {
-class ISC_LIBDATASRC_API Name;
-class ISC_LIBDATASRC_API RRType;
-class ISC_LIBDATASRC_API RRset;
-class ISC_LIBDATASRC_API RRsetList;
+class B10_LIBDATASRC_API Name;
+class B10_LIBDATASRC_API RRType;
+class B10_LIBDATASRC_API RRset;
+class B10_LIBDATASRC_API RRsetList;
}
namespace datasrc {
-class ISC_LIBDATASRC_API DataSrcMatch;
-class ISC_LIBDATASRC_API Query;
+class B10_LIBDATASRC_API DataSrcMatch;
+class B10_LIBDATASRC_API Query;
-class ISC_LIBDATASRC_API DataSrc;
+class B10_LIBDATASRC_API DataSrc;
typedef boost::shared_ptr<DataSrc> DataSrcPtr;
typedef boost::shared_ptr<const DataSrc> ConstDataSrcPtr;
/// This exception represents Backend-independent errors relating to
/// data source operations.
-class ISC_LIBDATASRC_API DataSourceError : public Exception {
+class B10_LIBDATASRC_API DataSourceError : public Exception {
public:
DataSourceError(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -64,14 +64,14 @@ public:
/// combination does not exist in the differences table. (Note that this
/// includes the case where the differences table contains no records related
/// to that zone.)
-class ISC_LIBDATASRC_API NoSuchSerial : public DataSourceError {
+class B10_LIBDATASRC_API NoSuchSerial : public DataSourceError {
public:
NoSuchSerial(const char* file, size_t line, const char* what) :
DataSourceError(file, line, what) {}
};
-class ISC_LIBDATASRC_API AbstractDataSrc {
+class B10_LIBDATASRC_API AbstractDataSrc {
///
/// \name Constructors, Assignment Operator and Destructor.
///
@@ -177,7 +177,7 @@ public:
};
// Base class for a DNS Data Source
-class ISC_LIBDATASRC_API DataSrc : public AbstractDataSrc {
+class B10_LIBDATASRC_API DataSrc : public AbstractDataSrc {
///
/// \name Constructors, Assignment Operator and Destructor.
///
@@ -243,7 +243,7 @@ private:
isc::dns::RRClass rrclass;
};
-class ISC_LIBDATASRC_API MetaDataSrc : public DataSrc {
+class B10_LIBDATASRC_API MetaDataSrc : public DataSrc {
///
/// \name Constructors, Assignment Operator and Destructor.
///
@@ -328,7 +328,7 @@ private:
/// - There is no matching %data source and name found (which is probably
/// wrong, see below), or the given enclosing name gives a longer match
/// than the currently stored enclosing name against the specified name.
-class ISC_LIBDATASRC_API DataSrcMatch {
+class B10_LIBDATASRC_API DataSrcMatch {
///
/// \name Constructors, Assignment Operator and Destructor.
///
@@ -414,7 +414,7 @@ private:
const isc::dns::RRClass& rrclass_;
};
-class ISC_LIBDATASRC_API Nsec3Param {
+class B10_LIBDATASRC_API Nsec3Param {
public:
Nsec3Param(uint8_t a, uint8_t f, uint16_t i, const std::vector<uint8_t>& s);
std::string getHash(const isc::dns::Name& name) const;
diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index f894c5a..9f28fbe 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <string>
#include <utility>
diff --git a/src/lib/datasrc/database.h b/src/lib/datasrc/database.h
index 21ed616..179b9ac 100644
--- a/src/lib/datasrc/database.h
+++ b/src/lib/datasrc/database.h
@@ -60,7 +60,7 @@ namespace datasrc {
/// database, having multiple instances of this class. If the database
/// allows having multiple open queries at one connection, the connection
/// class may share it.
-class ISC_LIBDATASRC_API DatabaseAccessor : boost::noncopyable {
+class B10_LIBDATASRC_API DatabaseAccessor : boost::noncopyable {
public:
/// \brief Data columns for by IteratorContext::getNext()
///
@@ -810,7 +810,7 @@ public:
/// While it is possible to subclass it for specific database in case
/// of special needs, it is not expected to be needed. This should just
/// work as it is with whatever DatabaseAccessor.
-class ISC_LIBDATASRC_API DatabaseClient : public DataSourceClient {
+class B10_LIBDATASRC_API DatabaseClient : public DataSourceClient {
public:
/// \brief Constructor
///
diff --git a/src/lib/datasrc/dll.h b/src/lib/datasrc/dll.h
index b4f4a7d..1734d5b 100644
--- a/src/lib/datasrc/dll.h
+++ b/src/lib/datasrc/dll.h
@@ -16,12 +16,12 @@
#define __LIBDATASRC_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBDATASRC_API
+#define B10_LIBDATASRC_API
#else
-#ifdef ISC_LIBDATASRC_EXPORT
-#define ISC_LIBDATASRC_API __declspec(dllexport)
+#ifdef B10_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_API __declspec(dllexport)
#else
-#define ISC_LIBDATASRC_API __declspec(dllimport)
+#define B10_LIBDATASRC_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/datasrc/factory.cc b/src/lib/datasrc/factory.cc
index f9c26a6..af54d29 100644
--- a/src/lib/datasrc/factory.cc
+++ b/src/lib/datasrc/factory.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <config.h>
diff --git a/src/lib/datasrc/factory.h b/src/lib/datasrc/factory.h
index f98c78f..ab88a8f 100644
--- a/src/lib/datasrc/factory.h
+++ b/src/lib/datasrc/factory.h
@@ -30,7 +30,7 @@ namespace datasrc {
/// \brief Raised if there is an error loading the datasource implementation
/// library
-class ISC_LIBDATASRC_API DataSourceLibraryError : public DataSourceError {
+class B10_LIBDATASRC_API DataSourceLibraryError : public DataSourceError {
public:
DataSourceLibraryError(const char* file, size_t line, const char* what) :
DataSourceError(file, line, what) {}
@@ -38,7 +38,7 @@ public:
/// \brief Raised if there is an error reading a symbol from the datasource
/// implementation library
-class ISC_LIBDATASRC_API DataSourceLibrarySymbolError :
+class B10_LIBDATASRC_API DataSourceLibrarySymbolError :
public DataSourceError {
public:
DataSourceLibrarySymbolError(const char* file, size_t line,
@@ -62,7 +62,7 @@ typedef void ds_destructor(DataSourceClient* instance);
/// in other places than for dynamically loading datasources, then, apart
/// from moving it to another location, we also need to make the
/// exceptions raised more general.
-class ISC_LIBDATASRC_API LibraryContainer : boost::noncopyable {
+class B10_LIBDATASRC_API LibraryContainer : boost::noncopyable {
public:
/// \brief Constructor
///
@@ -155,7 +155,7 @@ private:
/// derived classes as well. Currently, the class is actually derived in some
/// of the tests, which is rather unclean (as this class as written is really
/// intended to be used directly).
-class ISC_LIBDATASRC_API DataSourceClientContainer : boost::noncopyable {
+class B10_LIBDATASRC_API DataSourceClientContainer : boost::noncopyable {
public:
/// \brief Constructor
///
diff --git a/src/lib/datasrc/iterator.h b/src/lib/datasrc/iterator.h
index b0bc1a4..4d1d7b0 100644
--- a/src/lib/datasrc/iterator.h
+++ b/src/lib/datasrc/iterator.h
@@ -35,7 +35,7 @@ namespace datasrc {
*
* There's no way to start iterating from the beginning again or return.
*/
-class ISC_LIBDATASRC_API ZoneIterator : public boost::noncopyable {
+class B10_LIBDATASRC_API ZoneIterator : public boost::noncopyable {
public:
/**
* \brief Destructor
diff --git a/src/lib/datasrc/logger.cc b/src/lib/datasrc/logger.cc
index a695bad..7fa6e01 100644
--- a/src/lib/datasrc/logger.cc
+++ b/src/lib/datasrc/logger.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <datasrc/logger.h>
diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index f5729fa..e17b447 100644
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <config.h>
diff --git a/src/lib/datasrc/memory_datasrc.h b/src/lib/datasrc/memory_datasrc.h
index 3529ac6..2c00f5f 100644
--- a/src/lib/datasrc/memory_datasrc.h
+++ b/src/lib/datasrc/memory_datasrc.h
@@ -27,8 +27,8 @@
namespace isc {
namespace dns {
-class ISC_LIBDATASRC_API Name;
-class ISC_LIBDATASRC_API RRsetList;
+class B10_LIBDATASRC_API Name;
+class B10_LIBDATASRC_API RRsetList;
};
namespace datasrc {
@@ -41,7 +41,7 @@ namespace datasrc {
/// backend). This is why the class has methods like \c load() or \c add().
///
/// This class is non copyable.
-class ISC_LIBDATASRC_API InMemoryZoneFinder :
+class B10_LIBDATASRC_API InMemoryZoneFinder :
boost::noncopyable, public ZoneFinder {
///
/// \name Constructors and Destructor.
@@ -255,7 +255,7 @@ private:
/// The findZone() method takes a domain name and returns the best matching
/// \c InMemoryZoneFinder in the form of (Boost) shared pointer, so that it can
/// provide the general interface for all data sources.
-class ISC_LIBDATASRC_API InMemoryClient : public DataSourceClient {
+class B10_LIBDATASRC_API InMemoryClient : public DataSourceClient {
public:
///
/// \name Constructors and Destructor.
@@ -355,22 +355,22 @@ private:
/// an error
#if defined(_WIN32) && defined(USE_STATIC_LINK)
-extern "C" ISC_LIBDATASRC_API DataSourceClient*
+extern "C" B10_LIBDATASRC_API DataSourceClient*
MemoryCreateInstance(isc::data::ConstElementPtr config, std::string& error);
-extern "C" ISC_LIBDATASRC_API DataSourceClient*
+extern "C" B10_LIBDATASRC_API DataSourceClient*
StaticCreateInstance(isc::data::ConstElementPtr config, std::string& error);
/// \brief Destroy the instance created by createInstance()
-extern "C" ISC_LIBDATASRC_API void
+extern "C" B10_LIBDATASRC_API void
MemoryDestroyInstance(DataSourceClient* instance);
-extern "C" ISC_LIBDATASRC_API void
+extern "C" B10_LIBDATASRC_API void
StaticDestroyInstance(DataSourceClient* instance);
#else
-extern "C" ISC_LIBDATASRC_API DataSourceClient*
+extern "C" B10_LIBDATASRC_API DataSourceClient*
createInstance(isc::data::ConstElementPtr config, std::string& error);
/// \brief Destroy the instance created by createInstance()
-extern "C" ISC_LIBDATASRC_API void destroyInstance(DataSourceClient* instance);
+extern "C" B10_LIBDATASRC_API void destroyInstance(DataSourceClient* instance);
#endif
}
diff --git a/src/lib/datasrc/memory_datasrc_link.cc b/src/lib/datasrc/memory_datasrc_link.cc
index 7d088b1..4063a2d 100644
--- a/src/lib/datasrc/memory_datasrc_link.cc
+++ b/src/lib/datasrc/memory_datasrc_link.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <config.h>
@@ -39,7 +39,7 @@ namespace datasrc {
/// This exception is raised if there is an error in the configuration
/// that has been passed; missing information, duplicate values, etc.
-class ISC_LIBDATASRC_API InMemoryConfigError : public isc::Exception {
+class B10_LIBDATASRC_API InMemoryConfigError : public isc::Exception {
public:
InMemoryConfigError(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -249,7 +249,7 @@ applyConfig(isc::datasrc::InMemoryClient& client,
} // end unnamed namespace
-ISC_LIBDATASRC_API DataSourceClient *
+B10_LIBDATASRC_API DataSourceClient *
#if defined(_WIN32) && defined(USE_STATIC_LINK)
MemoryCreateInstance
#else
@@ -278,7 +278,7 @@ createInstance
}
}
-ISC_LIBDATASRC_API void
+B10_LIBDATASRC_API void
#if defined(_WIN32) && defined(USE_STATIC_LINK)
MemoryDestroyInstance
#else
diff --git a/src/lib/datasrc/query.cc b/src/lib/datasrc/query.cc
index 4d3936f..6c52e4f 100644
--- a/src/lib/datasrc/query.cc
+++ b/src/lib/datasrc/query.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <util/buffer.h>
#include <dns/name.h>
diff --git a/src/lib/datasrc/query.h b/src/lib/datasrc/query.h
index 01cb782..c8c81cc 100644
--- a/src/lib/datasrc/query.h
+++ b/src/lib/datasrc/query.h
@@ -31,11 +31,11 @@
namespace isc {
namespace datasrc {
-class ISC_LIBDATASRC_API Query;
+class B10_LIBDATASRC_API Query;
typedef boost::shared_ptr<Query> QueryPtr;
// An individual task to be carried out by the query logic
-class ISC_LIBDATASRC_API QueryTask {
+class B10_LIBDATASRC_API QueryTask {
private:
/// Note: The copy constructor and the assignment operator are intentionally
/// defined as private.
@@ -159,7 +159,7 @@ typedef boost::shared_ptr<QueryTask> QueryTaskPtr;
typedef std::queue<QueryTaskPtr> QueryTaskQueue;
// Data Source query
-class ISC_LIBDATASRC_API Query {
+class B10_LIBDATASRC_API Query {
public:
// The state of a query: pending or answered.
enum Status {
diff --git a/src/lib/datasrc/rbnode_rrset.h b/src/lib/datasrc/rbnode_rrset.h
index e872755..3577eb0 100644
--- a/src/lib/datasrc/rbnode_rrset.h
+++ b/src/lib/datasrc/rbnode_rrset.h
@@ -44,7 +44,7 @@ struct RBNodeRRsetImpl;
// Note that the definition of the structure is still hidden within the
// implementation, so, basically, a normal application should never be able
// to use it directly even if it peeks into the "internal" namespace.
-struct ISC_LIBDATASRC_API AdditionalNodeInfo;
+struct B10_LIBDATASRC_API AdditionalNodeInfo;
/// \brief Special RRset for optimizing memory datasource requirement
///
@@ -85,7 +85,7 @@ struct ISC_LIBDATASRC_API AdditionalNodeInfo;
///
// Note: non-Doxygen-documented methods are documented in the base class.
-class ISC_LIBDATASRC_API RBNodeRRset : public isc::dns::AbstractRRset {
+class B10_LIBDATASRC_API RBNodeRRset : public isc::dns::AbstractRRset {
private:
// Note: The copy constructor and the assignment operator are intentionally
diff --git a/src/lib/datasrc/sqlite3_accessor.cc b/src/lib/datasrc/sqlite3_accessor.cc
index 4927ed8..82e0a81 100644
--- a/src/lib/datasrc/sqlite3_accessor.cc
+++ b/src/lib/datasrc/sqlite3_accessor.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <config.h>
diff --git a/src/lib/datasrc/sqlite3_accessor.h b/src/lib/datasrc/sqlite3_accessor.h
index e76bd05..7e8a65a 100644
--- a/src/lib/datasrc/sqlite3_accessor.h
+++ b/src/lib/datasrc/sqlite3_accessor.h
@@ -30,7 +30,7 @@
namespace isc {
namespace dns {
-class ISC_LIBDATASRC_API RRClass;
+class B10_LIBDATASRC_API RRClass;
}
namespace datasrc {
@@ -42,13 +42,13 @@ namespace datasrc {
* It might mean corrupt database file, invalid request or that something is
* rotten in the library.
*/
-class ISC_LIBDATASRC_API SQLite3Error : public DataSourceError {
+class B10_LIBDATASRC_API SQLite3Error : public DataSourceError {
public:
SQLite3Error(const char* file, size_t line, const char* what) :
DataSourceError(file, line, what) {}
};
-class ISC_LIBDATASRC_API IncompatibleDbVersion : public Exception {
+class B10_LIBDATASRC_API IncompatibleDbVersion : public Exception {
public:
IncompatibleDbVersion(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -60,7 +60,7 @@ public:
* Thrown if a query expecting a certain number of rows back returned too
* many rows.
*/
-class ISC_LIBDATASRC_API TooMuchData : public DataSourceError {
+class B10_LIBDATASRC_API TooMuchData : public DataSourceError {
public:
TooMuchData(const char* file, size_t line, const char* what) :
DataSourceError(file, line, what) {}
@@ -72,7 +72,7 @@ public:
* Thrown if a query expecting a certain number of rows back returned too
* few rows (including none).
*/
-class ISC_LIBDATASRC_API TooLittleData : public DataSourceError {
+class B10_LIBDATASRC_API TooLittleData : public DataSourceError {
public:
TooLittleData(const char* file, size_t line, const char* what) :
DataSourceError(file, line, what) {}
@@ -87,7 +87,7 @@ struct SQLite3Parameters;
* According to the design, it doesn't interpret the data in any way, it just
* provides unified access to the DB.
*/
-class ISC_LIBDATASRC_API SQLite3Accessor : public DatabaseAccessor,
+class B10_LIBDATASRC_API SQLite3Accessor : public DatabaseAccessor,
public boost::enable_shared_from_this<SQLite3Accessor> {
public:
/**
@@ -284,18 +284,18 @@ private:
/// \return An instance of the sqlite3 datasource client, or NULL if there was
/// an error
#if defined(_WIN32) && defined(USE_STATIC_LINK)
-extern "C" ISC_LIBDATASRC_API DataSourceClient*
+extern "C" B10_LIBDATASRC_API DataSourceClient*
SQLCreateInstance(isc::data::ConstElementPtr config, std::string& error);
/// \brief Destroy the instance created by createInstance()
-extern "C" ISC_LIBDATASRC_API void
+extern "C" B10_LIBDATASRC_API void
SQLDestroyInstance(DataSourceClient* instance);
#else
-extern "C" ISC_LIBDATASRC_API DataSourceClient*
+extern "C" B10_LIBDATASRC_API DataSourceClient*
createInstance(isc::data::ConstElementPtr config, std::string& error);
/// \brief Destroy the instance created by createInstance()
-extern "C" ISC_LIBDATASRC_API void destroyInstance(DataSourceClient* instance);
+extern "C" B10_LIBDATASRC_API void destroyInstance(DataSourceClient* instance);
#endif
}
diff --git a/src/lib/datasrc/sqlite3_accessor_link.cc b/src/lib/datasrc/sqlite3_accessor_link.cc
index 826077a..1384e5e 100644
--- a/src/lib/datasrc/sqlite3_accessor_link.cc
+++ b/src/lib/datasrc/sqlite3_accessor_link.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <cc/data.h>
@@ -77,7 +77,7 @@ checkConfig(ConstElementPtr config, ElementPtr errors) {
} // end unnamed namespace
-ISC_LIBDATASRC_API DataSourceClient *
+B10_LIBDATASRC_API DataSourceClient *
#if defined(_WIN32) && defined(USE_STATIC_LINK)
SQLCreateInstance
#else
@@ -106,7 +106,7 @@ createInstance
}
}
-ISC_LIBDATASRC_API void
+B10_LIBDATASRC_API void
#if defined(_WIN32) && defined(USE_STATIC_LINK)
SQLDestroyInstance
#else
diff --git a/src/lib/datasrc/sqlite3_datasrc.cc b/src/lib/datasrc/sqlite3_datasrc.cc
index 6ddee35..3c8891f 100644
--- a/src/lib/datasrc/sqlite3_datasrc.cc
+++ b/src/lib/datasrc/sqlite3_datasrc.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <config.h>
@@ -53,7 +53,7 @@ using namespace isc::dns::rdata;
namespace isc {
namespace datasrc {
-struct ISC_LIBDATASRC_API Sqlite3Parameters {
+struct B10_LIBDATASRC_API Sqlite3Parameters {
Sqlite3Parameters() : db_(NULL), major_version_(-1), minor_version_(-1),
q_zone_(NULL), q_record_(NULL), q_addrs_(NULL), q_referral_(NULL),
q_any_(NULL), q_count_(NULL), q_previous_(NULL), q_nsec3_(NULL),
diff --git a/src/lib/datasrc/sqlite3_datasrc.h b/src/lib/datasrc/sqlite3_datasrc.h
index 18ffd34..7f2c271 100644
--- a/src/lib/datasrc/sqlite3_datasrc.h
+++ b/src/lib/datasrc/sqlite3_datasrc.h
@@ -30,30 +30,30 @@
namespace isc {
namespace dns {
-class ISC_LIBDATASRC_API Name;
-class ISC_LIBDATASRC_API RRClass;
-class ISC_LIBDATASRC_API RRType;
-class ISC_LIBDATASRC_API RRsetList;
+class B10_LIBDATASRC_API Name;
+class B10_LIBDATASRC_API RRClass;
+class B10_LIBDATASRC_API RRType;
+class B10_LIBDATASRC_API RRsetList;
}
namespace datasrc {
-class ISC_LIBDATASRC_API Query;
-struct ISC_LIBDATASRC_API Sqlite3Parameters;
+class B10_LIBDATASRC_API Query;
+struct B10_LIBDATASRC_API Sqlite3Parameters;
-class ISC_LIBDATASRC_API Sqlite3Error : public Exception {
+class B10_LIBDATASRC_API Sqlite3Error : public Exception {
public:
Sqlite3Error(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
};
-class ISC_LIBDATASRC_API IncompatibleDbVersion : public Exception {
+class B10_LIBDATASRC_API IncompatibleDbVersion : public Exception {
public:
IncompatibleDbVersion(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
};
-class ISC_LIBDATASRC_API Sqlite3DataSrc : public DataSrc {
+class B10_LIBDATASRC_API Sqlite3DataSrc : public DataSrc {
///
/// \name Constructors, Assignment Operator and Destructor.
///
diff --git a/src/lib/datasrc/static_datasrc.cc b/src/lib/datasrc/static_datasrc.cc
index 31f01f6..2088b38 100644
--- a/src/lib/datasrc/static_datasrc.cc
+++ b/src/lib/datasrc/static_datasrc.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <config.h>
diff --git a/src/lib/datasrc/static_datasrc.h b/src/lib/datasrc/static_datasrc.h
index 501cec5..ee3791c 100644
--- a/src/lib/datasrc/static_datasrc.h
+++ b/src/lib/datasrc/static_datasrc.h
@@ -29,18 +29,18 @@
namespace isc {
namespace dns {
-class ISC_LIBDATASRC_API Name;
-class ISC_LIBDATASRC_API RRClass;
-class ISC_LIBDATASRC_API RRType;
-class ISC_LIBDATASRC_API RRType;
-class ISC_LIBDATASRC_API RRsetList;
+class B10_LIBDATASRC_API Name;
+class B10_LIBDATASRC_API RRClass;
+class B10_LIBDATASRC_API RRType;
+class B10_LIBDATASRC_API RRType;
+class B10_LIBDATASRC_API RRsetList;
}
namespace datasrc {
struct StaticDataSrcImpl;
-class ISC_LIBDATASRC_API StaticDataSrc : public DataSrc {
+class B10_LIBDATASRC_API StaticDataSrc : public DataSrc {
private:
///
/// \name Constructors, Assignment Operator and Destructor.
diff --git a/src/lib/datasrc/static_datasrc_link.cc b/src/lib/datasrc/static_datasrc_link.cc
index 6509a63..a7b6631 100644
--- a/src/lib/datasrc/static_datasrc_link.cc
+++ b/src/lib/datasrc/static_datasrc_link.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include "client.h"
#include "memory_datasrc.h"
@@ -31,7 +31,7 @@ using namespace std;
namespace isc {
namespace datasrc {
-ISC_LIBDATASRC_API DataSourceClient*
+B10_LIBDATASRC_API DataSourceClient*
#if defined(_WIN32) && defined(USE_STATIC_LINK)
StaticCreateInstance
#else
@@ -60,7 +60,7 @@ createInstance
return (NULL);
}
-ISC_LIBDATASRC_API void
+B10_LIBDATASRC_API void
#if defined(_WIN32) && defined(USE_STATIC_LINK)
StaticDestroyInstance
#else
diff --git a/src/lib/datasrc/tests/cache_unittest.cc b/src/lib/datasrc/tests/cache_unittest.cc
index 9aef8a5..adb4b31 100644
--- a/src/lib/datasrc/tests/cache_unittest.cc
+++ b/src/lib/datasrc/tests/cache_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <config.h>
diff --git a/src/lib/datasrc/tests/client_list_unittest.cc b/src/lib/datasrc/tests/client_list_unittest.cc
index 7c3fd32..62b38ea 100644
--- a/src/lib/datasrc/tests/client_list_unittest.cc
+++ b/src/lib/datasrc/tests/client_list_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <datasrc/client_list.h>
#include <datasrc/client.h>
diff --git a/src/lib/datasrc/tests/client_unittest.cc b/src/lib/datasrc/tests/client_unittest.cc
index 931de9b..eda75e4 100644
--- a/src/lib/datasrc/tests/client_unittest.cc
+++ b/src/lib/datasrc/tests/client_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <utility>
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index 5ff3490..157a4c8 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include "faked_nsec3.h"
diff --git a/src/lib/datasrc/tests/datasrc_unittest.cc b/src/lib/datasrc/tests/datasrc_unittest.cc
index a918b29..71ebb87 100644
--- a/src/lib/datasrc/tests/datasrc_unittest.cc
+++ b/src/lib/datasrc/tests/datasrc_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <stdint.h>
diff --git a/src/lib/datasrc/tests/factory_unittest.cc b/src/lib/datasrc/tests/factory_unittest.cc
index 38608ef..01fd269 100644
--- a/src/lib/datasrc/tests/factory_unittest.cc
+++ b/src/lib/datasrc/tests/factory_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <config.h>
diff --git a/src/lib/datasrc/tests/faked_nsec3.cc b/src/lib/datasrc/tests/faked_nsec3.cc
index 3498ddf..2336910 100644
--- a/src/lib/datasrc/tests/faked_nsec3.cc
+++ b/src/lib/datasrc/tests/faked_nsec3.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include "faked_nsec3.h"
diff --git a/src/lib/datasrc/tests/logger_unittest.cc b/src/lib/datasrc/tests/logger_unittest.cc
index 668cd75..b4bb7c4 100644
--- a/src/lib/datasrc/tests/logger_unittest.cc
+++ b/src/lib/datasrc/tests/logger_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <gtest/gtest.h>
diff --git a/src/lib/datasrc/tests/memory_datasrc_unittest.cc b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
index 1a26c08..5f64c66 100644
--- a/src/lib/datasrc/tests/memory_datasrc_unittest.cc
+++ b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include "faked_nsec3.h"
diff --git a/src/lib/datasrc/tests/query_unittest.cc b/src/lib/datasrc/tests/query_unittest.cc
index e48b84f..9ddb08d 100644
--- a/src/lib/datasrc/tests/query_unittest.cc
+++ b/src/lib/datasrc/tests/query_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <gtest/gtest.h>
diff --git a/src/lib/datasrc/tests/rbnode_rrset_unittest.cc b/src/lib/datasrc/tests/rbnode_rrset_unittest.cc
index db4c026..4d63e47 100644
--- a/src/lib/datasrc/tests/rbnode_rrset_unittest.cc
+++ b/src/lib/datasrc/tests/rbnode_rrset_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <exceptions/exceptions.h>
#include <dns/rdataclass.h>
diff --git a/src/lib/datasrc/tests/rbtree_unittest.cc b/src/lib/datasrc/tests/rbtree_unittest.cc
index b92efcd..d59a8e0 100644
--- a/src/lib/datasrc/tests/rbtree_unittest.cc
+++ b/src/lib/datasrc/tests/rbtree_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <gtest/gtest.h>
diff --git a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
index a83e27e..5709d01 100644
--- a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
+++ b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include "faked_nsec3.h"
diff --git a/src/lib/datasrc/tests/sqlite3_unittest.cc b/src/lib/datasrc/tests/sqlite3_unittest.cc
index 63e3da7..f959196 100644
--- a/src/lib/datasrc/tests/sqlite3_unittest.cc
+++ b/src/lib/datasrc/tests/sqlite3_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <stdint.h>
diff --git a/src/lib/datasrc/tests/static_unittest.cc b/src/lib/datasrc/tests/static_unittest.cc
index c9984c5..4da492c 100644
--- a/src/lib/datasrc/tests/static_unittest.cc
+++ b/src/lib/datasrc/tests/static_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <stdint.h>
#include <string>
diff --git a/src/lib/datasrc/tests/test_client.cc b/src/lib/datasrc/tests/test_client.cc
index 6c9491d..4073de3 100644
--- a/src/lib/datasrc/tests/test_client.cc
+++ b/src/lib/datasrc/tests/test_client.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <exceptions/exceptions.h>
diff --git a/src/lib/datasrc/tests/test_datasrc.cc b/src/lib/datasrc/tests/test_datasrc.cc
index e5ad555..8620a9c 100644
--- a/src/lib/datasrc/tests/test_datasrc.cc
+++ b/src/lib/datasrc/tests/test_datasrc.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <config.h>
diff --git a/src/lib/datasrc/tests/zone_finder_context_unittest.cc b/src/lib/datasrc/tests/zone_finder_context_unittest.cc
index 000bf3c..26aa4ec 100644
--- a/src/lib/datasrc/tests/zone_finder_context_unittest.cc
+++ b/src/lib/datasrc/tests/zone_finder_context_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <exceptions/exceptions.h>
diff --git a/src/lib/datasrc/tests/zonetable_unittest.cc b/src/lib/datasrc/tests/zonetable_unittest.cc
index f16d1b0..2df6796 100644
--- a/src/lib/datasrc/tests/zonetable_unittest.cc
+++ b/src/lib/datasrc/tests/zonetable_unittest.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <exceptions/exceptions.h>
diff --git a/src/lib/datasrc/zone.h b/src/lib/datasrc/zone.h
index 1b5ced6..9cd7612 100644
--- a/src/lib/datasrc/zone.h
+++ b/src/lib/datasrc/zone.h
@@ -32,7 +32,7 @@ namespace datasrc {
///
/// This is thrown when a method is called for a name or RRset which
/// is not in or below the zone.
-class ISC_LIBDATASRC_API OutOfZone : public Exception {
+class B10_LIBDATASRC_API OutOfZone : public Exception {
public:
OutOfZone(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -63,7 +63,7 @@ public:
/// same name and type can be different if other threads or programs make
/// updates to the zone between the lookups. We should revisit this point
/// as we gain more experiences.
-class ISC_LIBDATASRC_API ZoneFinder {
+class B10_LIBDATASRC_API ZoneFinder {
public:
/// Result codes of the \c find() method.
///
@@ -168,7 +168,7 @@ public:
/// ZoneFinder that originally performed the \c find() call, and expects
/// the finder is valid throughout the lifetime of this object. It's
/// caller's responsibility to ensure that assumption.
- class ISC_LIBDATASRC_API Context {
+ class B10_LIBDATASRC_API Context {
public:
/// \brief The constructor for the normal find call.
///
@@ -686,7 +686,7 @@ typedef boost::shared_ptr<ZoneFinder::Context> ConstZoneFinderContextPtr;
/// \note This initial implementation provides a quite simple interface of
/// adding and deleting RRs (see the description of the related methods).
/// It may be revisited as we gain more experiences.
-class ISC_LIBDATASRC_API ZoneUpdater {
+class B10_LIBDATASRC_API ZoneUpdater {
protected:
/// The default constructor.
///
@@ -904,7 +904,7 @@ typedef boost::shared_ptr<ZoneUpdater> ZoneUpdaterPtr;
/// over the sequences. Every time the \c getNextDiff() method is called
/// it returns one element of the differences in the form of an \c RRset
/// until it reaches the end of the entire sequences.
-class ISC_LIBDATASRC_API ZoneJournalReader {
+class B10_LIBDATASRC_API ZoneJournalReader {
public:
/// Result codes used by a factory method for \c ZoneJournalReader
enum Result {
diff --git a/src/lib/datasrc/zone_finder_context.cc b/src/lib/datasrc/zone_finder_context.cc
index 4524474..772d53d 100644
--- a/src/lib/datasrc/zone_finder_context.cc
+++ b/src/lib/datasrc/zone_finder_context.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <dns/rdata.h>
#include <dns/rrset.h>
diff --git a/src/lib/datasrc/zonetable.cc b/src/lib/datasrc/zonetable.cc
index c494383..aad3895 100644
--- a/src/lib/datasrc/zonetable.cc
+++ b/src/lib/datasrc/zonetable.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDATASRC_EXPORT
+#define B10_LIBDATASRC_EXPORT
#include <cassert>
diff --git a/src/lib/datasrc/zonetable.h b/src/lib/datasrc/zonetable.h
index f2492fa..3093547 100644
--- a/src/lib/datasrc/zonetable.h
+++ b/src/lib/datasrc/zonetable.h
@@ -24,8 +24,8 @@
namespace isc {
namespace dns {
-class ISC_LIBDATASRC_API Name;
-class ISC_LIBDATASRC_API RRClass;
+class B10_LIBDATASRC_API Name;
+class B10_LIBDATASRC_API RRClass;
}
namespace datasrc {
@@ -39,7 +39,7 @@ namespace datasrc {
///
/// For more descriptions about its struct and interfaces, please refer to the
/// corresponding struct and interfaces of \c MemoryDataSrc.
-class ISC_LIBDATASRC_API ZoneTable {
+class B10_LIBDATASRC_API ZoneTable {
public:
struct FindResult {
FindResult(result::Result param_code, const ZoneFinderPtr param_zone) :
diff --git a/src/lib/dhcp/dll.h b/src/lib/dhcp/dll.h
index a6a7c51..3ae566d 100644
--- a/src/lib/dhcp/dll.h
+++ b/src/lib/dhcp/dll.h
@@ -16,12 +16,12 @@
#define __LIBDHCP_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBDHCP_API
+#define B10_LIBDHCP_API
#else
-#ifdef ISC_LIBDHCP_EXPORT
-#define ISC_LIBDHCP_API __declspec(dllexport)
+#ifdef B10_LIBDHCP_EXPORT
+#define B10_LIBDHCP_API __declspec(dllexport)
#else
-#define ISC_LIBDHCP_API __declspec(dllimport)
+#define B10_LIBDHCP_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc
index e1bf70f..12fe898 100644
--- a/src/lib/dhcp/iface_mgr.cc
+++ b/src/lib/dhcp/iface_mgr.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDHCP_EXPORT
+#define B10_LIBDHCP_EXPORT
#include <config.h>
#include <sstream>
diff --git a/src/lib/dhcp/iface_mgr.h b/src/lib/dhcp/iface_mgr.h
index 69cfb6a..7d78bdb 100644
--- a/src/lib/dhcp/iface_mgr.h
+++ b/src/lib/dhcp/iface_mgr.h
@@ -35,7 +35,7 @@ namespace dhcp {
/// interfaces, configured addresses, link-local addresses, and provides
/// API for using sockets.
///
-class ISC_LIBDHCP_API IfaceMgr : public boost::noncopyable {
+class B10_LIBDHCP_API IfaceMgr : public boost::noncopyable {
public:
/// type that defines list of addresses
typedef std::vector<isc::asiolink::IOAddress> AddressCollection;
@@ -89,7 +89,7 @@ public:
/// Iface structure represents network interface with all useful
/// information, like name, interface index, MAC address and
/// list of assigned addresses
- class ISC_LIBDHCP_API Iface {
+ class B10_LIBDHCP_API Iface {
public:
/// @brief Iface constructor.
///
diff --git a/src/lib/dhcp/iface_mgr_bsd.cc b/src/lib/dhcp/iface_mgr_bsd.cc
index 5351694..dbda676 100644
--- a/src/lib/dhcp/iface_mgr_bsd.cc
+++ b/src/lib/dhcp/iface_mgr_bsd.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDHCP_EXPORT
+#define B10_LIBDHCP_EXPORT
#include <config.h>
diff --git a/src/lib/dhcp/iface_mgr_linux.cc b/src/lib/dhcp/iface_mgr_linux.cc
index 6cef882..50449f0 100644
--- a/src/lib/dhcp/iface_mgr_linux.cc
+++ b/src/lib/dhcp/iface_mgr_linux.cc
@@ -27,7 +27,7 @@
/// to do something with address labels. Getting a list of interfaces with
/// addresses configured on it is just a small subset of all possible actions.
-#define ISC_LIBDHCP_EXPORT
+#define B10_LIBDHCP_EXPORT
#include <config.h>
diff --git a/src/lib/dhcp/iface_mgr_sun.cc b/src/lib/dhcp/iface_mgr_sun.cc
index 918f774..7865a89 100644
--- a/src/lib/dhcp/iface_mgr_sun.cc
+++ b/src/lib/dhcp/iface_mgr_sun.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDHCP_EXPORT
+#define B10_LIBDHCP_EXPORT
#include <config.h>
diff --git a/src/lib/dhcp/iface_mgr_windows.cc b/src/lib/dhcp/iface_mgr_windows.cc
index 699bd18..756437e 100644
--- a/src/lib/dhcp/iface_mgr_windows.cc
+++ b/src/lib/dhcp/iface_mgr_windows.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDHCP_EXPORT
+#define B10_LIBDHCP_EXPORT
#include <config.h>
diff --git a/src/lib/dhcp/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc
index 29a2a0a..3cdd081 100644
--- a/src/lib/dhcp/libdhcp++.cc
+++ b/src/lib/dhcp/libdhcp++.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDHCP_EXPORT
+#define B10_LIBDHCP_EXPORT
#include <config.h>
diff --git a/src/lib/dhcp/libdhcp++.h b/src/lib/dhcp/libdhcp++.h
index 1f72896..7b3449b 100644
--- a/src/lib/dhcp/libdhcp++.h
+++ b/src/lib/dhcp/libdhcp++.h
@@ -23,7 +23,7 @@
namespace isc {
namespace dhcp {
-class ISC_LIBDHCP_API LibDHCP {
+class B10_LIBDHCP_API LibDHCP {
public:
/// Builds collection of options.
diff --git a/src/lib/dhcp/option.cc b/src/lib/dhcp/option.cc
index ec62e51..6a765fd 100644
--- a/src/lib/dhcp/option.cc
+++ b/src/lib/dhcp/option.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDHCP_EXPORT
+#define B10_LIBDHCP_EXPORT
#include <string.h>
#include <stdint.h>
diff --git a/src/lib/dhcp/option.h b/src/lib/dhcp/option.h
index 6c46a04..937c57a 100644
--- a/src/lib/dhcp/option.h
+++ b/src/lib/dhcp/option.h
@@ -41,11 +41,11 @@ typedef OptionBuffer::const_iterator OptionBufferConstIter;
typedef boost::shared_ptr<OptionBuffer> OptionBufferPtr;
/// shared pointer to Option object
-class ISC_LIBDHCP_API Option;
+class B10_LIBDHCP_API Option;
typedef boost::shared_ptr<Option> OptionPtr;
-class ISC_LIBDHCP_API Option {
+class B10_LIBDHCP_API Option {
public:
/// length of the usual DHCPv4 option header (there are exceptions)
const static size_t OPTION4_HDR_LEN = 2;
diff --git a/src/lib/dhcp/option4_addrlst.cc b/src/lib/dhcp/option4_addrlst.cc
index 41626af..78502dc 100644
--- a/src/lib/dhcp/option4_addrlst.cc
+++ b/src/lib/dhcp/option4_addrlst.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDHCP_EXPORT
+#define B10_LIBDHCP_EXPORT
#include <string.h>
#include <stdint.h>
diff --git a/src/lib/dhcp/option4_addrlst.h b/src/lib/dhcp/option4_addrlst.h
index 082c2d6..c02a180 100644
--- a/src/lib/dhcp/option4_addrlst.h
+++ b/src/lib/dhcp/option4_addrlst.h
@@ -32,7 +32,7 @@ namespace dhcp {
///
/// This class handles a list of IPv4 addresses. An example of such option
/// is dns-servers option. It can also be used to handle a single address.
-class ISC_LIBDHCP_API Option4AddrLst : public isc::dhcp::Option {
+class B10_LIBDHCP_API Option4AddrLst : public isc::dhcp::Option {
public:
/// Defines a collection of IPv4 addresses.
diff --git a/src/lib/dhcp/option6_addrlst.cc b/src/lib/dhcp/option6_addrlst.cc
index c94e2b5..e77bd12 100644
--- a/src/lib/dhcp/option6_addrlst.cc
+++ b/src/lib/dhcp/option6_addrlst.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDHCP_EXPORT
+#define B10_LIBDHCP_EXPORT
#include <stdint.h>
#ifdef _WIN32
diff --git a/src/lib/dhcp/option6_addrlst.h b/src/lib/dhcp/option6_addrlst.h
index d34eea7..ff9c43e 100644
--- a/src/lib/dhcp/option6_addrlst.h
+++ b/src/lib/dhcp/option6_addrlst.h
@@ -27,7 +27,7 @@ namespace dhcp {
///
/// This class handles a list of IPv6 addresses. An example of such option
/// is dns-servers option. It can also be used to handle single address.
-class ISC_LIBDHCP_API Option6AddrLst: public Option {
+class B10_LIBDHCP_API Option6AddrLst: public Option {
public:
/// a container for (IPv6) addresses
diff --git a/src/lib/dhcp/option6_ia.cc b/src/lib/dhcp/option6_ia.cc
index 2e55165..6de2b9a 100644
--- a/src/lib/dhcp/option6_ia.cc
+++ b/src/lib/dhcp/option6_ia.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDHCP_EXPORT
+#define B10_LIBDHCP_EXPORT
#include <stdint.h>
#ifdef _WIN32
diff --git a/src/lib/dhcp/option6_ia.h b/src/lib/dhcp/option6_ia.h
index d1bca1c..e31390c 100644
--- a/src/lib/dhcp/option6_ia.h
+++ b/src/lib/dhcp/option6_ia.h
@@ -22,7 +22,7 @@
namespace isc {
namespace dhcp {
-class ISC_LIBDHCP_API Option6IA: public Option {
+class B10_LIBDHCP_API Option6IA: public Option {
public:
/// Length of IA_NA and IA_PD content
diff --git a/src/lib/dhcp/option6_iaaddr.cc b/src/lib/dhcp/option6_iaaddr.cc
index 8e7ff6f..5776363 100644
--- a/src/lib/dhcp/option6_iaaddr.cc
+++ b/src/lib/dhcp/option6_iaaddr.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDHCP_EXPORT
+#define B10_LIBDHCP_EXPORT
#include <stdint.h>
#ifdef _WIN32
diff --git a/src/lib/dhcp/option6_iaaddr.h b/src/lib/dhcp/option6_iaaddr.h
index 19a4da4..773da70 100644
--- a/src/lib/dhcp/option6_iaaddr.h
+++ b/src/lib/dhcp/option6_iaaddr.h
@@ -22,7 +22,7 @@
namespace isc {
namespace dhcp {
-class ISC_LIBDHCP_API Option6IAAddr: public Option {
+class B10_LIBDHCP_API Option6IAAddr: public Option {
public:
/// length of the fixed part of the IAADDR option
diff --git a/src/lib/dhcp/pkt4.cc b/src/lib/dhcp/pkt4.cc
index 5171ff3..b3c80c5 100644
--- a/src/lib/dhcp/pkt4.cc
+++ b/src/lib/dhcp/pkt4.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDHCP_EXPORT
+#define B10_LIBDHCP_EXPORT
#include <config.h>
diff --git a/src/lib/dhcp/pkt4.h b/src/lib/dhcp/pkt4.h
index ac8b9a1..08e985c 100644
--- a/src/lib/dhcp/pkt4.h
+++ b/src/lib/dhcp/pkt4.h
@@ -29,7 +29,7 @@ namespace isc {
namespace dhcp {
-class ISC_LIBDHCP_API Pkt4 {
+class B10_LIBDHCP_API Pkt4 {
public:
/// length of the CHADDR field in DHCPv4 message
diff --git a/src/lib/dhcp/pkt6.cc b/src/lib/dhcp/pkt6.cc
index 3e2d164..8f1530f 100644
--- a/src/lib/dhcp/pkt6.cc
+++ b/src/lib/dhcp/pkt6.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDHCP_EXPORT
+#define B10_LIBDHCP_EXPORT
#include <config.h>
diff --git a/src/lib/dhcp/pkt6.h b/src/lib/dhcp/pkt6.h
index 46a3f77..d8f2a12 100644
--- a/src/lib/dhcp/pkt6.h
+++ b/src/lib/dhcp/pkt6.h
@@ -28,7 +28,7 @@ namespace isc {
namespace dhcp {
-class ISC_LIBDHCP_API Pkt6 {
+class B10_LIBDHCP_API Pkt6 {
public:
/// specifes DHCPv6 packet header length
const static size_t DHCPV6_PKT_HDR_LEN = 4;
diff --git a/src/lib/dns/character_string.cc b/src/lib/dns/character_string.cc
index 2c17f5a..61425b7 100644
--- a/src/lib/dns/character_string.cc
+++ b/src/lib/dns/character_string.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include "character_string.h"
#include "rdata.h"
diff --git a/src/lib/dns/character_string.h b/src/lib/dns/character_string.h
index 7b5fe4c..262f84c 100644
--- a/src/lib/dns/character_string.h
+++ b/src/lib/dns/character_string.h
@@ -41,7 +41,7 @@ namespace characterstr {
/// the iterator will be updated to new position after the function
/// is returned
/// \return A std::string that contains the extracted <character-string>
- ISC_LIBDNS_API std::string
+ B10_LIBDNS_API std::string
getNextCharacterString(const std::string& input_str,
std::string::const_iterator& input_iterator);
@@ -50,7 +50,7 @@ namespace characterstr {
/// \param buffer The input buffer
/// \param len The input buffer total length
/// \return A std::string that contains the extracted <character-string>
- ISC_LIBDNS_API std::string
+ B10_LIBDNS_API std::string
getNextCharacterString(util::InputBuffer& buffer, size_t len);
} // namespace characterstr
diff --git a/src/lib/dns/dll.h b/src/lib/dns/dll.h
index 0d7e634..e1692df 100644
--- a/src/lib/dns/dll.h
+++ b/src/lib/dns/dll.h
@@ -16,12 +16,12 @@
#define __LIBDNS_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBDNS_API
+#define B10_LIBDNS_API
#else
-#ifdef ISC_LIBDNS_EXPORT
-#define ISC_LIBDNS_API __declspec(dllexport)
+#ifdef B10_LIBDNS_EXPORT
+#define B10_LIBDNS_API __declspec(dllexport)
#else
-#define ISC_LIBDNS_API __declspec(dllimport)
+#define B10_LIBDNS_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/dns/edns.cc b/src/lib/dns/edns.cc
index 32be642..67512ea 100644
--- a/src/lib/dns/edns.cc
+++ b/src/lib/dns/edns.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <config.h>
diff --git a/src/lib/dns/edns.h b/src/lib/dns/edns.h
index 6850067..deda345 100644
--- a/src/lib/dns/edns.h
+++ b/src/lib/dns/edns.h
@@ -26,18 +26,18 @@
namespace isc {
namespace util {
-class ISC_LIBDNS_API OutputBuffer;
+class B10_LIBDNS_API OutputBuffer;
}
namespace dns {
-class ISC_LIBDNS_API EDNS;
-class ISC_LIBDNS_API Name;
-class ISC_LIBDNS_API AbstractMessageRenderer;
-class ISC_LIBDNS_API RRClass;
-class ISC_LIBDNS_API RRTTL;
-class ISC_LIBDNS_API RRType;
-class ISC_LIBDNS_API Rcode;
+class B10_LIBDNS_API EDNS;
+class B10_LIBDNS_API Name;
+class B10_LIBDNS_API AbstractMessageRenderer;
+class B10_LIBDNS_API RRClass;
+class B10_LIBDNS_API RRTTL;
+class B10_LIBDNS_API RRType;
+class B10_LIBDNS_API Rcode;
/// \brief A pointer-like type pointing to an \c EDNS object.
typedef boost::shared_ptr<EDNS> EDNSPtr;
@@ -129,7 +129,7 @@ typedef boost::shared_ptr<const EDNS> ConstEDNSPtr;
/// If a future version of the %EDNS protocol introduces further relationship
/// between the message and the %EDNS, we might reconsider the interface,
/// probably with higher abstraction.
-class ISC_LIBDNS_API EDNS {
+class B10_LIBDNS_API EDNS {
public:
///
/// \name Constructors and Destructor
@@ -422,7 +422,7 @@ private:
/// \param extended_rcode A placeholder to store the topmost 8 bits of the
/// extended Rcode.
/// \return A pointer to the created \c EDNS object.
-ISC_LIBDNS_API
+B10_LIBDNS_API
EDNS* createEDNSFromRR(const Name& name, const RRClass& rrclass,
const RRType& rrtype, const RRTTL& ttl,
const rdata::Rdata& rdata, uint8_t& extended_rcode);
@@ -437,7 +437,7 @@ EDNS* createEDNSFromRR(const Name& name, const RRClass& rrclass,
/// \param edns A reference to an \c EDNS object output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const EDNS& edns);
}
}
diff --git a/src/lib/dns/exceptions.cc b/src/lib/dns/exceptions.cc
index 4ee8aab..bc13e16 100644
--- a/src/lib/dns/exceptions.cc
+++ b/src/lib/dns/exceptions.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <dns/exceptions.h>
#include <dns/rcode.h>
diff --git a/src/lib/dns/exceptions.h b/src/lib/dns/exceptions.h
index 1662b9e..2bfa0e3 100644
--- a/src/lib/dns/exceptions.h
+++ b/src/lib/dns/exceptions.h
@@ -29,23 +29,23 @@ namespace dns {
///
/// \brief A standard DNS module exception ...[TBD]
///
-class ISC_LIBDNS_API Rcode; // forward declaration
+class B10_LIBDNS_API Rcode; // forward declaration
-class ISC_LIBDNS_API DNSProtocolError : public isc::Exception {
+class B10_LIBDNS_API DNSProtocolError : public isc::Exception {
public:
DNSProtocolError(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
virtual const Rcode& getRcode() const = 0;
};
-class ISC_LIBDNS_API DNSMessageFORMERR : public DNSProtocolError {
+class B10_LIBDNS_API DNSMessageFORMERR : public DNSProtocolError {
public:
DNSMessageFORMERR(const char* file, size_t line, const char* what) :
DNSProtocolError(file, line, what) {}
virtual const Rcode& getRcode() const;
};
-class ISC_LIBDNS_API DNSMessageBADVERS : public DNSProtocolError {
+class B10_LIBDNS_API DNSMessageBADVERS : public DNSProtocolError {
public:
DNSMessageBADVERS(const char* file, size_t line, const char* what) :
DNSProtocolError(file, line, what) {}
diff --git a/src/lib/dns/gen-rdatacode.py.in b/src/lib/dns/gen-rdatacode.py.in
index 107beba..97ea171 100755
--- a/src/lib/dns/gen-rdatacode.py.in
+++ b/src/lib/dns/gen-rdatacode.py.in
@@ -41,7 +41,7 @@ heading_txt = '''///////////////
///////////////
///////////////
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
'''
diff --git a/src/lib/dns/gen-rdatacode.py.win32 b/src/lib/dns/gen-rdatacode.py.win32
index 758f6c6..afb2a14 100755
--- a/src/lib/dns/gen-rdatacode.py.win32
+++ b/src/lib/dns/gen-rdatacode.py.win32
@@ -43,7 +43,7 @@ heading_txt = '''///////////////
'''
export_txt = '''
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
'''
diff --git a/src/lib/dns/labelsequence.cc b/src/lib/dns/labelsequence.cc
index a97523d..2eb5884 100644
--- a/src/lib/dns/labelsequence.cc
+++ b/src/lib/dns/labelsequence.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <dns/labelsequence.h>
#include <dns/name_internal.h>
diff --git a/src/lib/dns/labelsequence.h b/src/lib/dns/labelsequence.h
index ccd9f79..137de0e 100644
--- a/src/lib/dns/labelsequence.h
+++ b/src/lib/dns/labelsequence.h
@@ -41,7 +41,7 @@ namespace dns {
/// data can be requested (which then points to part of the original
/// data of the associated Name object).
///
-class ISC_LIBDNS_API LabelSequence {
+class B10_LIBDNS_API LabelSequence {
public:
/// \brief Constructs a LabelSequence for the given name
///
diff --git a/src/lib/dns/masterload.cc b/src/lib/dns/masterload.cc
index 1fe25f4..5fcc91c 100644
--- a/src/lib/dns/masterload.cc
+++ b/src/lib/dns/masterload.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <istream>
#include <fstream>
@@ -62,7 +62,7 @@ stripLine(string& s, const Exception& ex) {
}
}
-ISC_LIBDNS_API void
+B10_LIBDNS_API void
masterLoad(const char* const filename, const Name& origin,
const RRClass& zone_class, MasterLoadCallback callback)
{
@@ -79,7 +79,7 @@ masterLoad(const char* const filename, const Name& origin,
ifs.close();
}
-ISC_LIBDNS_API void
+B10_LIBDNS_API void
masterLoad(istream& input, const Name& origin, const RRClass& zone_class,
MasterLoadCallback callback)
{
diff --git a/src/lib/dns/masterload.h b/src/lib/dns/masterload.h
index 0d43728..6f4bc36 100644
--- a/src/lib/dns/masterload.h
+++ b/src/lib/dns/masterload.h
@@ -26,12 +26,12 @@
namespace isc {
namespace dns {
-class ISC_LIBDNS_API Name;
-class ISC_LIBDNS_API RRClass;
+class B10_LIBDNS_API Name;
+class B10_LIBDNS_API RRClass;
/// \brief An exception that is thrown if an error occurs while loading a
/// master zone data.
-class ISC_LIBDNS_API MasterLoadError : public isc::Exception {
+class B10_LIBDNS_API MasterLoadError : public isc::Exception {
public:
MasterLoadError(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -215,7 +215,7 @@ typedef boost::function<void(RRsetPtr)> MasterLoadCallback;
/// \param zone_class The RR class of the zone.
/// \param callback A callback functor or function that is to be called
/// for each RRset.
-ISC_LIBDNS_API
+B10_LIBDNS_API
void masterLoad(const char* const filename, const Name& origin,
const RRClass& zone_class, MasterLoadCallback callback);
@@ -234,7 +234,7 @@ void masterLoad(const char* const filename, const Name& origin,
/// \param zone_class The RR class of the zone.
/// \param callback A callback functor or function that is to be called for
/// each RRset.
-ISC_LIBDNS_API
+B10_LIBDNS_API
void masterLoad(std::istream& input, const Name& origin,
const RRClass& zone_class, MasterLoadCallback callback);
}
diff --git a/src/lib/dns/message.cc b/src/lib/dns/message.cc
index 3ce7f3c..ad0feb3 100644
--- a/src/lib/dns/message.cc
+++ b/src/lib/dns/message.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <stdint.h>
@@ -1151,7 +1151,7 @@ Message::endSection(const Section section) const {
return (RRsetIterator(RRsetIteratorImpl(impl_->rrsets_[section].end())));
}
-ISC_LIBDNS_API ostream&
+B10_LIBDNS_API ostream&
operator<<(ostream& os, const Message& message) {
return (os << message.toText());
}
diff --git a/src/lib/dns/message.h b/src/lib/dns/message.h
index f0525f7..c938070 100644
--- a/src/lib/dns/message.h
+++ b/src/lib/dns/message.h
@@ -30,19 +30,19 @@
namespace isc {
namespace util {
-class ISC_LIBDNS_API InputBuffer;
+class B10_LIBDNS_API InputBuffer;
}
namespace dns {
-class ISC_LIBDNS_API TSIGContext;
-class ISC_LIBDNS_API TSIGRecord;
+class B10_LIBDNS_API TSIGContext;
+class B10_LIBDNS_API TSIGRecord;
///
/// \brief A standard DNS module exception that is thrown if a wire format
/// message parser encounters a short length of data that don't even contain
/// the full header section.
///
-class ISC_LIBDNS_API MessageTooShort : public Exception {
+class B10_LIBDNS_API MessageTooShort : public Exception {
public:
MessageTooShort(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -53,7 +53,7 @@ public:
/// is being constructed for an incompatible section. Specifically, this
/// happens RRset iterator is being constructed for a Question section.
///
-class ISC_LIBDNS_API InvalidMessageSection : public Exception {
+class B10_LIBDNS_API InvalidMessageSection : public Exception {
public:
InvalidMessageSection(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -64,7 +64,7 @@ public:
/// class method is called that is prohibited for the current mode of
/// the message.
///
-class ISC_LIBDNS_API InvalidMessageOperation : public Exception {
+class B10_LIBDNS_API InvalidMessageOperation : public Exception {
public:
InvalidMessageOperation(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -75,7 +75,7 @@ public:
/// smaller than the standard default maximum (DEFAULT_MAX_UDPSIZE) is
/// being specified for the message.
///
-class ISC_LIBDNS_API InvalidMessageUDPSize : public Exception {
+class B10_LIBDNS_API InvalidMessageUDPSize : public Exception {
public:
InvalidMessageUDPSize(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -83,11 +83,11 @@ public:
typedef uint16_t qid_t;
-class ISC_LIBDNS_API AbstractMessageRenderer;
-class ISC_LIBDNS_API Message;
+class B10_LIBDNS_API AbstractMessageRenderer;
+class B10_LIBDNS_API Message;
class MessageImpl;
-class ISC_LIBDNS_API Opcode;
-class ISC_LIBDNS_API Rcode;
+class B10_LIBDNS_API Opcode;
+class B10_LIBDNS_API Rcode;
template <typename T>
struct SectionIteratorImpl;
@@ -117,8 +117,8 @@ private:
typedef SectionIterator<QuestionPtr> QuestionIterator;
typedef SectionIterator<RRsetPtr> RRsetIterator;
-class ISC_LIBDNS_API QuestionIteratorChild : public QuestionIterator {};
-class ISC_LIBDNS_API RRsetIteratorChild : public RRsetIterator {};
+class B10_LIBDNS_API QuestionIteratorChild : public QuestionIterator {};
+class B10_LIBDNS_API RRsetIteratorChild : public RRsetIterator {};
/// \brief The \c Message class encapsulates a standard DNS message.
///
@@ -152,7 +152,7 @@ class ISC_LIBDNS_API RRsetIteratorChild : public RRsetIterator {};
/// so the implementation can only be moderately efficient.
/// - We may want to provide a "find" method for a specified type
/// of RR in the message.
-class ISC_LIBDNS_API Message {
+class B10_LIBDNS_API Message {
public:
/// Constants to specify the operation mode of the \c Message.
enum Mode {
@@ -685,7 +685,7 @@ typedef boost::shared_ptr<const Message> ConstMessagePtr;
/// \param message A \c Message object output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const Message& message);
}
}
diff --git a/src/lib/dns/messagerenderer.cc b/src/lib/dns/messagerenderer.cc
index b71581c..b4a57dd 100644
--- a/src/lib/dns/messagerenderer.cc
+++ b/src/lib/dns/messagerenderer.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <exceptions/exceptions.h>
#include <util/buffer.h>
diff --git a/src/lib/dns/messagerenderer.h b/src/lib/dns/messagerenderer.h
index 4cb04ff..9043973 100644
--- a/src/lib/dns/messagerenderer.h
+++ b/src/lib/dns/messagerenderer.h
@@ -22,7 +22,7 @@ namespace isc {
namespace dns {
// forward declarations
-class ISC_LIBDNS_API Name;
+class B10_LIBDNS_API Name;
/// \brief The \c AbstractMessageRenderer class is an abstract base class
/// that provides common interfaces for rendering a DNS message into a buffer
@@ -71,7 +71,7 @@ class ISC_LIBDNS_API Name;
/// The only one that is virtual is writeName and it's because this
/// function is much more complicated, therefore there's a lot of space
/// for different implementations or behaviours.
-class ISC_LIBDNS_API AbstractMessageRenderer {
+class B10_LIBDNS_API AbstractMessageRenderer {
public:
/// \brief Compression mode constants.
///
@@ -346,7 +346,7 @@ public:
/// end of the buffer at the time of construction. However, if the
/// pre-existing portion of the buffer contains DNS names, these names won't
/// be considered for name compression.
-class ISC_LIBDNS_API MessageRenderer : public AbstractMessageRenderer {
+class B10_LIBDNS_API MessageRenderer : public AbstractMessageRenderer {
public:
using AbstractMessageRenderer::CASE_INSENSITIVE;
using AbstractMessageRenderer::CASE_SENSITIVE;
diff --git a/src/lib/dns/name.cc b/src/lib/dns/name.cc
index 62cedc7..e5707da 100644
--- a/src/lib/dns/name.cc
+++ b/src/lib/dns/name.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <cctype>
#include <cassert>
@@ -798,7 +798,7 @@ Name::downcase() {
return (*this);
}
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const Name& name) {
os << name.toText();
return (os);
diff --git a/src/lib/dns/name.h b/src/lib/dns/name.h
index f8866f5..955ca69 100644
--- a/src/lib/dns/name.h
+++ b/src/lib/dns/name.h
@@ -25,17 +25,17 @@
namespace isc {
namespace util {
-class ISC_LIBDNS_API InputBuffer;
-class ISC_LIBDNS_API OutputBuffer;
+class B10_LIBDNS_API InputBuffer;
+class B10_LIBDNS_API OutputBuffer;
}
namespace dns {
-class ISC_LIBDNS_API AbstractMessageRenderer;
+class B10_LIBDNS_API AbstractMessageRenderer;
///
/// \brief Base class for name parser exceptions.
///
-class ISC_LIBDNS_API NameParserException : public Exception {
+class B10_LIBDNS_API NameParserException : public Exception {
public:
NameParserException(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -45,7 +45,7 @@ public:
/// \brief A standard DNS module exception that is thrown if the name parser
/// encounters an empty label in the middle of a name.
///
-class ISC_LIBDNS_API EmptyLabel : public NameParserException {
+class B10_LIBDNS_API EmptyLabel : public NameParserException {
public:
EmptyLabel(const char* file, size_t line, const char* what) :
NameParserException(file, line, what) {}
@@ -55,7 +55,7 @@ public:
/// \brief A standard DNS module exception that is thrown if the name parser
/// encounters too long a name.
///
-class ISC_LIBDNS_API TooLongName : public NameParserException {
+class B10_LIBDNS_API TooLongName : public NameParserException {
public:
TooLongName(const char* file, size_t line, const char* what) :
NameParserException(file, line, what) {}
@@ -65,7 +65,7 @@ public:
/// \brief A standard DNS module exception that is thrown if the name parser
/// encounters too long a label.
///
-class ISC_LIBDNS_API TooLongLabel : public NameParserException {
+class B10_LIBDNS_API TooLongLabel : public NameParserException {
public:
TooLongLabel(const char* file, size_t line, const char* what) :
NameParserException(file, line, what) {}
@@ -77,7 +77,7 @@ public:
/// applies to bitstring labels, which would begin with "\[". Incomplete cases
/// include an incomplete escaped sequence such as "\12".
///
-class ISC_LIBDNS_API BadLabelType : public NameParserException {
+class B10_LIBDNS_API BadLabelType : public NameParserException {
public:
BadLabelType(const char* file, size_t line, const char* what) :
NameParserException(file, line, what) {}
@@ -87,7 +87,7 @@ public:
/// \brief A standard DNS module exception that is thrown if the name parser
/// fails to decode a "\"-escaped sequence.
///
-class ISC_LIBDNS_API BadEscape : public NameParserException {
+class B10_LIBDNS_API BadEscape : public NameParserException {
public:
BadEscape(const char* file, size_t line, const char* what) :
NameParserException(file, line, what) {}
@@ -100,7 +100,7 @@ public:
/// An attempt of constructing a name from an empty string will trigger this
/// exception.
///
-class ISC_LIBDNS_API IncompleteName : public NameParserException {
+class B10_LIBDNS_API IncompleteName : public NameParserException {
public:
IncompleteName(const char* file, size_t line, const char* what) :
NameParserException(file, line, what) {}
@@ -115,7 +115,7 @@ public:
/// compared
/// - relationship: see NameComparisonResult::NameRelation
///
-class ISC_LIBDNS_API NameComparisonResult {
+class B10_LIBDNS_API NameComparisonResult {
public:
/// The relation of two names under comparison.
/// Its semantics for the case of
@@ -220,7 +220,7 @@ private:
/// introduce a parser of master files, we'll introduce the notion of relative
/// names as a special case.
///
-class ISC_LIBDNS_API Name {
+class B10_LIBDNS_API Name {
// LabelSequences use knowledge about the internal data structure
// of this class for efficiency (they use the offsets_ vector and
// the ndata_ string)
@@ -742,7 +742,7 @@ Name::ROOT_NAME() {
/// \param name The \c Name object output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const Name& name);
}
}
diff --git a/src/lib/dns/nsec3hash.cc b/src/lib/dns/nsec3hash.cc
index 96f4537..d915794 100644
--- a/src/lib/dns/nsec3hash.cc
+++ b/src/lib/dns/nsec3hash.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <stdint.h>
@@ -188,7 +188,7 @@ DefaultNSEC3HashCreator::create(const generic::NSEC3& nsec3) const {
nsec3.getSalt()));
}
-ISC_LIBDNS_API void
+B10_LIBDNS_API void
setNSEC3HashCreator(const NSEC3HashCreator* new_creator) {
creator = new_creator;
}
diff --git a/src/lib/dns/nsec3hash.h b/src/lib/dns/nsec3hash.h
index a2ad06c..74412ab 100644
--- a/src/lib/dns/nsec3hash.h
+++ b/src/lib/dns/nsec3hash.h
@@ -22,12 +22,12 @@
namespace isc {
namespace dns {
-class ISC_LIBDNS_API Name;
+class B10_LIBDNS_API Name;
namespace rdata {
namespace generic {
-class ISC_LIBDNS_API NSEC3;
-class ISC_LIBDNS_API NSEC3PARAM;
+class B10_LIBDNS_API NSEC3;
+class B10_LIBDNS_API NSEC3PARAM;
}
}
@@ -37,7 +37,7 @@ class ISC_LIBDNS_API NSEC3PARAM;
/// A specific exception class is used so that the caller can selectively
/// catch this exception, e.g., while loading a zone, and handle it
/// accordingly.
-class ISC_LIBDNS_API UnknownNSEC3HashAlgorithm : public isc::Exception {
+class B10_LIBDNS_API UnknownNSEC3HashAlgorithm : public isc::Exception {
public:
UnknownNSEC3HashAlgorithm(const char* file, size_t line,
const char* what) :
@@ -78,7 +78,7 @@ public:
/// - Allow producing hash value as binary data
/// - Allow updating NSEC3 parameters of a class object so we can still reuse
/// the internal resources for different sets of parameters.
-class ISC_LIBDNS_API NSEC3Hash {
+class B10_LIBDNS_API NSEC3Hash {
protected:
/// \brief The default constructor.
///
@@ -183,7 +183,7 @@ public:
/// as const member functions for this reason. But if we see the need for
/// having a customized creator that benefits from its own state in future,
/// this condition can be loosened.
-class ISC_LIBDNS_API NSEC3HashCreator {
+class B10_LIBDNS_API NSEC3HashCreator {
protected:
/// \brief The default constructor.
///
@@ -222,7 +222,7 @@ public:
/// convenience of special applications that want to customize the creator
/// behavior for a particular type of parameters while preserving the default
/// behavior for others.
-class ISC_LIBDNS_API DefaultNSEC3HashCreator : public NSEC3HashCreator {
+class B10_LIBDNS_API DefaultNSEC3HashCreator : public NSEC3HashCreator {
public:
virtual NSEC3Hash* create(const rdata::generic::NSEC3PARAM& param) const;
virtual NSEC3Hash* create(const rdata::generic::NSEC3& nsec3) const;
@@ -243,7 +243,7 @@ public:
///
/// \exception None
/// \param new_creator A pointer to the new creator object or NULL.
-ISC_LIBDNS_API void setNSEC3HashCreator(const NSEC3HashCreator* new_creator);
+B10_LIBDNS_API void setNSEC3HashCreator(const NSEC3HashCreator* new_creator);
}
}
diff --git a/src/lib/dns/opcode.cc b/src/lib/dns/opcode.cc
index d5dbdc8..2e88137 100644
--- a/src/lib/dns/opcode.cc
+++ b/src/lib/dns/opcode.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <string>
#include <ostream>
@@ -61,7 +61,7 @@ Opcode::toText() const {
return (opcodetext[code_]);
}
-ISC_LIBDNS_API ostream&
+B10_LIBDNS_API ostream&
operator<<(std::ostream& os, const Opcode& opcode) {
return (os << opcode.toText());
}
diff --git a/src/lib/dns/opcode.h b/src/lib/dns/opcode.h
index 00ebe77..0786919 100644
--- a/src/lib/dns/opcode.h
+++ b/src/lib/dns/opcode.h
@@ -39,7 +39,7 @@ namespace dns {
/// to handle OPCODEs through this class. In fact, public interfaces of
/// this library uses this class to pass or return OPCODEs instead of the
/// bare code values.
-class ISC_LIBDNS_API Opcode {
+class B10_LIBDNS_API Opcode {
public:
/// Constants for standard OPCODE values.
enum CodeValue {
@@ -282,7 +282,7 @@ Opcode::RESERVED15() {
/// \param opcode A reference to an \c Opcode object output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const Opcode& opcode);
}
}
diff --git a/src/lib/dns/python/dll.h b/src/lib/dns/python/dll.h
index 846fa82..fa104fe 100644
--- a/src/lib/dns/python/dll.h
+++ b/src/lib/dns/python/dll.h
@@ -16,19 +16,19 @@
#define __LIBDNS_PYTHON_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBDNS_PYTHON_API
+#define B10_LIBDNS_PYTHON_API
#else
-#ifdef ISC_LIBDNS_PYTHON_EXPORT
-#define ISC_LIBDNS_PYTHON_API __declspec(dllexport)
+#ifdef B10_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_API __declspec(dllexport)
#else
-#define ISC_LIBDNS_PYTHON_API __declspec(dllimport)
+#define B10_LIBDNS_PYTHON_API __declspec(dllimport)
#endif
#endif
#if !defined(_WIN32) || defined(USE_STATIC_LINK) || defined(USE_STATIC_WRAPPER)
#define ISC_PYTHON_WRAPPER_API
#else
-#ifdef ISC_LIBDNS_PYTHON_EXPORT
+#ifdef B10_LIBDNS_PYTHON_EXPORT
#define ISC_PYTHON_WRAPPER_API __declspec(dllexport)
#else
#define ISC_PYTHON_WRAPPER_API __declspec(dllimport)
diff --git a/src/lib/dns/python/edns_python.cc b/src/lib/dns/python/edns_python.cc
index 99097b7..8b7de26 100644
--- a/src/lib/dns/python/edns_python.cc
+++ b/src/lib/dns/python/edns_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
@@ -314,7 +314,7 @@ namespace python {
// This defines the complete type for reflection in python and
// parsing of PyObject* to s_EDNS
// Most of the functions are not actually implemented and NULL here.
-ISC_LIBDNS_PYTHON_API PyTypeObject edns_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject edns_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.EDNS",
sizeof(s_EDNS), // tp_basicsize
@@ -365,14 +365,14 @@ ISC_LIBDNS_PYTHON_API PyTypeObject edns_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createEDNSObject(const EDNS& source) {
EDNSContainer container(PyObject_New(s_EDNS, &edns_type));
container.set(new EDNS(source));
return (container.release());
}
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyEDNS_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -380,7 +380,7 @@ PyEDNS_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &edns_type));
}
-ISC_LIBDNS_PYTHON_API const EDNS&
+B10_LIBDNS_PYTHON_API const EDNS&
PyEDNS_ToEDNS(const PyObject* edns_obj) {
if (edns_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/edns_python.h b/src/lib/dns/python/edns_python.h
index 2517870..3ebc505 100644
--- a/src/lib/dns/python/edns_python.h
+++ b/src/lib/dns/python/edns_python.h
@@ -25,7 +25,7 @@ class EDNS;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyTypeObject edns_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject edns_type;
/// This is a simple shortcut to create a python EDNS object (in the
/// form of a pointer to PyObject) with minimal exception safety.
@@ -34,7 +34,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject edns_type;
/// returns a NULL pointer).
/// This function is expected to be called within a try block
/// followed by necessary setup for python exception.
-ISC_LIBDNS_PYTHON_API PyObject* createEDNSObject(const EDNS& source);
+B10_LIBDNS_PYTHON_API PyObject* createEDNSObject(const EDNS& source);
/// \brief Checks if the given python object is a EDNS object
///
@@ -42,7 +42,7 @@ ISC_LIBDNS_PYTHON_API PyObject* createEDNSObject(const EDNS& source);
///
/// \param obj The object to check the type of
/// \return true if the object is of type EDNS, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyEDNS_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyEDNS_Check(PyObject* obj);
/// \brief Returns a reference to the EDNS object contained within the given
/// Python object.
@@ -54,7 +54,7 @@ ISC_LIBDNS_PYTHON_API bool PyEDNS_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param edns_obj The edns object to convert
-ISC_LIBDNS_PYTHON_API const EDNS& PyEDNS_ToEDNS(const PyObject* edns_obj);
+B10_LIBDNS_PYTHON_API const EDNS& PyEDNS_ToEDNS(const PyObject* edns_obj);
} // namespace python
} // namespace dns
diff --git a/src/lib/dns/python/message_python.cc b/src/lib/dns/python/message_python.cc
index 0170fc2..a46e9d2 100644
--- a/src/lib/dns/python/message_python.cc
+++ b/src/lib/dns/python/message_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#define PY_SSIZE_T_CLEAN
#include <Python.h>
@@ -791,15 +791,15 @@ namespace python {
// Initialization and addition of these go in the initModulePart
// function in pydnspp.cc
//
-ISC_LIBDNS_PYTHON_API PyObject* po_MessageTooShort;
-ISC_LIBDNS_PYTHON_API PyObject* po_InvalidMessageSection;
-ISC_LIBDNS_PYTHON_API PyObject* po_InvalidMessageOperation;
-ISC_LIBDNS_PYTHON_API PyObject* po_InvalidMessageUDPSize;
+B10_LIBDNS_PYTHON_API PyObject* po_MessageTooShort;
+B10_LIBDNS_PYTHON_API PyObject* po_InvalidMessageSection;
+B10_LIBDNS_PYTHON_API PyObject* po_InvalidMessageOperation;
+B10_LIBDNS_PYTHON_API PyObject* po_InvalidMessageUDPSize;
// This defines the complete type for reflection in python and
// parsing of PyObject* to s_Message
// Most of the functions are not actually implemented and NULL here.
-ISC_LIBDNS_PYTHON_API PyTypeObject message_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject message_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.Message",
sizeof(s_Message), // tp_basicsize
diff --git a/src/lib/dns/python/message_python.h b/src/lib/dns/python/message_python.h
index 370d216..c690204 100644
--- a/src/lib/dns/python/message_python.h
+++ b/src/lib/dns/python/message_python.h
@@ -25,12 +25,12 @@ class Message;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyObject* po_MessageTooShort;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_InvalidMessageSection;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_InvalidMessageOperation;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_InvalidMessageUDPSize;
+extern B10_LIBDNS_PYTHON_API PyObject* po_MessageTooShort;
+extern B10_LIBDNS_PYTHON_API PyObject* po_InvalidMessageSection;
+extern B10_LIBDNS_PYTHON_API PyObject* po_InvalidMessageOperation;
+extern B10_LIBDNS_PYTHON_API PyObject* po_InvalidMessageUDPSize;
-extern ISC_LIBDNS_PYTHON_API PyTypeObject message_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject message_type;
} // namespace python
} // namespace dns
diff --git a/src/lib/dns/python/messagerenderer_python.cc b/src/lib/dns/python/messagerenderer_python.cc
index 8da00db..334cdb4 100644
--- a/src/lib/dns/python/messagerenderer_python.cc
+++ b/src/lib/dns/python/messagerenderer_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
@@ -182,7 +182,7 @@ MessageRenderer_clear(s_MessageRenderer* self) {
namespace isc {
namespace dns {
namespace python {
-ISC_LIBDNS_PYTHON_API PyTypeObject messagerenderer_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject messagerenderer_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.MessageRenderer",
sizeof(s_MessageRenderer), // tp_basicsize
@@ -241,7 +241,7 @@ ISC_LIBDNS_PYTHON_API PyTypeObject messagerenderer_type = {
// copy the existing buffer into a new one, then create a new renderer with
// that buffer?
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyMessageRenderer_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -249,7 +249,7 @@ PyMessageRenderer_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &messagerenderer_type));
}
-ISC_LIBDNS_PYTHON_API MessageRenderer&
+B10_LIBDNS_PYTHON_API MessageRenderer&
PyMessageRenderer_ToMessageRenderer(PyObject* messagerenderer_obj) {
if (messagerenderer_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/messagerenderer_python.h b/src/lib/dns/python/messagerenderer_python.h
index d13ecec..d7bcac6 100644
--- a/src/lib/dns/python/messagerenderer_python.h
+++ b/src/lib/dns/python/messagerenderer_python.h
@@ -26,7 +26,7 @@ class MessageRenderer;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyTypeObject messagerenderer_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject messagerenderer_type;
/// \brief Checks if the given python object is a MessageRenderer object
///
@@ -34,7 +34,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject messagerenderer_type;
///
/// \param obj The object to check the type of
/// \return true if the object is of type MessageRenderer, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyMessageRenderer_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyMessageRenderer_Check(PyObject* obj);
/// \brief Returns a reference to the MessageRenderer object contained within the given
/// Python object.
@@ -46,7 +46,7 @@ ISC_LIBDNS_PYTHON_API bool PyMessageRenderer_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param messagerenderer_obj The messagerenderer object to convert
-ISC_LIBDNS_PYTHON_API MessageRenderer&
+B10_LIBDNS_PYTHON_API MessageRenderer&
PyMessageRenderer_ToMessageRenderer(PyObject* messagerenderer_obj);
} // namespace python
diff --git a/src/lib/dns/python/name_python.cc b/src/lib/dns/python/name_python.cc
index d0815bb..27782f4 100644
--- a/src/lib/dns/python/name_python.cc
+++ b/src/lib/dns/python/name_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
@@ -539,23 +539,23 @@ namespace python {
// Initialization and addition of these go in the module init at the
// end
//
-ISC_LIBDNS_PYTHON_API PyObject* po_EmptyLabel;
-ISC_LIBDNS_PYTHON_API PyObject* po_TooLongName;
-ISC_LIBDNS_PYTHON_API PyObject* po_TooLongLabel;
-ISC_LIBDNS_PYTHON_API PyObject* po_BadLabelType;
-ISC_LIBDNS_PYTHON_API PyObject* po_BadEscape;
-ISC_LIBDNS_PYTHON_API PyObject* po_IncompleteName;
-ISC_LIBDNS_PYTHON_API PyObject* po_InvalidBufferPosition;
-ISC_LIBDNS_PYTHON_API PyObject* po_DNSMessageFORMERR;
+B10_LIBDNS_PYTHON_API PyObject* po_EmptyLabel;
+B10_LIBDNS_PYTHON_API PyObject* po_TooLongName;
+B10_LIBDNS_PYTHON_API PyObject* po_TooLongLabel;
+B10_LIBDNS_PYTHON_API PyObject* po_BadLabelType;
+B10_LIBDNS_PYTHON_API PyObject* po_BadEscape;
+B10_LIBDNS_PYTHON_API PyObject* po_IncompleteName;
+B10_LIBDNS_PYTHON_API PyObject* po_InvalidBufferPosition;
+B10_LIBDNS_PYTHON_API PyObject* po_DNSMessageFORMERR;
//
// Definition of enums
// Initialization and addition of these go in the module init at the
// end
//
-ISC_LIBDNS_PYTHON_API PyObject* po_NameRelation;
+B10_LIBDNS_PYTHON_API PyObject* po_NameRelation;
-ISC_LIBDNS_PYTHON_API PyTypeObject name_comparison_result_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject name_comparison_result_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.NameComparisonResult",
sizeof(s_NameComparisonResult), // tp_basicsize
@@ -611,7 +611,7 @@ ISC_LIBDNS_PYTHON_API PyTypeObject name_comparison_result_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyTypeObject name_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject name_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.Name",
sizeof(s_Name), // tp_basicsize
@@ -666,14 +666,14 @@ ISC_LIBDNS_PYTHON_API PyTypeObject name_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createNameObject(const Name& source) {
NameContainer container(PyObject_New(s_Name, &name_type));
container.set(new Name(source));
return (container.release());
}
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyName_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -681,7 +681,7 @@ PyName_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &name_type));
}
-ISC_LIBDNS_PYTHON_API const Name&
+B10_LIBDNS_PYTHON_API const Name&
PyName_ToName(const PyObject* name_obj) {
if (name_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/name_python.h b/src/lib/dns/python/name_python.h
index 90f9e6e..b4cb1f8 100644
--- a/src/lib/dns/python/name_python.h
+++ b/src/lib/dns/python/name_python.h
@@ -25,24 +25,24 @@ class Name;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyObject* po_EmptyLabel;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_TooLongName;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_TooLongLabel;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_BadLabelType;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_BadEscape;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_IncompleteName;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_InvalidBufferPosition;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_DNSMessageFORMERR;
+extern B10_LIBDNS_PYTHON_API PyObject* po_EmptyLabel;
+extern B10_LIBDNS_PYTHON_API PyObject* po_TooLongName;
+extern B10_LIBDNS_PYTHON_API PyObject* po_TooLongLabel;
+extern B10_LIBDNS_PYTHON_API PyObject* po_BadLabelType;
+extern B10_LIBDNS_PYTHON_API PyObject* po_BadEscape;
+extern B10_LIBDNS_PYTHON_API PyObject* po_IncompleteName;
+extern B10_LIBDNS_PYTHON_API PyObject* po_InvalidBufferPosition;
+extern B10_LIBDNS_PYTHON_API PyObject* po_DNSMessageFORMERR;
//
// Declaration of enums
// Initialization and addition of these go in the module init at the
// end
//
-extern ISC_LIBDNS_PYTHON_API PyObject* po_NameRelation;
+extern B10_LIBDNS_PYTHON_API PyObject* po_NameRelation;
-extern ISC_LIBDNS_PYTHON_API PyTypeObject name_comparison_result_type;
-extern ISC_LIBDNS_PYTHON_API PyTypeObject name_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject name_comparison_result_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject name_type;
/// This is A simple shortcut to create a python Name object (in the
/// form of a pointer to PyObject) with minimal exception safety.
@@ -51,7 +51,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject name_type;
/// returns a NULL pointer).
/// This function is expected to be called with in a try block
/// followed by necessary setup for python exception.
-ISC_LIBDNS_PYTHON_API PyObject* createNameObject(const Name& source);
+B10_LIBDNS_PYTHON_API PyObject* createNameObject(const Name& source);
/// \brief Checks if the given python object is a Name object
///
@@ -59,7 +59,7 @@ ISC_LIBDNS_PYTHON_API PyObject* createNameObject(const Name& source);
///
/// \param obj The object to check the type of
/// \return true if the object is of type Name, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyName_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyName_Check(PyObject* obj);
/// \brief Returns a reference to the Name object contained within the given
/// Python object.
@@ -71,7 +71,7 @@ ISC_LIBDNS_PYTHON_API bool PyName_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param name_obj The name object to convert
-ISC_LIBDNS_PYTHON_API const Name& PyName_ToName(const PyObject* name_obj);
+B10_LIBDNS_PYTHON_API const Name& PyName_ToName(const PyObject* name_obj);
} // namespace python
} // namespace dns
diff --git a/src/lib/dns/python/nsec3hash_python.cc b/src/lib/dns/python/nsec3hash_python.cc
index 46eac79..1c62f94 100644
--- a/src/lib/dns/python/nsec3hash_python.cc
+++ b/src/lib/dns/python/nsec3hash_python.cc
@@ -19,7 +19,7 @@
// Python.h needs to be placed at the head of the program file, see:
// http://docs.python.org/py3k/extending/extending.html#a-simple-example
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
@@ -197,12 +197,12 @@ namespace python {
// Declaration of the custom exceptions
// Initialization and addition of these go in pydnspp.cc
//
-ISC_LIBDNS_PYTHON_API PyObject* po_UnknownNSEC3HashAlgorithm;
+B10_LIBDNS_PYTHON_API PyObject* po_UnknownNSEC3HashAlgorithm;
// This defines the complete type for reflection in python and
// parsing of PyObject* to s_NSEC3Hash
// Most of the functions are not actually implemented and NULL here.
-ISC_LIBDNS_PYTHON_API PyTypeObject nsec3hash_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject nsec3hash_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"dns.NSEC3Hash",
sizeof(s_NSEC3Hash), // tp_basicsize
@@ -253,7 +253,7 @@ ISC_LIBDNS_PYTHON_API PyTypeObject nsec3hash_type = {
};
// Module Initialization, all statics (nothing right now) are initialized here
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
initModulePart_NSEC3Hash(PyObject* mod) {
// We initialize the static description object with PyType_Ready(),
// then add it to the module. This is not just a check! (leaving
diff --git a/src/lib/dns/python/nsec3hash_python.h b/src/lib/dns/python/nsec3hash_python.h
index 29abaa0..906cd6a 100644
--- a/src/lib/dns/python/nsec3hash_python.h
+++ b/src/lib/dns/python/nsec3hash_python.h
@@ -32,12 +32,12 @@ public:
NSEC3Hash* cppobj;
};
-extern ISC_LIBDNS_PYTHON_API PyTypeObject nsec3hash_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject nsec3hash_type;
// Public exception object.
-extern ISC_LIBDNS_PYTHON_API PyObject* po_UnknownNSEC3HashAlgorithm;
+extern B10_LIBDNS_PYTHON_API PyObject* po_UnknownNSEC3HashAlgorithm;
-ISC_LIBDNS_PYTHON_API bool initModulePart_NSEC3Hash(PyObject* mod);
+B10_LIBDNS_PYTHON_API bool initModulePart_NSEC3Hash(PyObject* mod);
} // namespace python
} // namespace dns
diff --git a/src/lib/dns/python/opcode_python.cc b/src/lib/dns/python/opcode_python.cc
index 3f3038c..f4a5036 100644
--- a/src/lib/dns/python/opcode_python.cc
+++ b/src/lib/dns/python/opcode_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
@@ -292,7 +292,7 @@ namespace isc {
namespace dns {
namespace python {
-ISC_LIBDNS_PYTHON_API PyTypeObject opcode_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject opcode_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.Opcode",
sizeof(s_Opcode), // tp_basicsize
@@ -343,14 +343,14 @@ ISC_LIBDNS_PYTHON_API PyTypeObject opcode_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createOpcodeObject(const Opcode& source) {
OpcodeContainer container(PyObject_New(s_Opcode, &opcode_type));
container.set(new Opcode(source));
return (container.release());
}
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyOpcode_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -358,7 +358,7 @@ PyOpcode_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &opcode_type));
}
-ISC_LIBDNS_PYTHON_API const Opcode&
+B10_LIBDNS_PYTHON_API const Opcode&
PyOpcode_ToOpcode(const PyObject* opcode_obj) {
if (opcode_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/opcode_python.h b/src/lib/dns/python/opcode_python.h
index 6656583..807c3cf 100644
--- a/src/lib/dns/python/opcode_python.h
+++ b/src/lib/dns/python/opcode_python.h
@@ -25,7 +25,7 @@ class Opcode;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyTypeObject opcode_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject opcode_type;
/// This is a simple shortcut to create a python Opcode object (in the
/// form of a pointer to PyObject) with minimal exception safety.
@@ -34,7 +34,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject opcode_type;
/// returns a NULL pointer).
/// This function is expected to be called within a try block
/// followed by necessary setup for python exception.
-ISC_LIBDNS_PYTHON_API PyObject* createOpcodeObject(const Opcode& source);
+B10_LIBDNS_PYTHON_API PyObject* createOpcodeObject(const Opcode& source);
/// \brief Checks if the given python object is a Opcode object
///
@@ -42,7 +42,7 @@ ISC_LIBDNS_PYTHON_API PyObject* createOpcodeObject(const Opcode& source);
///
/// \param obj The object to check the type of
/// \return true if the object is of type Opcode, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyOpcode_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyOpcode_Check(PyObject* obj);
/// \brief Returns a reference to the Opcode object contained within the given
/// Python object.
@@ -54,7 +54,7 @@ ISC_LIBDNS_PYTHON_API bool PyOpcode_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param opcode_obj The opcode object to convert
-ISC_LIBDNS_PYTHON_API const Opcode&
+B10_LIBDNS_PYTHON_API const Opcode&
PyOpcode_ToOpcode(const PyObject* opcode_obj);
} // namespace python
diff --git a/src/lib/dns/python/pydnspp.cc b/src/lib/dns/python/pydnspp.cc
index 65905f0..4ee85a1 100644
--- a/src/lib/dns/python/pydnspp.cc
+++ b/src/lib/dns/python/pydnspp.cc
@@ -775,7 +775,7 @@ PyModuleDef pydnspp = {
namespace isc {
namespace util {
namespace detail {
-extern ISC_LIBDNS_API int64_t (*gettimeFunction)();
+extern B10_LIBDNS_API int64_t (*gettimeFunction)();
}
}
}
diff --git a/src/lib/dns/python/pydnspp_common.cc b/src/lib/dns/python/pydnspp_common.cc
index ef6a511..3fe1ed1 100644
--- a/src/lib/dns/python/pydnspp_common.cc
+++ b/src/lib/dns/python/pydnspp_common.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
@@ -49,14 +49,14 @@ namespace isc {
namespace dns {
namespace python {
// For our 'general' isc::Exceptions
-ISC_LIBDNS_PYTHON_API PyObject* po_IscException;
-ISC_LIBDNS_PYTHON_API PyObject* po_InvalidParameter;
+B10_LIBDNS_PYTHON_API PyObject* po_IscException;
+B10_LIBDNS_PYTHON_API PyObject* po_InvalidParameter;
// For our own isc::dns::Exception
-ISC_LIBDNS_PYTHON_API PyObject* po_DNSMessageBADVERS;
+B10_LIBDNS_PYTHON_API PyObject* po_DNSMessageBADVERS;
-ISC_LIBDNS_PYTHON_API int
+B10_LIBDNS_PYTHON_API int
readDataFromSequence(uint8_t *data, size_t len, PyObject* sequence) {
PyObject* el = NULL;
for (size_t i = 0; i < len; i++) {
@@ -84,7 +84,7 @@ readDataFromSequence(uint8_t *data, size_t len, PyObject* sequence) {
return (0);
}
-ISC_LIBDNS_PYTHON_API int
+B10_LIBDNS_PYTHON_API int
addClassVariable(PyTypeObject& c, const char* name, PyObject* obj) {
if (obj == NULL) {
PyErr_SetString(PyExc_ValueError,
diff --git a/src/lib/dns/python/pydnspp_common.h b/src/lib/dns/python/pydnspp_common.h
index 2a749e4..e0463d0 100644
--- a/src/lib/dns/python/pydnspp_common.h
+++ b/src/lib/dns/python/pydnspp_common.h
@@ -26,11 +26,11 @@ namespace isc {
namespace dns {
namespace python {
// For our 'general' isc::Exceptions
-extern ISC_LIBDNS_PYTHON_API PyObject* po_IscException;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_InvalidParameter;
+extern B10_LIBDNS_PYTHON_API PyObject* po_IscException;
+extern B10_LIBDNS_PYTHON_API PyObject* po_InvalidParameter;
// For our own isc::dns::Exception
-extern ISC_LIBDNS_PYTHON_API PyObject* po_DNSMessageBADVERS;
+extern B10_LIBDNS_PYTHON_API PyObject* po_DNSMessageBADVERS;
// This function reads 'bytes' from a sequence
// This sequence can be anything that implements the Sequence interface,
@@ -42,10 +42,10 @@ extern ISC_LIBDNS_PYTHON_API PyObject* po_DNSMessageBADVERS;
// The current implementation removes read items from the
// head of the sequence, unless it fails (and returns -1), in which
// case nothing is removed
-ISC_LIBDNS_PYTHON_API
+B10_LIBDNS_PYTHON_API
int readDataFromSequence(uint8_t *data, size_t len, PyObject* sequence);
-ISC_LIBDNS_PYTHON_API
+B10_LIBDNS_PYTHON_API
int addClassVariable(PyTypeObject& c, const char* name, PyObject* obj);
// Short term workaround for unifying the return type of tp_hash
diff --git a/src/lib/dns/python/question_python.cc b/src/lib/dns/python/question_python.cc
index c0239ba..20e297e 100644
--- a/src/lib/dns/python/question_python.cc
+++ b/src/lib/dns/python/question_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#define PY_SSIZE_T_CLEAN
#include <Python.h>
@@ -241,7 +241,7 @@ namespace python {
// This defines the complete type for reflection in python and
// parsing of PyObject* to s_Question
// Most of the functions are not actually implemented and NULL here.
-ISC_LIBDNS_PYTHON_API PyTypeObject question_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject question_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.Question",
sizeof(s_Question), // tp_basicsize
@@ -292,7 +292,7 @@ ISC_LIBDNS_PYTHON_API PyTypeObject question_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createQuestionObject(const Question& source) {
s_Question* question =
static_cast<s_Question*>(question_type.tp_alloc(&question_type, 0));
@@ -300,7 +300,7 @@ createQuestionObject(const Question& source) {
return (question);
}
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyQuestion_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -308,7 +308,7 @@ PyQuestion_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &question_type));
}
-ISC_LIBDNS_PYTHON_API const Question&
+B10_LIBDNS_PYTHON_API const Question&
PyQuestion_ToQuestion(const PyObject* question_obj) {
if (question_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/question_python.h b/src/lib/dns/python/question_python.h
index 0fd9f6d..9713d48 100644
--- a/src/lib/dns/python/question_python.h
+++ b/src/lib/dns/python/question_python.h
@@ -25,9 +25,9 @@ class Question;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyObject* po_EmptyQuestion;
+extern B10_LIBDNS_PYTHON_API PyObject* po_EmptyQuestion;
-extern ISC_LIBDNS_PYTHON_API PyTypeObject question_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject question_type;
/// This is a simple shortcut to create a python Question object (in the
/// form of a pointer to PyObject) with minimal exception safety.
@@ -36,7 +36,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject question_type;
/// returns a NULL pointer).
/// This function is expected to be called within a try block
/// followed by necessary setup for python exception.
-ISC_LIBDNS_PYTHON_API PyObject* createQuestionObject(const Question& source);
+B10_LIBDNS_PYTHON_API PyObject* createQuestionObject(const Question& source);
/// \brief Checks if the given python object is a Question object
///
@@ -44,7 +44,7 @@ ISC_LIBDNS_PYTHON_API PyObject* createQuestionObject(const Question& source);
///
/// \param obj The object to check the type of
/// \return true if the object is of type Question, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyQuestion_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyQuestion_Check(PyObject* obj);
/// \brief Returns a reference to the Question object contained within the given
/// Python object.
@@ -56,7 +56,7 @@ ISC_LIBDNS_PYTHON_API bool PyQuestion_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param question_obj The question object to convert
-ISC_LIBDNS_PYTHON_API const Question&
+B10_LIBDNS_PYTHON_API const Question&
PyQuestion_ToQuestion(const PyObject* question_obj);
} // namespace python
diff --git a/src/lib/dns/python/rcode_python.cc b/src/lib/dns/python/rcode_python.cc
index 615851f..12446b5 100644
--- a/src/lib/dns/python/rcode_python.cc
+++ b/src/lib/dns/python/rcode_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
@@ -332,7 +332,7 @@ Rcode_richcmp(const s_Rcode* const self, const s_Rcode* const other,
namespace isc {
namespace dns {
namespace python {
-ISC_LIBDNS_PYTHON_API PyTypeObject rcode_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject rcode_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.Rcode",
sizeof(s_Rcode), // tp_basicsize
@@ -383,14 +383,14 @@ ISC_LIBDNS_PYTHON_API PyTypeObject rcode_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createRcodeObject(const Rcode& source) {
RcodeContainer container(PyObject_New(s_Rcode, &rcode_type));
container.set(new Rcode(source));
return (container.release());
}
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyRcode_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -398,7 +398,7 @@ PyRcode_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &rcode_type));
}
-ISC_LIBDNS_PYTHON_API const Rcode&
+B10_LIBDNS_PYTHON_API const Rcode&
PyRcode_ToRcode(const PyObject* rcode_obj) {
if (rcode_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/rcode_python.h b/src/lib/dns/python/rcode_python.h
index a7e850c..017710b 100644
--- a/src/lib/dns/python/rcode_python.h
+++ b/src/lib/dns/python/rcode_python.h
@@ -25,7 +25,7 @@ class Rcode;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyTypeObject rcode_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject rcode_type;
/// This is a simple shortcut to create a python Rcode object (in the
/// form of a pointer to PyObject) with minimal exception safety.
@@ -34,7 +34,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject rcode_type;
/// returns a NULL pointer).
/// This function is expected to be called within a try block
/// followed by necessary setup for python exception.
-ISC_LIBDNS_PYTHON_API PyObject* createRcodeObject(const Rcode& source);
+B10_LIBDNS_PYTHON_API PyObject* createRcodeObject(const Rcode& source);
/// \brief Checks if the given python object is a Rcode object
///
@@ -42,7 +42,7 @@ ISC_LIBDNS_PYTHON_API PyObject* createRcodeObject(const Rcode& source);
///
/// \param obj The object to check the type of
/// \return true if the object is of type Rcode, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyRcode_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyRcode_Check(PyObject* obj);
/// \brief Returns a reference to the Rcode object contained within the given
/// Python object.
@@ -54,7 +54,7 @@ ISC_LIBDNS_PYTHON_API bool PyRcode_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param rcode_obj The rcode object to convert
-ISC_LIBDNS_PYTHON_API const Rcode& PyRcode_ToRcode(const PyObject* rcode_obj);
+B10_LIBDNS_PYTHON_API const Rcode& PyRcode_ToRcode(const PyObject* rcode_obj);
} // namespace python
} // namespace dns
diff --git a/src/lib/dns/python/rdata_python.cc b/src/lib/dns/python/rdata_python.cc
index 8b0ed70..dcd0375 100644
--- a/src/lib/dns/python/rdata_python.cc
+++ b/src/lib/dns/python/rdata_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#define PY_SSIZE_T_CLEAN
#include <Python.h>
@@ -286,14 +286,14 @@ namespace python {
// Initialization and addition of these go in the initModulePart
// function in pydnspp
//
-ISC_LIBDNS_PYTHON_API PyObject* po_InvalidRdataLength;
-ISC_LIBDNS_PYTHON_API PyObject* po_InvalidRdataText;
-ISC_LIBDNS_PYTHON_API PyObject* po_CharStringTooLong;
+B10_LIBDNS_PYTHON_API PyObject* po_InvalidRdataLength;
+B10_LIBDNS_PYTHON_API PyObject* po_InvalidRdataText;
+B10_LIBDNS_PYTHON_API PyObject* po_CharStringTooLong;
// This defines the complete type for reflection in python and
// parsing of PyObject* to s_Rdata
// Most of the functions are not actually implemented and NULL here.
-ISC_LIBDNS_PYTHON_API PyTypeObject rdata_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject rdata_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.Rdata",
sizeof(s_Rdata), // tp_basicsize
@@ -344,7 +344,7 @@ ISC_LIBDNS_PYTHON_API PyTypeObject rdata_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createRdataObject(ConstRdataPtr source) {
s_Rdata* py_rdata =
static_cast<s_Rdata*>(rdata_type.tp_alloc(&rdata_type, 0));
@@ -356,7 +356,7 @@ createRdataObject(ConstRdataPtr source) {
return (py_rdata);
}
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyRdata_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -364,7 +364,7 @@ PyRdata_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &rdata_type));
}
-ISC_LIBDNS_PYTHON_API const Rdata&
+B10_LIBDNS_PYTHON_API const Rdata&
PyRdata_ToRdata(const PyObject* rdata_obj) {
if (rdata_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/rdata_python.h b/src/lib/dns/python/rdata_python.h
index 3b8fcf2..5b0ff7f 100644
--- a/src/lib/dns/python/rdata_python.h
+++ b/src/lib/dns/python/rdata_python.h
@@ -24,11 +24,11 @@ namespace isc {
namespace dns {
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyObject* po_InvalidRdataLength;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_InvalidRdataText;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_CharStringTooLong;
+extern B10_LIBDNS_PYTHON_API PyObject* po_InvalidRdataLength;
+extern B10_LIBDNS_PYTHON_API PyObject* po_InvalidRdataText;
+extern B10_LIBDNS_PYTHON_API PyObject* po_CharStringTooLong;
-extern ISC_LIBDNS_PYTHON_API PyTypeObject rdata_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject rdata_type;
/// This is a simple shortcut to create a python Rdata object (in the
/// form of a pointer to PyObject) with minimal exception safety.
@@ -37,7 +37,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject rdata_type;
/// returns a NULL pointer).
/// This function is expected to be called within a try block
/// followed by necessary setup for python exception.
-ISC_LIBDNS_PYTHON_API PyObject* createRdataObject(isc::dns::rdata::ConstRdataPtr source);
+B10_LIBDNS_PYTHON_API PyObject* createRdataObject(isc::dns::rdata::ConstRdataPtr source);
/// \brief Checks if the given python object is a Rdata object
///
@@ -45,7 +45,7 @@ ISC_LIBDNS_PYTHON_API PyObject* createRdataObject(isc::dns::rdata::ConstRdataPtr
///
/// \param obj The object to check the type of
/// \return true if the object is of type Rdata, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyRdata_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyRdata_Check(PyObject* obj);
/// \brief Returns a reference to the Rdata object contained within the given
/// Python object.
@@ -57,7 +57,7 @@ ISC_LIBDNS_PYTHON_API bool PyRdata_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param rdata_obj The rdata object to convert
-ISC_LIBDNS_PYTHON_API const isc::dns::rdata::Rdata&
+B10_LIBDNS_PYTHON_API const isc::dns::rdata::Rdata&
PyRdata_ToRdata(const PyObject* rdata_obj);
} // namespace python
diff --git a/src/lib/dns/python/rrclass_python.cc b/src/lib/dns/python/rrclass_python.cc
index 1f9daa8..bc75a68 100644
--- a/src/lib/dns/python/rrclass_python.cc
+++ b/src/lib/dns/python/rrclass_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
@@ -285,14 +285,14 @@ namespace python {
// Initialization and addition of these go in the initModulePart
// function in pydnspp.cc
//
-ISC_LIBDNS_PYTHON_API PyObject* po_InvalidRRClass;
-ISC_LIBDNS_PYTHON_API PyObject* po_IncompleteRRClass;
+B10_LIBDNS_PYTHON_API PyObject* po_InvalidRRClass;
+B10_LIBDNS_PYTHON_API PyObject* po_IncompleteRRClass;
// This defines the complete type for reflection in python and
// parsing of PyObject* to s_RRClass
// Most of the functions are not actually implemented and NULL here.
-ISC_LIBDNS_PYTHON_API PyTypeObject rrclass_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject rrclass_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.RRClass",
sizeof(s_RRClass), // tp_basicsize
@@ -345,7 +345,7 @@ ISC_LIBDNS_PYTHON_API PyTypeObject rrclass_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createRRClassObject(const RRClass& source) {
RRClassContainer container(PyObject_New(s_RRClass, &rrclass_type));
container.set(new RRClass(source));
@@ -353,7 +353,7 @@ createRRClassObject(const RRClass& source) {
}
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyRRClass_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -361,7 +361,7 @@ PyRRClass_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &rrclass_type));
}
-ISC_LIBDNS_PYTHON_API const RRClass&
+B10_LIBDNS_PYTHON_API const RRClass&
PyRRClass_ToRRClass(const PyObject* rrclass_obj) {
if (rrclass_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/rrclass_python.h b/src/lib/dns/python/rrclass_python.h
index e39eb38..1fe0180 100644
--- a/src/lib/dns/python/rrclass_python.h
+++ b/src/lib/dns/python/rrclass_python.h
@@ -25,10 +25,10 @@ class RRClass;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyObject* po_InvalidRRClass;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_IncompleteRRClass;
+extern B10_LIBDNS_PYTHON_API PyObject* po_InvalidRRClass;
+extern B10_LIBDNS_PYTHON_API PyObject* po_IncompleteRRClass;
-extern ISC_LIBDNS_PYTHON_API PyTypeObject rrclass_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject rrclass_type;
/// This is a simple shortcut to create a python RRClass object (in the
/// form of a pointer to PyObject) with minimal exception safety.
@@ -37,7 +37,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject rrclass_type;
/// returns a NULL pointer).
/// This function is expected to be called within a try block
/// followed by necessary setup for python exception.
-ISC_LIBDNS_PYTHON_API PyObject* createRRClassObject(const RRClass& source);
+B10_LIBDNS_PYTHON_API PyObject* createRRClassObject(const RRClass& source);
/// \brief Checks if the given python object is a RRClass object
///
@@ -45,7 +45,7 @@ ISC_LIBDNS_PYTHON_API PyObject* createRRClassObject(const RRClass& source);
///
/// \param obj The object to check the type of
/// \return true if the object is of type RRClass, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyRRClass_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyRRClass_Check(PyObject* obj);
/// \brief Returns a reference to the RRClass object contained within the given
/// Python object.
@@ -57,7 +57,7 @@ ISC_LIBDNS_PYTHON_API bool PyRRClass_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param rrclass_obj The rrclass object to convert
-ISC_LIBDNS_PYTHON_API const RRClass&
+B10_LIBDNS_PYTHON_API const RRClass&
PyRRClass_ToRRClass(const PyObject* rrclass_obj);
diff --git a/src/lib/dns/python/rrset_python.cc b/src/lib/dns/python/rrset_python.cc
index 9274bd4..29afecf 100644
--- a/src/lib/dns/python/rrset_python.cc
+++ b/src/lib/dns/python/rrset_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
@@ -349,9 +349,9 @@ namespace python {
// Initialization and addition of these go in the module init at the
// end
//
-ISC_LIBDNS_PYTHON_API PyObject* po_EmptyRRset;
+B10_LIBDNS_PYTHON_API PyObject* po_EmptyRRset;
-ISC_LIBDNS_PYTHON_API PyTypeObject rrset_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject rrset_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.RRset",
sizeof(s_RRset), // tp_basicsize
@@ -416,7 +416,7 @@ ISC_LIBDNS_PYTHON_API PyTypeObject rrset_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createRRsetObject(const AbstractRRset& source) {
// RRsets are noncopyable, so as a workaround we recreate a new one
@@ -444,7 +444,7 @@ createRRsetObject(const AbstractRRset& source) {
return (py_rrset);
}
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyRRset_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -452,13 +452,13 @@ PyRRset_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &rrset_type));
}
-ISC_LIBDNS_PYTHON_API AbstractRRset&
+B10_LIBDNS_PYTHON_API AbstractRRset&
PyRRset_ToRRset(PyObject* rrset_obj) {
s_RRset* rrset = static_cast<s_RRset*>(rrset_obj);
return (*rrset->cppobj);
}
-ISC_LIBDNS_PYTHON_API RRsetPtr
+B10_LIBDNS_PYTHON_API RRsetPtr
PyRRset_ToRRsetPtr(PyObject* rrset_obj) {
if (rrset_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/rrset_python.h b/src/lib/dns/python/rrset_python.h
index 547b205..5826372 100644
--- a/src/lib/dns/python/rrset_python.h
+++ b/src/lib/dns/python/rrset_python.h
@@ -26,9 +26,9 @@ namespace isc {
namespace dns {
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyObject* po_EmptyRRset;
+extern B10_LIBDNS_PYTHON_API PyObject* po_EmptyRRset;
-extern ISC_LIBDNS_PYTHON_API PyTypeObject rrset_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject rrset_type;
/// This is a simple shortcut to create a python RRset object (in the
/// form of a pointer to PyObject) with minimal exception safety.
@@ -37,7 +37,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject rrset_type;
/// returns a NULL pointer).
/// This function is expected to be called within a try block
/// followed by necessary setup for python exception.
-ISC_LIBDNS_PYTHON_API PyObject* createRRsetObject(const AbstractRRset& source);
+B10_LIBDNS_PYTHON_API PyObject* createRRsetObject(const AbstractRRset& source);
/// \brief Checks if the given python object is a RRset object
///
@@ -45,7 +45,7 @@ ISC_LIBDNS_PYTHON_API PyObject* createRRsetObject(const AbstractRRset& source);
///
/// \param obj The object to check the type of
/// \return true if the object is of type RRset, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyRRset_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyRRset_Check(PyObject* obj);
/// \brief Returns a reference to the RRset object contained within the given
/// Python object.
@@ -57,7 +57,7 @@ ISC_LIBDNS_PYTHON_API bool PyRRset_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param rrset_obj The rrset object to convert
-ISC_LIBDNS_PYTHON_API AbstractRRset& PyRRset_ToRRset(PyObject* rrset_obj);
+B10_LIBDNS_PYTHON_API AbstractRRset& PyRRset_ToRRset(PyObject* rrset_obj);
/// \brief Returns the shared_ptr of the RRset object contained within the
/// given Python object.
@@ -66,7 +66,7 @@ ISC_LIBDNS_PYTHON_API AbstractRRset& PyRRset_ToRRset(PyObject* rrset_obj);
/// either the right call to ParseTuple("O!"), or with PyRRset_Check()
///
/// \param rrset_obj The rrset object to convert
-ISC_LIBDNS_PYTHON_API RRsetPtr PyRRset_ToRRsetPtr(PyObject* rrset_obj);
+B10_LIBDNS_PYTHON_API RRsetPtr PyRRset_ToRRsetPtr(PyObject* rrset_obj);
} // namespace python
diff --git a/src/lib/dns/python/rrttl_python.cc b/src/lib/dns/python/rrttl_python.cc
index fb2d930..79b552e 100644
--- a/src/lib/dns/python/rrttl_python.cc
+++ b/src/lib/dns/python/rrttl_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
#include <vector>
@@ -232,13 +232,13 @@ namespace python {
// Initialization and addition of these go in the initModulePart
// function in pydnspp.cc
//
-ISC_LIBDNS_PYTHON_API PyObject* po_InvalidRRTTL;
-ISC_LIBDNS_PYTHON_API PyObject* po_IncompleteRRTTL;
+B10_LIBDNS_PYTHON_API PyObject* po_InvalidRRTTL;
+B10_LIBDNS_PYTHON_API PyObject* po_IncompleteRRTTL;
// This defines the complete type for reflection in python and
// parsing of PyObject* to s_RRTTL
// Most of the functions are not actually implemented and NULL here.
-ISC_LIBDNS_PYTHON_API PyTypeObject rrttl_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject rrttl_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.RRTTL",
sizeof(s_RRTTL), // tp_basicsize
@@ -293,14 +293,14 @@ ISC_LIBDNS_PYTHON_API PyTypeObject rrttl_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createRRTTLObject(const RRTTL& source) {
RRTTLContainer container(PyObject_New(s_RRTTL, &rrttl_type));
container.set(new RRTTL(source));
return (container.release());
}
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyRRTTL_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -308,7 +308,7 @@ PyRRTTL_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &rrttl_type));
}
-ISC_LIBDNS_PYTHON_API const RRTTL&
+B10_LIBDNS_PYTHON_API const RRTTL&
PyRRTTL_ToRRTTL(const PyObject* rrttl_obj) {
if (rrttl_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/rrttl_python.h b/src/lib/dns/python/rrttl_python.h
index 0c694dc..b2a77eb 100644
--- a/src/lib/dns/python/rrttl_python.h
+++ b/src/lib/dns/python/rrttl_python.h
@@ -25,10 +25,10 @@ class RRTTL;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyObject* po_InvalidRRTTL;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_IncompleteRRTTL;
+extern B10_LIBDNS_PYTHON_API PyObject* po_InvalidRRTTL;
+extern B10_LIBDNS_PYTHON_API PyObject* po_IncompleteRRTTL;
-extern ISC_LIBDNS_PYTHON_API PyTypeObject rrttl_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject rrttl_type;
/// This is a simple shortcut to create a python RRTTL object (in the
/// form of a pointer to PyObject) with minimal exception safety.
@@ -37,7 +37,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject rrttl_type;
/// returns a NULL pointer).
/// This function is expected to be called within a try block
/// followed by necessary setup for python exception.
-ISC_LIBDNS_PYTHON_API PyObject* createRRTTLObject(const RRTTL& source);
+B10_LIBDNS_PYTHON_API PyObject* createRRTTLObject(const RRTTL& source);
/// \brief Checks if the given python object is a RRTTL object
///
@@ -45,7 +45,7 @@ ISC_LIBDNS_PYTHON_API PyObject* createRRTTLObject(const RRTTL& source);
///
/// \param obj The object to check the type of
/// \return true if the object is of type RRTTL, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyRRTTL_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyRRTTL_Check(PyObject* obj);
/// \brief Returns a reference to the RRTTL object contained within the given
/// Python object.
@@ -57,7 +57,7 @@ ISC_LIBDNS_PYTHON_API bool PyRRTTL_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param rrttl_obj The rrttl object to convert
-ISC_LIBDNS_PYTHON_API const RRTTL& PyRRTTL_ToRRTTL(const PyObject* rrttl_obj);
+B10_LIBDNS_PYTHON_API const RRTTL& PyRRTTL_ToRRTTL(const PyObject* rrttl_obj);
} // namespace python
} // namespace dns
diff --git a/src/lib/dns/python/rrtype_python.cc b/src/lib/dns/python/rrtype_python.cc
index d5afdcc..7b7d81b 100644
--- a/src/lib/dns/python/rrtype_python.cc
+++ b/src/lib/dns/python/rrtype_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
#include <vector>
@@ -376,13 +376,13 @@ namespace isc {
namespace dns {
namespace python {
-ISC_LIBDNS_PYTHON_API PyObject* po_InvalidRRType;
-ISC_LIBDNS_PYTHON_API PyObject* po_IncompleteRRType;
+B10_LIBDNS_PYTHON_API PyObject* po_InvalidRRType;
+B10_LIBDNS_PYTHON_API PyObject* po_IncompleteRRType;
// This defines the complete type for reflection in python and
// parsing of PyObject* to s_RRType
// Most of the functions are not actually implemented and NULL here.
-ISC_LIBDNS_PYTHON_API PyTypeObject rrtype_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject rrtype_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.RRType",
sizeof(s_RRType), // tp_basicsize
@@ -435,14 +435,14 @@ ISC_LIBDNS_PYTHON_API PyTypeObject rrtype_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createRRTypeObject(const RRType& source) {
RRTypeContainer container(PyObject_New(s_RRType, &rrtype_type));
container.set(new RRType(source));
return (container.release());
}
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyRRType_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -450,7 +450,7 @@ PyRRType_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &rrtype_type));
}
-ISC_LIBDNS_PYTHON_API const RRType&
+B10_LIBDNS_PYTHON_API const RRType&
PyRRType_ToRRType(const PyObject* rrtype_obj) {
if (rrtype_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/rrtype_python.h b/src/lib/dns/python/rrtype_python.h
index 8c8b8e7..195c036 100644
--- a/src/lib/dns/python/rrtype_python.h
+++ b/src/lib/dns/python/rrtype_python.h
@@ -25,10 +25,10 @@ class RRType;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyObject* po_InvalidRRType;
-extern ISC_LIBDNS_PYTHON_API PyObject* po_IncompleteRRType;
+extern B10_LIBDNS_PYTHON_API PyObject* po_InvalidRRType;
+extern B10_LIBDNS_PYTHON_API PyObject* po_IncompleteRRType;
-extern ISC_LIBDNS_PYTHON_API PyTypeObject rrtype_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject rrtype_type;
/// This is a simple shortcut to create a python RRType object (in the
/// form of a pointer to PyObject) with minimal exception safety.
@@ -37,7 +37,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject rrtype_type;
/// returns a NULL pointer).
/// This function is expected to be called within a try block
/// followed by necessary setup for python exception.
-ISC_LIBDNS_PYTHON_API PyObject* createRRTypeObject(const RRType& source);
+B10_LIBDNS_PYTHON_API PyObject* createRRTypeObject(const RRType& source);
/// \brief Checks if the given python object is a RRType object
///
@@ -45,7 +45,7 @@ ISC_LIBDNS_PYTHON_API PyObject* createRRTypeObject(const RRType& source);
///
/// \param obj The object to check the type of
/// \return true if the object is of type RRType, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyRRType_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyRRType_Check(PyObject* obj);
/// \brief Returns a reference to the RRType object contained within the given
/// Python object.
@@ -57,7 +57,7 @@ ISC_LIBDNS_PYTHON_API bool PyRRType_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param rrtype_obj The rrtype object to convert
-ISC_LIBDNS_PYTHON_API const RRType&
+B10_LIBDNS_PYTHON_API const RRType&
PyRRType_ToRRType(const PyObject* rrtype_obj);
diff --git a/src/lib/dns/python/serial_python.cc b/src/lib/dns/python/serial_python.cc
index 6fda6e5..b298632 100644
--- a/src/lib/dns/python/serial_python.cc
+++ b/src/lib/dns/python/serial_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
@@ -195,7 +195,7 @@ namespace python {
// This defines the complete type for reflection in python and
// parsing of PyObject* to s_Serial
// Most of the functions are not actually implemented and NULL here.
-ISC_LIBDNS_PYTHON_API PyTypeObject serial_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject serial_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.Serial",
sizeof(s_Serial), // tp_basicsize
@@ -252,14 +252,14 @@ ISC_LIBDNS_PYTHON_API PyTypeObject serial_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createSerialObject(const Serial& source) {
SerialContainer container(PyObject_New(s_Serial, &serial_type));
container.set(new Serial(source));
return (container.release());
}
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PySerial_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException,
@@ -268,7 +268,7 @@ PySerial_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &serial_type));
}
-ISC_LIBDNS_PYTHON_API const Serial&
+B10_LIBDNS_PYTHON_API const Serial&
PySerial_ToSerial(const PyObject* serial_obj) {
if (serial_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/serial_python.h b/src/lib/dns/python/serial_python.h
index cb5241c..a370c45 100644
--- a/src/lib/dns/python/serial_python.h
+++ b/src/lib/dns/python/serial_python.h
@@ -25,7 +25,7 @@ class Serial;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyTypeObject serial_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject serial_type;
/// This is a simple shortcut to create a python Serial object (in the
/// form of a pointer to PyObject) with minimal exception safety.
@@ -34,7 +34,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject serial_type;
/// returns a NULL pointer).
/// This function is expected to be called within a try block
/// followed by necessary setup for python exception.
-ISC_LIBDNS_PYTHON_API PyObject* createSerialObject(const Serial& source);
+B10_LIBDNS_PYTHON_API PyObject* createSerialObject(const Serial& source);
/// \brief Checks if the given python object is a Serial object
///
@@ -42,7 +42,7 @@ ISC_LIBDNS_PYTHON_API PyObject* createSerialObject(const Serial& source);
///
/// \param obj The object to check the type of
/// \return true if the object is of type Serial, false otherwise
-ISC_LIBDNS_PYTHON_API bool PySerial_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PySerial_Check(PyObject* obj);
/// \brief Returns a reference to the Serial object contained within the given
/// Python object.
@@ -54,7 +54,7 @@ ISC_LIBDNS_PYTHON_API bool PySerial_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param Serial_obj The Serial object to convert
-ISC_LIBDNS_PYTHON_API const Serial&
+B10_LIBDNS_PYTHON_API const Serial&
PySerial_ToSerial(const PyObject* Serial_obj);
} // namespace python
diff --git a/src/lib/dns/python/tsig_python.cc b/src/lib/dns/python/tsig_python.cc
index e149c4b..9b51e87 100644
--- a/src/lib/dns/python/tsig_python.cc
+++ b/src/lib/dns/python/tsig_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#define PY_SSIZE_T_CLEAN // need for "y#" below
#include <Python.h>
@@ -242,12 +242,12 @@ namespace isc {
namespace dns {
namespace python {
// Definition of class specific exception(s)
-ISC_LIBDNS_PYTHON_API PyObject* po_TSIGContextError;
+B10_LIBDNS_PYTHON_API PyObject* po_TSIGContextError;
// This defines the complete type for reflection in python and
// parsing of PyObject* to s_TSIGContext
// Most of the functions are not actually implemented and NULL here.
-ISC_LIBDNS_PYTHON_API PyTypeObject tsigcontext_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject tsigcontext_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.TSIGContext",
sizeof(s_TSIGContext), // tp_basicsize
@@ -304,7 +304,7 @@ ISC_LIBDNS_PYTHON_API PyTypeObject tsigcontext_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyTSIGContext_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -312,7 +312,7 @@ PyTSIGContext_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &tsigcontext_type));
}
-ISC_LIBDNS_PYTHON_API TSIGContext&
+B10_LIBDNS_PYTHON_API TSIGContext&
PyTSIGContext_ToTSIGContext(PyObject* tsigcontext_obj) {
if (tsigcontext_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/tsig_python.h b/src/lib/dns/python/tsig_python.h
index b953522..35de914 100644
--- a/src/lib/dns/python/tsig_python.h
+++ b/src/lib/dns/python/tsig_python.h
@@ -25,10 +25,10 @@ class TSIGContext;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyTypeObject tsigcontext_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject tsigcontext_type;
// Class specific exceptions
-extern ISC_LIBDNS_PYTHON_API PyObject* po_TSIGContextError;
+extern B10_LIBDNS_PYTHON_API PyObject* po_TSIGContextError;
/// \brief Checks if the given python object is a TSIGContext object
///
@@ -36,7 +36,7 @@ extern ISC_LIBDNS_PYTHON_API PyObject* po_TSIGContextError;
///
/// \param obj The object to check the type of
/// \return true if the object is of type TSIGContext, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyTSIGContext_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyTSIGContext_Check(PyObject* obj);
/// \brief Returns a reference to the TSIGContext object contained within the given
/// Python object.
@@ -48,7 +48,7 @@ ISC_LIBDNS_PYTHON_API bool PyTSIGContext_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param tsigcontext_obj The tsigcontext object to convert
-ISC_LIBDNS_PYTHON_API TSIGContext&
+B10_LIBDNS_PYTHON_API TSIGContext&
PyTSIGContext_ToTSIGContext(PyObject* tsigcontext_obj);
diff --git a/src/lib/dns/python/tsig_rdata_python.cc b/src/lib/dns/python/tsig_rdata_python.cc
index 4475b3e..4c4c441 100644
--- a/src/lib/dns/python/tsig_rdata_python.cc
+++ b/src/lib/dns/python/tsig_rdata_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#define PY_SSIZE_T_CLEAN
#include <Python.h>
@@ -287,7 +287,7 @@ namespace python {
// This defines the complete type for reflection in python and
// parsing of PyObject* to s_TSIG
// Most of the functions are not actually implemented and NULL here.
-ISC_LIBDNS_PYTHON_API PyTypeObject tsig_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject tsig_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.TSIG",
sizeof(s_TSIG), // tp_basicsize
@@ -339,14 +339,14 @@ ISC_LIBDNS_PYTHON_API PyTypeObject tsig_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createTSIGObject(const any::TSIG& source) {
TSIGContainer container(PyObject_New(s_TSIG, &tsig_type));
container.set(new any::TSIG(source));
return (container.release());
}
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyTSIG_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -354,7 +354,7 @@ PyTSIG_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &tsig_type));
}
-ISC_LIBDNS_PYTHON_API const any::TSIG&
+B10_LIBDNS_PYTHON_API const any::TSIG&
PyTSIG_ToTSIG(const PyObject* tsig_obj) {
if (tsig_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/tsig_rdata_python.h b/src/lib/dns/python/tsig_rdata_python.h
index c90e114..8f02763 100644
--- a/src/lib/dns/python/tsig_rdata_python.h
+++ b/src/lib/dns/python/tsig_rdata_python.h
@@ -29,7 +29,7 @@ class TSIG;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyTypeObject tsig_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject tsig_type;
/// This is A simple shortcut to create a python TSIG object (in the
/// form of a pointer to PyObject) with minimal exception safety.
@@ -38,7 +38,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject tsig_type;
/// returns a NULL pointer).
/// This function is expected to be called with in a try block
/// followed by necessary setup for python exception.
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createTSIGObject(const rdata::any::TSIG& source);
/// \brief Checks if the given python object is a TSIG object
@@ -47,7 +47,7 @@ createTSIGObject(const rdata::any::TSIG& source);
///
/// \param obj The object to check the type of
/// \return true if the object is of type TSIG, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyTSIG_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyTSIG_Check(PyObject* obj);
/// \brief Returns a reference to the TSIG object contained within the given
/// Python object.
@@ -59,7 +59,7 @@ ISC_LIBDNS_PYTHON_API bool PyTSIG_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param tsig_obj The tsig object to convert
-ISC_LIBDNS_PYTHON_API const rdata::any::TSIG&
+B10_LIBDNS_PYTHON_API const rdata::any::TSIG&
PyTSIG_ToTSIG(const PyObject* tsig_obj);
} // namespace python
diff --git a/src/lib/dns/python/tsigerror_python.cc b/src/lib/dns/python/tsigerror_python.cc
index e842ff8..a1f55b3 100644
--- a/src/lib/dns/python/tsigerror_python.cc
+++ b/src/lib/dns/python/tsigerror_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
@@ -230,7 +230,7 @@ namespace python {
// This defines the complete type for reflection in python and
// parsing of PyObject* to s_TSIGError
// Most of the functions are not actually implemented and NULL here.
-ISC_LIBDNS_PYTHON_API PyTypeObject tsigerror_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject tsigerror_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.TSIGError",
sizeof(s_TSIGError), // tp_basicsize
@@ -282,7 +282,7 @@ ISC_LIBDNS_PYTHON_API PyTypeObject tsigerror_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createTSIGErrorObject(const TSIGError& source) {
TSIGErrorContainer container(PyObject_New(s_TSIGError, &tsigerror_type));
container.set(new TSIGError(source));
diff --git a/src/lib/dns/python/tsigerror_python.h b/src/lib/dns/python/tsigerror_python.h
index 3622d33..439e834 100644
--- a/src/lib/dns/python/tsigerror_python.h
+++ b/src/lib/dns/python/tsigerror_python.h
@@ -25,7 +25,7 @@ class TSIGError;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyTypeObject tsigerror_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject tsigerror_type;
/// This is A simple shortcut to create a python TSIGError object (in the
/// form of a pointer to PyObject) with minimal exception safety.
@@ -34,7 +34,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject tsigerror_type;
/// returns a NULL pointer).
/// This function is expected to be called with in a try block
/// followed by necessary setup for python exception.
-ISC_LIBDNS_PYTHON_API PyObject* createTSIGErrorObject(const TSIGError& source);
+B10_LIBDNS_PYTHON_API PyObject* createTSIGErrorObject(const TSIGError& source);
} // namespace python
} // namespace dns
diff --git a/src/lib/dns/python/tsigkey_python.cc b/src/lib/dns/python/tsigkey_python.cc
index f8b938d..78a8d80 100644
--- a/src/lib/dns/python/tsigkey_python.cc
+++ b/src/lib/dns/python/tsigkey_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
@@ -183,7 +183,7 @@ namespace python {
// This defines the complete type for reflection in python and
// parsing of PyObject* to s_EDNS
// Most of the functions are not actually implemented and NULL here.
-ISC_LIBDNS_PYTHON_API PyTypeObject tsigkey_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject tsigkey_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.TSIGKey",
sizeof(s_TSIGKey), // tp_basicsize
@@ -234,7 +234,7 @@ ISC_LIBDNS_PYTHON_API PyTypeObject tsigkey_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyTSIGKey_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -242,7 +242,7 @@ PyTSIGKey_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &tsigkey_type));
}
-ISC_LIBDNS_PYTHON_API const TSIGKey&
+B10_LIBDNS_PYTHON_API const TSIGKey&
PyTSIGKey_ToTSIGKey(const PyObject* tsigkey_obj) {
const s_TSIGKey* tsigkey = static_cast<const s_TSIGKey*>(tsigkey_obj);
return (*tsigkey->cppobj);
@@ -396,7 +396,7 @@ TSIGKeyRing_find(const s_TSIGKeyRing* self, PyObject* args) {
namespace isc {
namespace dns {
namespace python {
-ISC_LIBDNS_PYTHON_API PyTypeObject tsigkeyring_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject tsigkeyring_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.TSIGKeyRing",
sizeof(s_TSIGKeyRing), // tp_basicsize
@@ -446,7 +446,7 @@ ISC_LIBDNS_PYTHON_API PyTypeObject tsigkeyring_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyTSIGKeyRing_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -454,7 +454,7 @@ PyTSIGKeyRing_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &tsigkeyring_type));
}
-ISC_LIBDNS_PYTHON_API const TSIGKeyRing&
+B10_LIBDNS_PYTHON_API const TSIGKeyRing&
PyTSIGKeyRing_ToTSIGKeyRing(const PyObject* tsigkeyring_obj) {
if (tsigkeyring_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/tsigkey_python.h b/src/lib/dns/python/tsigkey_python.h
index b830b96..9d23046 100644
--- a/src/lib/dns/python/tsigkey_python.h
+++ b/src/lib/dns/python/tsigkey_python.h
@@ -26,8 +26,8 @@ class TSIGKeyRing;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyTypeObject tsigkey_type;
-extern ISC_LIBDNS_PYTHON_API PyTypeObject tsigkeyring_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject tsigkey_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject tsigkeyring_type;
/// \brief Checks if the given python object is a TSIGKey object
///
@@ -35,7 +35,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject tsigkeyring_type;
///
/// \param obj The object to check the type of
/// \return true if the object is of type TSIGKey, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyTSIGKey_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyTSIGKey_Check(PyObject* obj);
/// \brief Returns a reference to the TSIGKey object contained within the given
/// Python object.
@@ -47,14 +47,14 @@ ISC_LIBDNS_PYTHON_API bool PyTSIGKey_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param tsigkey_obj The tsigkey object to convert
-ISC_LIBDNS_PYTHON_API const TSIGKey&
+B10_LIBDNS_PYTHON_API const TSIGKey&
PyTSIGKey_ToTSIGKey(const PyObject* tsigkey_obj);
/// \brief Checks if the given python object is a TSIGKeyRing object
///
/// \param obj The object to check the type of
/// \return true if the object is of type TSIGKeyRing, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyTSIGKeyRing_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyTSIGKeyRing_Check(PyObject* obj);
/// \brief Returns a reference to the TSIGKeyRing object contained within the given
/// Python object.
@@ -66,7 +66,7 @@ ISC_LIBDNS_PYTHON_API bool PyTSIGKeyRing_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param tsigkeyring_obj The tsigkeyring object to convert
-ISC_LIBDNS_PYTHON_API const TSIGKeyRing&
+B10_LIBDNS_PYTHON_API const TSIGKeyRing&
PyTSIGKeyRing_ToTSIGKeyRing(const PyObject* tsigkeyring_obj);
} // namespace python
diff --git a/src/lib/dns/python/tsigrecord_python.cc b/src/lib/dns/python/tsigrecord_python.cc
index 84896b4..b3b7d09 100644
--- a/src/lib/dns/python/tsigrecord_python.cc
+++ b/src/lib/dns/python/tsigrecord_python.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_PYTHON_EXPORT
+#define B10_LIBDNS_PYTHON_EXPORT
#include <Python.h>
@@ -214,7 +214,7 @@ namespace python {
// This defines the complete type for reflection in python and
// parsing of PyObject* to s_TSIGRecord
// Most of the functions are not actually implemented and NULL here.
-ISC_LIBDNS_PYTHON_API PyTypeObject tsigrecord_type = {
+B10_LIBDNS_PYTHON_API PyTypeObject tsigrecord_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"pydnspp.TSIGRecord",
sizeof(s_TSIGRecord), // tp_basicsize
@@ -264,14 +264,14 @@ ISC_LIBDNS_PYTHON_API PyTypeObject tsigrecord_type = {
0 // tp_version_tag
};
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createTSIGRecordObject(const TSIGRecord& source) {
TSIGRecordContainer container(PyObject_New(s_TSIGRecord, &tsigrecord_type));
container.set(new TSIGRecord(source));
return (container.release());
}
-ISC_LIBDNS_PYTHON_API bool
+B10_LIBDNS_PYTHON_API bool
PyTSIGRecord_Check(PyObject* obj) {
if (obj == NULL) {
isc_throw(PyCPPWrapperException, "obj argument NULL in typecheck");
@@ -279,7 +279,7 @@ PyTSIGRecord_Check(PyObject* obj) {
return (PyObject_TypeCheck(obj, &tsigrecord_type));
}
-ISC_LIBDNS_PYTHON_API const TSIGRecord&
+B10_LIBDNS_PYTHON_API const TSIGRecord&
PyTSIGRecord_ToTSIGRecord(PyObject* tsigrecord_obj) {
if (tsigrecord_obj == NULL) {
isc_throw(PyCPPWrapperException,
diff --git a/src/lib/dns/python/tsigrecord_python.h b/src/lib/dns/python/tsigrecord_python.h
index c653812..c094ef6 100644
--- a/src/lib/dns/python/tsigrecord_python.h
+++ b/src/lib/dns/python/tsigrecord_python.h
@@ -26,7 +26,7 @@ class TSIGRecord;
namespace python {
-extern ISC_LIBDNS_PYTHON_API PyTypeObject tsigrecord_type;
+extern B10_LIBDNS_PYTHON_API PyTypeObject tsigrecord_type;
/// This is A simple shortcut to create a python TSIGRecord object (in the
/// form of a pointer to PyObject) with minimal exception safety.
@@ -35,7 +35,7 @@ extern ISC_LIBDNS_PYTHON_API PyTypeObject tsigrecord_type;
/// returns a NULL pointer).
/// This function is expected to be called with in a try block
/// followed by necessary setup for python exception.
-ISC_LIBDNS_PYTHON_API PyObject*
+B10_LIBDNS_PYTHON_API PyObject*
createTSIGRecordObject(const TSIGRecord& source);
/// \brief Checks if the given python object is a TSIGRecord object
@@ -44,7 +44,7 @@ createTSIGRecordObject(const TSIGRecord& source);
///
/// \param obj The object to check the type of
/// \return true if the object is of type TSIGRecord, false otherwise
-ISC_LIBDNS_PYTHON_API bool PyTSIGRecord_Check(PyObject* obj);
+B10_LIBDNS_PYTHON_API bool PyTSIGRecord_Check(PyObject* obj);
/// \brief Returns a reference to the TSIGRecord object contained within the given
/// Python object.
@@ -56,7 +56,7 @@ ISC_LIBDNS_PYTHON_API bool PyTSIGRecord_Check(PyObject* obj);
/// may be destroyed, the caller must copy it itself.
///
/// \param rrtype_obj The rrtype object to convert
-ISC_LIBDNS_PYTHON_API const TSIGRecord&
+B10_LIBDNS_PYTHON_API const TSIGRecord&
PyTSIGRecord_ToTSIGRecord(PyObject* tsigrecord_obj);
} // namespace python
diff --git a/src/lib/dns/question.cc b/src/lib/dns/question.cc
index 4789eaa..7df444c 100644
--- a/src/lib/dns/question.cc
+++ b/src/lib/dns/question.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <iostream>
#include <string>
@@ -75,7 +75,7 @@ Question::toWire(AbstractMessageRenderer& renderer) const {
return (1); // number of "entries"
}
-ISC_LIBDNS_API ostream&
+B10_LIBDNS_API ostream&
operator<<(std::ostream& os, const Question& question) {
os << question.toText();
return (os);
diff --git a/src/lib/dns/question.h b/src/lib/dns/question.h
index 813f333..f26a370 100644
--- a/src/lib/dns/question.h
+++ b/src/lib/dns/question.h
@@ -27,14 +27,14 @@
namespace isc {
namespace util {
-class ISC_LIBDNS_API InputBuffer;
-class ISC_LIBDNS_API OutputBuffer;
+class B10_LIBDNS_API InputBuffer;
+class B10_LIBDNS_API OutputBuffer;
}
namespace dns {
-class ISC_LIBDNS_API AbstractMessageRenderer;
-class ISC_LIBDNS_API Question;
+class B10_LIBDNS_API AbstractMessageRenderer;
+class B10_LIBDNS_API Question;
/// \brief A pointer-like type pointing to an \c Question object.
typedef boost::shared_ptr<Question> QuestionPtr;
@@ -101,7 +101,7 @@ typedef boost::shared_ptr<const Question> ConstQuestionPtr;
/// \c AbstractRRset such as \c %getName() or \c %toWire().
/// So the user class may use a template function that is applicable to both
/// \c Question and \c RRset to avoid writing duplicate code logic.
-class ISC_LIBDNS_API Question {
+class B10_LIBDNS_API Question {
///
/// \name Constructors and Destructor
///
@@ -286,7 +286,7 @@ private:
/// operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const Question& question);
} // end of namespace dns
} // end of namespace isc
diff --git a/src/lib/dns/rcode.cc b/src/lib/dns/rcode.cc
index de9b359..a4701cd 100644
--- a/src/lib/dns/rcode.cc
+++ b/src/lib/dns/rcode.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <string>
#include <sstream>
@@ -95,7 +95,7 @@ Rcode::toText() const {
return (oss.str());
}
-ISC_LIBDNS_API ostream&
+B10_LIBDNS_API ostream&
operator<<(std::ostream& os, const Rcode& rcode) {
return (os << rcode.toText());
}
diff --git a/src/lib/dns/rcode.h b/src/lib/dns/rcode.h
index e01e141..ef032e2 100644
--- a/src/lib/dns/rcode.h
+++ b/src/lib/dns/rcode.h
@@ -51,7 +51,7 @@ namespace dns {
/// to handle RCODEs through this class. In fact, public interfaces of
/// this library uses this class to pass or return RCODEs instead of the
/// bare code values.
-class ISC_LIBDNS_API Rcode {
+class B10_LIBDNS_API Rcode {
public:
/// Constants for pre-defined RCODE values.
enum CodeValue {
@@ -342,7 +342,7 @@ Rcode::BADVERS() {
/// \param rcode A reference to an \c Rcode object output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const Rcode& rcode);
}
}
diff --git a/src/lib/dns/rdata.cc b/src/lib/dns/rdata.cc
index 18d2640..6ab53a3 100644
--- a/src/lib/dns/rdata.cc
+++ b/src/lib/dns/rdata.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <algorithm>
#include <cctype>
@@ -46,7 +46,7 @@ namespace rdata {
// XXX: we need to specify std:: for string to help doxygen match the
// function signature with that given in the header file.
-ISC_LIBDNS_API RdataPtr
+B10_LIBDNS_API RdataPtr
createRdata(const RRType& rrtype, const RRClass& rrclass,
const std::string& rdata_string)
{
@@ -54,7 +54,7 @@ createRdata(const RRType& rrtype, const RRClass& rrclass,
rdata_string));
}
-ISC_LIBDNS_API RdataPtr
+B10_LIBDNS_API RdataPtr
createRdata(const RRType& rrtype, const RRClass& rrclass,
isc::util::InputBuffer& buffer, size_t len)
{
@@ -76,14 +76,14 @@ createRdata(const RRType& rrtype, const RRClass& rrclass,
return (rdata);
}
-ISC_LIBDNS_API RdataPtr
+B10_LIBDNS_API RdataPtr
createRdata(const RRType& rrtype, const RRClass& rrclass, const Rdata& source)
{
return (RRParamRegistry::getRegistry().createRdata(rrtype, rrclass,
source));
}
-ISC_LIBDNS_API int
+B10_LIBDNS_API int
compareNames(const Name& n1, const Name& n2) {
size_t len1 = n1.getLength();
size_t len2 = n2.getLength();
@@ -265,7 +265,7 @@ Generic::compare(const Rdata& other) const {
return (compare_internal(*impl_, *other_rdata.impl_));
}
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const Generic& rdata) {
return (os << rdata.toText());
}
diff --git a/src/lib/dns/rdata.h b/src/lib/dns/rdata.h
index 7a771f0..6abc72b 100644
--- a/src/lib/dns/rdata.h
+++ b/src/lib/dns/rdata.h
@@ -24,14 +24,14 @@
namespace isc {
namespace util {
-class ISC_LIBDNS_API InputBuffer;
-class ISC_LIBDNS_API OutputBuffer;
+class B10_LIBDNS_API InputBuffer;
+class B10_LIBDNS_API OutputBuffer;
}
namespace dns {
-class ISC_LIBDNS_API AbstractMessageRenderer;
-class ISC_LIBDNS_API RRType;
-class ISC_LIBDNS_API RRClass;
-class ISC_LIBDNS_API Name;
+class B10_LIBDNS_API AbstractMessageRenderer;
+class B10_LIBDNS_API RRType;
+class B10_LIBDNS_API RRClass;
+class B10_LIBDNS_API Name;
namespace rdata {
@@ -39,7 +39,7 @@ namespace rdata {
/// \brief A standard DNS module exception that is thrown if RDATA parser
/// encounters an invalid or inconsistent data length.
///
-class ISC_LIBDNS_API InvalidRdataLength : public Exception {
+class B10_LIBDNS_API InvalidRdataLength : public Exception {
public:
InvalidRdataLength(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -49,7 +49,7 @@ public:
/// \brief A standard DNS module exception that is thrown if RDATA parser
/// fails to recognize a given textual representation.
///
-class ISC_LIBDNS_API InvalidRdataText : public Exception {
+class B10_LIBDNS_API InvalidRdataText : public Exception {
public:
InvalidRdataText(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -60,14 +60,14 @@ public:
/// parser encounters a character-string (as defined in RFC1035) exceeding
/// the maximum allowable length (\c MAX_CHARSTRING_LEN).
///
-class ISC_LIBDNS_API CharStringTooLong : public Exception {
+class B10_LIBDNS_API CharStringTooLong : public Exception {
public:
CharStringTooLong(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
};
// Forward declaration to define RdataPtr.
-class ISC_LIBDNS_API Rdata;
+class B10_LIBDNS_API Rdata;
///
/// The \c RdataPtr type is a pointer-like type, pointing to an
@@ -125,7 +125,7 @@ const unsigned int MAX_CHARSTRING_LEN = 255;
/// specifically concerned about a particular type.
/// So, this API generally handles \c Rdata in a polymorphic way through
/// a pointer or reference to this base abstract class.
-class ISC_LIBDNS_API Rdata {
+class B10_LIBDNS_API Rdata {
///
/// \name Constructors and Destructor
///
@@ -236,7 +236,7 @@ struct GenericImpl;
/// This class is used as a placeholder for all non well-known type of RDATA.
/// By definition, the stored data is regarded as opaque binary without
/// assuming any structure.
-class ISC_LIBDNS_API Generic : public Rdata {
+class B10_LIBDNS_API Generic : public Rdata {
public:
///
/// \name Constructors, Assignment Operator and Destructor.
@@ -386,7 +386,7 @@ private:
/// \param rdata The \c Generic object output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const Generic& rdata);
} // end of namespace "generic"
@@ -432,7 +432,7 @@ operator<<(std::ostream& os, const Generic& rdata);
/// \param rdata_string A string of textual representation of the \c Rdata.
/// \return An \c RdataPtr object pointing to the created \c Rdata
/// object.
-ISC_LIBDNS_API
+B10_LIBDNS_API
RdataPtr createRdata(const RRType& rrtype, const RRClass& rrclass,
const std::string& rdata_string);
@@ -457,7 +457,7 @@ RdataPtr createRdata(const RRType& rrtype, const RRClass& rrclass,
/// \param len The length in buffer of the \c Rdata. In bytes.
/// \return An \c RdataPtr object pointing to the created \c Rdata
/// object.
-ISC_LIBDNS_API
+B10_LIBDNS_API
RdataPtr createRdata(const RRType& rrtype, const RRClass& rrclass,
isc::util::InputBuffer& buffer, size_t len);
@@ -474,7 +474,7 @@ RdataPtr createRdata(const RRType& rrtype, const RRClass& rrclass,
/// is to be copied to the created \c Rdata object.
/// \return An \c RdataPtr object pointing to the created
/// \c Rdata object.
-ISC_LIBDNS_API
+B10_LIBDNS_API
RdataPtr createRdata(const RRType& rrtype, const RRClass& rrclass,
const Rdata& source);
//@}
@@ -509,7 +509,7 @@ RdataPtr createRdata(const RRType& rrtype, const RRClass& rrclass,
/// \return 0 if \c n1 is identical to \c n2 in terms of sorting order.
/// \return 1 if \c n1 would be sorted after \c n2.
///
-ISC_LIBDNS_API int compareNames(const Name& n1, const Name& n2);
+B10_LIBDNS_API int compareNames(const Name& n1, const Name& n2);
} // end of namespace "rdata"
}
diff --git a/src/lib/dns/rdata/any_255/tsig_250.h b/src/lib/dns/rdata/any_255/tsig_250.h
index 6b93fcd..261c7e3 100644
--- a/src/lib/dns/rdata/any_255/tsig_250.h
+++ b/src/lib/dns/rdata/any_255/tsig_250.h
@@ -23,7 +23,7 @@
namespace isc {
namespace dns {
-class ISC_LIBDNS_API Name;
+class B10_LIBDNS_API Name;
}
}
@@ -40,7 +40,7 @@ class ISC_LIBDNS_API Name;
/// This class implements the basic interfaces inherited from the abstract
/// \c rdata::Rdata class, and provides trivial accessors specific to the
/// TSIG RDATA.
-class ISC_LIBDNS_API TSIG : public Rdata {
+class B10_LIBDNS_API TSIG : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/ch_3/a_1.h b/src/lib/dns/rdata/ch_3/a_1.h
index 15881d1..55ae81d 100644
--- a/src/lib/dns/rdata/ch_3/a_1.h
+++ b/src/lib/dns/rdata/ch_3/a_1.h
@@ -26,7 +26,7 @@
// BEGIN_RDATA_NAMESPACE
-class ISC_LIBDNS_API A : public Rdata {
+class B10_LIBDNS_API A : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/afsdb_18.h b/src/lib/dns/rdata/generic/afsdb_18.h
index 35778a9..45c7650 100644
--- a/src/lib/dns/rdata/generic/afsdb_18.h
+++ b/src/lib/dns/rdata/generic/afsdb_18.h
@@ -35,7 +35,7 @@
/// This class implements the basic interfaces inherited from the abstract
/// \c rdata::Rdata class, and provides trivial accessors specific to the
/// AFSDB RDATA.
-class ISC_LIBDNS_API AFSDB : public Rdata {
+class B10_LIBDNS_API AFSDB : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/cname_5.h b/src/lib/dns/rdata/generic/cname_5.h
index 09f6b67..bc605d0 100644
--- a/src/lib/dns/rdata/generic/cname_5.h
+++ b/src/lib/dns/rdata/generic/cname_5.h
@@ -27,7 +27,7 @@
// BEGIN_RDATA_NAMESPACE
-class ISC_LIBDNS_API CNAME : public Rdata {
+class B10_LIBDNS_API CNAME : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/detail/nsec3param_common.cc b/src/lib/dns/rdata/generic/detail/nsec3param_common.cc
index 35f1b71..17ae550 100644
--- a/src/lib/dns/rdata/generic/detail/nsec3param_common.cc
+++ b/src/lib/dns/rdata/generic/detail/nsec3param_common.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <exceptions/exceptions.h>
diff --git a/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc b/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc
index 1c84856..4c0b9e9 100644
--- a/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc
+++ b/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <exceptions/exceptions.h>
diff --git a/src/lib/dns/rdata/generic/dlv_32769.h b/src/lib/dns/rdata/generic/dlv_32769.h
index f9bb6a5..fecfefc 100644
--- a/src/lib/dns/rdata/generic/dlv_32769.h
+++ b/src/lib/dns/rdata/generic/dlv_32769.h
@@ -41,7 +41,7 @@ template <class Type, uint16_t typeCode> class DSLikeImpl;
/// This class implements the basic interfaces inherited from the abstract
/// \c rdata::Rdata class, and provides trivial accessors specific to the
/// DLV RDATA.
-class ISC_LIBDNS_API DLV : public Rdata {
+class B10_LIBDNS_API DLV : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/dname_39.h b/src/lib/dns/rdata/generic/dname_39.h
index 1de1d9f..cfa424d 100644
--- a/src/lib/dns/rdata/generic/dname_39.h
+++ b/src/lib/dns/rdata/generic/dname_39.h
@@ -27,7 +27,7 @@
// BEGIN_RDATA_NAMESPACE
-class ISC_LIBDNS_API DNAME : public Rdata {
+class B10_LIBDNS_API DNAME : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/dnskey_48.h b/src/lib/dns/rdata/generic/dnskey_48.h
index f431825..ec704f4 100644
--- a/src/lib/dns/rdata/generic/dnskey_48.h
+++ b/src/lib/dns/rdata/generic/dnskey_48.h
@@ -33,7 +33,7 @@
struct DNSKEYImpl;
-class ISC_LIBDNS_API DNSKEY : public Rdata {
+class B10_LIBDNS_API DNSKEY : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/ds_43.h b/src/lib/dns/rdata/generic/ds_43.h
index 06da2a9..3b8c15e 100644
--- a/src/lib/dns/rdata/generic/ds_43.h
+++ b/src/lib/dns/rdata/generic/ds_43.h
@@ -41,7 +41,7 @@ template <class Type, uint16_t typeCode> class DSLikeImpl;
/// This class implements the basic interfaces inherited from the abstract
/// \c rdata::Rdata class, and provides trivial accessors specific to the
/// DS RDATA.
-class ISC_LIBDNS_API DS : public Rdata {
+class B10_LIBDNS_API DS : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/hinfo_13.h b/src/lib/dns/rdata/generic/hinfo_13.h
index d2a7080..acecd28 100644
--- a/src/lib/dns/rdata/generic/hinfo_13.h
+++ b/src/lib/dns/rdata/generic/hinfo_13.h
@@ -35,7 +35,7 @@
/// This class implements the basic interfaces inherited from the
/// \c rdata::Rdata class, and provides accessors specific to the
/// HINFO rdata.
-class ISC_LIBDNS_API HINFO : public Rdata {
+class B10_LIBDNS_API HINFO : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/minfo_14.h b/src/lib/dns/rdata/generic/minfo_14.h
index f29850b..2c860c2 100644
--- a/src/lib/dns/rdata/generic/minfo_14.h
+++ b/src/lib/dns/rdata/generic/minfo_14.h
@@ -33,7 +33,7 @@
/// This class implements the basic interfaces inherited from the abstract
/// \c rdata::Rdata class, and provides trivial accessors specific to the
/// MINFO RDATA.
-class ISC_LIBDNS_API MINFO : public Rdata {
+class B10_LIBDNS_API MINFO : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/mx_15.h b/src/lib/dns/rdata/generic/mx_15.h
index 12b8b03..03291c4 100644
--- a/src/lib/dns/rdata/generic/mx_15.h
+++ b/src/lib/dns/rdata/generic/mx_15.h
@@ -29,7 +29,7 @@
// BEGIN_RDATA_NAMESPACE
-class ISC_LIBDNS_API MX : public Rdata {
+class B10_LIBDNS_API MX : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/naptr_35.h b/src/lib/dns/rdata/generic/naptr_35.h
index c999585..270c994 100644
--- a/src/lib/dns/rdata/generic/naptr_35.h
+++ b/src/lib/dns/rdata/generic/naptr_35.h
@@ -34,7 +34,7 @@
/// This class implements the basic interfaces inherited from the
/// \c rdata::Rdata class, and provides accessors specific to the
/// NAPTR rdata.
-class ISC_LIBDNS_API NAPTR : public Rdata {
+class B10_LIBDNS_API NAPTR : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/ns_2.h b/src/lib/dns/rdata/generic/ns_2.h
index fe84249..0b9fd7c 100644
--- a/src/lib/dns/rdata/generic/ns_2.h
+++ b/src/lib/dns/rdata/generic/ns_2.h
@@ -27,7 +27,7 @@
// BEGIN_RDATA_NAMESPACE
-class ISC_LIBDNS_API NS : public Rdata {
+class B10_LIBDNS_API NS : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/nsec3_50.h b/src/lib/dns/rdata/generic/nsec3_50.h
index 298ff4f..248d82f 100644
--- a/src/lib/dns/rdata/generic/nsec3_50.h
+++ b/src/lib/dns/rdata/generic/nsec3_50.h
@@ -34,7 +34,7 @@
struct NSEC3Impl;
-class ISC_LIBDNS_API NSEC3 : public Rdata {
+class B10_LIBDNS_API NSEC3 : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/nsec3param_51.h b/src/lib/dns/rdata/generic/nsec3param_51.h
index 171e285..8b6cd7b 100644
--- a/src/lib/dns/rdata/generic/nsec3param_51.h
+++ b/src/lib/dns/rdata/generic/nsec3param_51.h
@@ -34,7 +34,7 @@
struct NSEC3PARAMImpl;
-class ISC_LIBDNS_API NSEC3PARAM : public Rdata {
+class B10_LIBDNS_API NSEC3PARAM : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/nsec_47.h b/src/lib/dns/rdata/generic/nsec_47.h
index 68cc749..a4c434e 100644
--- a/src/lib/dns/rdata/generic/nsec_47.h
+++ b/src/lib/dns/rdata/generic/nsec_47.h
@@ -33,7 +33,7 @@
struct NSECImpl;
-class ISC_LIBDNS_API NSEC : public Rdata {
+class B10_LIBDNS_API NSEC : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/opt_41.h b/src/lib/dns/rdata/generic/opt_41.h
index c231c89..8881e3c 100644
--- a/src/lib/dns/rdata/generic/opt_41.h
+++ b/src/lib/dns/rdata/generic/opt_41.h
@@ -26,7 +26,7 @@
// BEGIN_RDATA_NAMESPACE
-class ISC_LIBDNS_API OPT : public Rdata {
+class B10_LIBDNS_API OPT : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/ptr_12.h b/src/lib/dns/rdata/generic/ptr_12.h
index 41b451d..51a23f2 100644
--- a/src/lib/dns/rdata/generic/ptr_12.h
+++ b/src/lib/dns/rdata/generic/ptr_12.h
@@ -27,7 +27,7 @@
// BEGIN_RDATA_NAMESPACE
-class ISC_LIBDNS_API PTR : public Rdata {
+class B10_LIBDNS_API PTR : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/rp_17.h b/src/lib/dns/rdata/generic/rp_17.h
index 6bdfc18..db752a8 100644
--- a/src/lib/dns/rdata/generic/rp_17.h
+++ b/src/lib/dns/rdata/generic/rp_17.h
@@ -33,7 +33,7 @@
/// This class implements the basic interfaces inherited from the abstract
/// \c rdata::Rdata class, and provides trivial accessors specific to the
/// RP RDATA.
-class ISC_LIBDNS_API RP : public Rdata {
+class B10_LIBDNS_API RP : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/rrsig_46.h b/src/lib/dns/rdata/generic/rrsig_46.h
index 9d12054..675006b 100644
--- a/src/lib/dns/rdata/generic/rrsig_46.h
+++ b/src/lib/dns/rdata/generic/rrsig_46.h
@@ -33,7 +33,7 @@
struct RRSIGImpl;
-class ISC_LIBDNS_API RRSIG : public Rdata {
+class B10_LIBDNS_API RRSIG : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/soa_6.h b/src/lib/dns/rdata/generic/soa_6.h
index b74cce8..0206844 100644
--- a/src/lib/dns/rdata/generic/soa_6.h
+++ b/src/lib/dns/rdata/generic/soa_6.h
@@ -28,7 +28,7 @@
// BEGIN_RDATA_NAMESPACE
-class ISC_LIBDNS_API SOA : public Rdata {
+class B10_LIBDNS_API SOA : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/spf_99.h b/src/lib/dns/rdata/generic/spf_99.h
index 096131a..c692b7d 100644
--- a/src/lib/dns/rdata/generic/spf_99.h
+++ b/src/lib/dns/rdata/generic/spf_99.h
@@ -37,7 +37,7 @@ template<class Type, uint16_t typeCode> class TXTLikeImpl;
/// This class implements the basic interfaces inherited from the abstract
/// \c rdata::Rdata class. The semantics of the class is provided by
/// a copy of instantiated TXTLikeImpl class common to both TXT and SPF.
-class ISC_LIBDNS_API SPF : public Rdata {
+class B10_LIBDNS_API SPF : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/sshfp_44.h b/src/lib/dns/rdata/generic/sshfp_44.h
index d6134b7..dd04b22 100644
--- a/src/lib/dns/rdata/generic/sshfp_44.h
+++ b/src/lib/dns/rdata/generic/sshfp_44.h
@@ -29,7 +29,7 @@
// BEGIN_RDATA_NAMESPACE
-class ISC_LIBDNS_API SSHFP : public Rdata {
+class B10_LIBDNS_API SSHFP : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/generic/txt_16.h b/src/lib/dns/rdata/generic/txt_16.h
index a59354d..117f33b 100644
--- a/src/lib/dns/rdata/generic/txt_16.h
+++ b/src/lib/dns/rdata/generic/txt_16.h
@@ -31,7 +31,7 @@
template<class Type, uint16_t typeCode> class TXTLikeImpl;
-class ISC_LIBDNS_API TXT : public Rdata {
+class B10_LIBDNS_API TXT : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/hs_4/a_1.h b/src/lib/dns/rdata/hs_4/a_1.h
index 15881d1..55ae81d 100644
--- a/src/lib/dns/rdata/hs_4/a_1.h
+++ b/src/lib/dns/rdata/hs_4/a_1.h
@@ -26,7 +26,7 @@
// BEGIN_RDATA_NAMESPACE
-class ISC_LIBDNS_API A : public Rdata {
+class B10_LIBDNS_API A : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/in_1/a_1.h b/src/lib/dns/rdata/in_1/a_1.h
index 347a668..cf8f437 100644
--- a/src/lib/dns/rdata/in_1/a_1.h
+++ b/src/lib/dns/rdata/in_1/a_1.h
@@ -26,7 +26,7 @@
// BEGIN_RDATA_NAMESPACE
-class ISC_LIBDNS_API A : public Rdata {
+class B10_LIBDNS_API A : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/in_1/aaaa_28.h b/src/lib/dns/rdata/in_1/aaaa_28.h
index 975964a..91df916 100644
--- a/src/lib/dns/rdata/in_1/aaaa_28.h
+++ b/src/lib/dns/rdata/in_1/aaaa_28.h
@@ -28,7 +28,7 @@
// BEGIN_RDATA_NAMESPACE
-class ISC_LIBDNS_API AAAA : public Rdata {
+class B10_LIBDNS_API AAAA : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/in_1/dhcid_49.h b/src/lib/dns/rdata/in_1/dhcid_49.h
index b90991d..47f9df2 100644
--- a/src/lib/dns/rdata/in_1/dhcid_49.h
+++ b/src/lib/dns/rdata/in_1/dhcid_49.h
@@ -33,7 +33,7 @@
/// This class implements the basic interfaces inherited from the abstract
/// \c rdata::Rdata class, and provides trivial accessors specific to the
/// DHCID RDATA.
-class ISC_LIBDNS_API DHCID : public Rdata {
+class B10_LIBDNS_API DHCID : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/in_1/srv_33.h b/src/lib/dns/rdata/in_1/srv_33.h
index 7639154..1a78cea 100644
--- a/src/lib/dns/rdata/in_1/srv_33.h
+++ b/src/lib/dns/rdata/in_1/srv_33.h
@@ -35,7 +35,7 @@ struct SRVImpl;
/// This class implements the basic interfaces inherited from the abstract
/// \c rdata::Rdata class, and provides trivial accessors specific to the
/// SRV RDATA.
-class ISC_LIBDNS_API SRV : public Rdata {
+class B10_LIBDNS_API SRV : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// END_COMMON_MEMBERS
diff --git a/src/lib/dns/rdata/template.h b/src/lib/dns/rdata/template.h
index 5ee9453..f30d8ba 100644
--- a/src/lib/dns/rdata/template.h
+++ b/src/lib/dns/rdata/template.h
@@ -41,7 +41,7 @@
// These are markers used by a script for auto-generating build-able source
// files.
-class ISC_LIBDNS_API MyType : public Rdata {
+class B10_LIBDNS_API MyType : public Rdata {
public:
// BEGIN_COMMON_MEMBERS
// Do not remove the BEGIN_xxx and END_xxx comment lines.
diff --git a/src/lib/dns/rdatafields.cc b/src/lib/dns/rdatafields.cc
index 030cec6..a2a5a0e 100644
--- a/src/lib/dns/rdatafields.cc
+++ b/src/lib/dns/rdatafields.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <stdint.h>
diff --git a/src/lib/dns/rdatafields.h b/src/lib/dns/rdatafields.h
index b4a7aef..fc4e724 100644
--- a/src/lib/dns/rdatafields.h
+++ b/src/lib/dns/rdatafields.h
@@ -23,13 +23,13 @@
namespace isc {
namespace util {
-class ISC_LIBDNS_API OutputBuffer;
+class B10_LIBDNS_API OutputBuffer;
}
namespace dns {
-class ISC_LIBDNS_API AbstractMessageRenderer;
+class B10_LIBDNS_API AbstractMessageRenderer;
namespace rdata {
-class ISC_LIBDNS_API Rdata;
+class B10_LIBDNS_API Rdata;
/// A low-level, RR type-independent representation of DNS RDATA.
///
@@ -158,7 +158,7 @@ getFieldSpecData()-> { compressible name { compressible name { other data
/// future version. One possibility is to store offset information as well
/// as the name data (at the cost of increasing memory footprint), and
/// to use the pair of data for faster rendering.
-class ISC_LIBDNS_API RdataFields {
+class B10_LIBDNS_API RdataFields {
public:
/// Types of \c RdataFields fields.
///
diff --git a/src/lib/dns/rrclass-placeholder.h b/src/lib/dns/rrclass-placeholder.h
index e1b04d2..c0ad81a 100644
--- a/src/lib/dns/rrclass-placeholder.h
+++ b/src/lib/dns/rrclass-placeholder.h
@@ -29,20 +29,20 @@
namespace isc {
namespace util {
-class ISC_LIBDNS_API InputBuffer;
-class ISC_LIBDNS_API OutputBuffer;
+class B10_LIBDNS_API InputBuffer;
+class B10_LIBDNS_API OutputBuffer;
}
namespace dns {
// forward declarations
-class ISC_LIBDNS_API AbstractMessageRenderer;
+class B10_LIBDNS_API AbstractMessageRenderer;
///
/// \brief A standard DNS module exception that is thrown if an RRClass object
/// is being constructed from an unrecognized string.
///
-class ISC_LIBDNS_API InvalidRRClass : public Exception {
+class B10_LIBDNS_API InvalidRRClass : public Exception {
public:
InvalidRRClass(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -52,7 +52,7 @@ public:
/// \brief A standard DNS module exception that is thrown if an RRClass object
/// is being constructed from a incomplete (too short) wire-format data.
///
-class ISC_LIBDNS_API IncompleteRRClass : public Exception {
+class B10_LIBDNS_API IncompleteRRClass : public Exception {
public:
IncompleteRRClass(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -92,7 +92,7 @@ public:
/// the proxy function.
///
/// Note to developers: same note as \c RRType applies.
-class ISC_LIBDNS_API RRClass {
+class B10_LIBDNS_API RRClass {
public:
///
/// \name Constructors and Destructor
@@ -284,7 +284,7 @@ RRClass::NONE() {
/// \param rrclass The \c RRClass object output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const RRClass& rrclass);
}
}
diff --git a/src/lib/dns/rrclass.cc b/src/lib/dns/rrclass.cc
index 49192f0..82e85a4 100644
--- a/src/lib/dns/rrclass.cc
+++ b/src/lib/dns/rrclass.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <stdint.h>
@@ -58,7 +58,7 @@ RRClass::toWire(AbstractMessageRenderer& renderer) const {
renderer.writeUint16(classcode_);
}
-ISC_LIBDNS_API ostream&
+B10_LIBDNS_API ostream&
operator<<(ostream& os, const RRClass& rrclass) {
os << rrclass.toText();
return (os);
diff --git a/src/lib/dns/rrparamregistry-placeholder.cc b/src/lib/dns/rrparamregistry-placeholder.cc
index acb07c1..76ebeba 100644
--- a/src/lib/dns/rrparamregistry-placeholder.cc
+++ b/src/lib/dns/rrparamregistry-placeholder.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <cassert>
#include <algorithm>
diff --git a/src/lib/dns/rrparamregistry.h b/src/lib/dns/rrparamregistry.h
index 4468798..f50520c 100644
--- a/src/lib/dns/rrparamregistry.h
+++ b/src/lib/dns/rrparamregistry.h
@@ -36,7 +36,7 @@ struct RRParamRegistryImpl;
/// \brief A standard DNS module exception that is thrown if a new RR type is
/// being registered with a different type string.
///
-class ISC_LIBDNS_API RRTypeExists : public Exception {
+class B10_LIBDNS_API RRTypeExists : public Exception {
public:
RRTypeExists(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -46,7 +46,7 @@ public:
/// \brief A standard DNS module exception that is thrown if a new RR class is
/// being registered with a different type string.
///
-class ISC_LIBDNS_API RRClassExists : public Exception {
+class B10_LIBDNS_API RRClassExists : public Exception {
public:
RRClassExists(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -63,7 +63,7 @@ namespace rdata {
/// For other users of this API normally do not have to care about this class
/// or its derived classes; this class is generally intended to be used
/// as an internal utility of the API implementation.
-class ISC_LIBDNS_API AbstractRdataFactory {
+class B10_LIBDNS_API AbstractRdataFactory {
///
/// \name Constructors and Destructor
///
@@ -167,7 +167,7 @@ typedef boost::shared_ptr<AbstractRdataFactory> RdataFactoryPtr;
/// Note: the implementation of this class is incomplete: we should at least
/// add RDATA related parameters. This will be done in a near future version,
/// at which point some of method signatures will be changed.
-class ISC_LIBDNS_API RRParamRegistry {
+class B10_LIBDNS_API RRParamRegistry {
///
/// \name Constructors and Destructor
///
diff --git a/src/lib/dns/rrset.cc b/src/lib/dns/rrset.cc
index df2279a..43b5883 100644
--- a/src/lib/dns/rrset.cc
+++ b/src/lib/dns/rrset.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <algorithm>
#include <string>
@@ -149,7 +149,7 @@ AbstractRRset::isSameKind(const AbstractRRset& other) const {
getClass() == other.getClass());
}
-ISC_LIBDNS_API ostream&
+B10_LIBDNS_API ostream&
operator<<(ostream& os, const AbstractRRset& rrset) {
os << rrset.toText();
return (os);
diff --git a/src/lib/dns/rrset.h b/src/lib/dns/rrset.h
index ae275cb..9146202 100644
--- a/src/lib/dns/rrset.h
+++ b/src/lib/dns/rrset.h
@@ -28,7 +28,7 @@
namespace isc {
namespace util {
-class ISC_LIBDNS_API OututBuffer;
+class B10_LIBDNS_API OututBuffer;
}
namespace dns {
@@ -37,23 +37,23 @@ namespace dns {
/// \brief A standard DNS module exception that is thrown if an RRset object
/// does not contain any RDATA where required.
///
-class ISC_LIBDNS_API EmptyRRset : public Exception {
+class B10_LIBDNS_API EmptyRRset : public Exception {
public:
EmptyRRset(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
};
// forward declarations
-class ISC_LIBDNS_API Name;
-class ISC_LIBDNS_API RRType;
-class ISC_LIBDNS_API RRClass;
-class ISC_LIBDNS_API RRTTL;
-class ISC_LIBDNS_API AbstractMessageRenderer;
-class ISC_LIBDNS_API AbstractRRset;
-class ISC_LIBDNS_API BasicRRset;
-class ISC_LIBDNS_API RdataIterator;
+class B10_LIBDNS_API Name;
+class B10_LIBDNS_API RRType;
+class B10_LIBDNS_API RRClass;
+class B10_LIBDNS_API RRTTL;
+class B10_LIBDNS_API AbstractMessageRenderer;
+class B10_LIBDNS_API AbstractRRset;
+class B10_LIBDNS_API BasicRRset;
+class B10_LIBDNS_API RdataIterator;
class BasicRRsetImpl;
-class ISC_LIBDNS_API RRset;
+class B10_LIBDNS_API RRset;
/// \brief A pointer-like type pointing to an \c RRset object.
///
@@ -160,7 +160,7 @@ typedef boost::shared_ptr<RdataIterator> RdataIteratorPtr;
/// monolithic.)
/// - Do we need to allow the user to remove specific Rdata?
/// Probably not, according to the current usage of the BIND9 code.
-class ISC_LIBDNS_API AbstractRRset {
+class B10_LIBDNS_API AbstractRRset {
///
/// \name Constructors and Destructor
///
@@ -524,7 +524,7 @@ public:
/// Most applications will simply go through the RDATA objects contained in
/// an RRset, examining (and possibly using) each object, as one path
/// operation.
-class ISC_LIBDNS_API RdataIterator {
+class B10_LIBDNS_API RdataIterator {
///
/// \name Constructors and Destructor
///
@@ -595,7 +595,7 @@ public:
/// Highly performance-sensitive applications, such as a large scale
/// authoritative or caching name servers will implement and use a customized
/// version of derived \c AbstractRRset class.
-class ISC_LIBDNS_API BasicRRset : public AbstractRRset {
+class B10_LIBDNS_API BasicRRset : public AbstractRRset {
///
/// \name Constructors and Destructor
///
@@ -804,7 +804,7 @@ private:
/// containing associated RRSIG records. This allows DNSSEC aware
/// applications to treat data associated with a particular
/// QNAME/QTYPE/QCLASS as a single object.
-class ISC_LIBDNS_API RRset : public BasicRRset {
+class B10_LIBDNS_API RRset : public BasicRRset {
public:
RRset(const Name& name, const RRClass& rrclass,
const RRType& rrtype, const RRTTL& ttl);
@@ -888,7 +888,7 @@ private:
/// output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const AbstractRRset& rrset);
} // end of namespace dns
} // end of namespace isc
diff --git a/src/lib/dns/rrsetlist.cc b/src/lib/dns/rrsetlist.cc
index 927f24c..6bc7ae2 100644
--- a/src/lib/dns/rrsetlist.cc
+++ b/src/lib/dns/rrsetlist.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <vector>
diff --git a/src/lib/dns/rrsetlist.h b/src/lib/dns/rrsetlist.h
index 6e5f64a..5e2ac20 100644
--- a/src/lib/dns/rrsetlist.h
+++ b/src/lib/dns/rrsetlist.h
@@ -29,7 +29,7 @@
namespace isc {
namespace dns {
-class ISC_LIBDNS_API DuplicateRRset : public Exception {
+class B10_LIBDNS_API DuplicateRRset : public Exception {
public:
DuplicateRRset(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -95,7 +95,7 @@ private:
/// reason and is actually quite specific to a particular need for libdatasrc.
/// If you are tempted to use it, think twice to assess if this class
/// is really what you want. Again, in many cases the answer will be no.
-class ISC_LIBDNS_API RRsetList {
+class B10_LIBDNS_API RRsetList {
private:
RRsetList(const RRsetList& source);
RRsetList& operator=(const RRsetList& source);
diff --git a/src/lib/dns/rrttl.cc b/src/lib/dns/rrttl.cc
index e89adc7..5791e21 100644
--- a/src/lib/dns/rrttl.cc
+++ b/src/lib/dns/rrttl.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <stdint.h>
@@ -69,7 +69,7 @@ RRTTL::toWire(AbstractMessageRenderer& renderer) const {
renderer.writeUint32(ttlval_);
}
-ISC_LIBDNS_API ostream&
+B10_LIBDNS_API ostream&
operator<<(ostream& os, const RRTTL& rrttl) {
os << rrttl.toText();
return (os);
diff --git a/src/lib/dns/rrttl.h b/src/lib/dns/rrttl.h
index 386ba7e..7a0b592 100644
--- a/src/lib/dns/rrttl.h
+++ b/src/lib/dns/rrttl.h
@@ -22,20 +22,20 @@
namespace isc {
namespace util {
-class ISC_LIBDNS_API InputBuffer;
-class ISC_LIBDNS_API OutputBuffer;
+class B10_LIBDNS_API InputBuffer;
+class B10_LIBDNS_API OutputBuffer;
}
namespace dns {
// forward declarations
-class ISC_LIBDNS_API AbstractMessageRenderer;
+class B10_LIBDNS_API AbstractMessageRenderer;
///
/// \brief A standard DNS module exception that is thrown if an RRTTL object
/// is being constructed from an unrecognized string.
///
-class ISC_LIBDNS_API InvalidRRTTL : public Exception {
+class B10_LIBDNS_API InvalidRRTTL : public Exception {
public:
InvalidRRTTL(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -45,7 +45,7 @@ public:
/// \brief A standard DNS module exception that is thrown if an RRTTL object
/// is being constructed from a incomplete (too short) wire-format data.
///
-class ISC_LIBDNS_API IncompleteRRTTL : public Exception {
+class B10_LIBDNS_API IncompleteRRTTL : public Exception {
public:
IncompleteRRTTL(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -59,7 +59,7 @@ public:
/// of this class is to provide convenient interfaces to convert a textual
/// representation into the integer TTL value and vice versa, and to handle
/// wire-format representations.
-class ISC_LIBDNS_API RRTTL {
+class B10_LIBDNS_API RRTTL {
public:
///
/// \name Constructors and Destructor
@@ -252,7 +252,7 @@ private:
/// \param rrttl The \c RRTTL object output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const RRTTL& rrttl);
}
}
diff --git a/src/lib/dns/rrtype-placeholder.h b/src/lib/dns/rrtype-placeholder.h
index e437cad..ace590f 100644
--- a/src/lib/dns/rrtype-placeholder.h
+++ b/src/lib/dns/rrtype-placeholder.h
@@ -30,20 +30,20 @@
namespace isc {
namespace util {
-class ISC_LIBDNS_API InputBuffer;
-class ISC_LIBDNS_API OutputBuffer;
+class B10_LIBDNS_API InputBuffer;
+class B10_LIBDNS_API OutputBuffer;
}
namespace dns {
// forward declarations
-class ISC_LIBDNS_API AbstractMessageRenderer;
+class B10_LIBDNS_API AbstractMessageRenderer;
///
/// \brief A standard DNS module exception that is thrown if an RRType object
/// is being constructed from an unrecognized string.
///
-class ISC_LIBDNS_API InvalidRRType : public Exception {
+class B10_LIBDNS_API InvalidRRType : public Exception {
public:
InvalidRRType(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -53,7 +53,7 @@ public:
/// \brief A standard DNS module exception that is thrown if an RRType object
/// is being constructed from a incomplete (too short) wire-format data.
///
-class ISC_LIBDNS_API IncompleteRRType : public Exception {
+class B10_LIBDNS_API IncompleteRRType : public Exception {
public:
IncompleteRRType(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -105,7 +105,7 @@ public:
/// this assumption, but if we encounter memory bloat due to this problem with
/// particular compilers we need to revisit the design or think about
/// workaround.
-class ISC_LIBDNS_API RRType {
+class B10_LIBDNS_API RRType {
public:
///
/// \name Constructors and Destructor
@@ -314,7 +314,7 @@ RRType::ANY() {
/// \param rrtype The \c RRType object output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const RRType& rrtype);
}
}
diff --git a/src/lib/dns/rrtype.cc b/src/lib/dns/rrtype.cc
index dc856a9..016c188 100644
--- a/src/lib/dns/rrtype.cc
+++ b/src/lib/dns/rrtype.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <stdint.h>
@@ -59,7 +59,7 @@ RRType::toWire(AbstractMessageRenderer& renderer) const {
renderer.writeUint16(typecode_);
}
-ISC_LIBDNS_API ostream&
+B10_LIBDNS_API ostream&
operator<<(ostream& os, const RRType& rrtype) {
os << rrtype.toText();
return (os);
diff --git a/src/lib/dns/serial.cc b/src/lib/dns/serial.cc
index cca3d38..5e5ed16 100644
--- a/src/lib/dns/serial.cc
+++ b/src/lib/dns/serial.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <dns/serial.h>
@@ -68,7 +68,7 @@ Serial::operator+(const Serial& other) const {
return (operator+(other.getValue()));
}
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const Serial& serial) {
return (os << serial.getValue());
}
diff --git a/src/lib/dns/serial.h b/src/lib/dns/serial.h
index 34ce2bf..b5c9b77 100644
--- a/src/lib/dns/serial.h
+++ b/src/lib/dns/serial.h
@@ -48,7 +48,7 @@ const uint64_t MAX_SERIAL_VALUE = 4294967296ull;
/// \note RFC 1982 defines everything based on the value SERIAL_BITS. Since
/// the serial number has a fixed length of 32 bits, the values we use are
/// hard-coded, and not computed based on variable bit lengths.
-class ISC_LIBDNS_API Serial {
+class B10_LIBDNS_API Serial {
public:
/// \brief Constructor with value
///
@@ -149,7 +149,7 @@ private:
/// \param os The ostream to write to
/// \param serial The Serial to write
/// \return the output stream
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const Serial& serial);
} // end namespace dns
diff --git a/src/lib/dns/tests/message_unittest.cc b/src/lib/dns/tests/message_unittest.cc
index 7ca4e2f..8b6a6a5 100644
--- a/src/lib/dns/tests/message_unittest.cc
+++ b/src/lib/dns/tests/message_unittest.cc
@@ -68,7 +68,7 @@ const uint16_t Message::DEFAULT_MAX_UDPSIZE;
namespace isc {
namespace util {
namespace detail {
-extern ISC_LIBDNS_API int64_t (*gettimeFunction)();
+extern B10_LIBDNS_API int64_t (*gettimeFunction)();
}
}
}
diff --git a/src/lib/dns/tests/tsig_unittest.cc b/src/lib/dns/tests/tsig_unittest.cc
index 2bd4f93..a736d0b 100644
--- a/src/lib/dns/tests/tsig_unittest.cc
+++ b/src/lib/dns/tests/tsig_unittest.cc
@@ -53,7 +53,7 @@ using isc::UnitTestUtil;
namespace isc {
namespace util {
namespace detail {
-extern ISC_LIBDNS_API int64_t (*gettimeFunction)();
+extern B10_LIBDNS_API int64_t (*gettimeFunction)();
}
}
}
diff --git a/src/lib/dns/tsig.cc b/src/lib/dns/tsig.cc
index b66772d..ba7ee0c 100644
--- a/src/lib/dns/tsig.cc
+++ b/src/lib/dns/tsig.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <config.h>
diff --git a/src/lib/dns/tsig.h b/src/lib/dns/tsig.h
index 0d8b187..a712531 100644
--- a/src/lib/dns/tsig.h
+++ b/src/lib/dns/tsig.h
@@ -33,7 +33,7 @@ namespace dns {
/// Note that this exception is not thrown for TSIG protocol errors such as
/// verification failures. In general, this exception indicates an internal
/// program bug.
-class ISC_LIBDNS_API TSIGContextError : public isc::Exception {
+class B10_LIBDNS_API TSIGContextError : public isc::Exception {
public:
TSIGContextError(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -173,7 +173,7 @@ public:
/// direct or indirect dependencies. The interface of \c sign() that takes
/// opaque data (instead of, e.g., a \c Message or \c MessageRenderer object)
/// is therefore a deliberate design decision.
-class ISC_LIBDNS_API TSIGContext : boost::noncopyable {
+class B10_LIBDNS_API TSIGContext : boost::noncopyable {
public:
/// Internal state of context
///
diff --git a/src/lib/dns/tsigerror.cc b/src/lib/dns/tsigerror.cc
index 238688c..367e589 100644
--- a/src/lib/dns/tsigerror.cc
+++ b/src/lib/dns/tsigerror.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <ostream>
#include <string>
@@ -62,7 +62,7 @@ TSIGError::toRcode() const {
return (Rcode::NOTAUTH());
}
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const TSIGError& error) {
return (os << error.toText());
}
diff --git a/src/lib/dns/tsigerror.h b/src/lib/dns/tsigerror.h
index 50b7f4c..a2564e9 100644
--- a/src/lib/dns/tsigerror.h
+++ b/src/lib/dns/tsigerror.h
@@ -28,7 +28,7 @@ namespace dns {
/// The \c TSIGError class objects represent standard errors related to
/// TSIG protocol operations as defined in related specifications, mainly
/// in RFC2845.
-class ISC_LIBDNS_API TSIGError {
+class B10_LIBDNS_API TSIGError {
public:
/// Constants for pre-defined TSIG error values.
///
@@ -328,7 +328,7 @@ TSIGError::BAD_TIME() {
/// \param tsig_error An \c TSIGError object output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const TSIGError& tsig_error);
}
}
diff --git a/src/lib/dns/tsigkey.cc b/src/lib/dns/tsigkey.cc
index 1e96ca4..a738ae0 100644
--- a/src/lib/dns/tsigkey.cc
+++ b/src/lib/dns/tsigkey.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <map>
#include <utility>
diff --git a/src/lib/dns/tsigkey.h b/src/lib/dns/tsigkey.h
index 6bd687f..ed00065 100644
--- a/src/lib/dns/tsigkey.h
+++ b/src/lib/dns/tsigkey.h
@@ -21,7 +21,7 @@
namespace isc {
namespace dns {
-class ISC_LIBDNS_API Name;
+class B10_LIBDNS_API Name;
/// \brief TSIG key.
///
@@ -61,7 +61,7 @@ class ISC_LIBDNS_API Name;
/// remember the actual domain names defined in the protocol specification.
/// We may also have to add conversion routines between domain names
/// and more intuitive representations (e.g. strings) for algorithms.
-class ISC_LIBDNS_API TSIGKey {
+class B10_LIBDNS_API TSIGKey {
public:
///
/// \name Constructors, Assignment Operator and Destructor.
@@ -235,7 +235,7 @@ private:
/// in different DNS transactions).
/// If this assumption does not hold and memory consumption becomes an issue
/// we may have to revisit the design.
-class ISC_LIBDNS_API TSIGKeyRing {
+class B10_LIBDNS_API TSIGKeyRing {
public:
/// Result codes of various public methods of \c TSIGKeyRing
enum Result {
diff --git a/src/lib/dns/tsigrecord.cc b/src/lib/dns/tsigrecord.cc
index 101202a..b534e98 100644
--- a/src/lib/dns/tsigrecord.cc
+++ b/src/lib/dns/tsigrecord.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBDNS_EXPORT
+#define B10_LIBDNS_EXPORT
#include <ostream>
#include <string>
@@ -141,7 +141,7 @@ TSIGRecord::toText() const {
rdata_.toText() + "\n");
}
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const TSIGRecord& record) {
return (os << record.toText());
}
diff --git a/src/lib/dns/tsigrecord.h b/src/lib/dns/tsigrecord.h
index 31ad413..991fc42 100644
--- a/src/lib/dns/tsigrecord.h
+++ b/src/lib/dns/tsigrecord.h
@@ -28,10 +28,10 @@
namespace isc {
namespace util {
-class ISC_LIBDNS_API OutputBuffer;
+class B10_LIBDNS_API OutputBuffer;
}
namespace dns {
-class ISC_LIBDNS_API AbstractMessageRenderer;
+class B10_LIBDNS_API AbstractMessageRenderer;
/// TSIG resource record.
///
@@ -60,7 +60,7 @@ class ISC_LIBDNS_API AbstractMessageRenderer;
/// handle it through a generic interface in a polymorphic way.
/// We therefore chose to define it as a separate class. This is also
/// similar to why \c EDNS is a separate class.
-class ISC_LIBDNS_API TSIGRecord {
+class B10_LIBDNS_API TSIGRecord {
public:
///
/// \name Constructors
@@ -298,7 +298,7 @@ typedef boost::shared_ptr<const TSIGRecord> ConstTSIGRecordPtr;
/// \param record A \c TSIGRecord object output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBDNS_API std::ostream&
+B10_LIBDNS_API std::ostream&
operator<<(std::ostream& os, const TSIGRecord& record);
}
}
diff --git a/src/lib/log/dll.h b/src/lib/log/dll.h
index 7b99393..512c339 100644
--- a/src/lib/log/dll.h
+++ b/src/lib/log/dll.h
@@ -16,12 +16,12 @@
#define __LIBLOG_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBLOG_API
+#define B10_LIBLOG_API
#else
-#ifdef ISC_LIBLOG_EXPORT
-#define ISC_LIBLOG_API __declspec(dllexport)
+#ifdef B10_LIBLOG_EXPORT
+#define B10_LIBLOG_API __declspec(dllexport)
#else
-#define ISC_LIBLOG_API __declspec(dllimport)
+#define B10_LIBLOG_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/log/dummylog.cc b/src/lib/log/dummylog.cc
index 280545e..9e9250d 100644
--- a/src/lib/log/dummylog.cc
+++ b/src/lib/log/dummylog.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include "dummylog.h"
@@ -23,10 +23,10 @@ using namespace std;
namespace isc {
namespace log {
-ISC_LIBLOG_API bool denabled = false;
-ISC_LIBLOG_API string dprefix;
+B10_LIBLOG_API bool denabled = false;
+B10_LIBLOG_API string dprefix;
-ISC_LIBLOG_API void dlog(const string& message, bool error_flag) {
+B10_LIBLOG_API void dlog(const string& message, bool error_flag) {
if (denabled || error_flag) {
if (!dprefix.empty()) {
cerr << "[" << dprefix << "] ";
diff --git a/src/lib/log/dummylog.h b/src/lib/log/dummylog.h
index de1bca7..f0a5cc5 100644
--- a/src/lib/log/dummylog.h
+++ b/src/lib/log/dummylog.h
@@ -22,14 +22,14 @@ namespace isc {
namespace log {
/// Are we doing logging?
-extern ISC_LIBLOG_API bool denabled;
+extern B10_LIBLOG_API bool denabled;
/**
* \short Prefix into logs.
*
* The prefix is printed in front of every log message in square brackets.
* The usual convention is to put the name of program here.
*/
-extern ISC_LIBLOG_API std::string dprefix;
+extern B10_LIBLOG_API std::string dprefix;
/**
* \short Temporary interface to logging.
@@ -54,7 +54,7 @@ extern ISC_LIBLOG_API std::string dprefix;
* more parameters.
* \param error_flag TODO
*/
-ISC_LIBLOG_API void dlog(const std::string& message, bool error_flag=false);
+B10_LIBLOG_API void dlog(const std::string& message, bool error_flag=false);
}
}
diff --git a/src/lib/log/log_formatter.cc b/src/lib/log/log_formatter.cc
index 0812a5d..caa5e82 100644
--- a/src/lib/log/log_formatter.cc
+++ b/src/lib/log/log_formatter.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include "config.h"
#include <log/log_formatter.h>
@@ -29,7 +29,7 @@ using namespace boost;
namespace isc {
namespace log {
-ISC_LIBLOG_API void
+B10_LIBLOG_API void
replacePlaceholder(string* message, const string& arg,
const unsigned placeholder)
{
@@ -55,7 +55,7 @@ replacePlaceholder(string* message, const string& arg,
#endif /* ENABLE_LOGGER_CHECKS */
}
-ISC_LIBLOG_API void
+B10_LIBLOG_API void
checkExcessPlaceholders(string* message, unsigned int placeholder) {
const string mark("%" + lexical_cast<string>(placeholder));
const size_t pos(message->find(mark));
diff --git a/src/lib/log/log_formatter.h b/src/lib/log/log_formatter.h
index 3d8447a..31bb6f2 100644
--- a/src/lib/log/log_formatter.h
+++ b/src/lib/log/log_formatter.h
@@ -32,7 +32,7 @@ namespace log {
/// This exception is used to wrap a bad_lexical_cast exception thrown during
/// formatting an argument.
-class ISC_LIBLOG_API FormatFailure : public isc::Exception {
+class B10_LIBLOG_API FormatFailure : public isc::Exception {
public:
FormatFailure(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what)
@@ -45,7 +45,7 @@ public:
/// This exception is used when the number of placeholders do not match
/// the number of arguments passed to the formatter.
-class ISC_LIBLOG_API MismatchedPlaceholders : public isc::Exception {
+class B10_LIBLOG_API MismatchedPlaceholders : public isc::Exception {
public:
MismatchedPlaceholders(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what)
@@ -58,7 +58,7 @@ public:
///
/// This is used internally by the Formatter to check for excess
/// placeholders (and fewer arguments).
-ISC_LIBLOG_API void
+B10_LIBLOG_API void
checkExcessPlaceholders(std::string* message, unsigned int placeholder);
///
@@ -67,7 +67,7 @@ checkExcessPlaceholders(std::string* message, unsigned int placeholder);
/// This is used internally by the Formatter. Replaces a placeholder
/// in the message by replacement. If the placeholder is not found,
/// it adds a complain at the end.
-ISC_LIBLOG_API void
+B10_LIBLOG_API void
replacePlaceholder(std::string* message, const std::string& replacement,
const unsigned placeholder);
diff --git a/src/lib/log/log_messages.cc b/src/lib/log/log_messages.cc
index 306f617..212c0cb 100644
--- a/src/lib/log/log_messages.cc
+++ b/src/lib/log/log_messages.cc
@@ -1,6 +1,6 @@
// File created from log_messages.mes on Thu Jul 7 15:32:06 2011
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <cstddef>
#include <log/message_types.h>
@@ -9,45 +9,45 @@
namespace isc {
namespace log {
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_BAD_DESTINATION = "LOG_BAD_DESTINATION";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_BAD_SEVERITY = "LOG_BAD_SEVERITY";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_BAD_STREAM = "LOG_BAD_STREAM";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_DUPLICATE_MESSAGE_ID = "LOG_DUPLICATE_MESSAGE_ID";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_DUPLICATE_NAMESPACE = "LOG_DUPLICATE_NAMESPACE";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_INPUT_OPEN_FAIL = "LOG_INPUT_OPEN_FAIL";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_INVALID_MESSAGE_ID = "LOG_INVALID_MESSAGE_ID";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_NAMESPACE_EXTRA_ARGS = "LOG_NAMESPACE_EXTRA_ARGS";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_NAMESPACE_INVALID_ARG = "LOG_NAMESPACE_INVALID_ARG";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_NAMESPACE_NO_ARGS = "LOG_NAMESPACE_NO_ARGS";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_NO_MESSAGE_ID = "LOG_NO_MESSAGE_ID";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_NO_MESSAGE_TEXT = "LOG_NO_MESSAGE_TEXT";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_NO_SUCH_MESSAGE = "LOG_NO_SUCH_MESSAGE";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_OPEN_OUTPUT_FAIL = "LOG_OPEN_OUTPUT_FAIL";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_PREFIX_EXTRA_ARGS = "LOG_PREFIX_EXTRA_ARGS";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_PREFIX_INVALID_ARG = "LOG_PREFIX_INVALID_ARG";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_READING_LOCAL_FILE = "LOG_READING_LOCAL_FILE";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_READ_ERROR = "LOG_READ_ERROR";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_UNRECOGNISED_DIRECTIVE = "LOG_UNRECOGNISED_DIRECTIVE";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOG_WRITE_ERROR = "LOG_WRITE_ERROR";
} // namespace log
diff --git a/src/lib/log/log_messages.h b/src/lib/log/log_messages.h
index 1e50ad5..4726f3b 100644
--- a/src/lib/log/log_messages.h
+++ b/src/lib/log/log_messages.h
@@ -9,26 +9,26 @@
namespace isc {
namespace log {
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_BAD_DESTINATION;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_BAD_SEVERITY;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_BAD_STREAM;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_DUPLICATE_MESSAGE_ID;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_DUPLICATE_NAMESPACE;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_INPUT_OPEN_FAIL;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_INVALID_MESSAGE_ID;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_NAMESPACE_EXTRA_ARGS;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_NAMESPACE_INVALID_ARG;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_NAMESPACE_NO_ARGS;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_NO_MESSAGE_ID;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_NO_MESSAGE_TEXT;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_NO_SUCH_MESSAGE;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_OPEN_OUTPUT_FAIL;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_PREFIX_EXTRA_ARGS;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_PREFIX_INVALID_ARG;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_READING_LOCAL_FILE;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_READ_ERROR;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_UNRECOGNISED_DIRECTIVE;
-extern const ISC_LIBLOG_API isc::log::MessageID LOG_WRITE_ERROR;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_BAD_DESTINATION;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_BAD_SEVERITY;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_BAD_STREAM;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_DUPLICATE_MESSAGE_ID;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_DUPLICATE_NAMESPACE;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_INPUT_OPEN_FAIL;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_INVALID_MESSAGE_ID;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_NAMESPACE_EXTRA_ARGS;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_NAMESPACE_INVALID_ARG;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_NAMESPACE_NO_ARGS;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_NO_MESSAGE_ID;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_NO_MESSAGE_TEXT;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_NO_SUCH_MESSAGE;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_OPEN_OUTPUT_FAIL;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_PREFIX_EXTRA_ARGS;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_PREFIX_INVALID_ARG;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_READING_LOCAL_FILE;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_READ_ERROR;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_UNRECOGNISED_DIRECTIVE;
+extern const B10_LIBLOG_API isc::log::MessageID LOG_WRITE_ERROR;
} // namespace log
} // namespace isc
diff --git a/src/lib/log/logger.cc b/src/lib/log/logger.cc
index 18b3a7a..91f6aba 100644
--- a/src/lib/log/logger.cc
+++ b/src/lib/log/logger.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <config.h>
diff --git a/src/lib/log/logger.h b/src/lib/log/logger.h
index 4f7bfd1..7b7f04e 100644
--- a/src/lib/log/logger.h
+++ b/src/lib/log/logger.h
@@ -93,7 +93,7 @@ class LoggerImpl; // Forward declaration of the implementation class
///
/// Exception thrown if an attempt is made to access a logging function
/// if the logging system has not been initialized.
-class ISC_LIBLOG_API LoggingNotInitialized : public isc::Exception {
+class B10_LIBLOG_API LoggingNotInitialized : public isc::Exception {
public:
LoggingNotInitialized(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what)
@@ -104,7 +104,7 @@ public:
///
/// Exception thrown if a bad InterprocessSync object (such as NULL) is
/// used.
-class ISC_LIBLOG_API BadInterprocessSync : public isc::Exception {
+class B10_LIBLOG_API BadInterprocessSync : public isc::Exception {
public:
BadInterprocessSync(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what)
@@ -123,7 +123,7 @@ public:
/// These will avoid the potentially-expensive evaluation of arguments if the
/// severity is such that the message will be suppressed.)
-class ISC_LIBLOG_API Logger {
+class B10_LIBLOG_API Logger {
public:
/// Maximum size of a logger name
static const size_t MAX_LOGGER_NAME_SIZE = 31;
diff --git a/src/lib/log/logger_impl.cc b/src/lib/log/logger_impl.cc
index b7834c6..ae82ad7 100644
--- a/src/lib/log/logger_impl.cc
+++ b/src/lib/log/logger_impl.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <config.h>
diff --git a/src/lib/log/logger_level.cc b/src/lib/log/logger_level.cc
index 96e7938..22f43ca 100644
--- a/src/lib/log/logger_level.cc
+++ b/src/lib/log/logger_level.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <config.h>
@@ -26,7 +26,7 @@
namespace isc {
namespace log {
-ISC_LIBLOG_API isc::log::Severity
+B10_LIBLOG_API isc::log::Severity
getSeverity(const std::string& sev_str) {
if (boost::iequals(sev_str, "DEBUG")) {
return isc::log::DEBUG;
diff --git a/src/lib/log/logger_level.h b/src/lib/log/logger_level.h
index 6daea87..b57cb52 100644
--- a/src/lib/log/logger_level.h
+++ b/src/lib/log/logger_level.h
@@ -69,7 +69,7 @@ struct Level {
///
/// \return The severity. If the string is not recognized, an error will be
/// logged and the string will return isc::log::INFO.
-ISC_LIBLOG_API isc::log::Severity getSeverity(const std::string& sev_str);
+B10_LIBLOG_API isc::log::Severity getSeverity(const std::string& sev_str);
} // namespace log
} // namespace isc
diff --git a/src/lib/log/logger_level_impl.cc b/src/lib/log/logger_level_impl.cc
index 95b7dab..41e356f 100644
--- a/src/lib/log/logger_level_impl.cc
+++ b/src/lib/log/logger_level_impl.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <config.h>
diff --git a/src/lib/log/logger_level_impl.h b/src/lib/log/logger_level_impl.h
index b402e74..3fa9302 100644
--- a/src/lib/log/logger_level_impl.h
+++ b/src/lib/log/logger_level_impl.h
@@ -63,7 +63,7 @@ namespace log {
/// of logging levels between log4cplus and BIND 10, and to register those
/// levels with log4cplus.
-class ISC_LIBLOG_API LoggerLevelImpl {
+class B10_LIBLOG_API LoggerLevelImpl {
public:
/// \brief Convert BIND 10 level to log4cplus logging level
diff --git a/src/lib/log/logger_manager.cc b/src/lib/log/logger_manager.cc
index 502d04e..6fea372 100644
--- a/src/lib/log/logger_manager.cc
+++ b/src/lib/log/logger_manager.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <config.h>
diff --git a/src/lib/log/logger_manager.h b/src/lib/log/logger_manager.h
index 9448136..53e1484 100644
--- a/src/lib/log/logger_manager.h
+++ b/src/lib/log/logger_manager.h
@@ -21,7 +21,7 @@
// Generated if, when updating the logging specification, an unknown
// destination is encountered.
-class ISC_LIBLOG_API UnknownLoggingDestination : public isc::Exception {
+class B10_LIBLOG_API UnknownLoggingDestination : public isc::Exception {
public:
UnknownLoggingDestination(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what)
@@ -41,7 +41,7 @@ class LoggerManagerImpl;
/// To isolate the underlying implementation from basic processing, the
/// LoggerManager is implemented using the "pimpl" idiom.
-class ISC_LIBLOG_API LoggerManager {
+class B10_LIBLOG_API LoggerManager {
public:
/// \brief Constructor
LoggerManager();
diff --git a/src/lib/log/logger_manager_impl.cc b/src/lib/log/logger_manager_impl.cc
index 2bca144..82ba323 100644
--- a/src/lib/log/logger_manager_impl.cc
+++ b/src/lib/log/logger_manager_impl.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <config.h>
diff --git a/src/lib/log/logger_manager_impl.h b/src/lib/log/logger_manager_impl.h
index c088bff..f5c6774 100644
--- a/src/lib/log/logger_manager_impl.h
+++ b/src/lib/log/logger_manager_impl.h
@@ -31,8 +31,8 @@ namespace isc {
namespace log {
// Forward declarations
-class ISC_LIBLOG_API LoggerSpecification;
-struct ISC_LIBLOG_API OutputOption;
+class B10_LIBLOG_API LoggerSpecification;
+struct B10_LIBLOG_API OutputOption;
/// \brief Logger Manager Implementation
///
diff --git a/src/lib/log/logger_name.cc b/src/lib/log/logger_name.cc
index d213193..72be0c0 100644
--- a/src/lib/log/logger_name.cc
+++ b/src/lib/log/logger_name.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <string>
#include "log/logger_name.h"
@@ -33,16 +33,16 @@ getRootLoggerNameInternal() {
} // Anonymous namespace
-ISC_LIBLOG_API void
+B10_LIBLOG_API void
setRootLoggerName(const std::string& name) {
getRootLoggerNameInternal() = name;
}
-ISC_LIBLOG_API const std::string& getRootLoggerName() {
+B10_LIBLOG_API const std::string& getRootLoggerName() {
return (getRootLoggerNameInternal());
}
-ISC_LIBLOG_API std::string expandLoggerName(const std::string& name) {
+B10_LIBLOG_API std::string expandLoggerName(const std::string& name) {
// Are we the root logger, or does the logger name start with
// the string "<root_logger_name>.". If so, use a logger
diff --git a/src/lib/log/logger_name.h b/src/lib/log/logger_name.h
index b8763ac..2a17452 100644
--- a/src/lib/log/logger_name.h
+++ b/src/lib/log/logger_name.h
@@ -34,12 +34,12 @@ namespace log {
/// any logging functions are called.
///
/// \param name Name of the root logger. This should be the program name.
-ISC_LIBLOG_API void setRootLoggerName(const std::string& name);
+B10_LIBLOG_API void setRootLoggerName(const std::string& name);
/// \brief Get root logger name
///
/// \return Name of the root logger.
-ISC_LIBLOG_API const std::string& getRootLoggerName();
+B10_LIBLOG_API const std::string& getRootLoggerName();
/// \brief Expand logger name
///
@@ -50,7 +50,7 @@ ISC_LIBLOG_API const std::string& getRootLoggerName();
/// \param name Name to expand.
///
/// \return Fully-expanded logger name.
-ISC_LIBLOG_API std::string expandLoggerName(const std::string& name);
+B10_LIBLOG_API std::string expandLoggerName(const std::string& name);
}
}
diff --git a/src/lib/log/logger_specification.h b/src/lib/log/logger_specification.h
index 856a380..0128128 100644
--- a/src/lib/log/logger_specification.h
+++ b/src/lib/log/logger_specification.h
@@ -35,7 +35,7 @@
namespace isc {
namespace log {
-class ISC_LIBLOG_API LoggerSpecification {
+class B10_LIBLOG_API LoggerSpecification {
public:
typedef std::vector<OutputOption>::iterator iterator;
typedef std::vector<OutputOption>::const_iterator const_iterator;
diff --git a/src/lib/log/logger_support.cc b/src/lib/log/logger_support.cc
index 9088a29..0382333 100644
--- a/src/lib/log/logger_support.cc
+++ b/src/lib/log/logger_support.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <config.h>
@@ -33,7 +33,7 @@ namespace isc {
namespace log {
// Return initialization state.
-ISC_LIBLOG_API bool
+B10_LIBLOG_API bool
isLoggingInitialized() {
return (logging_init_state);
}
@@ -41,14 +41,14 @@ isLoggingInitialized() {
// Set initialization state. (Note: as logging can be initialized via a direct
// call to LoggerManager::init(), this function is called from there, not from
// the initialization functions in this file.
-ISC_LIBLOG_API void
+B10_LIBLOG_API void
setLoggingInitialized(bool state) {
logging_init_state = state;
}
// Logger Run-Time Initialization.
-ISC_LIBLOG_API void
+B10_LIBLOG_API void
initLogger(const string& root, isc::log::Severity severity, int dbglevel,
const char* file) {
LoggerManager::init(root, severity, dbglevel, file);
diff --git a/src/lib/log/logger_support.h b/src/lib/log/logger_support.h
index 4dd2846..2bd43da 100644
--- a/src/lib/log/logger_support.h
+++ b/src/lib/log/logger_support.h
@@ -41,13 +41,13 @@ namespace log {
/// and throw an exception if logging is not initialized at that point.
///
/// \return true if logging has been initialized, false if not
-ISC_LIBLOG_API bool isLoggingInitialized();
+B10_LIBLOG_API bool isLoggingInitialized();
/// \brief Set state of "logging initialized" flag
///
/// \param state State to set the flag to. (This is expected to be "true" - the
/// default - for all code apart from specific unit tests.)
-ISC_LIBLOG_API void setLoggingInitialized(bool state = true);
+B10_LIBLOG_API void setLoggingInitialized(bool state = true);
/// \brief Run-time initialization
///
@@ -64,7 +64,7 @@ ISC_LIBLOG_API void setLoggingInitialized(bool state = true);
/// \param severity Severity at which to log
/// \param dbglevel Debug severity (ignored if "severity" is not "DEBUG")
/// \param file Name of the local message file.
-ISC_LIBLOG_API
+B10_LIBLOG_API
void initLogger(const std::string& root,
isc::log::Severity severity = isc::log::INFO,
int dbglevel = 0, const char* file = NULL);
diff --git a/src/lib/log/logger_unittest_support.cc b/src/lib/log/logger_unittest_support.cc
index 469a966..9d51c0d 100644
--- a/src/lib/log/logger_unittest_support.cc
+++ b/src/lib/log/logger_unittest_support.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <config.h>
@@ -38,7 +38,7 @@ namespace log {
// of "FATAL". (Note that the string must be in upper case with no leading
// of trailing blanks.) If not present, the default severity passed to the
// function is returned.
-ISC_LIBLOG_API isc::log::Severity
+B10_LIBLOG_API isc::log::Severity
b10LoggerSeverity(isc::log::Severity defseverity) {
const char* sev_char = getenv("B10_LOGGER_SEVERITY");
if (sev_char) {
@@ -50,7 +50,7 @@ b10LoggerSeverity(isc::log::Severity defseverity) {
// Get the debug level. This is defined by the envornment variable
// B10_LOGGER_DBGLEVEL. If not defined, a default value passed to the function
// is returned.
-ISC_LIBLOG_API int
+B10_LIBLOG_API int
b10LoggerDbglevel(int defdbglevel) {
const char* dbg_char = getenv("B10_LOGGER_DBGLEVEL");
if (dbg_char) {
@@ -83,7 +83,7 @@ b10LoggerDbglevel(int defdbglevel) {
// Reset characteristics of the root logger to that set by the environment
// variables B10_LOGGER_SEVERITY, B10_LOGGER_DBGLEVEL and B10_LOGGER_DESTINATION.
-ISC_LIBLOG_API void
+B10_LIBLOG_API void
resetUnitTestRootLogger() {
using namespace isc::log;
@@ -155,7 +155,7 @@ resetUnitTestRootLogger() {
// Logger Run-Time Initialization via Environment Variables
-ISC_LIBLOG_API void initLogger(isc::log::Severity severity, int dbglevel) {
+B10_LIBLOG_API void initLogger(isc::log::Severity severity, int dbglevel) {
// Root logger name is defined by the environment variable B10_LOGGER_ROOT.
// If not present, the name is "bind10".
diff --git a/src/lib/log/logger_unittest_support.h b/src/lib/log/logger_unittest_support.h
index 697a606..d57ffb3 100644
--- a/src/lib/log/logger_unittest_support.h
+++ b/src/lib/log/logger_unittest_support.h
@@ -73,7 +73,7 @@ namespace log {
///
/// TODO: Rename. This function overloads the initLogger() function that can
/// be used to initialize production programs. This may lead to confusion.
-ISC_LIBLOG_API
+B10_LIBLOG_API
void initLogger(isc::log::Severity severity = isc::log::DEBUG,
int dbglevel = isc::log::MAX_DEBUG_LEVEL);
@@ -88,7 +88,7 @@ void initLogger(isc::log::Severity severity = isc::log::DEBUG,
// defined.
///
/// \return Severity to use for the logging.
-ISC_LIBLOG_API
+B10_LIBLOG_API
isc::log::Severity b10LoggerSeverity(isc::log::Severity defseverity);
@@ -108,7 +108,7 @@ isc::log::Severity b10LoggerSeverity(isc::log::Severity defseverity);
/// is not defined.
///
/// \return Debug level to use.
-ISC_LIBLOG_API int b10LoggerDbglevel(int defdbglevel);
+B10_LIBLOG_API int b10LoggerDbglevel(int defdbglevel);
/// \brief Reset root logger characteristics
@@ -118,7 +118,7 @@ ISC_LIBLOG_API int b10LoggerDbglevel(int defdbglevel);
/// characteristics of the root logger to use a severity, debug level and
/// destination set by the environment variables B10_LOGGER_SEVERITY,
/// B10_LOGGER_DBGLEVEL and B10_LOGGER_DESTINATION.
-ISC_LIBLOG_API void
+B10_LIBLOG_API void
resetUnitTestRootLogger();
} // namespace log
diff --git a/src/lib/log/logimpl_messages.cc b/src/lib/log/logimpl_messages.cc
index 5d6d502..695a37f 100644
--- a/src/lib/log/logimpl_messages.cc
+++ b/src/lib/log/logimpl_messages.cc
@@ -1,6 +1,6 @@
// File created from logimpl_messages.mes on Wed Jun 22 10:57:02 2011
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <cstddef>
#include <log/message_types.h>
@@ -9,11 +9,11 @@
namespace isc {
namespace log {
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOGIMPL_ABOVE_MAX_DEBUG = "LOGIMPL_ABOVE_MAX_DEBUG";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOGIMPL_BAD_DEBUG_STRING = "LOGIMPL_BAD_DEBUG_STRING";
-extern const ISC_LIBLOG_API
+extern const B10_LIBLOG_API
isc::log::MessageID LOGIMPL_BELOW_MIN_DEBUG = "LOGIMPL_BELOW_MIN_DEBUG";
} // namespace log
diff --git a/src/lib/log/logimpl_messages.h b/src/lib/log/logimpl_messages.h
index 452c67c..6d5e8f6 100644
--- a/src/lib/log/logimpl_messages.h
+++ b/src/lib/log/logimpl_messages.h
@@ -9,9 +9,9 @@
namespace isc {
namespace log {
-extern const ISC_LIBLOG_API isc::log::MessageID LOGIMPL_ABOVE_MAX_DEBUG;
-extern const ISC_LIBLOG_API isc::log::MessageID LOGIMPL_BAD_DEBUG_STRING;
-extern const ISC_LIBLOG_API isc::log::MessageID LOGIMPL_BELOW_MIN_DEBUG;
+extern const B10_LIBLOG_API isc::log::MessageID LOGIMPL_ABOVE_MAX_DEBUG;
+extern const B10_LIBLOG_API isc::log::MessageID LOGIMPL_BAD_DEBUG_STRING;
+extern const B10_LIBLOG_API isc::log::MessageID LOGIMPL_BELOW_MIN_DEBUG;
} // namespace log
} // namespace isc
diff --git a/src/lib/log/message_dictionary.cc b/src/lib/log/message_dictionary.cc
index 2a98264..7eb9f7b 100644
--- a/src/lib/log/message_dictionary.cc
+++ b/src/lib/log/message_dictionary.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <cstddef>
#include <log/message_dictionary.h>
diff --git a/src/lib/log/message_dictionary.h b/src/lib/log/message_dictionary.h
index e469568..12e6600 100644
--- a/src/lib/log/message_dictionary.h
+++ b/src/lib/log/message_dictionary.h
@@ -46,7 +46,7 @@ namespace log {
/// Although the class can be used stand-alone, it does supply a static method
/// to return a particular instance - the "global" dictionary.
-class ISC_LIBLOG_API MessageDictionary {
+class B10_LIBLOG_API MessageDictionary {
public:
typedef std::map<std::string, std::string> Dictionary;
diff --git a/src/lib/log/message_exception.h b/src/lib/log/message_exception.h
index dc35f64..bea29fe 100644
--- a/src/lib/log/message_exception.h
+++ b/src/lib/log/message_exception.h
@@ -34,7 +34,7 @@ namespace log {
/// code and its arguments to be encapsulated in an exception and thrown
/// up the stack.
-class ISC_LIBLOG_API MessageException : public isc::Exception {
+class B10_LIBLOG_API MessageException : public isc::Exception {
public:
/// \brief Constructor
diff --git a/src/lib/log/message_initializer.cc b/src/lib/log/message_initializer.cc
index fb57f83..e117327 100644
--- a/src/lib/log/message_initializer.cc
+++ b/src/lib/log/message_initializer.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <cassert>
#include <cstdlib>
diff --git a/src/lib/log/message_initializer.h b/src/lib/log/message_initializer.h
index 35ddb04..2faa988 100644
--- a/src/lib/log/message_initializer.h
+++ b/src/lib/log/message_initializer.h
@@ -64,7 +64,7 @@ namespace log {
/// global dictionary's overflow vector whence they can be retrieved at
/// run-time.
-class ISC_LIBLOG_API MessageInitializer {
+class B10_LIBLOG_API MessageInitializer {
public:
/// Maximum number of message arrays that can be initialized in this way
static const size_t MAX_MESSAGE_ARRAYS = 256;
diff --git a/src/lib/log/message_reader.cc b/src/lib/log/message_reader.cc
index 5bca8fc..5abde8f 100644
--- a/src/lib/log/message_reader.cc
+++ b/src/lib/log/message_reader.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <cassert>
#include <errno.h>
diff --git a/src/lib/log/message_reader.h b/src/lib/log/message_reader.h
index ae03e6e..3bebfad 100644
--- a/src/lib/log/message_reader.h
+++ b/src/lib/log/message_reader.h
@@ -31,7 +31,7 @@ namespace log {
/// Reads a message file and creates a map of identifier against the text of the
/// message. This map can be retrieved for subsequent processing.
-class ISC_LIBLOG_API MessageReader {
+class B10_LIBLOG_API MessageReader {
public:
/// \brief Read Mode
diff --git a/src/lib/log/message_types.h b/src/lib/log/message_types.h
index c74a8b6..a492058 100644
--- a/src/lib/log/message_types.h
+++ b/src/lib/log/message_types.h
@@ -29,7 +29,7 @@ typedef const char* MessageID;
/// \param m1 First message ID
/// \param m2 Second message ID
/// \return true if they are equal, false if not
-ISC_LIBLOG_API bool equalMessageID(const MessageID& m1, const MessageID& m2);
+B10_LIBLOG_API bool equalMessageID(const MessageID& m1, const MessageID& m2);
} // namespace log
} // namespace isc
diff --git a/src/lib/log/output_option.cc b/src/lib/log/output_option.cc
index b0b5608..9f76ec6 100644
--- a/src/lib/log/output_option.cc
+++ b/src/lib/log/output_option.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBLOG_EXPORT
+#define B10_LIBLOG_EXPORT
#include <config.h>
diff --git a/src/lib/log/output_option.h b/src/lib/log/output_option.h
index edb2fcc..24954df 100644
--- a/src/lib/log/output_option.h
+++ b/src/lib/log/output_option.h
@@ -44,7 +44,7 @@
namespace isc {
namespace log {
-struct ISC_LIBLOG_API OutputOption {
+struct B10_LIBLOG_API OutputOption {
/// Destinations. Prefixed "DEST_" to avoid problems with the C stdio.h
/// FILE type.
@@ -77,9 +77,9 @@ struct ISC_LIBLOG_API OutputOption {
unsigned int maxver; ///< Maximum versions (none if <= 0)
};
-ISC_LIBLOG_API
+B10_LIBLOG_API
OutputOption::Destination getDestination(const std::string& dest_str);
-ISC_LIBLOG_API
+B10_LIBLOG_API
OutputOption::Stream getStream(const std::string& stream_str);
diff --git a/src/lib/nsas/address_entry.cc b/src/lib/nsas/address_entry.cc
index 7bc575b..894ffc1 100644
--- a/src/lib/nsas/address_entry.cc
+++ b/src/lib/nsas/address_entry.cc
@@ -30,7 +30,7 @@
/// static class constant, and define it in this source file. As we can control
/// the order of include files, this ensures that the value is defined.
-#define ISC_LIBNSAS_EXPORT
+#define B10_LIBNSAS_EXPORT
#define __STDC_LIMIT_MACROS
#include <stdint.h>
diff --git a/src/lib/nsas/address_entry.h b/src/lib/nsas/address_entry.h
index 391cac8..8203c5b 100644
--- a/src/lib/nsas/address_entry.h
+++ b/src/lib/nsas/address_entry.h
@@ -28,7 +28,7 @@
namespace isc {
namespace nsas {
-class ISC_LIBNSAS_API AddressEntry {
+class B10_LIBNSAS_API AddressEntry {
public:
/// Creates an address entry given IOAddress entry and RTT
/// This is the only constructor; the default copy constructor and
diff --git a/src/lib/nsas/address_request_callback.h b/src/lib/nsas/address_request_callback.h
index 8e035e4..8a65515 100644
--- a/src/lib/nsas/address_request_callback.h
+++ b/src/lib/nsas/address_request_callback.h
@@ -40,7 +40,7 @@ namespace nsas {
/// callback object is up to the caller - if the caller wants to retain it
/// they should keep the shared pointer.
-class ISC_LIBNSAS_API AddressRequestCallback {
+class B10_LIBNSAS_API AddressRequestCallback {
public:
/// Default constructor, copy contructor and assignment operator
diff --git a/src/lib/nsas/dll.h b/src/lib/nsas/dll.h
index 2c5293e..8645e55 100644
--- a/src/lib/nsas/dll.h
+++ b/src/lib/nsas/dll.h
@@ -16,12 +16,12 @@
#define __LIBNSAS_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBNSAS_API
+#define B10_LIBNSAS_API
#else
-#ifdef ISC_LIBNSAS_EXPORT
-#define ISC_LIBNSAS_API __declspec(dllexport)
+#ifdef B10_LIBNSAS_EXPORT
+#define B10_LIBNSAS_API __declspec(dllexport)
#else
-#define ISC_LIBNSAS_API __declspec(dllimport)
+#define B10_LIBNSAS_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/nsas/fetchable.h b/src/lib/nsas/fetchable.h
index fc76b32..4f3eef8 100644
--- a/src/lib/nsas/fetchable.h
+++ b/src/lib/nsas/fetchable.h
@@ -31,7 +31,7 @@ namespace nsas {
* This just holds a state of information that can be fetched from somewhere.
* No locking is performed, if it is desirable, it should be locked manually.
*/
-class ISC_LIBNSAS_API Fetchable {
+class B10_LIBNSAS_API Fetchable {
public:
/// \short States the Fetchable object can be in.
enum State {
diff --git a/src/lib/nsas/glue_hints.cc b/src/lib/nsas/glue_hints.cc
index 3adb630..720b2d9 100644
--- a/src/lib/nsas/glue_hints.cc
+++ b/src/lib/nsas/glue_hints.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBNSAS_EXPORT
+#define B10_LIBNSAS_EXPORT
#include <config.h>
diff --git a/src/lib/nsas/glue_hints.h b/src/lib/nsas/glue_hints.h
index d24f8d5..5cc2a5c 100644
--- a/src/lib/nsas/glue_hints.h
+++ b/src/lib/nsas/glue_hints.h
@@ -26,7 +26,7 @@
namespace isc {
namespace nsas {
-class ISC_LIBNSAS_API GlueHints {
+class B10_LIBNSAS_API GlueHints {
public:
/// \brief Empty constructor
GlueHints() {};
diff --git a/src/lib/nsas/hash.cc b/src/lib/nsas/hash.cc
index cd6e4c9..4c3cf47 100644
--- a/src/lib/nsas/hash.cc
+++ b/src/lib/nsas/hash.cc
@@ -52,7 +52,7 @@ or otherwise) arising in any way out of the use of this software, even
if advised of the possibility of such damage.
*/
-#define ISC_LIBNSAS_EXPORT
+#define B10_LIBNSAS_EXPORT
#include <cassert>
#include <stdlib.h>
diff --git a/src/lib/nsas/hash.h b/src/lib/nsas/hash.h
index aa74fca..c3de578 100644
--- a/src/lib/nsas/hash.h
+++ b/src/lib/nsas/hash.h
@@ -30,7 +30,7 @@ namespace nsas {
///
/// Thrown if the expected maximum key length is too long for the data types
/// declared in the class.
-class ISC_LIBNSAS_API KeyLengthTooLong : public isc::Exception {
+class B10_LIBNSAS_API KeyLengthTooLong : public isc::Exception {
public:
KeyLengthTooLong(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what)
@@ -41,7 +41,7 @@ public:
/// \brief Hash Calculation
///
/// Class abstracting the mechanics of the hash calculation.
-class ISC_LIBNSAS_API Hash {
+class B10_LIBNSAS_API Hash {
public:
/// \brief Constructor
diff --git a/src/lib/nsas/hash_key.cc b/src/lib/nsas/hash_key.cc
index c382a69..5c8a35d 100644
--- a/src/lib/nsas/hash_key.cc
+++ b/src/lib/nsas/hash_key.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBNSAS_EXPORT
+#define B10_LIBNSAS_EXPORT
#include <cstring>
diff --git a/src/lib/nsas/hash_key.h b/src/lib/nsas/hash_key.h
index 5b3c5f4..d2869c9 100644
--- a/src/lib/nsas/hash_key.h
+++ b/src/lib/nsas/hash_key.h
@@ -42,7 +42,7 @@ namespace nsas {
///
/// To avoid passing round three elements (key, key length, and class), they
/// have been combined into this simple struct.
-struct ISC_LIBNSAS_API HashKey {
+struct B10_LIBNSAS_API HashKey {
/// \brief Constructor
///
diff --git a/src/lib/nsas/nameserver_address.cc b/src/lib/nsas/nameserver_address.cc
index e3286e5..1c3a009 100644
--- a/src/lib/nsas/nameserver_address.cc
+++ b/src/lib/nsas/nameserver_address.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBNSAS_EXPORT
+#define B10_LIBNSAS_EXPORT
#include <config.h>
diff --git a/src/lib/nsas/nameserver_address.h b/src/lib/nsas/nameserver_address.h
index 0cdfbd3..f367aeb 100644
--- a/src/lib/nsas/nameserver_address.h
+++ b/src/lib/nsas/nameserver_address.h
@@ -27,14 +27,14 @@
namespace isc {
namespace nsas {
-class ISC_LIBNSAS_API ZoneEntry;
-class ISC_LIBNSAS_API NameserverEntry;
+class B10_LIBNSAS_API ZoneEntry;
+class B10_LIBNSAS_API NameserverEntry;
/// \brief Empty \c NameserverEntry pointer exception
///
/// Thrown if the the \c NameservrEntry pointer in the \c boost::shared_ptr that passed
/// into \c NameserverAddress' constructor is NULL
-class ISC_LIBNSAS_API NullNameserverEntryPointer : public isc::Exception {
+class B10_LIBNSAS_API NullNameserverEntryPointer : public isc::Exception {
public:
NullNameserverEntryPointer(const char* file, size_t line,
const char* what) :
@@ -53,7 +53,7 @@ public:
/// It is not thread safe, only reentrant. It is expected to be kept inside
/// the resolver and used only once for the address and once for the update.
-class ISC_LIBNSAS_API NameserverAddress {
+class B10_LIBNSAS_API NameserverAddress {
public:
/// \brief Constructor
///
diff --git a/src/lib/nsas/nameserver_address_store.cc b/src/lib/nsas/nameserver_address_store.cc
index 0dca9d7..c722dbc 100644
--- a/src/lib/nsas/nameserver_address_store.cc
+++ b/src/lib/nsas/nameserver_address_store.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBNSAS_EXPORT
+#define B10_LIBNSAS_EXPORT
#include <config.h>
diff --git a/src/lib/nsas/nameserver_address_store.h b/src/lib/nsas/nameserver_address_store.h
index 72905bc..47b0773 100644
--- a/src/lib/nsas/nameserver_address_store.h
+++ b/src/lib/nsas/nameserver_address_store.h
@@ -30,7 +30,7 @@ namespace isc {
// Some forward declarations, so we do not need to include so many headers
namespace dns {
-class ISC_LIBNSAS_API RRClass;
+class B10_LIBNSAS_API RRClass;
}
namespace util {
@@ -40,9 +40,9 @@ template<class T> class LruList;
namespace nsas {
template<class T> class HashTable;
-class ISC_LIBNSAS_API ZoneEntry;
-class ISC_LIBNSAS_API NameserverEntry;
-class ISC_LIBNSAS_API AddressRequestCallback;
+class B10_LIBNSAS_API ZoneEntry;
+class B10_LIBNSAS_API NameserverEntry;
+class B10_LIBNSAS_API AddressRequestCallback;
/// \brief Nameserver Address Store
///
@@ -51,7 +51,7 @@ class ISC_LIBNSAS_API AddressRequestCallback;
/// the logic for sending queries for the nameserver addresses if they are not
/// in the store.
-class ISC_LIBNSAS_API NameserverAddressStore {
+class B10_LIBNSAS_API NameserverAddressStore {
public:
/// \brief Constructor
diff --git a/src/lib/nsas/nameserver_entry.cc b/src/lib/nsas/nameserver_entry.cc
index 8322d81..52ce2a9 100644
--- a/src/lib/nsas/nameserver_entry.cc
+++ b/src/lib/nsas/nameserver_entry.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBNSAS_EXPORT
+#define B10_LIBNSAS_EXPORT
#include <config.h>
diff --git a/src/lib/nsas/nameserver_entry.h b/src/lib/nsas/nameserver_entry.h
index 1b71071..079afea 100644
--- a/src/lib/nsas/nameserver_entry.h
+++ b/src/lib/nsas/nameserver_entry.h
@@ -39,13 +39,13 @@
namespace isc {
namespace nsas {
-class ISC_LIBNSAS_API NameserverAddress;
+class B10_LIBNSAS_API NameserverAddress;
/// \brief Inconsistent Owner Names
///
/// Thrown if a NameserverEntry is constructed from both an A and AAAA RRset
/// where the owner names do not match.
-class ISC_LIBNSAS_API InconsistentOwnerNames : public Exception {
+class B10_LIBNSAS_API InconsistentOwnerNames : public Exception {
public:
InconsistentOwnerNames(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what)
@@ -55,7 +55,7 @@ public:
/// \brief RTT is zero
///
/// Thrown if a RTT related with an address is 0.
-class ISC_LIBNSAS_API RTTIsZero : public Exception {
+class B10_LIBNSAS_API RTTIsZero : public Exception {
public:
RTTIsZero(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what)
@@ -66,14 +66,14 @@ public:
///
/// Thrown if a NameserverEntry is constructed from both an A and AAAA RRset
/// where the classes do not match.
-class ISC_LIBNSAS_API InconsistentClass : public Exception {
+class B10_LIBNSAS_API InconsistentClass : public Exception {
public:
InconsistentClass(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what)
{}
};
-class ISC_LIBNSAS_API ZoneEntry;
+class B10_LIBNSAS_API ZoneEntry;
/// \brief Nameserver Entry
///
@@ -92,7 +92,7 @@ class ISC_LIBNSAS_API ZoneEntry;
///
/// It uses shared_from_this in its methods. It must live inside a shared_ptr.
-class ISC_LIBNSAS_API NameserverEntry :
+class B10_LIBNSAS_API NameserverEntry :
public NsasEntry<NameserverEntry>, public Fetchable {
public:
/// List of addresses associated with this nameserver
diff --git a/src/lib/nsas/nsas_entry.h b/src/lib/nsas/nsas_entry.h
index 57df3f5..54669a1 100644
--- a/src/lib/nsas/nsas_entry.h
+++ b/src/lib/nsas/nsas_entry.h
@@ -32,7 +32,7 @@ namespace nsas {
///
/// Thrown if an attempt was made to access the iterator - the pointer into
/// the LRU list where this element is located - when it is marked as invalid.
-class ISC_LIBNSAS_API InvalidLruIterator : public isc::Exception {
+class B10_LIBNSAS_API InvalidLruIterator : public isc::Exception {
public:
InvalidLruIterator(const char* file, size_t line, const char* what) :
Exception(file, line, what)
diff --git a/src/lib/nsas/nsas_log.cc b/src/lib/nsas/nsas_log.cc
index 1b203a5..8196f51 100644
--- a/src/lib/nsas/nsas_log.cc
+++ b/src/lib/nsas/nsas_log.cc
@@ -14,7 +14,7 @@
/// Defines the logger used by the NSAS
-#define ISC_LIBNSAS_EXPORT
+#define B10_LIBNSAS_EXPORT
#include "nsas/nsas_log.h"
diff --git a/src/lib/nsas/zone_entry.cc b/src/lib/nsas/zone_entry.cc
index db311b6..beb4365 100644
--- a/src/lib/nsas/zone_entry.cc
+++ b/src/lib/nsas/zone_entry.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBNSAS_EXPORT
+#define B10_LIBNSAS_EXPORT
#include <map>
diff --git a/src/lib/nsas/zone_entry.h b/src/lib/nsas/zone_entry.h
index 23dacb5..a72aabf 100644
--- a/src/lib/nsas/zone_entry.h
+++ b/src/lib/nsas/zone_entry.h
@@ -39,8 +39,8 @@
namespace isc {
namespace nsas {
-class ISC_LIBNSAS_API NameserverEntry;
-class ISC_LIBNSAS_API AddressRequestCallback;
+class B10_LIBNSAS_API NameserverEntry;
+class B10_LIBNSAS_API AddressRequestCallback;
/// \brief Zone Entry
///
@@ -53,7 +53,7 @@ class ISC_LIBNSAS_API AddressRequestCallback;
///
/// It uses shared_from_this in its methods. It must live inside a shared_ptr.
-class ISC_LIBNSAS_API ZoneEntry :
+class B10_LIBNSAS_API ZoneEntry :
public NsasEntry<ZoneEntry>, public Fetchable {
public:
diff --git a/src/lib/resolve/dll.h b/src/lib/resolve/dll.h
index 88eba3f..afa0317 100644
--- a/src/lib/resolve/dll.h
+++ b/src/lib/resolve/dll.h
@@ -16,22 +16,22 @@
#define __LIBRESOLVE_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBRESOLVE_API
+#define B10_LIBRESOLVE_API
#else
-#ifdef ISC_LIBRESOLVE_EXPORT
-#define ISC_LIBRESOLVE_API __declspec(dllexport)
+#ifdef B10_LIBRESOLVE_EXPORT
+#define B10_LIBRESOLVE_API __declspec(dllexport)
#else
-#define ISC_LIBRESOLVE_API __declspec(dllimport)
+#define B10_LIBRESOLVE_API __declspec(dllimport)
#endif
#endif
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBNSASRESOLVE_API
+#define B10_LIBNSASRESOLVE_API
#else
-#if defined(ISC_LIBNSAS_EXPORT) || defined(ISC_LIBRESOLVE_EXPORT)
-#define ISC_LIBNSASRESOLVE_API __declspec(dllexport)
+#if defined(B10_LIBNSAS_EXPORT) || defined(B10_LIBRESOLVE_EXPORT)
+#define B10_LIBNSASRESOLVE_API __declspec(dllexport)
#else
-#define ISC_LIBNSASRESOLVE_API __declspec(dllimport)
+#define B10_LIBNSASRESOLVE_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/resolve/recursive_query.cc b/src/lib/resolve/recursive_query.cc
index 7776bcd..e5b63cd 100644
--- a/src/lib/resolve/recursive_query.cc
+++ b/src/lib/resolve/recursive_query.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBRESOLVE_EXPORT
+#define B10_LIBRESOLVE_EXPORT
#include <config.h>
@@ -94,7 +94,7 @@ questionText(const isc::dns::Question& question) {
/// \param name The name we want to delegate to.
/// \param rrclass The class.
/// \param cache The place too look for known delegations.
-ISC_LIBRESOLVE_API std::string
+B10_LIBRESOLVE_API std::string
deepestDelegation(Name name, RRClass rrclass,
isc::cache::ResolverCache& cache)
{
@@ -939,7 +939,7 @@ public:
}
};
-class ISC_LIBRESOLVE_API ForwardQuery : public IOFetch::Callback {
+class B10_LIBRESOLVE_API ForwardQuery : public IOFetch::Callback {
private:
// The io service to handle async calls
IOService& io_;
diff --git a/src/lib/resolve/recursive_query.h b/src/lib/resolve/recursive_query.h
index cc9ab8f..6cf9da9 100644
--- a/src/lib/resolve/recursive_query.h
+++ b/src/lib/resolve/recursive_query.h
@@ -33,7 +33,7 @@ namespace asiodns {
/// A pointer to an object of this class is passed to RecursiveQuery which in
/// turn passes it to the created RunningQuery class. When a running query
/// completes, its RTT is passed to the RTT Recorder object.
-class ISC_LIBRESOLVE_API RttRecorder {
+class B10_LIBRESOLVE_API RttRecorder {
public:
/// \brief Record Time
///
@@ -59,7 +59,7 @@ private:
/// The \c RecursiveQuery class provides a layer of abstraction around
/// the ASIO code that carries out an upstream query.
-class ISC_LIBRESOLVE_API RecursiveQuery {
+class B10_LIBRESOLVE_API RecursiveQuery {
///
/// \name Constructors
///
diff --git a/src/lib/resolve/resolve.cc b/src/lib/resolve/resolve.cc
index d316075..70b761e 100644
--- a/src/lib/resolve/resolve.cc
+++ b/src/lib/resolve/resolve.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBRESOLVE_EXPORT
+#define B10_LIBRESOLVE_EXPORT
#include <config.h>
@@ -45,7 +45,7 @@ namespace {
namespace isc {
namespace resolve {
-ISC_LIBRESOLVE_API void
+B10_LIBRESOLVE_API void
makeErrorMessage(MessagePtr answer_message,
const Rcode& error_code)
{
@@ -56,7 +56,7 @@ makeErrorMessage(MessagePtr answer_message,
answer_message->setRcode(error_code);
}
-ISC_LIBRESOLVE_API void
+B10_LIBRESOLVE_API void
initResponseMessage(const isc::dns::Message& query_message,
isc::dns::Message& response_message)
{
@@ -67,7 +67,7 @@ initResponseMessage(const isc::dns::Message& query_message,
query_message);
}
-ISC_LIBRESOLVE_API void
+B10_LIBRESOLVE_API void
initResponseMessage(const isc::dns::Question& question,
isc::dns::Message& response_message)
{
@@ -75,7 +75,7 @@ initResponseMessage(const isc::dns::Question& question,
response_message.addQuestion(question);
}
-ISC_LIBRESOLVE_API void
+B10_LIBRESOLVE_API void
copyResponseMessage(const Message& source, MessagePtr target) {
target->setRcode(source.getRcode());
diff --git a/src/lib/resolve/resolve.h b/src/lib/resolve/resolve.h
index b5763e2..40e1488 100644
--- a/src/lib/resolve/resolve.h
+++ b/src/lib/resolve/resolve.h
@@ -39,7 +39,7 @@ namespace resolve {
///
/// \param answer_message The message to clear and place the error in
/// \param error_code The error Rcode
-ISC_LIBRESOLVE_API void
+B10_LIBRESOLVE_API void
makeErrorMessage(isc::dns::MessagePtr answer_message,
const isc::dns::Rcode& error_code);
@@ -58,7 +58,7 @@ makeErrorMessage(isc::dns::MessagePtr answer_message,
/// and Opcode from.
/// \param response_message The fresh response message to initialize
/// (must be in RENDER mode)
-ISC_LIBRESOLVE_API void
+B10_LIBRESOLVE_API void
initResponseMessage(const isc::dns::Message& query_message,
isc::dns::Message& response_message);
@@ -76,7 +76,7 @@ initResponseMessage(const isc::dns::Message& query_message,
/// \param question The question to place in the Question section
/// \param response_message The fresh response message to initialize
/// (must be in RENDER mode)
-ISC_LIBRESOLVE_API void
+B10_LIBRESOLVE_API void
initResponseMessage(const isc::dns::Question& question,
isc::dns::Message& response_message);
@@ -89,7 +89,7 @@ initResponseMessage(const isc::dns::Question& question,
/// code
/// \param source The Message to copy the data from
/// \param target The Message to copy the data to
-ISC_LIBRESOLVE_API void
+B10_LIBRESOLVE_API void
copyResponseMessage(const isc::dns::Message& source,
isc::dns::MessagePtr target);
diff --git a/src/lib/resolve/resolve_log.cc b/src/lib/resolve/resolve_log.cc
index 59929b9..7dd3294 100644
--- a/src/lib/resolve/resolve_log.cc
+++ b/src/lib/resolve/resolve_log.cc
@@ -14,7 +14,7 @@
/// Defines the logger used by the NSAS
-#define ISC_LIBRESOLVE_EXPORT
+#define B10_LIBRESOLVE_EXPORT
#include <resolve/resolve_log.h>
diff --git a/src/lib/resolve/resolver_callback.cc b/src/lib/resolve/resolver_callback.cc
index 1df17ce..b1e90a4 100644
--- a/src/lib/resolve/resolver_callback.cc
+++ b/src/lib/resolve/resolver_callback.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBRESOLVE_EXPORT
+#define B10_LIBRESOLVE_EXPORT
#include <config.h>
#include <stdint.h>
diff --git a/src/lib/resolve/resolver_callback.h b/src/lib/resolve/resolver_callback.h
index 3e0d2b4..bea3895 100644
--- a/src/lib/resolve/resolver_callback.h
+++ b/src/lib/resolve/resolver_callback.h
@@ -32,7 +32,7 @@ namespace resolve {
///
/// This class will ignore the response MessagePtr in the callback,
/// as the server itself should also have a reference.
-class ISC_LIBRESOLVE_API ResolverCallbackServer :
+class B10_LIBRESOLVE_API ResolverCallbackServer :
public ResolverInterface::Callback {
public:
ResolverCallbackServer(asiodns::DNSServer* server) :
diff --git a/src/lib/resolve/resolver_interface.h b/src/lib/resolve/resolver_interface.h
index 9e40152..3d835ef 100644
--- a/src/lib/resolve/resolver_interface.h
+++ b/src/lib/resolve/resolver_interface.h
@@ -45,7 +45,7 @@ namespace resolve {
///
/// It is abstract to allow tests pass dummy resolvers.
///
-class ISC_LIBNSASRESOLVE_API ResolverInterface {
+class B10_LIBNSASRESOLVE_API ResolverInterface {
public:
/// \short An abstract callback for when the resolver is done.
///
diff --git a/src/lib/resolve/response_classifier.cc b/src/lib/resolve/response_classifier.cc
index e1bac65..f6137ea 100644
--- a/src/lib/resolve/response_classifier.cc
+++ b/src/lib/resolve/response_classifier.cc
@@ -14,7 +14,7 @@
// $Id$
-#define ISC_LIBRESOLVE_EXPORT
+#define B10_LIBRESOLVE_EXPORT
#include <cstddef>
#include <vector>
diff --git a/src/lib/resolve/response_classifier.h b/src/lib/resolve/response_classifier.h
index daee898..83bea73 100644
--- a/src/lib/resolve/response_classifier.h
+++ b/src/lib/resolve/response_classifier.h
@@ -36,7 +36,7 @@ namespace resolve {
///
/// TODO: The code here does not take into account any EDNS0 fields.
-class ISC_LIBRESOLVE_API ResponseClassifier {
+class B10_LIBRESOLVE_API ResponseClassifier {
public:
/// \brief Category of Answer
diff --git a/src/lib/server_common/client.cc b/src/lib/server_common/client.cc
index 3315550..a6c2e6b 100644
--- a/src/lib/server_common/client.cc
+++ b/src/lib/server_common/client.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBSERVER_COMMON_EXPORT
+#define B10_LIBSERVER_COMMON_EXPORT
#include <string>
#include <sstream>
@@ -64,7 +64,7 @@ Client::toText() const {
return (ss.str());
}
-ISC_LIBSERVER_COMMON_API std::ostream&
+B10_LIBSERVER_COMMON_API std::ostream&
isc::server_common::operator<<(std::ostream& os, const Client& client) {
return (os << client.toText());
}
diff --git a/src/lib/server_common/client.h b/src/lib/server_common/client.h
index c750a63..388c522 100644
--- a/src/lib/server_common/client.h
+++ b/src/lib/server_common/client.h
@@ -25,12 +25,12 @@
namespace isc {
namespace asiolink {
-class ISC_LIBSERVER_COMMON_API IOMessage;
-class ISC_LIBSERVER_COMMON_API IOEndpoint;
+class B10_LIBSERVER_COMMON_API IOMessage;
+class B10_LIBSERVER_COMMON_API IOEndpoint;
}
namespace acl {
-struct ISC_LIBSERVER_COMMON_API IPAddress;
+struct B10_LIBSERVER_COMMON_API IPAddress;
}
namespace server_common {
@@ -68,7 +68,7 @@ namespace server_common {
/// We might also want to separate DNS clients for authoritative servers
/// and clients for the resolver, especially because the former could be
/// simpler with performance optimizations.
-class ISC_LIBSERVER_COMMON_API Client : boost::noncopyable {
+class B10_LIBSERVER_COMMON_API Client : boost::noncopyable {
public:
///
/// \name Constructors and Destructor
@@ -144,7 +144,7 @@ private:
/// \param client A reference to a \c Client object output by the operation.
/// \return A reference to the same \c std::ostream object referenced by
/// parameter \c os after the insertion operation.
-ISC_LIBSERVER_COMMON_API std::ostream&
+B10_LIBSERVER_COMMON_API std::ostream&
operator<<(std::ostream& os, const Client& client);
}
}
diff --git a/src/lib/server_common/dll.h b/src/lib/server_common/dll.h
index 920827c..a53c6e5 100644
--- a/src/lib/server_common/dll.h
+++ b/src/lib/server_common/dll.h
@@ -16,12 +16,12 @@
#define __LIBSERVER_COMMON_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBSERVER_COMMON_API
+#define B10_LIBSERVER_COMMON_API
#else
-#ifdef ISC_LIBSERVER_COMMON_EXPORT
-#define ISC_LIBSERVER_COMMON_API __declspec(dllexport)
+#ifdef B10_LIBSERVER_COMMON_EXPORT
+#define B10_LIBSERVER_COMMON_API __declspec(dllexport)
#else
-#define ISC_LIBSERVER_COMMON_API __declspec(dllimport)
+#define B10_LIBSERVER_COMMON_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/server_common/keyring.cc b/src/lib/server_common/keyring.cc
index fc4b0d5..e4a07cf 100644
--- a/src/lib/server_common/keyring.cc
+++ b/src/lib/server_common/keyring.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBSERVER_COMMON_EXPORT
+#define B10_LIBSERVER_COMMON_EXPORT
#include <config.h>
@@ -31,7 +31,7 @@ namespace server_common {
typedef boost::shared_ptr<TSIGKeyRing> KeyringPtr;
-ISC_LIBSERVER_COMMON_API KeyringPtr keyring;
+B10_LIBSERVER_COMMON_API KeyringPtr keyring;
namespace {
@@ -54,7 +54,7 @@ updateKeyring(const std::string&, ConstElementPtr data,
}
-ISC_LIBSERVER_COMMON_API void
+B10_LIBSERVER_COMMON_API void
initKeyring(config::ModuleCCSession& session) {
if (keyring) {
// We are already initialized
@@ -64,7 +64,7 @@ initKeyring(config::ModuleCCSession& session) {
session.addRemoteConfig("tsig_keys", updateKeyring, false);
}
-ISC_LIBSERVER_COMMON_API void
+B10_LIBSERVER_COMMON_API void
deinitKeyring(config::ModuleCCSession& session) {
if (!keyring) {
// Not initialized, ignore it
diff --git a/src/lib/server_common/keyring.h b/src/lib/server_common/keyring.h
index fb3d630..e5c08c9 100644
--- a/src/lib/server_common/keyring.h
+++ b/src/lib/server_common/keyring.h
@@ -56,7 +56,7 @@ namespace server_common {
* but you need to call initKeyring first, otherwise you'll find a NULL pointer
* here only.
*/
-extern ISC_LIBSERVER_COMMON_API boost::shared_ptr<dns::TSIGKeyRing> keyring;
+extern B10_LIBSERVER_COMMON_API boost::shared_ptr<dns::TSIGKeyRing> keyring;
/**
* \brief Load the key ring for the first time
@@ -72,7 +72,7 @@ extern ISC_LIBSERVER_COMMON_API boost::shared_ptr<dns::TSIGKeyRing> keyring;
*
* \param session The configuration session used to talk to the config manager.
*/
-ISC_LIBSERVER_COMMON_API void
+B10_LIBSERVER_COMMON_API void
initKeyring(config::ModuleCCSession& session);
/**
@@ -94,7 +94,7 @@ initKeyring(config::ModuleCCSession& session);
* as walidity should have been checked already in the config manager, or
* throw? What about when we get an update and it's invalid?
*/
-ISC_LIBSERVER_COMMON_API void
+B10_LIBSERVER_COMMON_API void
deinitKeyring(config::ModuleCCSession& session);
}
diff --git a/src/lib/server_common/logger.cc b/src/lib/server_common/logger.cc
index 764bac7..9b68b5c 100644
--- a/src/lib/server_common/logger.cc
+++ b/src/lib/server_common/logger.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBSERVER_COMMON_EXPORT
+#define B10_LIBSERVER_COMMON_EXPORT
#include <server_common/logger.h>
diff --git a/src/lib/server_common/portconfig.cc b/src/lib/server_common/portconfig.cc
index 41f9981..3486ccb 100644
--- a/src/lib/server_common/portconfig.cc
+++ b/src/lib/server_common/portconfig.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBSERVER_COMMON_EXPORT
+#define B10_LIBSERVER_COMMON_EXPORT
#include <config.h>
@@ -40,7 +40,7 @@ namespace isc {
namespace server_common {
namespace portconfig {
-ISC_LIBSERVER_COMMON_API AddressList
+B10_LIBSERVER_COMMON_API AddressList
parseAddresses(isc::data::ConstElementPtr addresses,
const std::string& elemName)
{
@@ -117,7 +117,7 @@ setAddresses(DNSServiceBase& service, const AddressList& addresses,
}
-ISC_LIBSERVER_COMMON_API void
+B10_LIBSERVER_COMMON_API void
installListenAddresses(const AddressList& new_addresses,
AddressList& address_store,
DNSServiceBase& service,
diff --git a/src/lib/server_common/portconfig.h b/src/lib/server_common/portconfig.h
index 63b1148..6e84261 100644
--- a/src/lib/server_common/portconfig.h
+++ b/src/lib/server_common/portconfig.h
@@ -78,7 +78,7 @@ typedef std::vector<AddressPair> AddressList;
* element in the hash, port number out of range).
* \throw std::bad_alloc when allocation fails.
*/
-ISC_LIBSERVER_COMMON_API AddressList
+B10_LIBSERVER_COMMON_API AddressList
parseAddresses(isc::data::ConstElementPtr addresses,
const std::string& elemName);
@@ -112,7 +112,7 @@ parseAddresses(isc::data::ConstElementPtr addresses,
/// \throw std::bad_alloc when allocation fails.
/// \throw isc::InvalidOperation when the function is called and the
/// SocketRequestor isn't initialized yet.
-ISC_LIBSERVER_COMMON_API void
+B10_LIBSERVER_COMMON_API void
installListenAddresses(const AddressList& new_addresses,
AddressList& address_store,
asiodns::DNSServiceBase& dns_service,
diff --git a/src/lib/server_common/socket_request.cc b/src/lib/server_common/socket_request.cc
index 8cb6055..2204fc6 100644
--- a/src/lib/server_common/socket_request.cc
+++ b/src/lib/server_common/socket_request.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBSERVER_COMMON_EXPORT
+#define B10_LIBSERVER_COMMON_EXPORT
#include <config.h>
@@ -463,7 +463,7 @@ private:
}
-ISC_LIBSERVER_COMMON_API SocketRequestor&
+B10_LIBSERVER_COMMON_API SocketRequestor&
socketRequestor() {
if (requestor != NULL) {
return (*requestor);
@@ -472,7 +472,7 @@ socketRequestor() {
}
}
-ISC_LIBSERVER_COMMON_API void
+B10_LIBSERVER_COMMON_API void
initSocketRequestor(cc::AbstractSession& session,
const std::string& app_name)
{
@@ -484,12 +484,12 @@ initSocketRequestor(cc::AbstractSession& session,
}
}
-ISC_LIBSERVER_COMMON_API void
+B10_LIBSERVER_COMMON_API void
initTestSocketRequestor(SocketRequestor* new_requestor) {
requestor = new_requestor;
}
-ISC_LIBSERVER_COMMON_API void
+B10_LIBSERVER_COMMON_API void
cleanupSocketRequestor() {
if (requestor != NULL) {
delete requestor;
diff --git a/src/lib/server_common/socket_request.h b/src/lib/server_common/socket_request.h
index ded0914..bebc526 100644
--- a/src/lib/server_common/socket_request.h
+++ b/src/lib/server_common/socket_request.h
@@ -44,7 +44,7 @@ namespace server_common {
/// subclass when needed.
///
/// \see socketRequestor function to access the object of this class.
-class ISC_LIBSERVER_COMMON_API SocketRequestor : boost::noncopyable {
+class B10_LIBSERVER_COMMON_API SocketRequestor : boost::noncopyable {
protected:
/// \brief Protected constructor
///
@@ -102,7 +102,7 @@ public:
/// This is thrown if the other side doesn't want to comply to our
/// requests, like when we ask for a socket already held by someone
/// else or ask for nonsense (releasing a socket we don't own).
- class ISC_LIBSERVER_COMMON_API SocketError : public Exception {
+ class B10_LIBSERVER_COMMON_API SocketError : public Exception {
public:
SocketError(const char* file, size_t line, const char* what) :
Exception(file, line, what)
@@ -120,7 +120,7 @@ public:
///
/// \see ShareError
/// \see SocketAllocateError
- class ISC_LIBSERVER_COMMON_API NonFatalSocketError : public SocketError {
+ class B10_LIBSERVER_COMMON_API NonFatalSocketError : public SocketError {
public:
NonFatalSocketError(const char* file, size_t line, const char* what) :
SocketError(file, line, what)
@@ -134,7 +134,7 @@ public:
/// allocated by bind10, but other bind10 module(s) is using it and
/// the sharing parameters are incompatible (the socket can't be shared
/// between the module and our module).
- class ISC_LIBSERVER_COMMON_API ShareError : public NonFatalSocketError {
+ class B10_LIBSERVER_COMMON_API ShareError : public NonFatalSocketError {
public:
ShareError(const char* file, size_t line, const char* what) :
NonFatalSocketError(file, line, what)
@@ -148,7 +148,7 @@ public:
/// creator. This can happen when the address/port pair is already taken
/// by a different application, the socket creator doesn't have enough
/// privileges, or for some kind of similar reason.
- class ISC_LIBSERVER_COMMON_API SocketAllocateError :
+ class B10_LIBSERVER_COMMON_API SocketAllocateError :
public NonFatalSocketError {
public:
SocketAllocateError(const char* file, size_t line, const char* what) :
@@ -231,7 +231,7 @@ public:
/// \return the active socket requestor object.
/// \throw InvalidOperation if the object was not yet initialized.
/// \see SocketRequestor::init to initialize the object.
-ISC_LIBSERVER_COMMON_API SocketRequestor& socketRequestor();
+B10_LIBSERVER_COMMON_API SocketRequestor& socketRequestor();
/// \brief Initialize the singleton object
///
@@ -248,7 +248,7 @@ ISC_LIBSERVER_COMMON_API SocketRequestor& socketRequestor();
/// to avoid them and provide the name of the application
/// here.
/// \throw InvalidOperation when it is called more than once
-ISC_LIBSERVER_COMMON_API void
+B10_LIBSERVER_COMMON_API void
initSocketRequestor(cc::AbstractSession& session,
const std::string& app_name);
@@ -267,7 +267,7 @@ initSocketRequestor(cc::AbstractSession& session,
/// \param requestor the object to be used. It can be NULL to reset to
/// an "virgin" state (which acts as if initTest or init was never
/// called before).
-ISC_LIBSERVER_COMMON_API void
+B10_LIBSERVER_COMMON_API void
initTestSocketRequestor(SocketRequestor* requestor);
/// \brief Destroy the singleton instance
@@ -278,7 +278,7 @@ initTestSocketRequestor(SocketRequestor* requestor);
/// that want to be completely clean on exit.
/// After this function has been called, all operations except init
/// will fail.
-ISC_LIBSERVER_COMMON_API void cleanupSocketRequestor();
+B10_LIBSERVER_COMMON_API void cleanupSocketRequestor();
}
}
diff --git a/src/lib/statistics/counter.cc b/src/lib/statistics/counter.cc
index 9836bab..e584f7f 100644
--- a/src/lib/statistics/counter.cc
+++ b/src/lib/statistics/counter.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBSTATISTICS_EXPORT
+#define B10_LIBSTATISTICS_EXPORT
#include <vector>
diff --git a/src/lib/statistics/counter.h b/src/lib/statistics/counter.h
index 2713db4..ba52d77 100644
--- a/src/lib/statistics/counter.h
+++ b/src/lib/statistics/counter.h
@@ -27,7 +27,7 @@ namespace statistics {
// forward declaration for pImpl idiom
class CounterImpl;
-class ISC_LIBSTATISTICS_API Counter : boost::noncopyable {
+class B10_LIBSTATISTICS_API Counter : boost::noncopyable {
private:
boost::scoped_ptr<CounterImpl> impl_;
public:
diff --git a/src/lib/statistics/counter_dict.cc b/src/lib/statistics/counter_dict.cc
index c7bef91..e02fb98 100644
--- a/src/lib/statistics/counter_dict.cc
+++ b/src/lib/statistics/counter_dict.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBSTATISTICS_EXPORT
+#define B10_LIBSTATISTICS_EXPORT
#include <cassert>
#include <stdexcept>
@@ -217,20 +217,20 @@ CounterDictionary::end() const {
CounterDictionaryConstIteratorImpl(impl_->end())));
}
-ISC_LIBSTATISTICS_API CounterDictionary::ConstIterator::ConstIterator() :
+B10_LIBSTATISTICS_API CounterDictionary::ConstIterator::ConstIterator() :
impl_(new CounterDictionaryConstIteratorImpl())
{}
-ISC_LIBSTATISTICS_API CounterDictionary::ConstIterator::~ConstIterator() {}
+B10_LIBSTATISTICS_API CounterDictionary::ConstIterator::~ConstIterator() {}
// Copy constructor: deep copy of impl_
-ISC_LIBSTATISTICS_API CounterDictionary::ConstIterator::ConstIterator(
+B10_LIBSTATISTICS_API CounterDictionary::ConstIterator::ConstIterator(
const CounterDictionary::ConstIterator& source) :
impl_(new CounterDictionaryConstIteratorImpl(*(source.impl_)))
{}
// Assignment operator: deep copy of impl_
-ISC_LIBSTATISTICS_API CounterDictionary::ConstIterator &
+B10_LIBSTATISTICS_API CounterDictionary::ConstIterator &
CounterDictionary::ConstIterator::operator=(
const CounterDictionary::ConstIterator &source)
{
@@ -239,25 +239,25 @@ CounterDictionary::ConstIterator::operator=(
}
// The constructor from implementation detail
-ISC_LIBSTATISTICS_API CounterDictionary::ConstIterator::ConstIterator(
+B10_LIBSTATISTICS_API CounterDictionary::ConstIterator::ConstIterator(
const CounterDictionaryConstIteratorImpl& source) :
impl_(new CounterDictionaryConstIteratorImpl(source))
{}
-ISC_LIBSTATISTICS_API const CounterDictionary::ConstIterator::value_type&
+B10_LIBSTATISTICS_API const CounterDictionary::ConstIterator::value_type&
CounterDictionary::ConstIterator::dereference() const
{
return (impl_->dereference());
}
-ISC_LIBSTATISTICS_API bool
+B10_LIBSTATISTICS_API bool
CounterDictionary::ConstIterator::equal(
CounterDictionary::ConstIterator const& other) const
{
return (impl_->equal(*(other.impl_)));
}
-ISC_LIBSTATISTICS_API void
+B10_LIBSTATISTICS_API void
CounterDictionary::ConstIterator::increment() {
impl_->increment();
return;
diff --git a/src/lib/statistics/counter_dict.h b/src/lib/statistics/counter_dict.h
index 22d9b21..2ee5a2f 100644
--- a/src/lib/statistics/counter_dict.h
+++ b/src/lib/statistics/counter_dict.h
@@ -32,7 +32,7 @@ namespace statistics {
class CounterDictionaryImpl;
class CounterDictionaryConstIteratorImpl;
-class ISC_LIBSTATISTICS_API CounterDictionary : boost::noncopyable {
+class B10_LIBSTATISTICS_API CounterDictionary : boost::noncopyable {
private:
boost::scoped_ptr<CounterDictionaryImpl> impl_;
// Default constructor is forbidden; number of counter items must be
@@ -99,24 +99,24 @@ public:
/// This constructor is mostly exception free. But it may still
/// throw a standard exception if memory allocation fails
/// inside the method.
- ISC_LIBSTATISTICS_API ConstIterator();
+ B10_LIBSTATISTICS_API ConstIterator();
/// The destructor.
///
/// This method never throws an exception.
- ISC_LIBSTATISTICS_API ~ConstIterator();
+ B10_LIBSTATISTICS_API ~ConstIterator();
/// The assignment operator.
///
/// This method is mostly exception free. But it may still
/// throw a standard exception if memory allocation fails
/// inside the method.
- ISC_LIBSTATISTICS_API ConstIterator&
+ B10_LIBSTATISTICS_API ConstIterator&
operator=(const ConstIterator &source);
/// The copy constructor.
///
/// This constructor is mostly exception free. But it may still
/// throw a standard exception if memory allocation fails
/// inside the method.
- ISC_LIBSTATISTICS_API ConstIterator(const ConstIterator& source);
+ B10_LIBSTATISTICS_API ConstIterator(const ConstIterator& source);
/// The constructor from implementation detail.
///
/// This method is used to create an instance of ConstIterator
@@ -125,15 +125,15 @@ public:
/// This constructor is mostly exception free. But it may still
/// throw a standard exception if memory allocation fails
/// inside the method.
- ISC_LIBSTATISTICS_API ConstIterator(
+ B10_LIBSTATISTICS_API ConstIterator(
const CounterDictionaryConstIteratorImpl& source);
private:
/// \brief An internal method to increment this iterator.
- ISC_LIBSTATISTICS_API void increment();
+ B10_LIBSTATISTICS_API void increment();
/// \brief An internal method to check equality.
- ISC_LIBSTATISTICS_API bool equal(const ConstIterator& other) const;
+ B10_LIBSTATISTICS_API bool equal(const ConstIterator& other) const;
/// \brief An internal method to dereference this iterator.
- ISC_LIBSTATISTICS_API const value_type& dereference() const;
+ B10_LIBSTATISTICS_API const value_type& dereference() const;
private:
friend class boost::iterator_core_access;
};
diff --git a/src/lib/statistics/dll.h b/src/lib/statistics/dll.h
index c830240..c468d32 100644
--- a/src/lib/statistics/dll.h
+++ b/src/lib/statistics/dll.h
@@ -16,12 +16,12 @@
#define __LIBSTATISTICS_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBSTATISTICS_API
+#define B10_LIBSTATISTICS_API
#else
-#ifdef ISC_LIBSTATISTICS_EXPORT
-#define ISC_LIBSTATISTICS_API __declspec(dllexport)
+#ifdef B10_LIBSTATISTICS_EXPORT
+#define B10_LIBSTATISTICS_API __declspec(dllexport)
#else
-#define ISC_LIBSTATISTICS_API __declspec(dllimport)
+#define B10_LIBSTATISTICS_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/testutils/dll.h b/src/lib/testutils/dll.h
index d47c882..c063207 100644
--- a/src/lib/testutils/dll.h
+++ b/src/lib/testutils/dll.h
@@ -16,12 +16,12 @@
#define __LIBTESTUTILS_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBTESTUTILS_API
+#define B10_LIBTESTUTILS_API
#else
-#ifdef ISC_LIBTESTUTILS_EXPORT
-#define ISC_LIBTESTUTILS_API __declspec(dllexport)
+#ifdef B10_LIBTESTUTILS_EXPORT
+#define B10_LIBTESTUTILS_API __declspec(dllexport)
#else
-#define ISC_LIBTESTUTILS_API __declspec(dllimport)
+#define B10_LIBTESTUTILS_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/testutils/dnsmessage_test.cc b/src/lib/testutils/dnsmessage_test.cc
index fe6a79e..c72da6d 100644
--- a/src/lib/testutils/dnsmessage_test.cc
+++ b/src/lib/testutils/dnsmessage_test.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBTESTUTILS_EXPORT
+#define B10_LIBTESTUTILS_EXPORT
#include <dns/message.h>
#include <dns/opcode.h>
@@ -35,13 +35,13 @@ using namespace isc::dns;
namespace isc {
namespace testutils {
-ISC_LIBTESTUTILS_API const unsigned int QR_FLAG = 0x1;
-ISC_LIBTESTUTILS_API const unsigned int AA_FLAG = 0x2;
-ISC_LIBTESTUTILS_API const unsigned int TC_FLAG = 0x4;
-ISC_LIBTESTUTILS_API const unsigned int RD_FLAG = 0x8;
-ISC_LIBTESTUTILS_API const unsigned int RA_FLAG = 0x10;
-ISC_LIBTESTUTILS_API const unsigned int AD_FLAG = 0x20;
-ISC_LIBTESTUTILS_API const unsigned int CD_FLAG = 0x40;
+B10_LIBTESTUTILS_API const unsigned int QR_FLAG = 0x1;
+B10_LIBTESTUTILS_API const unsigned int AA_FLAG = 0x2;
+B10_LIBTESTUTILS_API const unsigned int TC_FLAG = 0x4;
+B10_LIBTESTUTILS_API const unsigned int RD_FLAG = 0x8;
+B10_LIBTESTUTILS_API const unsigned int RA_FLAG = 0x10;
+B10_LIBTESTUTILS_API const unsigned int AD_FLAG = 0x20;
+B10_LIBTESTUTILS_API const unsigned int CD_FLAG = 0x40;
void
headerCheck(const Message& message, const qid_t qid, const Rcode& rcode,
diff --git a/src/lib/testutils/dnsmessage_test.h b/src/lib/testutils/dnsmessage_test.h
index 0417a09..ada5499 100644
--- a/src/lib/testutils/dnsmessage_test.h
+++ b/src/lib/testutils/dnsmessage_test.h
@@ -42,13 +42,13 @@ namespace testutils {
/// (The flag values is irrelevant to their wire-format values).
/// The meaning of the flags should be obvious from the variable names.
//@{
-extern ISC_LIBTESTUTILS_API const unsigned int QR_FLAG;
-extern ISC_LIBTESTUTILS_API const unsigned int AA_FLAG;
-extern ISC_LIBTESTUTILS_API const unsigned int TC_FLAG;
-extern ISC_LIBTESTUTILS_API const unsigned int RD_FLAG;
-extern ISC_LIBTESTUTILS_API const unsigned int RA_FLAG;
-extern ISC_LIBTESTUTILS_API const unsigned int AD_FLAG;
-extern ISC_LIBTESTUTILS_API const unsigned int CD_FLAG;
+extern B10_LIBTESTUTILS_API const unsigned int QR_FLAG;
+extern B10_LIBTESTUTILS_API const unsigned int AA_FLAG;
+extern B10_LIBTESTUTILS_API const unsigned int TC_FLAG;
+extern B10_LIBTESTUTILS_API const unsigned int RD_FLAG;
+extern B10_LIBTESTUTILS_API const unsigned int RA_FLAG;
+extern B10_LIBTESTUTILS_API const unsigned int AD_FLAG;
+extern B10_LIBTESTUTILS_API const unsigned int CD_FLAG;
//@}
/// Set of unit tests to examine a DNS message header.
@@ -80,7 +80,7 @@ extern ISC_LIBTESTUTILS_API const unsigned int CD_FLAG;
/// \param ancount The expected value of ANCOUNT
/// \param nscount The expected value of NSCOUNT
/// \param arcount The expected value of ARCOUNT
-ISC_LIBTESTUTILS_API void
+B10_LIBTESTUTILS_API void
headerCheck(const isc::dns::Message& message, const isc::dns::qid_t qid,
const isc::dns::Rcode& rcode,
const uint16_t opcodeval, const unsigned int flags,
@@ -113,7 +113,7 @@ headerCheck(const isc::dns::Message& message, const isc::dns::qid_t qid,
///
/// \param expected_rrset The expected RRset
/// \param actual_rrset The RRset to be tested
-ISC_LIBTESTUTILS_API void
+B10_LIBTESTUTILS_API void
rrsetCheck(isc::dns::ConstRRsetPtr expected_rrset,
isc::dns::ConstRRsetPtr actual_rrset);
@@ -194,7 +194,7 @@ private:
/// parameter normally doesn't have to be specified, but for an SOA RR it
/// must be set to its owner name, due to the internal check of
/// \c dns::masterLoad().
-ISC_LIBTESTUTILS_API isc::dns::RRsetPtr
+B10_LIBTESTUTILS_API isc::dns::RRsetPtr
textToRRset(const std::string& text_rrset,
const isc::dns::RRClass& rrclass =
isc::dns::RRClass::IN(),
diff --git a/src/lib/testutils/mockups.h b/src/lib/testutils/mockups.h
index 09b7df8..3211320 100644
--- a/src/lib/testutils/mockups.h
+++ b/src/lib/testutils/mockups.h
@@ -37,7 +37,7 @@ namespace testutils {
// A minimal mock configuration session. Most the methods are
// stubbed out, except for a very basic group_sendmsg() and
// group_recvmsg(). hasQueuedMessages() always returns false.
-class ISC_LIBTESTUTILS_API MockSession : public isc::cc::AbstractSession {
+class B10_LIBTESTUTILS_API MockSession : public isc::cc::AbstractSession {
public:
MockSession() :
// by default we return a simple "success" message.
@@ -108,7 +108,7 @@ private:
// This mock object does nothing except for recording passed parameters
// to addServerXXX methods so the test code subsequently checks the parameters.
-class ISC_LIBTESTUTILS_API MockDNSService :
+class B10_LIBTESTUTILS_API MockDNSService :
public isc::asiodns::DNSServiceBase {
public:
// A helper tuple of parameters passed to addServerUDPFromFD().
@@ -170,7 +170,7 @@ private:
};
// A nonoperative DNSServer object to be used in calls to processMessage().
-class ISC_LIBTESTUTILS_API MockServer : public isc::asiodns::DNSServer {
+class B10_LIBTESTUTILS_API MockServer : public isc::asiodns::DNSServer {
public:
MockServer() : done_(false) {}
void operator()(asio::error_code, size_t) {}
@@ -182,7 +182,7 @@ private:
};
// Mock Xfrout client
-class ISC_LIBTESTUTILS_API MockXfroutClient :
+class B10_LIBTESTUTILS_API MockXfroutClient :
public isc::xfr::AbstractXfroutClient {
public:
MockXfroutClient() :
diff --git a/src/lib/testutils/socket_request.cc b/src/lib/testutils/socket_request.cc
index 10a5085..5a3dc45 100644
--- a/src/lib/testutils/socket_request.cc
+++ b/src/lib/testutils/socket_request.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBTESTUTILS_EXPORT
+#define B10_LIBTESTUTILS_EXPORT
#include <config.h>
@@ -24,7 +24,7 @@
// Instantiate class
-class ISC_LIBTESTUTILS_API TestSocketRequestor;
+class B10_LIBTESTUTILS_API TestSocketRequestor;
// Local Variables:
// mode: c++
diff --git a/src/lib/testutils/socket_request.h b/src/lib/testutils/socket_request.h
index bdba9ce..ea27f7e 100644
--- a/src/lib/testutils/socket_request.h
+++ b/src/lib/testutils/socket_request.h
@@ -45,7 +45,7 @@ namespace testutils {
/// Some member variables are intentionally made public so that test cases
/// can easily check the value of them. We prefer convenience for tests over
/// class integrity here.
-class ISC_LIBTESTUTILS_API TestSocketRequestor :
+class B10_LIBTESTUTILS_API TestSocketRequestor :
public isc::server_common::SocketRequestor {
public:
/// \brief Constructor
diff --git a/src/lib/testutils/srv_test.cc b/src/lib/testutils/srv_test.cc
index f5a27ce..3b7e149 100644
--- a/src/lib/testutils/srv_test.cc
+++ b/src/lib/testutils/srv_test.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBTESTUTILS_EXPORT
+#define B10_LIBTESTUTILS_EXPORT
#include <config.h>
@@ -40,8 +40,8 @@ using namespace isc::asiolink;
namespace isc {
namespace testutils {
-const ISC_LIBTESTUTILS_API char* const DEFAULT_REMOTE_ADDRESS = "192.0.2.1";
-const ISC_LIBTESTUTILS_API uint16_t DEFAULT_REMOTE_PORT = 53210;
+const B10_LIBTESTUTILS_API char* const DEFAULT_REMOTE_ADDRESS = "192.0.2.1";
+const B10_LIBTESTUTILS_API uint16_t DEFAULT_REMOTE_PORT = 53210;
SrvTestBase::SrvTestBase() : request_message(Message::RENDER),
parse_message(new Message(Message::PARSE)),
diff --git a/src/lib/testutils/srv_test.h b/src/lib/testutils/srv_test.h
index e70c8de..2ed9902 100644
--- a/src/lib/testutils/srv_test.h
+++ b/src/lib/testutils/srv_test.h
@@ -28,29 +28,29 @@
#include "mockups.h"
namespace asiolink {
-class ISC_LIBTESTUTILS_API IOSocket;
-class ISC_LIBTESTUTILS_API IOMessage;
-class ISC_LIBTESTUTILS_API IOEndpoint;
+class B10_LIBTESTUTILS_API IOSocket;
+class B10_LIBTESTUTILS_API IOMessage;
+class B10_LIBTESTUTILS_API IOEndpoint;
}
namespace isc {
namespace testutils {
-extern ISC_LIBTESTUTILS_API const char* const DEFAULT_REMOTE_ADDRESS;
-extern ISC_LIBTESTUTILS_API const uint16_t DEFAULT_REMOTE_PORT;
+extern B10_LIBTESTUTILS_API const char* const DEFAULT_REMOTE_ADDRESS;
+extern B10_LIBTESTUTILS_API const uint16_t DEFAULT_REMOTE_PORT;
// These are flags to indicate whether the corresponding flag bit of the
// DNS header is to be set in the test cases. (The flag values
// is irrelevant to their wire-format values)
-extern ISC_LIBTESTUTILS_API const unsigned int QR_FLAG;
-extern ISC_LIBTESTUTILS_API const unsigned int AA_FLAG;
-extern ISC_LIBTESTUTILS_API const unsigned int TC_FLAG;
-extern ISC_LIBTESTUTILS_API const unsigned int RD_FLAG;
-extern ISC_LIBTESTUTILS_API const unsigned int RA_FLAG;
-extern ISC_LIBTESTUTILS_API const unsigned int AD_FLAG;
-extern ISC_LIBTESTUTILS_API const unsigned int CD_FLAG;
+extern B10_LIBTESTUTILS_API const unsigned int QR_FLAG;
+extern B10_LIBTESTUTILS_API const unsigned int AA_FLAG;
+extern B10_LIBTESTUTILS_API const unsigned int TC_FLAG;
+extern B10_LIBTESTUTILS_API const unsigned int RD_FLAG;
+extern B10_LIBTESTUTILS_API const unsigned int RA_FLAG;
+extern B10_LIBTESTUTILS_API const unsigned int AD_FLAG;
+extern B10_LIBTESTUTILS_API const unsigned int CD_FLAG;
/// \brief The base class for Auth and Recurse test case
-class ISC_LIBTESTUTILS_API SrvTestBase : public ::testing::Test {
+class B10_LIBTESTUTILS_API SrvTestBase : public ::testing::Test {
protected:
SrvTestBase();
virtual ~SrvTestBase();
diff --git a/src/lib/util/buffer.cc b/src/lib/util/buffer.cc
index 65bd189..fc23d05 100644
--- a/src/lib/util/buffer.cc
+++ b/src/lib/util/buffer.cc
@@ -12,14 +12,14 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_EXPORT
+#define B10_LIBUTIL_EXPORT
#include <util/buffer.h>
// Instantiate classes
-class ISC_LIBUTIL_API InputBuffer;
-class ISC_LIBUTIL_API OutputBuffer;
+class B10_LIBUTIL_API InputBuffer;
+class B10_LIBUTIL_API OutputBuffer;
// Local Variables:
// mode: c++
diff --git a/src/lib/util/buffer.h b/src/lib/util/buffer.h
index 69f7558..d6e55d3 100644
--- a/src/lib/util/buffer.h
+++ b/src/lib/util/buffer.h
@@ -34,7 +34,7 @@ namespace util {
/// \brief A standard DNS module exception that is thrown if an out-of-range
/// buffer operation is being performed.
///
-class ISC_LIBUTIL_API InvalidBufferPosition : public Exception {
+class B10_LIBUTIL_API InvalidBufferPosition : public Exception {
public:
InvalidBufferPosition(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -88,7 +88,7 @@ public:
/// head of the unread data. An object of this class internally holds (a
/// notion of) where the next read operation should start. We call it the
/// <em>read position</em> in this document.
-class ISC_LIBUTIL_API InputBuffer {
+class B10_LIBUTIL_API InputBuffer {
public:
///
/// \name Constructors and Destructor
@@ -301,7 +301,7 @@ protected:
/// if we really want that flexibility. We may revisit the class design as
/// we see more applications of the class. The same considerations apply to
/// the \c InputBuffer and \c MessageRenderer classes.
-class ISC_LIBUTIL_API OutputBuffer {
+class B10_LIBUTIL_API OutputBuffer {
public:
///
/// \name Constructors and Destructor
diff --git a/src/lib/util/dll.h b/src/lib/util/dll.h
index a9442a3..9b7c46d 100644
--- a/src/lib/util/dll.h
+++ b/src/lib/util/dll.h
@@ -16,12 +16,12 @@
#define __LIBUTIL_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBUTIL_API
+#define B10_LIBUTIL_API
#else
-#ifdef ISC_LIBUTIL_EXPORT
-#define ISC_LIBUTIL_API __declspec(dllexport)
+#ifdef B10_LIBUTIL_EXPORT
+#define B10_LIBUTIL_API __declspec(dllexport)
#else
-#define ISC_LIBUTIL_API __declspec(dllimport)
+#define B10_LIBUTIL_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/util/encode/base32hex.h b/src/lib/util/encode/base32hex.h
index c9d460d..fd49a25 100644
--- a/src/lib/util/encode/base32hex.h
+++ b/src/lib/util/encode/base32hex.h
@@ -41,7 +41,7 @@ namespace encode {
/// \param binary A vector object storing the data to be encoded.
/// \return A newly created string that stores base32hex encoded value for
/// binary.
-ISC_LIBUTIL_API
+B10_LIBUTIL_API
std::string encodeBase32Hex(const std::vector<uint8_t>& binary);
/// \brief Decode a text encoded in the base32hex format into the
@@ -54,7 +54,7 @@ std::string encodeBase32Hex(const std::vector<uint8_t>& binary);
///
/// \param input A text encoded in the base32hex format.
/// \param result A vector in which the decoded %data is to be stored.
-ISC_LIBUTIL_API
+B10_LIBUTIL_API
void decodeBase32Hex(const std::string& input, std::vector<uint8_t>& result);
} // namespace encode
diff --git a/src/lib/util/encode/base64.h b/src/lib/util/encode/base64.h
index cf2b6ec..eace8e4 100644
--- a/src/lib/util/encode/base64.h
+++ b/src/lib/util/encode/base64.h
@@ -44,7 +44,7 @@ namespace encode {
///
/// \param binary A vector object storing the data to be encoded.
/// \return A newly created string that stores base64 encoded value for binary.
-ISC_LIBUTIL_API
+B10_LIBUTIL_API
std::string encodeBase64(const std::vector<uint8_t>& binary);
/// \brief Decode a text encoded in the base64 format into the original %data.
@@ -69,7 +69,7 @@ std::string encodeBase64(const std::vector<uint8_t>& binary);
///
/// \param input A text encoded in the base64 format.
/// \param result A vector in which the decoded %data is to be stored.
-ISC_LIBUTIL_API
+B10_LIBUTIL_API
void decodeBase64(const std::string& input, std::vector<uint8_t>& result);
} // namespace encode
diff --git a/src/lib/util/encode/base_n.cc b/src/lib/util/encode/base_n.cc
index a7c74b1..da4f068 100644
--- a/src/lib/util/encode/base_n.cc
+++ b/src/lib/util/encode/base_n.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_EXPORT
+#define B10_LIBUTIL_EXPORT
#include <config.h>
@@ -390,32 +390,32 @@ typedef BaseNTransformer<4, '0', base16_encoder, base16_decoder>
Base16Transformer;
}
-ISC_LIBUTIL_API string
+B10_LIBUTIL_API string
encodeBase64(const vector<uint8_t>& binary) {
return (Base64Transformer::encode(binary));
}
-ISC_LIBUTIL_API void
+B10_LIBUTIL_API void
decodeBase64(const string& input, vector<uint8_t>& result) {
Base64Transformer::decode("base64", input, result);
}
-ISC_LIBUTIL_API string
+B10_LIBUTIL_API string
encodeBase32Hex(const vector<uint8_t>& binary) {
return (Base32HexTransformer::encode(binary));
}
-ISC_LIBUTIL_API void
+B10_LIBUTIL_API void
decodeBase32Hex(const string& input, vector<uint8_t>& result) {
Base32HexTransformer::decode("base32hex", input, result);
}
-ISC_LIBUTIL_API string
+B10_LIBUTIL_API string
encodeHex(const vector<uint8_t>& binary) {
return (Base16Transformer::encode(binary));
}
-ISC_LIBUTIL_API void
+B10_LIBUTIL_API void
decodeHex(const string& input, vector<uint8_t>& result) {
Base16Transformer::decode("base16", input, result);
}
diff --git a/src/lib/util/encode/hex.h b/src/lib/util/encode/hex.h
index cf0eb97..5e8937a 100644
--- a/src/lib/util/encode/hex.h
+++ b/src/lib/util/encode/hex.h
@@ -41,7 +41,7 @@ namespace encode {
/// \param binary A vector object storing the data to be encoded.
/// \return A newly created string that stores base16 encoded value for
/// binary.
-ISC_LIBUTIL_API
+B10_LIBUTIL_API
std::string encodeHex(const std::vector<uint8_t>& binary);
/// \brief Decode a text encoded in the base16 ('hex') format into the
@@ -55,7 +55,7 @@ std::string encodeHex(const std::vector<uint8_t>& binary);
///
/// \param input A text encoded in the base16 format.
/// \param result A vector in which the decoded %data is to be stored.
-ISC_LIBUTIL_API
+B10_LIBUTIL_API
void decodeHex(const std::string& input, std::vector<uint8_t>& result);
} // namespace encode
diff --git a/src/lib/util/filename.cc b/src/lib/util/filename.cc
index f9bcb05..b7e9d20 100644
--- a/src/lib/util/filename.cc
+++ b/src/lib/util/filename.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_EXPORT
+#define B10_LIBUTIL_EXPORT
#include <iostream>
#include <algorithm>
diff --git a/src/lib/util/filename.h b/src/lib/util/filename.h
index ed4f1f7..d4e3239 100644
--- a/src/lib/util/filename.h
+++ b/src/lib/util/filename.h
@@ -56,7 +56,7 @@ namespace util {
/// substituting components.
-class ISC_LIBUTIL_API Filename {
+class B10_LIBUTIL_API Filename {
public:
/// \brief Constructor
diff --git a/src/lib/util/hash/sha1.cc b/src/lib/util/hash/sha1.cc
index 3686939..37a338d 100644
--- a/src/lib/util/hash/sha1.cc
+++ b/src/lib/util/hash/sha1.cc
@@ -51,7 +51,7 @@
*
*/
-#define ISC_LIBUTIL_EXPORT
+#define B10_LIBUTIL_EXPORT
#include <util/hash/sha1.h>
@@ -113,7 +113,7 @@ SHA1AddLength(SHA1Context *context, uint32_t length) {
* sha Error Code.
*
*/
-ISC_LIBUTIL_API int
+B10_LIBUTIL_API int
SHA1Reset(SHA1Context *context) {
if (!context) {
return (SHA_NULL);
@@ -155,7 +155,7 @@ SHA1Reset(SHA1Context *context) {
* sha Error Code.
*
*/
-ISC_LIBUTIL_API int
+B10_LIBUTIL_API int
SHA1Input(SHA1Context *context, const uint8_t *message_array, unsigned length) {
if (!length) {
return (SHA_SUCCESS);
@@ -209,7 +209,7 @@ SHA1Input(SHA1Context *context, const uint8_t *message_array, unsigned length) {
* Returns:
* sha Error Code.
*/
-ISC_LIBUTIL_API int
+B10_LIBUTIL_API int
SHA1FinalBits(SHA1Context *context, const uint8_t message_bits,
unsigned int length)
{
@@ -277,7 +277,7 @@ SHA1FinalBits(SHA1Context *context, const uint8_t message_bits,
* sha Error Code.
*
*/
-ISC_LIBUTIL_API int
+B10_LIBUTIL_API int
SHA1Result(SHA1Context *context, uint8_t Message_Digest[SHA1_HASHSIZE]) {
int i;
diff --git a/src/lib/util/hash/sha1.h b/src/lib/util/hash/sha1.h
index 0fd2b9b..49d77ea 100644
--- a/src/lib/util/hash/sha1.h
+++ b/src/lib/util/hash/sha1.h
@@ -66,7 +66,7 @@ enum {
* This structure will hold context information for the SHA-1
* hashing operation
*/
-typedef struct ISC_LIBUTIL_API SHA1Context
+typedef struct B10_LIBUTIL_API SHA1Context
{
uint32_t Intermediate_Hash[SHA1_HASHSIZE/4]; /* Message Digest */
uint32_t Length_Low; /* Message length in bits */
@@ -80,12 +80,12 @@ typedef struct ISC_LIBUTIL_API SHA1Context
/*
* Function Prototypes
*/
-extern ISC_LIBUTIL_API int SHA1Reset(SHA1Context *);
-extern ISC_LIBUTIL_API int SHA1Input(SHA1Context *, const uint8_t *bytes,
+extern B10_LIBUTIL_API int SHA1Reset(SHA1Context *);
+extern B10_LIBUTIL_API int SHA1Input(SHA1Context *, const uint8_t *bytes,
unsigned int bytecount);
-extern ISC_LIBUTIL_API int SHA1FinalBits(SHA1Context *, const uint8_t bits,
+extern B10_LIBUTIL_API int SHA1FinalBits(SHA1Context *, const uint8_t bits,
unsigned int bitcount);
-extern ISC_LIBUTIL_API int SHA1Result(SHA1Context *,
+extern B10_LIBUTIL_API int SHA1Result(SHA1Context *,
uint8_t Message_Digest[SHA1_HASHSIZE]);
} // namespace hash
diff --git a/src/lib/util/interprocess_sync.h b/src/lib/util/interprocess_sync.h
index 896f697..395dcb2 100644
--- a/src/lib/util/interprocess_sync.h
+++ b/src/lib/util/interprocess_sync.h
@@ -22,7 +22,7 @@
namespace isc {
namespace util {
-class ISC_LIBUTIL_API InterprocessSyncLocker; // forward declaration
+class B10_LIBUTIL_API InterprocessSyncLocker; // forward declaration
/// \brief Interprocess Sync Class
///
@@ -44,7 +44,7 @@ class ISC_LIBUTIL_API InterprocessSyncLocker; // forward declaration
/// NOTE: All implementations of InterprocessSync should keep the
/// is_locked_ member variable updated whenever their
/// lock()/tryLock()/unlock() implementations are called.
-class ISC_LIBUTIL_API InterprocessSync {
+class B10_LIBUTIL_API InterprocessSync {
// InterprocessSyncLocker is the only code outside this class that
// should be allowed to call the lock(), tryLock() and unlock()
// methods.
@@ -92,7 +92,7 @@ protected:
/// locks that are released automatically when the block is exited
/// (RAII). It is meant to be used along with InterprocessSync objects. See
/// the description of InterprocessSync.
-class ISC_LIBUTIL_API InterprocessSyncLocker {
+class B10_LIBUTIL_API InterprocessSyncLocker {
public:
/// \brief Constructor
///
diff --git a/src/lib/util/interprocess_sync_file.cc b/src/lib/util/interprocess_sync_file.cc
index 5e820b3..06fd21d 100644
--- a/src/lib/util/interprocess_sync_file.cc
+++ b/src/lib/util/interprocess_sync_file.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_EXPORT
+#define B10_LIBUTIL_EXPORT
#include <config.h>
diff --git a/src/lib/util/interprocess_sync_file.h b/src/lib/util/interprocess_sync_file.h
index 90fdd63..e9fcc52 100644
--- a/src/lib/util/interprocess_sync_file.h
+++ b/src/lib/util/interprocess_sync_file.h
@@ -26,7 +26,7 @@ namespace util {
///
/// Exception that is thrown if it's not possible to open the
/// lock file.
-class ISC_LIBUTIL_API InterprocessSyncFileError : public Exception {
+class B10_LIBUTIL_API InterprocessSyncFileError : public Exception {
public:
InterprocessSyncFileError(const char* file, size_t line,
const char* what) :
@@ -47,7 +47,7 @@ public:
/// This implementation opens lock files lazily (only when
/// necessary). It also leaves the lock files lying around as multiple
/// processes may have locks on them.
-class ISC_LIBUTIL_API InterprocessSyncFile : public InterprocessSync {
+class B10_LIBUTIL_API InterprocessSyncFile : public InterprocessSync {
public:
/// \brief Constructor
///
diff --git a/src/lib/util/interprocess_sync_null.cc b/src/lib/util/interprocess_sync_null.cc
index 7f12ed7..690304c 100644
--- a/src/lib/util/interprocess_sync_null.cc
+++ b/src/lib/util/interprocess_sync_null.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_EXPORT
+#define B10_LIBUTIL_EXPORT
#include "interprocess_sync_null.h"
diff --git a/src/lib/util/interprocess_sync_null.h b/src/lib/util/interprocess_sync_null.h
index e4f5f4e..f6248ad 100644
--- a/src/lib/util/interprocess_sync_null.h
+++ b/src/lib/util/interprocess_sync_null.h
@@ -26,7 +26,7 @@ namespace util {
/// This class specifies a concrete implementation for a null (no effect)
/// interprocess synchronization mechanism. Please see the
/// InterprocessSync class documentation for usage.
-class ISC_LIBUTIL_API InterprocessSyncNull : public InterprocessSync {
+class B10_LIBUTIL_API InterprocessSyncNull : public InterprocessSync {
public:
/// \brief Constructor
///
diff --git a/src/lib/util/io/dll.h b/src/lib/util/io/dll.h
index bb44db2..2af1fed 100644
--- a/src/lib/util/io/dll.h
+++ b/src/lib/util/io/dll.h
@@ -16,12 +16,12 @@
#define __LIBUTIL_IO_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBUTIL_IO_API
+#define B10_LIBUTIL_IO_API
#else
-#ifdef ISC_LIBUTIL_IO_EXPORT
-#define ISC_LIBUTIL_IO_API __declspec(dllexport)
+#ifdef B10_LIBUTIL_IO_EXPORT
+#define B10_LIBUTIL_IO_API __declspec(dllexport)
#else
-#define ISC_LIBUTIL_IO_API __declspec(dllimport)
+#define B10_LIBUTIL_IO_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/util/io/fd.cc b/src/lib/util/io/fd.cc
index 8218605..7c9bd8c 100644
--- a/src/lib/util/io/fd.cc
+++ b/src/lib/util/io/fd.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_IO_EXPORT
+#define B10_LIBUTIL_IO_EXPORT
#include "fd.h"
@@ -31,7 +31,7 @@ namespace isc {
namespace util {
namespace io {
-ISC_LIBUTIL_IO_API bool
+B10_LIBUTIL_IO_API bool
write_data(const int fd, const void *buffer_v, const size_t length) {
const unsigned char* buffer(static_cast<const unsigned char*>(buffer_v));
size_t remaining = length; // Amount remaining to be written
@@ -62,7 +62,7 @@ write_data(const int fd, const void *buffer_v, const size_t length) {
return (true);
}
-ISC_LIBUTIL_IO_API ssize_t
+B10_LIBUTIL_IO_API ssize_t
read_data(const int fd, void *buffer_v, const size_t length) {
unsigned char* buffer(static_cast<unsigned char*>(buffer_v));
size_t remaining = length; // Amount remaining to be read
@@ -89,7 +89,7 @@ read_data(const int fd, void *buffer_v, const size_t length) {
return (static_cast<ssize_t>(length - remaining));
}
-ISC_LIBUTIL_IO_API bool
+B10_LIBUTIL_IO_API bool
send_data(
#ifdef _WIN32
const SOCKET fd,
@@ -126,7 +126,7 @@ send_data(
return (true);
}
-ISC_LIBUTIL_IO_API ssize_t
+B10_LIBUTIL_IO_API ssize_t
recv_data(
#ifdef _WIN32
const SOCKET fd,
diff --git a/src/lib/util/io/fd.h b/src/lib/util/io/fd.h
index 9c06503..c441ed6 100644
--- a/src/lib/util/io/fd.h
+++ b/src/lib/util/io/fd.h
@@ -46,13 +46,13 @@ namespace io {
* \param data The buffer to write.
* \param length How much data is there to write.
*/
-ISC_LIBUTIL_IO_API bool
+B10_LIBUTIL_IO_API bool
write_data(const int fd, const void *data, const size_t length);
#ifdef _WIN32
-ISC_LIBUTIL_IO_API bool
+B10_LIBUTIL_IO_API bool
send_data(const SOCKET fd, const void *data, const size_t length);
#else
-ISC_LIBUTIL_IO_API bool
+B10_LIBUTIL_IO_API bool
send_data(const int fd, const void *data, const size_t length);
#endif
@@ -66,13 +66,13 @@ send_data(const int fd, const void *data, const size_t length);
* \param data Where to put the data.
* \param length How many of them.
*/
-ISC_LIBUTIL_IO_API ssize_t
+B10_LIBUTIL_IO_API ssize_t
read_data(const int fd, void *buffer, const size_t length);
#ifdef _WIN32
-ISC_LIBUTIL_IO_API ssize_t
+B10_LIBUTIL_IO_API ssize_t
recv_data(const SOCKET fd, void *buffer, const size_t length);
#else
-ISC_LIBUTIL_IO_API ssize_t
+B10_LIBUTIL_IO_API ssize_t
recv_data(const int fd, void *buffer, const size_t length);
#endif
diff --git a/src/lib/util/io/fd_share.cc b/src/lib/util/io/fd_share.cc
index 390f434..a6f81c6 100644
--- a/src/lib/util/io/fd_share.cc
+++ b/src/lib/util/io/fd_share.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_IO_EXPORT
+#define B10_LIBUTIL_IO_EXPORT
#include <config.h>
@@ -86,7 +86,7 @@ cmsg_space(const socklen_t len) {
}
}
-ISC_LIBUTIL_IO_API int
+B10_LIBUTIL_IO_API int
recv_fd(const int sock) {
struct msghdr msghdr;
struct iovec iov_dummy;
@@ -137,7 +137,7 @@ recv_fd(const int sock) {
return (new_fd);
}
-ISC_LIBUTIL_IO_API int
+B10_LIBUTIL_IO_API int
send_fd(const int sock, const int fd) {
struct msghdr msghdr;
struct iovec iov_dummy;
@@ -202,7 +202,7 @@ recv_pid(const SOCKET sock) {
}
}
-ISC_LIBUTIL_IO_API SOCKET
+B10_LIBUTIL_IO_API SOCKET
recv_fd(const SOCKET sock) {
int ret(send_pid(sock));
if (ret != 0) {
@@ -222,7 +222,7 @@ recv_fd(const SOCKET sock) {
return (nsock);
}
-ISC_LIBUTIL_IO_API int
+B10_LIBUTIL_IO_API int
send_fd(const SOCKET sock, const SOCKET fd) {
pid_t peerpid(recv_pid(sock));
if (peerpid == FD_SYSTEM_ERROR) {
diff --git a/src/lib/util/io/fd_share.h b/src/lib/util/io/fd_share.h
index 3e75431..b24d623 100644
--- a/src/lib/util/io/fd_share.h
+++ b/src/lib/util/io/fd_share.h
@@ -43,7 +43,7 @@ const int FD_OTHER_ERROR = -1;
* \param sock The unix domain socket to read from. Tested and it does
* not work with a pipe.
*/
-ISC_LIBUTIL_IO_API
+B10_LIBUTIL_IO_API
#ifdef _WIN32
SOCKET recv_fd(const SOCKET sock);
#else
@@ -63,7 +63,7 @@ int recv_fd(const int sock);
* \param fd The file descriptor to send. It should work with any valid
* file descriptor.
*/
-ISC_LIBUTIL_IO_API
+B10_LIBUTIL_IO_API
#ifdef _WIN32
int send_fd(const SOCKET sock, const SOCKET fd);
#else
diff --git a/src/lib/util/io/socketsession.cc b/src/lib/util/io/socketsession.cc
index 9b712b4..bd6ac08 100644
--- a/src/lib/util/io/socketsession.cc
+++ b/src/lib/util/io/socketsession.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_IO_EXPORT
+#define B10_LIBUTIL_IO_EXPORT
#include <config.h>
diff --git a/src/lib/util/io/socketsession.h b/src/lib/util/io/socketsession.h
index 56ebd3f..4c7cb07 100644
--- a/src/lib/util/io/socketsession.h
+++ b/src/lib/util/io/socketsession.h
@@ -158,7 +158,7 @@ namespace io {
/// In general the errors are unusual but possible failures such as unexpected
/// connection reset, and suggest the application to close the connection and
/// (if necessary) reestablish it.
-class ISC_LIBUTIL_IO_API SocketSessionError: public Exception {
+class B10_LIBUTIL_IO_API SocketSessionError: public Exception {
public:
SocketSessionError(const char *file, size_t line, const char *what):
isc::Exception(file, line, what) {}
@@ -179,7 +179,7 @@ public:
/// version of this base class, while it's not prohibited at the API level.
///
/// See description of \c SocketSessionForwarder for the expected interface.
-class ISC_LIBUTIL_IO_API BaseSocketSessionForwarder {
+class B10_LIBUTIL_IO_API BaseSocketSessionForwarder {
protected:
BaseSocketSessionForwarder() {}
@@ -207,7 +207,7 @@ public:
///
/// See the description of \ref SocketSessionUtility for other details of how
/// the session forwarding works.
-class ISC_LIBUTIL_IO_API SocketSessionForwarder :
+class B10_LIBUTIL_IO_API SocketSessionForwarder :
boost::noncopyable, public BaseSocketSessionForwarder
{
public:
@@ -352,7 +352,7 @@ private:
/// (e.g. a class or a function that constructs it) is responsible for validity
/// of the data passed to the object. See the description of
/// \c SocketSessionReceiver::pop() for the specific case of that usage.
-class ISC_LIBUTIL_IO_API SocketSession {
+class B10_LIBUTIL_IO_API SocketSession {
public:
/// The constructor.
///
@@ -455,7 +455,7 @@ private:
///
/// See the description of \ref SocketSessionUtility for other details of how
/// the session forwarding works.
-class ISC_LIBUTIL_IO_API SocketSessionReceiver : boost::noncopyable {
+class B10_LIBUTIL_IO_API SocketSessionReceiver : boost::noncopyable {
public:
/// The constructor.
///
diff --git a/src/lib/util/locks.h b/src/lib/util/locks.h
index a33d707..7d36a40 100644
--- a/src/lib/util/locks.h
+++ b/src/lib/util/locks.h
@@ -32,13 +32,13 @@ namespace isc {
namespace util {
namespace locks {
-class ISC_LIBUTIL_API mutex {
+class B10_LIBUTIL_API mutex {
};
-class ISC_LIBUTIL_API recursive_mutex {
+class B10_LIBUTIL_API recursive_mutex {
};
-class ISC_LIBUTIL_API upgradable_mutex {
+class B10_LIBUTIL_API upgradable_mutex {
};
template <typename T>
diff --git a/src/lib/util/pyunittests/pyunittests_util.cc b/src/lib/util/pyunittests/pyunittests_util.cc
index a66693d..2762dc7 100644
--- a/src/lib/util/pyunittests/pyunittests_util.cc
+++ b/src/lib/util/pyunittests/pyunittests_util.cc
@@ -22,7 +22,7 @@
namespace isc {
namespace util {
namespace detail {
-extern ISC_LIBUTIL_API int64_t (*gettimeFunction)();
+extern B10_LIBUTIL_API int64_t (*gettimeFunction)();
}
}
}
diff --git a/src/lib/util/random/qid_gen.cc b/src/lib/util/random/qid_gen.cc
index 88c4f1d..39e667c 100644
--- a/src/lib/util/random/qid_gen.cc
+++ b/src/lib/util/random/qid_gen.cc
@@ -18,7 +18,7 @@
// (and other parts where we need randomness, perhaps another thing
// for a general libutil?)
-#define ISC_LIBUTIL_EXPORT
+#define B10_LIBUTIL_EXPORT
#include <config.h>
#include <stdint.h>
diff --git a/src/lib/util/random/qid_gen.h b/src/lib/util/random/qid_gen.h
index 75ea9d3..b6ca02e 100644
--- a/src/lib/util/random/qid_gen.h
+++ b/src/lib/util/random/qid_gen.h
@@ -38,7 +38,7 @@ namespace random {
///
/// It automatically seeds it with the current time when it is first
/// used.
-class ISC_LIBUTIL_API QidGenerator {
+class B10_LIBUTIL_API QidGenerator {
public:
/// \brief Returns the singleton instance of the QidGenerator
///
diff --git a/src/lib/util/random/random_number_generator.cc b/src/lib/util/random/random_number_generator.cc
index 02e5bf5..6249931 100644
--- a/src/lib/util/random/random_number_generator.cc
+++ b/src/lib/util/random/random_number_generator.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_EXPORT
+#define B10_LIBUTIL_EXPORT
#include <config.h>
@@ -25,8 +25,8 @@
// Instantiate classes
-class ISC_LIBUTIL_API UniformRandomIntegerGenerator;
-class ISC_LIBUTIL_API WeightedRandomIntegerGenerator;
+class B10_LIBUTIL_API UniformRandomIntegerGenerator;
+class B10_LIBUTIL_API WeightedRandomIntegerGenerator;
// Local Variables:
// mode: c++
diff --git a/src/lib/util/random/random_number_generator.h b/src/lib/util/random/random_number_generator.h
index ea3db36..28edbf3 100644
--- a/src/lib/util/random/random_number_generator.h
+++ b/src/lib/util/random/random_number_generator.h
@@ -32,19 +32,19 @@ namespace isc {
namespace util {
namespace random {
-class ISC_LIBUTIL_API InvalidLimits : public isc::BadValue {
+class B10_LIBUTIL_API InvalidLimits : public isc::BadValue {
public:
InvalidLimits(const char* file, size_t line, const char* what) :
isc::BadValue(file, line, what) {}
};
-class ISC_LIBUTIL_API SumNotOne : public isc::BadValue {
+class B10_LIBUTIL_API SumNotOne : public isc::BadValue {
public:
SumNotOne(const char* file, size_t line, const char* what) :
isc::BadValue(file, line, what) {}
};
-class ISC_LIBUTIL_API InvalidProbValue : public isc::BadValue {
+class B10_LIBUTIL_API InvalidProbValue : public isc::BadValue {
public:
InvalidProbValue(const char* file, size_t line, const char* what) :
isc::BadValue(file, line, what) {}
@@ -55,7 +55,7 @@ public:
/// \brief Uniform random integer generator
///
/// Generate uniformly distributed integers in range of [min, max]
-class ISC_LIBUTIL_API UniformRandomIntegerGenerator{
+class B10_LIBUTIL_API UniformRandomIntegerGenerator{
public:
/// \brief Constructor
///
@@ -94,7 +94,7 @@ private:
/// \brief Weighted random integer generator
///
/// Generate random integers according different probabilities
-class ISC_LIBUTIL_API WeightedRandomIntegerGenerator {
+class B10_LIBUTIL_API WeightedRandomIntegerGenerator {
public:
/// \brief Constructor
///
diff --git a/src/lib/util/strutil.cc b/src/lib/util/strutil.cc
index 3f91667..7c8d79b 100644
--- a/src/lib/util/strutil.cc
+++ b/src/lib/util/strutil.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_EXPORT
+#define B10_LIBUTIL_EXPORT
#include <numeric>
@@ -27,7 +27,7 @@ namespace str {
// Normalize slashes
-ISC_LIBUTIL_API void
+B10_LIBUTIL_API void
normalizeSlash(std::string& name) {
if (!name.empty()) {
size_t pos = 0;
@@ -39,7 +39,7 @@ normalizeSlash(std::string& name) {
// Trim String
-ISC_LIBUTIL_API string
+B10_LIBUTIL_API string
trim(const string& instring) {
static const char* blanks = " \t\n";
@@ -64,7 +64,7 @@ trim(const string& instring) {
// Tokenise string. As noted in the header, this is locally written to avoid
// another dependency on a Boost library.
-ISC_LIBUTIL_API vector<string>
+B10_LIBUTIL_API vector<string>
tokens(const std::string& text, const std::string& delim) {
vector<string> result;
@@ -105,7 +105,7 @@ lengthSum(string::size_type curlen, const string& cur_string) {
// Provide printf-style formatting.
-ISC_LIBUTIL_API std::string
+B10_LIBUTIL_API std::string
format(const std::string& format, const std::vector<std::string>& args) {
static const string flag = "%s";
@@ -134,7 +134,7 @@ format(const std::string& format, const std::vector<std::string>& args) {
return (result);
}
-ISC_LIBUTIL_API std::string
+B10_LIBUTIL_API std::string
getToken(std::istringstream& iss) {
string token;
iss >> token;
diff --git a/src/lib/util/strutil.h b/src/lib/util/strutil.h
index 5ac353c..4561a79 100644
--- a/src/lib/util/strutil.h
+++ b/src/lib/util/strutil.h
@@ -35,7 +35,7 @@ namespace str {
/// \brief A standard string util exception that is thrown if getToken or
/// numToToken are called with bad input data
///
-class ISC_LIBUTIL_API StringTokenError : public Exception {
+class B10_LIBUTIL_API StringTokenError : public Exception {
public:
StringTokenError(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -49,7 +49,7 @@ public:
/// if not the command line).
///
/// \param name Name to be substituted
-ISC_LIBUTIL_API void normalizeSlash(std::string& name);
+B10_LIBUTIL_API void normalizeSlash(std::string& name);
/// \brief Trim Leading and Trailing Spaces
@@ -60,7 +60,7 @@ ISC_LIBUTIL_API void normalizeSlash(std::string& name);
/// \param instring Input string to modify
///
/// \return String with leading and trailing spaces removed
-ISC_LIBUTIL_API std::string trim(const std::string& instring);
+B10_LIBUTIL_API std::string trim(const std::string& instring);
/// \brief Split String into Tokens
@@ -87,7 +87,7 @@ ISC_LIBUTIL_API std::string trim(const std::string& instring);
/// \param delim Delimiter characters
///
/// \return Vector of tokens.
-ISC_LIBUTIL_API
+B10_LIBUTIL_API
std::vector<std::string> tokens(const std::string& text,
const std::string& delim = std::string(" \t\n"));
@@ -152,7 +152,7 @@ inline void lowercase(std::string& text) {
/// \param args Vector of argument strings
///
/// \return Resultant string
-ISC_LIBUTIL_API std::string format(const std::string& format,
+B10_LIBUTIL_API std::string format(const std::string& format,
const std::vector<std::string>& args);
@@ -165,7 +165,7 @@ ISC_LIBUTIL_API std::string format(const std::string& format,
/// \param iss stringstream to read one token from
///
/// \return the first token read from the stringstream
-ISC_LIBUTIL_API std::string getToken(std::istringstream& iss);
+B10_LIBUTIL_API std::string getToken(std::istringstream& iss);
/// \brief Converts a string token to an *unsigned* integer.
///
diff --git a/src/lib/util/tests/time_utilities_unittest.cc b/src/lib/util/tests/time_utilities_unittest.cc
index 2f41518..fefdbaf 100644
--- a/src/lib/util/tests/time_utilities_unittest.cc
+++ b/src/lib/util/tests/time_utilities_unittest.cc
@@ -27,7 +27,7 @@ using namespace isc::util;
namespace isc {
namespace util {
namespace detail {
-extern ISC_LIBUTIL_API int64_t (*gettimeFunction)();
+extern B10_LIBUTIL_API int64_t (*gettimeFunction)();
}
}
}
diff --git a/src/lib/util/time_utilities.cc b/src/lib/util/time_utilities.cc
index 49d5233..db78996 100644
--- a/src/lib/util/time_utilities.cc
+++ b/src/lib/util/time_utilities.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_EXPORT
+#define B10_LIBUTIL_EXPORT
#include <config.h>
@@ -58,7 +58,7 @@ monthSecs(const int month, const int year) {
namespace isc {
namespace util {
-ISC_LIBUTIL_API string
+B10_LIBUTIL_API string
timeToText64(uint64_t value) {
struct tm tm;
unsigned int secs;
@@ -115,9 +115,9 @@ timeToText64(uint64_t value) {
// intended for testing purposes, so, even if it's visible outside of this
// library, it's not even declared in a header file.
namespace detail {
-ISC_LIBUTIL_API int64_t (*gettimeFunction)() = NULL;
+B10_LIBUTIL_API int64_t (*gettimeFunction)() = NULL;
-ISC_LIBUTIL_API int64_t
+B10_LIBUTIL_API int64_t
gettimeWrapper() {
if (gettimeFunction != NULL) {
return (gettimeFunction());
@@ -145,7 +145,7 @@ gettimeWrapper() {
}
}
-ISC_LIBUTIL_API string
+B10_LIBUTIL_API string
timeToText32(const uint32_t value) {
// We first adjust the time to the closest epoch based on the current time.
// Note that the following variables must be signed in order to handle
@@ -175,7 +175,7 @@ checkRange(const int min, const int max, const int value,
}
}
-ISC_LIBUTIL_API uint64_t
+B10_LIBUTIL_API uint64_t
timeFromText64(const string& time_txt) {
// Confirm the source only consists digits. sscanf() allows some
// minor exceptions.
@@ -217,7 +217,7 @@ timeFromText64(const string& time_txt) {
return (timeval);
}
-ISC_LIBUTIL_API uint32_t
+B10_LIBUTIL_API uint32_t
timeFromText32(const string& time_txt) {
// The implicit conversion from uint64_t to uint32_t should just work here,
// because we only need to drop higher 32 bits.
diff --git a/src/lib/util/time_utilities.h b/src/lib/util/time_utilities.h
index dd5d8a8..ea643fe 100644
--- a/src/lib/util/time_utilities.h
+++ b/src/lib/util/time_utilities.h
@@ -37,7 +37,7 @@ namespace util {
/// \brief A standard DNS (or ISC) module exception that is thrown if
/// a time conversion function encounters bad input
///
-class ISC_LIBUTIL_API InvalidTime : public Exception {
+class B10_LIBUTIL_API InvalidTime : public Exception {
public:
InvalidTime(const char* file, size_t line, const char* what) :
isc::Exception(file, line, what) {}
@@ -66,7 +66,7 @@ namespace detail {
/// If the implementation doesn't need to be tested with faked current time,
/// it should simply use the system supplied library function instead of
/// this one.
-ISC_LIBUTIL_API int64_t gettimeWrapper();
+B10_LIBUTIL_API int64_t gettimeWrapper();
}
///
@@ -114,7 +114,7 @@ ISC_LIBUTIL_API int64_t gettimeWrapper();
///
/// \param time_txt Textual time in the form of YYYYMMDDHHmmSS
/// \return Seconds since epoch corresponding to \c time_txt
-ISC_LIBUTIL_API uint64_t
+B10_LIBUTIL_API uint64_t
timeFromText64(const std::string& time_txt);
/// Convert textual DNSSEC time to integer, 32-bit version.
@@ -122,7 +122,7 @@ timeFromText64(const std::string& time_txt);
/// This version is the same as \c timeFromText64() except that the return
/// value is wrapped around to an unsigned 32-bit integer, simply dropping
/// the upper 32 bits.
-ISC_LIBUTIL_API uint32_t
+B10_LIBUTIL_API uint32_t
timeFromText32(const std::string& time_txt);
/// Convert integral DNSSEC time to textual form, 64-bit version.
@@ -139,7 +139,7 @@ timeFromText32(const std::string& time_txt);
///
/// \param value Seconds since epoch to be converted.
/// \return Textual representation of \c value in the form of YYYYMMDDHHmmSS.
-ISC_LIBUTIL_API std::string
+B10_LIBUTIL_API std::string
timeToText64(uint64_t value);
/// Convert integral DNSSEC time to textual form, 32-bit version.
@@ -161,7 +161,7 @@ timeToText64(uint64_t value);
/// half of the 32-bit values are treated as a future time. For example,
/// 2^32-1 (the highest value in 32-bit unsigned integers) will be converted
/// to "21060207062815", instead of "19691231235959".
-ISC_LIBUTIL_API std::string
+B10_LIBUTIL_API std::string
timeToText32(const uint32_t value);
//@}
diff --git a/src/lib/util/unittests/dll.h b/src/lib/util/unittests/dll.h
index 38e2fd1..a3fa1a7 100644
--- a/src/lib/util/unittests/dll.h
+++ b/src/lib/util/unittests/dll.h
@@ -16,12 +16,12 @@
#define __LIBUTIL_UNITTESTS_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBUTIL_UNITTESTS_API
+#define B10_LIBUTIL_UNITTESTS_API
#else
-#ifdef ISC_LIBUTIL_UNITTESTS_EXPORT
-#define ISC_LIBUTIL_UNITTESTS_API __declspec(dllexport)
+#ifdef B10_LIBUTIL_UNITTESTS_EXPORT
+#define B10_LIBUTIL_UNITTESTS_API __declspec(dllexport)
#else
-#define ISC_LIBUTIL_UNITTESTS_API __declspec(dllimport)
+#define B10_LIBUTIL_UNITTESTS_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/util/unittests/fork.cc b/src/lib/util/unittests/fork.cc
index d17fcc2..497d1b5 100644
--- a/src/lib/util/unittests/fork.cc
+++ b/src/lib/util/unittests/fork.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_UNITTESTS_EXPORT
+#define B10_LIBUTIL_UNITTESTS_EXPORT
#include "fork.h"
@@ -44,7 +44,7 @@ namespace isc {
namespace util {
namespace unittests {
-ISC_LIBUTIL_UNITTESTS_API bool
+B10_LIBUTIL_UNITTESTS_API bool
process_ok(pid_t process) {
// Create a timeout
struct sigaction ignored, original;
@@ -75,7 +75,7 @@ process_ok(pid_t process) {
* This creates a pipe, forks and feeds the pipe with given data.
* Used to provide the input in non-blocking/asynchronous way.
*/
-ISC_LIBUTIL_UNITTESTS_API pid_t
+B10_LIBUTIL_UNITTESTS_API pid_t
provide_input(int *read_pipe, const void *input, const size_t length)
{
int pipes[2];
@@ -101,7 +101,7 @@ provide_input(int *read_pipe, const void *input, const size_t length)
* This creates a pipe, forks and reads the pipe and compares it
* with given data. Used to check output of run in asynchronous way.
*/
-ISC_LIBUTIL_UNITTESTS_API pid_t
+B10_LIBUTIL_UNITTESTS_API pid_t
check_output(int *write_pipe, const void *output, const size_t length)
{
int pipes[2];
@@ -168,7 +168,7 @@ namespace isc {
namespace util {
namespace unittests {
-ISC_LIBUTIL_UNITTESTS_API bool
+B10_LIBUTIL_UNITTESTS_API bool
process_ok(pid_t process) {
HANDLE handle;
@@ -220,7 +220,7 @@ DWORD WINAPI PIChildProc(void *childparam) {
* This creates a pipe, forks and feeds the pipe with given data.
* Used to provide the input in non-blocking/asynchronous way.
*/
-ISC_LIBUTIL_UNITTESTS_API pid_t
+B10_LIBUTIL_UNITTESTS_API pid_t
provide_input(int *read_pipe, const void *input, const size_t length)
{
HANDLE hReadPipe, hWritePipe;
@@ -291,7 +291,7 @@ DWORD WINAPI COChildProc(void *childparam) {
* This creates a pipe, forks and reads the pipe and compares it
* with given data. Used to check output of run in asynchronous way.
*/
-ISC_LIBUTIL_UNITTESTS_API pid_t
+B10_LIBUTIL_UNITTESTS_API pid_t
check_output(int *write_pipe, const void *output, const size_t length)
{
HANDLE hReadPipe, hWritePipe;
diff --git a/src/lib/util/unittests/fork.h b/src/lib/util/unittests/fork.h
index 48570ea..fcc118b 100644
--- a/src/lib/util/unittests/fork.h
+++ b/src/lib/util/unittests/fork.h
@@ -42,13 +42,13 @@ namespace unittests {
* @return True if the process terminates with 0, false otherwise.
* @param process The ID of process to wait for.
*/
-ISC_LIBUTIL_UNITTESTS_API bool
+B10_LIBUTIL_UNITTESTS_API bool
process_ok(pid_t process);
-ISC_LIBUTIL_UNITTESTS_API pid_t
+B10_LIBUTIL_UNITTESTS_API pid_t
provide_input(int *read_pipe, const void *input, const size_t length);
-ISC_LIBUTIL_UNITTESTS_API pid_t
+B10_LIBUTIL_UNITTESTS_API pid_t
check_output(int *write_pipe, const void *output, const size_t length);
} // End of the namespace
diff --git a/src/lib/util/unittests/newhook.cc b/src/lib/util/unittests/newhook.cc
index 4e2b570..b947735 100644
--- a/src/lib/util/unittests/newhook.cc
+++ b/src/lib/util/unittests/newhook.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_UNITTESTS_EXPORT
+#define B10_LIBUTIL_UNITTESTS_EXPORT
#include <stdlib.h>
@@ -46,8 +46,8 @@ operator delete(void* p) throw() {
namespace isc {
namespace util {
namespace unittests {
-ISC_LIBUTIL_UNITTESTS_API bool force_throw_on_new = false;
-ISC_LIBUTIL_UNITTESTS_API size_t throw_size_on_new = 0;
+B10_LIBUTIL_UNITTESTS_API bool force_throw_on_new = false;
+B10_LIBUTIL_UNITTESTS_API size_t throw_size_on_new = 0;
}
}
}
diff --git a/src/lib/util/unittests/newhook.h b/src/lib/util/unittests/newhook.h
index 3d2258c..b520f85 100644
--- a/src/lib/util/unittests/newhook.h
+++ b/src/lib/util/unittests/newhook.h
@@ -59,7 +59,7 @@ namespace unittests {
/// Switch to enable the use of special operator new
///
/// This is set to \c false by default.
-extern ISC_LIBUTIL_UNITTESTS_API bool force_throw_on_new;
+extern B10_LIBUTIL_UNITTESTS_API bool force_throw_on_new;
/// The allocation size that triggers an exception in the special operator new
///
@@ -72,7 +72,7 @@ extern ISC_LIBUTIL_UNITTESTS_API bool force_throw_on_new;
/// The default value is 0. The value of this variable has no meaning
/// unless the use of the special operator is enabled at build time and
/// via \c force_throw_on_new.
-extern ISC_LIBUTIL_UNITTESTS_API size_t throw_size_on_new;
+extern B10_LIBUTIL_UNITTESTS_API size_t throw_size_on_new;
}
}
}
diff --git a/src/lib/util/unittests/resource.cc b/src/lib/util/unittests/resource.cc
index 1d25fd1..f6e971b 100644
--- a/src/lib/util/unittests/resource.cc
+++ b/src/lib/util/unittests/resource.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_UNITTESTS_EXPORT
+#define B10_LIBUTIL_UNITTESTS_EXPORT
#include <config.h>
@@ -29,7 +29,7 @@ namespace isc {
namespace util {
namespace unittests {
-ISC_LIBUTIL_UNITTESTS_API void
+B10_LIBUTIL_UNITTESTS_API void
dontCreateCoreDumps() {
#ifndef _WIN32
const rlimit core_limit = {0, 0};
diff --git a/src/lib/util/unittests/resource.h b/src/lib/util/unittests/resource.h
index 1e10735..360c693 100644
--- a/src/lib/util/unittests/resource.h
+++ b/src/lib/util/unittests/resource.h
@@ -28,7 +28,7 @@ namespace unittests {
/// is used, where processes abort (and create cores in the process).
/// As a new process is forked to run EXPECT_DEATH tests, the rlimits of
/// the parent process that runs the other tests should be unaffected.
-ISC_LIBUTIL_UNITTESTS_API void dontCreateCoreDumps();
+B10_LIBUTIL_UNITTESTS_API void dontCreateCoreDumps();
} // end of namespace unittests
} // end of namespace util
diff --git a/src/lib/util/unittests/run_all.cc b/src/lib/util/unittests/run_all.cc
index 0a2dd86..0851475 100644
--- a/src/lib/util/unittests/run_all.cc
+++ b/src/lib/util/unittests/run_all.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_UNITTESTS_EXPORT
+#define B10_LIBUTIL_UNITTESTS_EXPORT
#include <stdlib.h>
@@ -27,7 +27,7 @@ namespace isc {
namespace util {
namespace unittests {
-ISC_LIBUTIL_UNITTESTS_API int
+B10_LIBUTIL_UNITTESTS_API int
run_all() {
int ret = 0;
diff --git a/src/lib/util/unittests/run_all.h b/src/lib/util/unittests/run_all.h
index a0e31b1..7eb0d51 100644
--- a/src/lib/util/unittests/run_all.h
+++ b/src/lib/util/unittests/run_all.h
@@ -43,7 +43,7 @@ namespace unittests {
///
/// \return Return value from RUN_ALL_TESTS().
-ISC_LIBUTIL_UNITTESTS_API int run_all();
+B10_LIBUTIL_UNITTESTS_API int run_all();
} // namespace unittests
} // namespace util
diff --git a/src/lib/util/unittests/testdata.cc b/src/lib/util/unittests/testdata.cc
index c6b2c35..2f070b2 100644
--- a/src/lib/util/unittests/testdata.cc
+++ b/src/lib/util/unittests/testdata.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBUTIL_UNITTESTS_EXPORT
+#define B10_LIBUTIL_UNITTESTS_EXPORT
#include <string>
#include <stdexcept>
@@ -40,7 +40,7 @@ addTestDataPath(const string& path) {
getDataPaths().push_back(path);
}
-ISC_LIBUTIL_UNITTESTS_API void
+B10_LIBUTIL_UNITTESTS_API void
openTestData(const char* const datafile, ifstream& ifs) {
vector<string>::const_iterator it = getDataPaths().begin();
for (; it != getDataPaths().end(); ++it) {
diff --git a/src/lib/util/unittests/testdata.h b/src/lib/util/unittests/testdata.h
index 547b9a2..efbec36 100644
--- a/src/lib/util/unittests/testdata.h
+++ b/src/lib/util/unittests/testdata.h
@@ -30,7 +30,7 @@ namespace util {
namespace unittests {
/// Add a path (directory) that \c openTestData() will search for test data
/// files.
-ISC_LIBUTIL_UNITTESTS_API void addTestDataPath(const std::string& path);
+B10_LIBUTIL_UNITTESTS_API void addTestDataPath(const std::string& path);
/// Open a file specified by 'datafile' using the data paths registered via
/// addTestDataPath(). On success, ifs will be ready for reading the data
@@ -44,7 +44,7 @@ ISC_LIBUTIL_UNITTESTS_API void addTestDataPath(const std::string& path);
/// is to use a different \c ifstream object for a new call to this function;
/// alternatively make sure you explicitly clear the error bit by calling
/// \c ifstream::clear() on \c ifs.
-ISC_LIBUTIL_UNITTESTS_API
+B10_LIBUTIL_UNITTESTS_API
void openTestData(const char* const datafile, std::ifstream& ifs);
}
}
diff --git a/src/lib/xfr/dll.h b/src/lib/xfr/dll.h
index 8bc2b01..fae992e 100644
--- a/src/lib/xfr/dll.h
+++ b/src/lib/xfr/dll.h
@@ -16,12 +16,12 @@
#define __LIBXFR_H 1
#if !defined(_WIN32) || defined(USE_STATIC_LINK)
-#define ISC_LIBXFR_API
+#define B10_LIBXFR_API
#else
-#ifdef ISC_LIBXFR_EXPORT
-#define ISC_LIBXFR_API __declspec(dllexport)
+#ifdef B10_LIBXFR_EXPORT
+#define B10_LIBXFR_API __declspec(dllexport)
#else
-#define ISC_LIBXFR_API __declspec(dllimport)
+#define B10_LIBXFR_API __declspec(dllimport)
#endif
#endif
diff --git a/src/lib/xfr/xfrout_client.cc b/src/lib/xfr/xfrout_client.cc
index b51248f..b7a54e3 100644
--- a/src/lib/xfr/xfrout_client.cc
+++ b/src/lib/xfr/xfrout_client.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define ISC_LIBXFR_EXPORT
+#define B10_LIBXFR_EXPORT
#include <config.h>
diff --git a/src/lib/xfr/xfrout_client.h b/src/lib/xfr/xfrout_client.h
index 56e348b..a5adf0d 100644
--- a/src/lib/xfr/xfrout_client.h
+++ b/src/lib/xfr/xfrout_client.h
@@ -27,7 +27,7 @@ namespace xfr {
struct XfroutClientImpl;
-class ISC_LIBXFR_API XfroutError: public Exception {
+class B10_LIBXFR_API XfroutError: public Exception {
public:
XfroutError(const char *file, size_t line, const char *what):
isc::Exception(file, line, what) {}
@@ -38,7 +38,7 @@ public:
///
/// The intended primary usage of abstraction is to allow tests for the
/// user class of XfroutClient without requiring actual communication.
-class ISC_LIBXFR_API AbstractXfroutClient {
+class B10_LIBXFR_API AbstractXfroutClient {
///
/// \name Constructors, Assignment Operator and Destructor.
///
@@ -71,7 +71,7 @@ public:
uint16_t msg_len) = 0;
};
-class ISC_LIBXFR_API XfroutClient : public AbstractXfroutClient {
+class B10_LIBXFR_API XfroutClient : public AbstractXfroutClient {
public:
XfroutClient(const std::string& file);
~XfroutClient();
More information about the bind10-changes
mailing list