summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2011-05-19 14:56:30 +0200
committerPatrick Ohly <patrick.ohly@intel.com>2011-05-19 14:59:51 +0200
commit20fc2b09389481d641cd8a8cc313bc8c9ebd983c (patch)
tree9fc8e7daa2104e47cf96127a2b29cbcbcabd2e0c
parentc8c0427699013b1050b3614e196feb046d587b08 (diff)
BinFileImplDS: ignore apiEndDataWrite() name clash
The name clash is okay in this case. The two virtual methods really can be overridden separately. Tell clang that via pragmas. The pragmas themselves are inside ifdefs to avoid complaints from other compilers about unknown pragmas.
-rwxr-xr-xsrc/sysync/customimplds.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/sysync/customimplds.h b/src/sysync/customimplds.h
index 2cd6815..c72d41e 100755
--- a/src/sysync/customimplds.h
+++ b/src/sysync/customimplds.h
@@ -498,8 +498,17 @@ public:
virtual localstatus apiEndDataRead(void) = 0;
/// start of write
virtual localstatus apiStartDataWrite(void) = 0;
+#ifdef __clang__
+/// Same name as in TBinfileImplDS. Tell clang compiler to ignore that name clash,
+/// it is okay here.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Woverloaded-virtual"
+#endif
/// end DB data write sequence (but not yet admin data)
virtual localstatus apiEndDataWrite(string &aThisSyncIdentifier) = 0;
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
/// @}