Move webrtc/{base => rtc_base}
This refactoring takes a careful approach to avoid rushing the change:
* stub headers are left in all the old locations of webrtc/base
* existing GN targets are kept and now just forward to the moved ones
using public_deps.
The only exception to the above is the base_java target and its .java files,
which were moved to webrtc/rtc_base right away since it's not possible
to use public_deps for android_library.
To avoid breaking builds, a temporary Dummy.java file was added to
the new intermediate target in webrtc/rtc_base:base_java as well to avoid
hitting a GN assert in the android_library template.
The above approach should make the transition smooth without breaking
downstream.
A helper script was created (https://codereview.webrtc.org/2879203002/)
and was run like this:
stub-headers.py -s webrtc/base -d webrtc/rtc_base -i 7634
stub-headers.py -s webrtc/base/numerics -d webrtc/rtc_base/numerics -i 7634
Fixed invalid header guards in the following files:
webrtc/base/base64.h
webrtc/base/cryptstring.h
webrtc/base/event.h
webrtc/base/flags.h
webrtc/base/httpbase.h
webrtc/base/httpcommon-inl.h
webrtc/base/httpcommon.h
webrtc/base/httpserver.h
webrtc/base/logsinks.h
webrtc/base/macutils.h
webrtc/base/nattypes.h
webrtc/base/openssladapter.h
webrtc/base/opensslstreamadapter.h
webrtc/base/pathutils.h
webrtc/base/physicalsocketserver.h
webrtc/base/proxyinfo.h
webrtc/base/sigslot.h
webrtc/base/sigslotrepeater.h
webrtc/base/socket.h
webrtc/base/socketaddresspair.h
webrtc/base/socketfactory.h
webrtc/base/stringutils.h
webrtc/base/testbase64.h
webrtc/base/testutils.h
webrtc/base/transformadapter.h
webrtc/base/win32filesystem.h
Added new header guards to:
sslroots.h
testbase64.h
BUG=webrtc:7634
NOTRY=True
NOPRESUBMIT=True
R=kwiberg@webrtc.org
Review-Url: https://codereview.webrtc.org/2877023002 .
Cr-Commit-Position: refs/heads/master@{#18816}
diff --git a/webrtc/base/mathutils.h b/webrtc/base/mathutils.h
index 3c70e76..9e5c3ca 100644
--- a/webrtc/base/mathutils.h
+++ b/webrtc/base/mathutils.h
@@ -11,29 +11,9 @@
#ifndef WEBRTC_BASE_MATHUTILS_H_
#define WEBRTC_BASE_MATHUTILS_H_
-#include <math.h>
-#include <type_traits>
-#include "webrtc/base/checks.h"
-
-#ifndef M_PI
-#define M_PI 3.14159265359f
-#endif
-
-// Given two numbers |x| and |y| such that x >= y, computes the difference
-// x - y without causing undefined behavior due to signed overflow.
-template <typename T>
-typename std::make_unsigned<T>::type unsigned_difference(T x, T y) {
- static_assert(
- std::is_signed<T>::value,
- "Function unsigned_difference is only meaningful for signed types.");
- RTC_DCHECK_GE(x, y);
- typedef typename std::make_unsigned<T>::type unsigned_type;
- // int -> unsigned conversion repeatedly adds UINT_MAX + 1 until the number
- // can be represented as an unsigned. Since we know that the actual
- // difference x - y can be represented as an unsigned, it is sufficient to
- // compute the difference modulo UINT_MAX + 1, i.e using unsigned arithmetic.
- return static_cast<unsigned_type>(x) - static_cast<unsigned_type>(y);
-}
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/mathutils.h"
#endif // WEBRTC_BASE_MATHUTILS_H_