summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-22 02:30:31 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-22 02:30:31 +0000
commit751f4ba16f739d8ef012c5534e18c5288e3f8948 (patch)
treed707c138e9d682a66211336c93f5a18275f13d23
parentd2db51aa31ca57ce620723f5b6758f09a5ae593b (diff)
downloadchromium_src-751f4ba16f739d8ef012c5534e18c5288e3f8948.zip
chromium_src-751f4ba16f739d8ef012c5534e18c5288e3f8948.tar.gz
chromium_src-751f4ba16f739d8ef012c5534e18c5288e3f8948.tar.bz2
Add missing #includes of <algorithm> in ppapi for std::min/max
Required when building on VS2013. TBR=dmichael@chromium.org BUG=288948 Review URL: https://codereview.chromium.org/32343005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230018 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ppapi/examples/2d/paint_manager_example.cc2
-rw-r--r--ppapi/examples/2d/scroll.cc2
-rw-r--r--ppapi/examples/gamepad/gamepad.cc1
-rw-r--r--ppapi/examples/ime/ime.cc1
-rw-r--r--ppapi/examples/input/pointer_event_input.cc2
-rw-r--r--ppapi/examples/mouse_cursor/mouse_cursor.cc2
-rw-r--r--ppapi/tests/test_case.cc1
7 files changed, 11 insertions, 0 deletions
diff --git a/ppapi/examples/2d/paint_manager_example.cc b/ppapi/examples/2d/paint_manager_example.cc
index 86bdbe7..c8d6a79 100644
--- a/ppapi/examples/2d/paint_manager_example.cc
+++ b/ppapi/examples/2d/paint_manager_example.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <algorithm>
+
#include "ppapi/c/pp_input_event.h"
#include "ppapi/cpp/graphics_2d.h"
#include "ppapi/cpp/image_data.h"
diff --git a/ppapi/examples/2d/scroll.cc b/ppapi/examples/2d/scroll.cc
index 5dffa57..506129c 100644
--- a/ppapi/examples/2d/scroll.cc
+++ b/ppapi/examples/2d/scroll.cc
@@ -4,6 +4,8 @@
#include <math.h>
+#include <algorithm>
+
#include "ppapi/cpp/graphics_2d.h"
#include "ppapi/cpp/image_data.h"
#include "ppapi/cpp/instance.h"
diff --git a/ppapi/examples/gamepad/gamepad.cc b/ppapi/examples/gamepad/gamepad.cc
index e4a9f9f..a94ccd4 100644
--- a/ppapi/examples/gamepad/gamepad.cc
+++ b/ppapi/examples/gamepad/gamepad.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <algorithm>
#include <cmath>
#include <stdarg.h>
#include <stdio.h>
diff --git a/ppapi/examples/ime/ime.cc b/ppapi/examples/ime/ime.cc
index 0f3e41e..26c2f42 100644
--- a/ppapi/examples/ime/ime.cc
+++ b/ppapi/examples/ime/ime.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <algorithm>
#include <string>
#include <utility>
#include <vector>
diff --git a/ppapi/examples/input/pointer_event_input.cc b/ppapi/examples/input/pointer_event_input.cc
index 57c3d31..3cd76b3 100644
--- a/ppapi/examples/input/pointer_event_input.cc
+++ b/ppapi/examples/input/pointer_event_input.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <algorithm>
+
#include "ppapi/c/pp_input_event.h"
#include "ppapi/cpp/graphics_2d.h"
#include "ppapi/cpp/image_data.h"
diff --git a/ppapi/examples/mouse_cursor/mouse_cursor.cc b/ppapi/examples/mouse_cursor/mouse_cursor.cc
index 8a70b15..e922fa0 100644
--- a/ppapi/examples/mouse_cursor/mouse_cursor.cc
+++ b/ppapi/examples/mouse_cursor/mouse_cursor.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <algorithm>
+
#include "ppapi/cpp/graphics_2d.h"
#include "ppapi/cpp/image_data.h"
#include "ppapi/cpp/input_event.h"
diff --git a/ppapi/tests/test_case.cc b/ppapi/tests/test_case.cc
index 9b565be..196798b 100644
--- a/ppapi/tests/test_case.cc
+++ b/ppapi/tests/test_case.cc
@@ -6,6 +6,7 @@
#include <string.h>
+#include <algorithm>
#include <sstream>
#include "ppapi/cpp/core.h"