Daniele Bartolini 10 vuotta sitten
vanhempi
sitoutus
a0d7cea0dd
2 muutettua tiedostoa jossa 9 lisäystä ja 9 poistoa
  1. 3 3
      src/core/strings/path.cpp
  2. 6 6
      src/core/strings/path.h

+ 3 - 3
src/core/strings/path.cpp

@@ -15,9 +15,9 @@ namespace path
 	{
 		CE_ASSERT(path != NULL, "Path must be != NULL");
 #if CROWN_PLATFORM_POSIX
-		return strlen32(path) > 0 && path[0] == SEPARATOR;
+		return strlen32(path) > 0 && path[0] == PATH_SEPARATOR;
 #elif CROWN_PLATFORM_WINDOWS
-		return strlen32(path) > 2 && isalpha(path[0]) && path[1] == ':' && path[2] == SEPARATOR;
+		return strlen32(path) > 2 && isalpha(path[0]) && path[1] == ':' && path[2] == PATH_SEPARATOR;
 #endif
 	}
 
@@ -37,7 +37,7 @@ namespace path
 		const uint32_t lb = strlen32(b);
 		path.reserve(la + lb + 1);
 		path += a;
-		path += SEPARATOR;
+		path += PATH_SEPARATOR;
 		path += b;
 	}
 

+ 6 - 6
src/core/strings/path.h

@@ -12,17 +12,17 @@ namespace crown
 {
 /// @defgroup Path Path
 
+#if CROWN_PLATFORM_POSIX
+	const char PATH_SEPARATOR = '/';
+#elif CROWN_PLATFORM_WINDOWS
+	const char PATH_SEPARATOR = '\\';
+#endif // CROWN_PLATFORM_POSIX
+
 /// Functions for operating on strings as file paths.
 ///
 /// @ingroup Path
 namespace path
 {
-#if CROWN_PLATFORM_POSIX
-	const char SEPARATOR = '/';
-#elif CROWN_PLATFORM_WINDOWS
-	const char SEPARATOR = '\\';
-#endif // CROWN_PLATFORM_POSIX
-
 	/// Returns whether the @a path is absolute.
 	bool is_absolute_path(const char* path);