agrega utiles.cpp como submodulo y elimina conflictos de espacio de n…

…ombres
Hernanatn · Jan 19, 2025 · 2369dbf · 2369dbf
1 parent 3d4ad90
commit 2369dbf
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 48 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "externos/Catch2"]
 	path = externos/Catch2
 	url = https://github.com/catchorg/Catch2
+[submodule "externos/utiles.cpp"]
+	path = externos/utiles.cpp
+	url = https://github.com/Hernanatn/utiles.cpp
diff --git a/CMakelists.txt b/CMakelists.txt
@@ -14,6 +14,8 @@ target_include_directories(errores-- INTERFACE fuente)
 set(CATCH2_DIR "${CMAKE_SOURCE_DIR}/externos/Catch2")
 add_subdirectory(${CATCH2_DIR} ${CMAKE_BINARY_DIR}/catch2-build)
 
+set(UTILES_DIR "${CMAKE_SOURCE_DIR}/externos/utiles.cpp")
+target_include_directories(errores-- INTERFACE ${UTILES_DIR}/fuente)
 
 
 enable_testing()

diff --git a/externos/utiles.cpp b/externos/utiles.cpp
diff --git a/fuente/Opcion.hpp b/fuente/Opcion.hpp
@@ -4,7 +4,7 @@
 #include <tuple>
 #include <utility>
 
-#include "utiles/Genericos.hpp"
+#include <conceptos.hpp>
 
 namespace opc { // Declaración
     template<typename T>

diff --git a/fuente/Resultado.hpp b/fuente/Resultado.hpp
@@ -4,7 +4,7 @@
 #include <tuple>
 #include <utility>
 
-#include "utiles/Genericos.hpp"
+#include <conceptos.hpp>
 #include "Error.hpp"
 
 namespace res { //Declaración

diff --git a/fuente/errores--.hpp b/fuente/errores--.hpp
@@ -1,6 +1,6 @@
 #ifndef ERRORES_HPP
 #define ERRORES_HPP
-#include "utiles/Genericos.hpp"
+#include <conceptos.hpp>
 #include "Error.hpp"
 #include "Opcion.hpp"
 #include "Resultado.hpp"

diff --git a/fuente/utiles/Genericos.hpp b/fuente/utiles/Genericos.hpp