X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FDiscriminatedPtr.h;h=02cd1b2ab3357494b7cf40015535fee31d74f868;hb=cbed222c1b9a10c3b67e04b8523aa8449c985b21;hp=1332701d3560e53fca8b5fc4b3285f3441196c21;hpb=27494a20393fa45072e7d526d358835f3abe312a;p=folly.git diff --git a/folly/DiscriminatedPtr.h b/folly/DiscriminatedPtr.h index 1332701d..02cd1b2a 100644 --- a/folly/DiscriminatedPtr.h +++ b/folly/DiscriminatedPtr.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Facebook, Inc. + * Copyright 2014 Facebook, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,10 +30,11 @@ #include #include #include -#include "folly/Likely.h" -#include "folly/detail/DiscriminatedPtrDetail.h" +#include +#include +#include -#ifndef __x86_64__ +#if !FOLLY_X64 # error "DiscriminatedPtr is x64-specific code." #endif @@ -218,4 +219,3 @@ class DiscriminatedPtr { } // namespace folly #endif /* FOLLY_DISCRIMINATEDPTR_H_ */ -