COMMON: Rename XOREOS_EXPLICIT_OPERATOR_CONV to PHAETHON_

xoreos · May 25, 2018 · 702d93c · 702d93c
1 parent 3faa5a3
commit 702d93c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/common/disposableptr.h b/src/common/disposableptr.h
@@ -76,7 +76,7 @@ class DisposablePtrBase : boost::noncopyable {
 	/** Implicit conversion operator to bool for convenience, to make
 	 *  checks like "if (disposablePtr) ..." possible.
 	 */
-	XOREOS_EXPLICIT_OPERATOR_CONV operator bool() const { return _pointer != 0; }
+	PHAETHON_EXPLICIT_OPERATOR_CONV operator bool() const { return _pointer != 0; }
 
 	~DisposablePtrBase() {
 		if (_dispose)

diff --git a/src/common/scopedptr.h b/src/common/scopedptr.h
@@ -77,7 +77,7 @@ class ScopedPtrBase : boost::noncopyable {
 	/** Implicit conversion operator to bool for convenience, to make
 	 *  checks like "if (scopedPtr) ..." possible.
 	 */
-	XOREOS_EXPLICIT_OPERATOR_CONV operator bool() const { return _pointer != 0; }
+	PHAETHON_EXPLICIT_OPERATOR_CONV operator bool() const { return _pointer != 0; }
 
 	~ScopedPtrBase() {
 		Deallocator::destroy(_pointer);

diff --git a/src/common/system.h b/src/common/system.h
@@ -401,9 +401,9 @@
 
 // Compatibility macro for dealing with the explicit bool cast problem.
 #if __cplusplus < 201103L
-	#define XOREOS_EXPLICIT_OPERATOR_CONV
+	#define PHAETHON_EXPLICIT_OPERATOR_CONV
 #else
-	#define XOREOS_EXPLICIT_OPERATOR_CONV explicit
+	#define PHAETHON_EXPLICIT_OPERATOR_CONV explicit
 #endif
 
 //