From 2bf6d27013203f78d4c48d4e21baf1b17825e615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Thu, 23 Aug 2018 15:42:21 +0200
Subject: [PATCH] [poincare] Fix Sine and Cosine

---
 poincare/include/poincare/cosine.h | 5 +----
 poincare/include/poincare/sine.h   | 5 +----
 poincare/src/cosine.cpp            | 5 +++++
 poincare/src/sine.cpp              | 5 +++++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/poincare/include/poincare/cosine.h b/poincare/include/poincare/cosine.h
index ccb5ec750..eaca27835 100644
--- a/poincare/include/poincare/cosine.h
+++ b/poincare/include/poincare/cosine.h
@@ -3,7 +3,6 @@
 
 #include <poincare/approximation_helper.h>
 #include <poincare/expression.h>
-#include <poincare/layout_helper.h>
 #include <poincare/serialization_helper.h>
 #include <poincare/trigonometry.h>
 
@@ -33,9 +32,7 @@ public:
 
 private:
   // Layout
-  LayoutReference createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override {
-    return LayoutHelper::Prefix(this, floatDisplayMode, numberOfSignificantDigits, name());
-  }
+  LayoutReference createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override;
   int serialize(char * buffer, int bufferSize, Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override {
     return SerializationHelper::Prefix(this, buffer, bufferSize, floatDisplayMode, numberOfSignificantDigits, name());
   }
diff --git a/poincare/include/poincare/sine.h b/poincare/include/poincare/sine.h
index fba8a52b3..2028be21b 100644
--- a/poincare/include/poincare/sine.h
+++ b/poincare/include/poincare/sine.h
@@ -3,7 +3,6 @@
 
 #include <poincare/approximation_helper.h>
 #include <poincare/expression.h>
-#include <poincare/layout_helper.h>
 #include <poincare/serialization_helper.h>
 #include <poincare/trigonometry.h>
 
@@ -33,9 +32,7 @@ public:
 
 private:
   // Layout
-  LayoutReference createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override {
-    return LayoutHelper::Prefix(this, floatDisplayMode, numberOfSignificantDigits, name());
-  }
+  LayoutReference createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override;
   int serialize(char * buffer, int bufferSize, Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override {
     return SerializationHelper::Prefix(this, buffer, bufferSize, floatDisplayMode, numberOfSignificantDigits, name());
   }
diff --git a/poincare/src/cosine.cpp b/poincare/src/cosine.cpp
index a890888eb..95fc12850 100644
--- a/poincare/src/cosine.cpp
+++ b/poincare/src/cosine.cpp
@@ -1,5 +1,6 @@
 #include <poincare/cosine.h>
 #include <poincare/complex.h>
+#include <poincare/layout_helper.h>
 #include <poincare/simplification_helper.h>
 #include <cmath>
 
@@ -22,6 +23,10 @@ Complex<T> CosineNode::computeOnComplex(const std::complex<T> c, Preferences::An
   return Complex<T>(Trigonometry::RoundToMeaningfulDigits(res));
 }
 
+LayoutReference CosineNode::createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const {
+  return LayoutHelper::Prefix(Cosine(this), floatDisplayMode, numberOfSignificantDigits, name());
+}
+
 Expression CosineNode::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) const {
   return Cosine(this).shallowReduce(context, angleUnit);
 }
diff --git a/poincare/src/sine.cpp b/poincare/src/sine.cpp
index e9fd8dce6..d40bb48da 100644
--- a/poincare/src/sine.cpp
+++ b/poincare/src/sine.cpp
@@ -1,5 +1,6 @@
 #include <poincare/sine.h>
 #include <poincare/complex.h>
+#include <poincare/layout_helper.h>
 #include <poincare/simplification_helper.h>
 #include <cmath>
 
@@ -22,6 +23,10 @@ Complex<T> SineNode::computeOnComplex(const std::complex<T> c, Preferences::Angl
   return Complex<T>(Trigonometry::RoundToMeaningfulDigits(res));
 }
 
+LayoutReference SineNode::createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const {
+  return LayoutHelper::Prefix(Sine(this), floatDisplayMode, numberOfSignificantDigits, name());
+}
+
 Expression SineNode::shallowReduce(Context& context, Preferences::AngleUnit angleUnit) const {
   return Sine(this).shallowReduce(context, angleUnit);
 }