@@ -199,11 +199,15 @@
  */
 @protocol OFObject
 /*!
  * @brief The class of the object.
  */
+#ifndef __cplusplus
 @property (readonly, nonatomic) Class class;
+#else
+@property (readonly, nonatomic, getter=class) Class class_;
+#endif
 
 /*!
  * @brief The superclass of the object.
  */
 @property OF_NULLABLE_PROPERTY (readonly, nonatomic) Class superclass;
@@ -415,11 +419,15 @@
 	Class _isa __attribute__((__unused__));
 #endif
 }
 
 #ifdef OF_HAVE_CLASS_PROPERTIES
+# ifndef __cplusplus
 @property (class, readonly, nonatomic) Class class;
+# else
+@property (class, readonly, nonatomic, getter=class) Class class_;
+# endif
 @property (class, readonly, nonatomic) OFString *className;
 @property (class, readonly, nullable, nonatomic) Class superclass;
 @property (class, readonly, nonatomic) OFString *description;
 #endif