diff options
| author | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 19:23:14 +0000 |
|---|---|---|
| committer | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 19:23:14 +0000 |
| commit | 604a7bee4d5ec7424ef71f094c2f4232f606b995 (patch) | |
| tree | 93d15c5b39bcdda79ee28a842b5e70109528ca5d /base/basictypes.h | |
| parent | 8399598fbbd3da606e0fef699fa50a439cde5f81 (diff) | |
| download | chromium_src-604a7bee4d5ec7424ef71f094c2f4232f606b995.zip chromium_src-604a7bee4d5ec7424ef71f094c2f4232f606b995.tar.gz chromium_src-604a7bee4d5ec7424ef71f094c2f4232f606b995.tar.bz2 | |
Back out r736 due to breakage
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/basictypes.h')
| -rw-r--r-- | base/basictypes.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/base/basictypes.h b/base/basictypes.h index 10a557e..26b4c3d 100644 --- a/base/basictypes.h +++ b/base/basictypes.h @@ -26,9 +26,10 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// Copied from base/basictypes.h with some modifications -#ifndef BASE_BASICTYPES_H_ -#define BASE_BASICTYPES_H_ +#ifndef BASE_BASICTYPES_H__ +#define BASE_BASICTYPES_H__ #include <assert.h> // for use with down_cast<> #include <limits.h> // So we can set the bounds of our types @@ -415,7 +416,7 @@ inline Dest bit_cast(const Source& source) { // static MyClass my_variable_name(base::LINKER_INITIALIZED); namespace base { enum LinkerInitialized { LINKER_INITIALIZED }; -} // base +} -#endif // BASE_BASICTYPES_H_ +#endif // BASE_BASICTYPES_H__ |