浏览代码

Allowing macros in the file API to be used without an implicitly used dsr namespace.

David Piuva 1 年之前
父节点
当前提交
1ef0dd8ef9
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6 6
      Source/DFPSR/api/fileAPI.h

+ 6 - 6
Source/DFPSR/api/fileAPI.h

@@ -39,10 +39,10 @@ namespace dsr {
 	enum class PathSyntax { Windows, Posix };
 	#ifdef USE_MICROSOFT_WINDOWS
 		// Let the local syntax be for Windows.
-		#define LOCAL_PATH_SYNTAX PathSyntax::Windows
+		#define LOCAL_PATH_SYNTAX dsr::PathSyntax::Windows
 	#else
 		// Let the local syntax be for Posix.
-		#define LOCAL_PATH_SYNTAX PathSyntax::Posix
+		#define LOCAL_PATH_SYNTAX dsr::PathSyntax::Posix
 	#endif
 
 	// Define NO_IMPLICIT_PATH_SYNTAX before including the header if you want all PathSyntax arguments to be explicit.
@@ -150,12 +150,12 @@ namespace dsr {
 	//   }
 	#ifdef USE_MICROSOFT_WINDOWS
 		#define DSR_MAIN_CALLER(MAIN_NAME) \
-			void MAIN_NAME(List<String> args); \
-			int main() { MAIN_NAME(file_impl_getInputArguments()); return 0; }
+			void MAIN_NAME(dsr::List<dsr::String> args); \
+			int main() { MAIN_NAME(dsr::file_impl_getInputArguments()); return 0; }
 	#else
 		#define DSR_MAIN_CALLER(MAIN_NAME) \
-			void MAIN_NAME(List<String> args); \
-			int main(int argc, char **argv) { MAIN_NAME(file_impl_convertInputArguments(argc, (void**)argv)); return 0; }
+			void MAIN_NAME(dsr::List<dsr::String> args); \
+			int main(int argc, char **argv) { MAIN_NAME(dsr::file_impl_convertInputArguments(argc, (void**)argv)); return 0; }
 	#endif
 	// Helper functions have to be exposed for the macro handle your input arguments.
 	//   Do not call these yourself.