Pārlūkot izejas kodu

Update variant submodule to 0.2

Sam Jaffe 5 gadi atpakaļ
vecāks
revīzija
4891285862
3 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. 1 1
      extern/variant
  2. 1 1
      include/logger/properties.h
  3. 2 2
      logger.xcodeproj/project.pbxproj

+ 1 - 1
extern/variant

@@ -1 +1 @@
-Subproject commit 02132d4e2987a643ebdf675ea7c8d12c4110b38b
+Subproject commit aae792dba7b3553bd84ad830eee24241377ad08f

+ 1 - 1
include/logger/properties.h

@@ -20,7 +20,7 @@ namespace logging {
   using array_t = std::vector<properties>;
 
   struct properties {
-    variant<object_t, array_t, std::string, int, bool> data;
+    variant::variant<object_t, array_t, std::string, int, bool> data;
 
     properties mergedWith(properties const & other) const;
 

+ 2 - 2
logger.xcodeproj/project.pbxproj

@@ -472,7 +472,7 @@
 				HEADER_SEARCH_PATHS = /opt/local/include/;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/extern/expect/include/ $(PROJECT_DIR)/extern/resource_factory/include/ $(PROJECT_DIR)/extern/scoped_buffer_capture/include/ $(PROJECT_DIR)/extern/";
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/extern/expect/include/ $(PROJECT_DIR)/extern/resource_factory/include/ $(PROJECT_DIR)/extern/scoped_buffer_capture/include/ $(PROJECT_DIR)/extern/variant/include/";
 			};
 			name = Debug;
 		};
@@ -509,7 +509,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = /opt/local/include/;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/extern/expect/include/ $(PROJECT_DIR)/extern/resource_factory/include/ $(PROJECT_DIR)/extern/scoped_buffer_capture/include/ $(PROJECT_DIR)/extern/";
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/extern/expect/include/ $(PROJECT_DIR)/extern/resource_factory/include/ $(PROJECT_DIR)/extern/scoped_buffer_capture/include/ $(PROJECT_DIR)/extern/variant/include/";
 			};
 			name = Release;
 		};