From 604a7bee4d5ec7424ef71f094c2f4232f606b995 Mon Sep 17 00:00:00 2001 From: "mmentovai@google.com" Date: Tue, 12 Aug 2008 19:23:14 +0000 Subject: Back out r736 due to breakage git-svn-id: svn://svn.chromium.org/chrome/trunk/src@738 0039d316-1c4b-4281-b951-d872f2087c98 --- base/basictypes.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'base/basictypes.h') 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 // for use with down_cast<> #include // 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__ -- cgit v1.1