Make PaddleReader constants private, to guard against same variable n…

…ames used elsewhere.
stella-emu · Sep 9, 2017 · 483013b · 483013b
1 parent 391601d
commit 483013b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/emucore/tia/PaddleReader.cxx b/src/emucore/tia/PaddleReader.cxx
@@ -19,13 +19,6 @@
 
 #include "PaddleReader.hxx"
 
-static constexpr double
-  C = 68e-9,
-  RPOT = 1e6,
-  USUPP = 5;
-
-static constexpr double TRIPPOINT_LINES = 379;
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 PaddleReader::PaddleReader()
 {

diff --git a/src/emucore/tia/PaddleReader.hxx b/src/emucore/tia/PaddleReader.hxx
@@ -65,7 +65,13 @@ class PaddleReader : public Serializable
 
     bool myIsDumped;
 
-    static constexpr double R0 = 1.5e3;
+    static constexpr double
+      R0 = 1.5e3,
+      C = 68e-9,
+      RPOT = 1e6,
+      USUPP = 5;
+
+    static constexpr double TRIPPOINT_LINES = 379;
 
   private:
     PaddleReader(const PaddleReader&) = delete;