From 39aeea8240bc28244af2ce86c3d2b3e1b3c7552f Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Tue, 5 Dec 2017 09:48:46 +1300 Subject: [PATCH] Drop workaround for older MSVC We now need a fairly modern version for decent C++11 support. --- xapian-core/backends/glass/glass_database.h | 2 -- xapian-core/backends/inmemory/inmemory_database.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/xapian-core/backends/glass/glass_database.h b/xapian-core/backends/glass/glass_database.h index 89ebbd31f..fce8cf6fa 100644 --- a/xapian-core/backends/glass/glass_database.h +++ b/xapian-core/backends/glass/glass_database.h @@ -381,10 +381,8 @@ class GlassWritableDatabase : public GlassDatabase { // a problem as we only try to call them through the base class // (where they aren't hidden) but some compilers generate a warning // about the hiding. -#ifndef _MSC_VER using Xapian::Database::Internal::delete_document; using Xapian::Database::Internal::replace_document; -#endif void delete_document(Xapian::docid did); void replace_document(Xapian::docid did, const Xapian::Document & document); diff --git a/xapian-core/backends/inmemory/inmemory_database.h b/xapian-core/backends/inmemory/inmemory_database.h index 766f18838..bade06089 100644 --- a/xapian-core/backends/inmemory/inmemory_database.h +++ b/xapian-core/backends/inmemory/inmemory_database.h @@ -300,10 +300,8 @@ class InMemoryDatabase : public Xapian::Database::Internal { // a problem as we only try to call them through the base class // (where they aren't hidden) but some compilers generate a warning // about the hiding. -#ifndef _MSC_VER using Xapian::Database::Internal::delete_document; using Xapian::Database::Internal::replace_document; -#endif void delete_document(Xapian::docid did); void replace_document(Xapian::docid did, const Xapian::Document & document); //@} -- 2.11.4.GIT