summaryrefslogtreecommitdiffstats
path: root/src/core/resources/qcircularbuffer_p.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-12-16 17:30:47 -0800
committerSean Harmer <sean.harmer@kdab.com>2014-12-17 09:29:28 +0100
commit21f995f47dc211e5272ff1ba64a0ceacdff9136f (patch)
treee1aa7dd1e3183c9dcd5e19771d50bf6697e8871c /src/core/resources/qcircularbuffer_p.h
parent9c361afa360df0ab91501a57bfc201c0d338a93e (diff)
Remove Q_NO_USING_KEYWORD usage
Compilers that don't support the using keyword are too old Change-Id: If6d2bc657f6c41e81009aabbb31000e3f2a3a3f7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/resources/qcircularbuffer_p.h')
-rw-r--r--src/core/resources/qcircularbuffer_p.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/core/resources/qcircularbuffer_p.h b/src/core/resources/qcircularbuffer_p.h
index 30dab5dc3..88d748698 100644
--- a/src/core/resources/qcircularbuffer_p.h
+++ b/src/core/resources/qcircularbuffer_p.h
@@ -144,17 +144,9 @@ public:
}
-#ifndef Q_NO_USING_KEYWORD
using CircularBufferData::wraparound;
-#else
- inline int wraparound(int index) const { return CircularBufferData::wraparound(index); }
-#endif
T *allocate(int count) { return static_cast<T*>(CircularBufferData::allocate(count, sizeof(T))); }
-#ifndef Q_NO_USING_KEYWORD
using CircularBufferData::deallocate;
-#else
- inline void deallocate(void *p) { return CircularBufferData::deallocate(p); }
-#endif
T *data() const { return static_cast<T*>(CircularBufferData::data); }
void setData(T *newdata) { CircularBufferData::data = static_cast<void*>(newdata); }
};