3.04.00 release

.appveyor.yml

@@ -1,18 +1,18 @@
-version: 1.0.{build}
-
-platform:
-    - MSVC_2013_x86
-    - MSVC_2013_x64
-    - MSVC_2015_x86
-    - MSVC_2015_x64
-    - MinGW_x86
-    - MinGW_x64
-
-install:
-    - scripts\ci-pre.cmd
-
-build_script:
-    - scripts\ci-build.cmd
-
-test_script:
-    - scripts\ci-test.cmd
+version: 1.0.{build}
+
+platform:
+    - MSVC_2013_x86
+    - MSVC_2013_x64
+    - MSVC_2015_x86
+    - MSVC_2015_x64
+    - MinGW_x86
+    - MinGW_x64
+
+install:
+    - scripts\ci-pre.cmd
+
+build_script:
+    - scripts\ci-build.cmd
+
+test_script:
+    - scripts\ci-test.cmd

.clang-format

@@ -21,7 +21,7 @@ DerivePointerBinding                      : false
 IndentWidth                               : 4
 KeepEmptyLinesAtTheStartOfBlocks          : true
 MaxEmptyLinesToKeep                       : 2
-NamespaceIndentation                      : Inner 
+NamespaceIndentation                      : All 
 PointerBindsToType                        : true
 SpacesBeforeTrailingComments              : 1
 SpacesInAngles                            : false

.gitignore

@@ -4,6 +4,7 @@ tags
 .swp
 *.swp
 .swo
+.TMP
 -.d
 eastl_build_out
 build_bench
@@ -23,8 +24,6 @@ cmake_install.cmake
 **/*.vcxproj.filters
 *.VC.opendb
 *.sdf
-**/*.suo
-**/*.user
 .vs/*
 **/Debug/*
 CMakeFiles/*
@@ -34,5 +33,6 @@ Release/*
 Win32/*
 x64/*
 MinSizeRel/*
-build*/*
+build/*
 Testing/*
+%ALLUSERSPROFILE%/*

.p4ignore

@@ -1,2 +1,3 @@
 /.git/
 tags
+.gitignore

include/EASTL/algorithm.h

@@ -4146,6 +4146,27 @@ namespace eastl
 
 
 
+	/// clamp
+	///
+	/// Returns a reference to a clamped value within the range of [lo, hi].
+	///
+	/// http://en.cppreference.com/w/cpp/algorithm/clamp
+	///
+	template <class T>
+	EA_CONSTEXPR const T& clamp(const T& v, const T& lo, const T& hi)
+	{
+		return clamp(v, lo, hi, eastl::less<>());
+	}
+
+	template <class T, class Compare>
+	EA_CONSTEXPR const T& clamp(const T& v, const T& lo, const T& hi, Compare comp)
+	{
+		// code collapsed to a single line due to constexpr requirements
+		return [&] { EASTL_ASSERT(!comp(hi, lo)); }(),
+			   comp(v, lo) ? lo : comp(hi, v) ? hi : v;
+	}
+
+
 } // namespace eastl