issue #2 Error and error.hpp merged

dibyendumajumdar · May 8, 2020 · e41882e · e41882e
1 parent ff687df
commit e41882e
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 21 deletions.
diff --git a/examples/segmented_mirror/segmented.cpp b/examples/segmented_mirror/segmented.cpp
@@ -54,7 +54,7 @@
 #include <goptical/core/math/VectorPair>
 #include <goptical/core/math/Vector>
 
-#include <goptical/core/Error>
+#include <goptical/core/error.hpp>
 
 using namespace goptical;
 

diff --git a/include/goptical/core/Error b/include/goptical/core/Error
diff --git a/include/goptical/core/error.hpp b/include/goptical/core/error.hpp
@@ -50,5 +50,9 @@ class Error : public std::runtime_error
 
 }
 
+namespace goptical {
+  using _goptical::Error;
+}
+
 #endif
 
diff --git a/src/core/curve_foucault.cpp b/src/core/curve_foucault.cpp
@@ -28,7 +28,7 @@
 
 */
 
-#include <goptical/core/Error>
+#include <goptical/core/error.hpp>
 #include <goptical/core/curve/Foucault>
 #include <goptical/core/math/Vector>
 

diff --git a/src/core/data_discrete_set.cpp b/src/core/data_discrete_set.cpp
@@ -24,7 +24,7 @@
 
 #include <iostream>
 
-#include <goptical/core/Error>
+#include <goptical/core/error.hpp>
 #include <goptical/core/data/DiscreteSet>
 
 #include "data_interpolate_1d_.hxx"

diff --git a/src/core/data_grid.cpp b/src/core/data_grid.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <goptical/core/data/Grid>
-#include <goptical/core/Error>
+#include <goptical/core/error.hpp>
 
 namespace _goptical {
 

diff --git a/src/core/data_plot.cpp b/src/core/data_plot.cpp
@@ -24,7 +24,7 @@
 
 #include <limits>
 
-#include <goptical/core/Error>
+#include <goptical/core/error.hpp>
 
 #include <goptical/core/data/Plot>
 #include <goptical/core/data/PlotData>

diff --git a/src/core/data_sample_set.cpp b/src/core/data_sample_set.cpp
@@ -23,7 +23,7 @@
 */
 
 
-#include <goptical/core/Error>
+#include <goptical/core/error.hpp>
 #include <goptical/core/data/SampleSet>
 
 #include "data_interpolate_1d_.hxx"

diff --git a/src/core/data_set.cpp b/src/core/data_set.cpp
@@ -25,7 +25,7 @@
 #include <limits>
 #include <iostream>
 
-#include <goptical/core/Error>
+#include <goptical/core/error.hpp>
 #include <goptical/core/data/Set>
 
 namespace _goptical

diff --git a/src/core/io_import_oslo.cpp b/src/core/io_import_oslo.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <goptical/core/io/ImportOslo>
-#include <goptical/core/Error>
+#include <goptical/core/error.hpp>
 
 #include <goptical/core/material/Dielectric>
 #include <goptical/core/material/Catalog>

diff --git a/src/core/io_import_zemax.cpp b/src/core/io_import_zemax.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <goptical/core/io/ImportZemax>
-#include <goptical/core/Error>
+#include <goptical/core/error.hpp>
 
 #include <goptical/core/shape/Infinite>
 #include <goptical/core/shape/Disk>

diff --git a/src/core/io_renderer_gd.cpp b/src/core/io_renderer_gd.cpp
@@ -30,7 +30,7 @@
 #include <goptical/core/io/RendererGd>
 #include <goptical/core/trace/Result>
 #include <goptical/core/trace/Ray>
-#include <goptical/core/Error>
+#include <goptical/core/error.hpp>
 
 namespace _goptical {
 

diff --git a/src/core/shape_infinite.cpp b/src/core/shape_infinite.cpp
@@ -26,7 +26,7 @@
 #include <goptical/core/sys/Surface>
 #include <goptical/core/shape/Infinite>
 #include <goptical/core/math/Vector>
-#include <goptical/core/Error>
+#include <goptical/core/error.hpp>
 
 namespace _goptical {
 

diff --git a/src/core/sys_container.cpp b/src/core/sys_container.cpp
@@ -28,7 +28,7 @@
 #include <goptical/core/math/Transform>
 #include <goptical/core/io/RendererViewport>
 
-#include <goptical/core/Error>
+#include <goptical/core/error.hpp>
 
 #include <limits>
 

diff --git a/src/core/sys_system.cpp b/src/core/sys_system.cpp
@@ -27,7 +27,7 @@
 #include <goptical/core/sys/Group>
 #include <goptical/core/sys/Container>
 
-#include <goptical/core/Error>
+#include <goptical/core/error.hpp>
 #include <goptical/core/sys/Surface>
 #include <goptical/core/sys/Source>
 #include <goptical/core/sys/OpticalSurface>

diff --git a/src/core/trace_tracer.cpp b/src/core/trace_tracer.cpp
@@ -31,7 +31,7 @@
 #include <goptical/core/trace/Ray>
 #include <goptical/core/sys/System>
 #include <goptical/core/sys/Source>
-#include <goptical/core/Error>
+#include <goptical/core/error.hpp>
 #include <goptical/core/sys/Surface>
 #include <goptical/core/math/VectorPair>
 #include <goptical/core/trace/Distribution>