Changeset 14903

Timestamp:

May 5, 2013, 10:04:51 AM (13 years ago)

Author:

Eric.Larour

Message:

CHG: de-entangling some header file dependencies

Location:

issm/trunk-jpl/src/c/Container

Files:

• Container.h (modified) (1 diff)
• DataSet.h (modified) (1 diff)
• Inputs.h (modified) (1 diff)
• Nodes.h (modified) (1 diff)
• Observations.h (modified) (1 diff)
• Options.h (modified) (1 diff)

issm/trunk-jpl/src/c/Container/Container.h

@@ -6 +6 @@
 #define  _CONTAINER_CONTAINER_H_
 
-#include "../include/include.h"
 #include "./DataSet.h"
 #include "./Constraints.h"

issm/trunk-jpl/src/c/Container/DataSet.h

@@ -3 +3 @@
 
 #include <vector>
-#include "../classes/objects/Object.h"
-#include "../EnumDefinitions/EnumDefinitions.h"
 
 /*forward declarations */
+class Object;
 class Elements;
 class Loads;

issm/trunk-jpl/src/c/Container/Inputs.h

@@ -14 +14 @@
 class GaussTria;
 class GaussPenta;
+#include "../include/types.h"
 
 /*! \brief Declaration of Inputs class.

issm/trunk-jpl/src/c/Container/Nodes.h

@@ -2 +2 @@
 #define  _CONTAINER_NODES_H_
 
-#include "./DataSet.h"
+class DataSet;
 
 /*!\brief Declaration of Nodes class.

issm/trunk-jpl/src/c/Container/Observations.h

@@ -1 +1 @@
 #ifndef _CONTAINER_OBSERVATIONS_H_
 #define  _CONTAINER_OBSERVATIONS_H_
-
-#include "../include/include.h"
-#include "../classes/objects/Options/GenericOption.h"
 
 class Quadtree;
 class Variogram;
 class Options;
+#include "../include/types.h"
 
 /*!\brief Declaration of Observations class.

issm/trunk-jpl/src/c/Container/Options.h

@@ -2 +2 @@
 #define _CONTAINER_OPTIONS_H_
 
-#include "../classes/objects/Options/GenericOption.h"
-
 /*forward declarations */
 class Option;
+#include "../classes/objects/Options/GenericOption.h"
 
 /*!\brief Declaration of Options class.