small fixes

thepluck · Apr 8, 2017 · d3c3e6e · d3c3e6e
1 parent ecf7e2b
commit d3c3e6e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/jngen.h b/jngen.h
@@ -1578,7 +1578,6 @@ int Random::wnext(int n, int w) {
         return smallWnext<int>(w, n);
     } else {
         double t = realWnext(w);
-        std::cerr << "t = " << t << std::endl;
         return n * t;
     }
 }
@@ -1935,13 +1934,12 @@ JNGEN_DECLARE_PRINTER(
     JNGEN_HAS_OSTREAM() && JNGEN_HAS_FUNCTION(Plus), 11)
 {
     if (std::is_integral<T>::value) {
-        out << t + mod.addition;
+        out << T(t + mod.addition);
     } else {
         out << t;
     }
 }
 
-
 JNGEN_DECLARE_PRINTER(detail::VectorDepth<T>::value == 1, 3)
 {
     if (mod.printN) {
@@ -3885,7 +3883,7 @@ class VariantArray : public GenericArray<Variant<Args...>> {
 
 namespace jngen {
 
-#define JNGEN_DEFAULT_WEIGHT_TYPES int, double, std::string, std::pair<int, int>
+#define JNGEN_DEFAULT_WEIGHT_TYPES int, double, std::string, char, std::pair<int, int>
 
 #if defined(JNGEN_EXTRA_WEIGHT_TYPES)
 #define JNGEN_WEIGHT_TYPES JNGEN_DEFAULT_WEIGHT_TYPES , JNGEN_EXTRA_WEIGHT_TYPES

diff --git a/printers.h b/printers.h
@@ -104,13 +104,12 @@ JNGEN_DECLARE_PRINTER(
     JNGEN_HAS_OSTREAM() && JNGEN_HAS_FUNCTION(Plus), 11)
 {
     if (std::is_integral<T>::value) {
-        out << t + mod.addition;
+        out << T(t + mod.addition);
     } else {
         out << t;
     }
 }
 
-
 JNGEN_DECLARE_PRINTER(detail::VectorDepth<T>::value == 1, 3)
 {
     if (mod.printN) {

diff --git a/random_inl.h b/random_inl.h
@@ -10,7 +10,6 @@ int Random::wnext(int n, int w) {
         return smallWnext<int>(w, n);
     } else {
         double t = realWnext(w);
-        std::cerr << "t = " << t << std::endl;
         return n * t;
     }
 }

diff --git a/weight.h b/weight.h
@@ -8,7 +8,7 @@
 
 namespace jngen {
 
-#define JNGEN_DEFAULT_WEIGHT_TYPES int, double, std::string, std::pair<int, int>
+#define JNGEN_DEFAULT_WEIGHT_TYPES int, double, std::string, char, std::pair<int, int>
 
 #if defined(JNGEN_EXTRA_WEIGHT_TYPES)
 #define JNGEN_WEIGHT_TYPES JNGEN_DEFAULT_WEIGHT_TYPES , JNGEN_EXTRA_WEIGHT_TYPES