Base/Py/PyObject.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_BASE_PY_PYOBJECT_H
 #define BORNAGAIN_BASE_PY_PYOBJECT_H
 
@@ -28,4 +26,3 @@ typedef _object PyObject;
 #endif
 
 #endif // BORNAGAIN_BASE_PY_PYOBJECT_H
-#endif // USER_API

Base/Py/PyUtils.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_BASE_PY_PYUTILS_H
 #define BORNAGAIN_BASE_PY_PYUTILS_H
 
@@ -57,4 +55,3 @@ PyObject* createNumpyArray(const std::vector<double>& data);
 #endif // BORNAGAIN_PYTHON
 
 #endif // BORNAGAIN_BASE_PY_PYUTILS_H
-#endif // USER_API

Base/Types/CloneableVector.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_BASE_TYPES_CLONEABLEVECTOR_H
 #define BORNAGAIN_BASE_TYPES_CLONEABLEVECTOR_H
 
@@ -62,4 +60,3 @@ public:
 };
 
 #endif // BORNAGAIN_BASE_TYPES_CLONEABLEVECTOR_H
-#endif // USER_API

Base/Types/ICloneable.h

@@ -12,7 +12,6 @@
 //
 //  ************************************************************************************************
 
-#ifndef USER_API
 #ifndef BORNAGAIN_BASE_TYPES_ICLONEABLE_H
 #define BORNAGAIN_BASE_TYPES_ICLONEABLE_H
 
@@ -33,4 +32,3 @@ public:
 };
 
 #endif // BORNAGAIN_BASE_TYPES_ICLONEABLE_H
-#endif // USER_API

Base/Types/OwningVector.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_BASE_TYPES_OWNINGVECTOR_H
 #define BORNAGAIN_BASE_TYPES_OWNINGVECTOR_H
 
@@ -117,4 +115,3 @@ protected:
 };
 
 #endif // BORNAGAIN_BASE_TYPES_OWNINGVECTOR_H
-#endif // USER_API

Base/Types/Span.h

@@ -12,7 +12,6 @@
 //
 //  ************************************************************************************************
 
-#ifndef USER_API
 #ifndef BORNAGAIN_BASE_TYPES_SPAN_H
 #define BORNAGAIN_BASE_TYPES_SPAN_H
 
@@ -52,4 +51,3 @@ private:
 };
 
 #endif // BORNAGAIN_BASE_TYPES_SPAN_H
-#endif // USER_API

Base/Util/Algorithms.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_BASE_UTIL_ALGORITHMS_H
 #define BORNAGAIN_BASE_UTIL_ALGORITHMS_H
 
@@ -87,4 +85,3 @@ std::vector<T> BaseUtils::algo::concat(const std::vector<T>& v1, const std::vect
 }
 
 #endif // BORNAGAIN_BASE_UTIL_ALGORITHMS_H
-#endif // USER_API

Base/Util/Assert.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_BASE_UTIL_ASSERT_H
 #define BORNAGAIN_BASE_UTIL_ASSERT_H
 
@@ -52,4 +50,3 @@
 #endif // BA_DEBUG
 
 #endif // BORNAGAIN_BASE_UTIL_ASSERT_H
-#endif // USER_API

Base/Util/FileSystemUtils.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_BASE_UTIL_FILESYSTEMUTILS_H
 #define BORNAGAIN_BASE_UTIL_FILESYSTEMUTILS_H
 
@@ -70,4 +68,3 @@ bool IsFileExists(const std::string& path);
 } // namespace BaseUtils::Filesystem
 
 #endif // BORNAGAIN_BASE_UTIL_FILESYSTEMUTILS_H
-#endif // USER_API

Base/Util/IFactory.h

@@ -12,7 +12,6 @@
 //
 //  ************************************************************************************************
 
-#ifndef USER_API
 #ifndef BORNAGAIN_BASE_UTIL_IFACTORY_H
 #define BORNAGAIN_BASE_UTIL_IFACTORY_H
 
@@ -79,4 +78,3 @@ T* create_new()
 }
 
 #endif // BORNAGAIN_BASE_UTIL_IFACTORY_H
-#endif // USER_API

Base/Util/StringUtils.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_BASE_UTIL_STRINGUTILS_H
 #define BORNAGAIN_BASE_UTIL_STRINGUTILS_H
 
@@ -80,4 +78,3 @@ std::string BaseUtils::String::scientific(const T value, int n)
 }
 
 #endif // BORNAGAIN_BASE_UTIL_STRINGUTILS_H
-#endif // USER_API

Base/Util/SysUtils.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_BASE_UTIL_SYSUTILS_H
 #define BORNAGAIN_BASE_UTIL_SYSUTILS_H
 
@@ -34,4 +32,3 @@ std::string getenv(const std::string& name);
 } // namespace BaseUtils::System
 
 #endif // BORNAGAIN_BASE_UTIL_SYSUTILS_H
-#endif // USER_API

Base/Vector/WavevectorInfo.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_BASE_VECTOR_WAVEVECTORINFO_H
 #define BORNAGAIN_BASE_VECTOR_WAVEVECTORINFO_H
 
@@ -44,4 +42,3 @@ private:
 };
 
 #endif // BORNAGAIN_BASE_VECTOR_WAVEVECTORINFO_H
-#endif // USER_API

CMakeLists.txt

@@ -61,9 +61,7 @@ option(BUILD_DEBIAN "Build a debian package" OFF)
 option(BA_APPLE_BUNDLE "Create a Mac OS X bundle" OFF)
 option(BA_CPP_API "Install header files" OFF)
 
-# note on two non-options:
-# macro SWIG is defined when code is processed by the tool Swig.
-# macros SWIG and USER_API are set by Doc/Doxygen/user/Doxyfile.in
+# note on a non-options: macro SWIG is defined when code is processed by the tool Swig.
 
 if(BA_TIDY AND BORNAGAIN_PYTHON)
     message(FATAL_ERROR "BA_TIDY is incompatible with BORNAGAIN_PYTHON")

Device/Coord/AxisNames.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_DEVICE_COORD_AXISNAMES_H
 #define BORNAGAIN_DEVICE_COORD_AXISNAMES_H
 
@@ -48,4 +46,3 @@ extern BA_DEVICE_API_ const std::map<Coords, std::string> sampleDepthAxis;
 } // namespace DataUtils::AxisNames
 
 #endif // BORNAGAIN_DEVICE_COORD_AXISNAMES_H
-#endif // USER_API

Device/Coord/CoordSystem1D.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_DEVICE_COORD_COORDSYSTEM1D_H
 #define BORNAGAIN_DEVICE_COORD_COORDSYSTEM1D_H
 
@@ -116,4 +114,3 @@ private:
 };
 
 #endif // BORNAGAIN_DEVICE_COORD_COORDSYSTEM1D_H
-#endif // USER_API

Device/Coord/CoordSystem2D.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_DEVICE_COORD_COORDSYSTEM2D_H
 #define BORNAGAIN_DEVICE_COORD_COORDSYSTEM2D_H
 
@@ -150,4 +148,3 @@ private:
 };
 
 #endif // BORNAGAIN_DEVICE_COORD_COORDSYSTEM2D_H
-#endif // USER_API

Device/Coord/ICoordSystem.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_DEVICE_COORD_ICOORDSYSTEM_H
 #define BORNAGAIN_DEVICE_COORD_ICOORDSYSTEM_H
 
@@ -71,4 +69,3 @@ private:
 };
 
 #endif // BORNAGAIN_DEVICE_COORD_ICOORDSYSTEM_H
-#endif // USER_API

Device/Data/ArrayUtils.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_DEVICE_DATA_ARRAYUTILS_H
 #define BORNAGAIN_DEVICE_DATA_ARRAYUTILS_H
 
@@ -45,4 +43,3 @@ std::vector<std::vector<double>> createVector2D(const Datafield& data);
 } // namespace DataUtils::Array
 
 #endif // BORNAGAIN_DEVICE_DATA_ARRAYUTILS_H
-#endif // USER_API

Device/Detector/SimulationAreaIterator.h

@@ -14,9 +14,7 @@
 
 #ifdef SWIG
 #error no need to expose this header to Swig
-#endif
-
-#ifndef USER_API
+#endif // SWIG
 #ifndef BORNAGAIN_DEVICE_DETECTOR_SIMULATIONAREAITERATOR_H
 #define BORNAGAIN_DEVICE_DETECTOR_SIMULATIONAREAITERATOR_H
 
@@ -82,4 +80,3 @@ inline bool SimulationAreaIterator::operator!=(const SimulationAreaIterator& rig
 }
 
 #endif // BORNAGAIN_DEVICE_DETECTOR_SIMULATIONAREAITERATOR_H
-#endif // USER_API