| Index: third_party/cacheinvalidation/src/google/cacheinvalidation/deps/stl-namespace.h
|
| diff --git a/chrome/third_party/chromevox/LICENSE b/third_party/cacheinvalidation/src/google/cacheinvalidation/deps/stl-namespace.h
|
| similarity index 63%
|
| copy from chrome/third_party/chromevox/LICENSE
|
| copy to third_party/cacheinvalidation/src/google/cacheinvalidation/deps/stl-namespace.h
|
| index 6766c3fe34bea439c8cbab3048d38b64db7904c2..e05bcb47f2ba338455bb1c2a0412086a389a74cf 100644
|
| --- a/chrome/third_party/chromevox/LICENSE
|
| +++ b/third_party/cacheinvalidation/src/google/cacheinvalidation/deps/stl-namespace.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright 2013 Google Inc.
|
| +// Copyright 2012 Google Inc.
|
| //
|
| // Licensed under the Apache License, Version 2.0 (the "License");
|
| // you may not use this file except in compliance with the License.
|
| @@ -11,3 +11,12 @@
|
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
| // See the License for the specific language governing permissions and
|
| // limitations under the License.
|
| +
|
| +#ifndef GOOGLE_CACHEINVALIDATION_DEPS_STL_NAMESPACE_H_
|
| +#define GOOGLE_CACHEINVALIDATION_DEPS_STL_NAMESPACE_H_
|
| +
|
| +// Google style is to use the global namespace for stl classes so we
|
| +// leave this blank.
|
| +#define INVALIDATION_STL_NAMESPACE
|
| +
|
| +#endif // GOOGLE_CACHEINVALIDATION_DEPS_STL_NAMESPACE_H_
|
|
|