update r691

doc/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = iutest
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.10.0.2
+PROJECT_NUMBER         = 1.10.0.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

include/gtest/switch/iutest_switch_peep.hpp

@@ -34,6 +34,22 @@
 #  define IUTEST_HAS_PEEP_STATIC_FUNC	0
 #endif
 
+#if IUTEST_HAS_PEEP
+
+namespace testing {
+namespace detail 
+{
+
+using ::iutest::detail::peep_tag;
+
+}	// end of namespace detail
+
+using ::iutest::Peep;
+
+}	// end of namespace testing
+
+#endif
+
 #endif // !defined(IUTEST_USE_GTEST)
 
 #endif // INCG_IRIS_IUTEST_SWITCH_PEEP_HPP_316C2127_8DF8_4B99_9C07_9170B403D6AD_

include/iutest_ver.hpp

@@ -17,11 +17,11 @@
 
 //======================================================================
 // define
-#define	IUTEST_VER			0x01100002u	//!< iutest version 1.10.0.2
+#define	IUTEST_VER			0x01100003u	//!< iutest version 1.10.0.3
 #define IUTEST_MAJORVER		0x01u		//!< Major Version
 #define IUTEST_MINORVER		0x10u		//!< Minor Version
 #define IUTEST_BUILD		0x00u		//!< Build
-#define IUTEST_REVISION		0x02u		//!< Revision
+#define IUTEST_REVISION		0x03u		//!< Revision
 
 /**
  * @mainpage

test/GNUmakefile

@@ -110,6 +110,7 @@ RUNNER = $(RUN_TARGETS:%=run_%)
 
 ifdef USE_FUSED
 IUTEST_INCLUDE=-I$(IUTEST_DIR)/fused-src
+IUTEST_HEADERS+=$(IUTEST_DIR)/fused-src/iutest.hpp
 endif
 
 #

tools/fuse/Makefile

@@ -24,6 +24,9 @@ FUSED_DIR = $(IUTEST_DIR)/fused-src
 default: $(FUSED_DIR) $(IUTEST_HEADERS) fuse_iutest_files.py Makefile
 	python fuse_iutest_files.py $(FUSED_DIR)
 
+min: default
+	mv $(FUSED_DIR)/iutest.min.hpp $(FUSED_DIR)/iutest.hpp
+
 clean:
 	$(RM) -rf $(FUSED_DIR)
 

tools/fuse/fuse_iutest_files.py

@@ -81,6 +81,7 @@ def ProcessFile(curr, filename, fileset, minimum):
 									line = re.sub('\s+([&|\+\-<>]+)[ \t]+', '\\1', line)
 									line = re.sub('\s*([{\+\-\*/%=<>&|]+=)[ \t]*', '\\1', line)
 									#line = re.sub('\w\s*([{\+\-\*/%=<>&|!]+)[ \t]*', '\\1', line)
+									line = re.sub('\s+:[ \t]+(\w)', ':\\1', line)
 									line = re.sub('\s*,[ \t]*', ',', line)
 									line = re.sub('\s*\)', ')', line)
 									line = re.sub('\)\s+{', '){', line)