Merge pull request #3652 from MikeMcQuaid/add-more-deprecations-disables

Add more deprecations, disable some existing ones.

1 files changed, 8 insertions, 16 deletions

diff --git a/Library/Homebrew/compat/hardware.rb b/Library/Homebrew/compat/hardware.rb
index 07a63f048..28bc79c60 100644
--- a/Library/Homebrew/compat/hardware.rb
+++ b/Library/Homebrew/compat/hardware.rb
@@ -1,43 +1,35 @@
 module Hardware
   class << self
     def is_32_bit?
-      odeprecated "Hardware.is_32_bit?", "Hardware::CPU.is_32_bit?"
-      !CPU.is_64_bit?
+      odisabled "Hardware.is_32_bit?", "Hardware::CPU.is_32_bit?"
     end
 
     def is_64_bit?
-      odeprecated "Hardware.is_64_bit?", "Hardware::CPU.is_64_bit?"
-      CPU.is_64_bit?
+      odisabled "Hardware.is_64_bit?", "Hardware::CPU.is_64_bit?"
     end
 
     def bits
-      odeprecated "Hardware.bits", "Hardware::CPU.bits"
-      Hardware::CPU.bits
+      odisabled "Hardware.bits", "Hardware::CPU.bits"
     end
 
     def cpu_type
-      odeprecated "Hardware.cpu_type", "Hardware::CPU.type"
-      Hardware::CPU.type
+      odisabled "Hardware.cpu_type", "Hardware::CPU.type"
     end
 
     def cpu_family
-      odeprecated "Hardware.cpu_family", "Hardware::CPU.family"
-      Hardware::CPU.family
+      odisabled "Hardware.cpu_family", "Hardware::CPU.family"
     end
 
     def intel_family
-      odeprecated "Hardware.intel_family", "Hardware::CPU.family"
-      Hardware::CPU.family
+      odisabled "Hardware.intel_family", "Hardware::CPU.family"
     end
 
     def ppc_family
-      odeprecated "Hardware.ppc_family", "Hardware::CPU.family"
-      Hardware::CPU.family
+      odisabled "Hardware.ppc_family", "Hardware::CPU.family"
     end
 
     def processor_count
-      odeprecated "Hardware.processor_count", "Hardware::CPU.cores"
-      Hardware::CPU.cores
+      odisabled "Hardware.processor_count", "Hardware::CPU.cores"
     end
   end
 end