[cig-commits] commit: Updated *.h *.meta files to have consistent #define and Location lines.
Mercurial
hg at geodynamics.org
Mon Feb 1 15:32:22 PST 2010
changeset: 708:23ed4f75f8fd
branch: pcu_rejig
user: JericoRevote
date: Fri Dec 04 17:06:33 2009 +1100
files: Base/Automation/src/Automation.h Base/Automation/src/CallGraph.h Base/Automation/src/DocumentationComponentFactory.h Base/Automation/src/Finalise.h Base/Automation/src/HierarchyTable.h Base/Automation/src/Init.h Base/Automation/src/LiveComponentRegister.h Base/Automation/src/Meta.h Base/Automation/src/RegisterFactory.h Base/Automation/src/Stg_Component.h Base/Automation/src/Stg_ComponentFactory.h Base/Automation/src/Stg_ComponentRegister.h Base/Automation/src/offsets.h Base/Automation/src/shortcuts.h Base/Automation/src/types.h Base/Container/src/BTree.h Base/Container/src/BTreeIterator.h Base/Container/src/BTreeNode.h Base/Container/src/ChunkArray.h Base/Container/src/Container.h Base/Container/src/Finalise.h Base/Container/src/HashTable.h Base/Container/src/Heap.h Base/Container/src/IndexMap.h Base/Container/src/IndexSet.h Base/Container/src/Init.h Base/Container/src/LinkedList.h Base/Container/src/LinkedListIterator.h Base/Container/src/LinkedListNode.h Base/Container/src/List.h Base/Container/src/MPIRoutines.h Base/Container/src/MaxHeap.h Base/Container/src/MemoryPool.h Base/Container/src/PtrMap.h Base/Container/src/PtrSet.h Base/Container/src/RangeSet.h Base/Container/src/Set.h Base/Container/src/UIntMap.h Base/Container/src/types.h Base/Container/src/units.h Base/Context/src/AbstractContext.h Base/Context/src/Codelet.h Base/Context/src/Codelet.meta Base/Context/src/CompositeVC.h Base/Context/src/CompositeVC.meta Base/Context/src/ConditionFunction.h Base/Context/src/ConditionFunction_Register.h Base/Context/src/Context.h Base/Context/src/ContextEntryPoint.h Base/Context/src/DictionaryCheck.h Base/Context/src/DynamicVC.h Base/Context/src/DynamicVC.meta Base/Context/src/Finalise.h Base/Context/src/Init.h Base/Context/src/SetVC.h Base/Context/src/SetVC.meta Base/Context/src/Variable.h Base/Context/src/Variable.meta Base/Context/src/VariableAllVC.h Base/Context/src/VariableAllVC.meta Base/Context/src/VariableCondition.h Base/Context/src/VariableCondition.meta Base/Context/src/VariableCondition_Register.h Base/Context/src/VariableDumpStream.h Base/Context/src/Variable_Register.h Base/Context/src/shortcuts.h Base/Context/src/types.h Base/Context/src/units.h Base/Extensibility/src/ClassHook.h Base/Extensibility/src/ClassPtrExtensionInfo.h Base/Extensibility/src/EntryPoint.h Base/Extensibility/src/EntryPoint_Register.h Base/Extensibility/src/Extensibility.h Base/Extensibility/src/ExtensionInfo.h Base/Extensibility/src/ExtensionManager.h Base/Extensibility/src/ExtensionManager_Register.h Base/Extensibility/src/Finalise.h Base/Extensibility/src/Hook.h Base/Extensibility/src/Init.h Base/Extensibility/src/Module.h Base/Extensibility/src/ModulesManager.h Base/Extensibility/src/Plugin.h Base/Extensibility/src/PluginsManager.h Base/Extensibility/src/SimpleExtensionInfo.h Base/Extensibility/src/Toolbox.h Base/Extensibility/src/ToolboxesManager.h Base/Extensibility/src/shortcuts.h Base/Extensibility/src/types.h Base/Foundation/src/Class.h Base/Foundation/src/CommonRoutines.h Base/Foundation/src/Finalise.h Base/Foundation/src/Foundation.h Base/Foundation/src/Init.h Base/Foundation/src/Log.h Base/Foundation/src/MemMonitor.h Base/Foundation/src/Memory.h Base/Foundation/src/MemoryField.h Base/Foundation/src/MemoryPointer.h Base/Foundation/src/MemoryReport.h Base/Foundation/src/MemoryTag.h Base/Foundation/src/NamedObject_Register.h Base/Foundation/src/Numerics.h Base/Foundation/src/Object.h Base/Foundation/src/ObjectAdaptor.h Base/Foundation/src/ObjectList.h Base/Foundation/src/PrimitiveObject.h Base/Foundation/src/TimeMonitor.h Base/Foundation/src/forwardDecl.h Base/Foundation/src/shortcuts.h Base/Foundation/src/types.h Base/IO/src/BinaryStream.h Base/IO/src/CFile.h Base/IO/src/CStream.h Base/IO/src/CmdLineArgs.h Base/IO/src/Dictionary.h Base/IO/src/Dictionary_Entry.h Base/IO/src/Dictionary_Entry_Value.h Base/IO/src/Finalise.h Base/IO/src/IO.h Base/IO/src/IO_Handler.h Base/IO/src/IndentFormatter.h Base/IO/src/Init.h Base/IO/src/Journal.h Base/IO/src/JournalFile.h Base/IO/src/LineFormatter.h Base/IO/src/MPIFile.h Base/IO/src/MPIStream.h Base/IO/src/PathUtils.h Base/IO/src/RankFormatter.h Base/IO/src/Stream.h Base/IO/src/StreamFormatter.h Base/IO/src/XML_IO_Handler.h Base/IO/src/forwardDecl.h Base/IO/src/shortcuts.h Base/IO/src/types.h
description:
Updated *.h *.meta files to have consistent #define and Location lines.
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/Automation.h
--- a/Base/Automation/src/Automation.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/Automation.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __Base_Automation_h__
-#define __Base_Automation_h__
+#ifndef __StGermain_Base_Automation_h__
+#define __StGermain_Base_Automation_h__
#include "types.h"
#include "shortcuts.h"
@@ -56,4 +56,4 @@
#include "Init.h"
#include "Finalise.h"
-#endif /* __Base_Automation_h__ */
+#endif /* __StGermain_Base_Automation_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/CallGraph.h
--- a/Base/Automation/src/CallGraph.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/CallGraph.h Fri Dec 04 17:06:33 2009 +1100
@@ -36,8 +36,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_Stg_CallGraph_h__
-#define __Base_Automation_Stg_CallGraph_h__
+#ifndef __StGermain_Base_Automation_Stg_CallGraph_h__
+#define __StGermain_Base_Automation_Stg_CallGraph_h__
/* Templates of virtual functions */
typedef struct {
@@ -132,5 +132,5 @@
/** Pop the function on the stack, and finalise trace */
void Stg_CallGraph_Pop( void* callGraph );
-#endif /* __Base_Automation_Stg_CallGraph_h__ */
+#endif /* __StGermain_Base_Automation_Stg_CallGraph_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/DocumentationComponentFactory.h
--- a/Base/Automation/src/DocumentationComponentFactory.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/DocumentationComponentFactory.h Fri Dec 04 17:06:33 2009 +1100
@@ -33,8 +33,8 @@
** $Id: DocumentationComponentFactory.h 3851 2006-10-12 08:57:22Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_DocumentationComponentFactory_h__
-#define __Base_Automation_DocumentationComponentFactory_h__
+#ifndef __StGermain_Base_Automation_DocumentationComponentFactory_h__
+#define __StGermain_Base_Automation_DocumentationComponentFactory_h__
extern const Type DocumentationComponentFactory_Type;
@@ -131,5 +131,5 @@
void DocumentationComponentFactory_DocumentType( void* cf, Type type ) ;
-#endif /* __Base_Automation_DocumentationComponentFactory_h__ */
+#endif /* __StGermain_Base_Automation_DocumentationComponentFactory_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/Finalise.h
--- a/Base/Automation/src/Finalise.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/Finalise.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,9 +38,9 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_BaseAutomation_Finalise_h__
-#define __Base_BaseAutomation_Finalise_h__
+#ifndef __StGermain_Base_Automation_Finalise_h__
+#define __StGermain_Base_Automation_Finalise_h__
- Bool BaseAutomation_Finalise( void );
+ Bool Automation_Finalise( void );
-#endif /* __Base_BaseAutomation_Finalise_h__ */
+#endif /* __StGermain_Base_Automation_Finalise_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/HierarchyTable.h
--- a/Base/Automation/src/HierarchyTable.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/HierarchyTable.h Fri Dec 04 17:06:33 2009 +1100
@@ -37,8 +37,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_HierarchyTable_h__
-#define __Base_Automation_HierarchyTable_h__
+#ifndef __StGermain_Base_Automation_HierarchyTable_h__
+#define __StGermain_Base_Automation_HierarchyTable_h__
/* Textual name of this class */
extern const Type HierarchyTable_Type;
@@ -121,4 +121,4 @@
Type HierarchyTable_GetTypePtrFromName( void* hierarchyTable, Name typeName ) ;
-#endif /* __Base_Automation_HierarchyTable_h__ */
+#endif /* __StGermain_Base_Automation_HierarchyTable_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/Init.h
--- a/Base/Automation/src/Init.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/Init.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,9 +39,9 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_BaseAutomation_Init_h__
-#define __Base_BaseAutomation_Init_h__
+#ifndef __StGermain_Base_Automation_Init_h__
+#define __StGermain_Base_Automation_Init_h__
- Bool BaseAutomation_Init( int* argc, char** argv[] );
+ Bool Automation_Init( int* argc, char** argv[] );
-#endif /* __Base_BaseAutomation_Init_h__ */
+#endif /* __StGermain_Base_Automation_Init_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/LiveComponentRegister.h
--- a/Base/Automation/src/LiveComponentRegister.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/LiveComponentRegister.h Fri Dec 04 17:06:33 2009 +1100
@@ -33,8 +33,8 @@
** $Id: LiveComponentRegister.h 2745 2005-05-10 08:12:18Z RaquibulHassan $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_LiveComponentRegister_h__
-#define __Base_Automation_LiveComponentRegister_h__
+#ifndef __StGermain_Base_Automation_LiveComponentRegister_h__
+#define __StGermain_Base_Automation_LiveComponentRegister_h__
extern const Type LiveComponentRegister_Type;
extern LiveComponentRegister* stgLiveComponentRegister; /**< Live components singleton. */
@@ -106,5 +106,5 @@
LiveComponentRegister* LiveComponentRegister_GetLiveComponentRegister();
void LiveComponentRegister_PrintSimilar( void* liveComponentRegister, Name name, Stream* stream, unsigned int number ) ;
-#endif /* __Base_Automation_LiveComponentRegister_h__ */
+#endif /* __StGermain_Base_Automation_LiveComponentRegister_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/Meta.h
--- a/Base/Automation/src/Meta.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/Meta.h Fri Dec 04 17:06:33 2009 +1100
@@ -37,8 +37,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_Stg_ComponentMeta_h__
-#define __Base_Automation_Stg_ComponentMeta_h__
+#ifndef __StGermain_Base_Automation_Stg_ComponentMeta_h__
+#define __StGermain_Base_Automation_Stg_ComponentMeta_h__
char* Stg_Meta_GetType( Dictionary* dictionary );
char* Stg_Meta_GetCreator( Dictionary* dictionary );
@@ -67,4 +67,4 @@
char* Stg_Meta_GetAssociationNillable( Dictionary* dictionary, Index i );
char* Stg_Meta_GetAssociationDocumentation( Dictionary* dictionary, Index i );
-#endif /* __Base_Automation_Stg_ComponentMeta_h__ */
+#endif /* __StGermain_Base_Automation_Stg_ComponentMeta_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/RegisterFactory.h
--- a/Base/Automation/src/RegisterFactory.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/RegisterFactory.h Fri Dec 04 17:06:33 2009 +1100
@@ -43,8 +43,8 @@
**
**/
-#ifndef __Base_IO_RegisterFactory_h__
-#define __Base_IO_RegisterFactory_h__
+#ifndef __StGermain_Base_IO_RegisterFactory_h__
+#define __StGermain_Base_IO_RegisterFactory_h__
/** Textual name for RegisterFactory class. */
extern const Type RegisterFactory_Type;
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/Stg_Component.h
--- a/Base/Automation/src/Stg_Component.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/Stg_Component.h Fri Dec 04 17:06:33 2009 +1100
@@ -37,8 +37,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_Stg_Component_h__
-#define __Base_Automation_Stg_Component_h__
+#ifndef __StGermain_Base_Automation_Stg_Component_h__
+#define __StGermain_Base_Automation_Stg_Component_h__
/* Templates of virtual functions */
typedef void* (Stg_Component_DefaultConstructorFunction) ( Name name );
@@ -177,5 +177,5 @@
void Stg_Component_SetupStreamFromDictionary( void* component, Dictionary* dictionary );
-#endif /* __Base_Automation_Stg_Component_h__ */
+#endif /* __StGermain_Base_Automation_Stg_Component_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/Stg_ComponentFactory.h
--- a/Base/Automation/src/Stg_ComponentFactory.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/Stg_ComponentFactory.h Fri Dec 04 17:06:33 2009 +1100
@@ -33,8 +33,8 @@
** $Id: Stg_ComponentFactory.h 3851 2006-10-12 08:57:22Z SteveQuenette $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_Stg_ComponentFactory_h__
-#define __Base_Automation_Stg_ComponentFactory_h__
+#ifndef __StGermain_Base_Automation_Stg_ComponentFactory_h__
+#define __StGermain_Base_Automation_Stg_ComponentFactory_h__
extern const Type Stg_ComponentFactory_Type;
@@ -320,5 +320,5 @@
#define Stg_ComponentFactory_Unlimited ((unsigned int) -1)
-#endif /* __Base_Automation_Stg_ComponentFactory_h__ */
+#endif /* __StGermain_Base_Automation_Stg_ComponentFactory_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/Stg_ComponentRegister.h
--- a/Base/Automation/src/Stg_ComponentRegister.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/Stg_ComponentRegister.h Fri Dec 04 17:06:33 2009 +1100
@@ -37,8 +37,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_Stg_ComponentRegister_h__
-#define __Base_Automation_Stg_ComponentRegister_h__
+#ifndef __StGermain_Base_Automation_Stg_ComponentRegister_h__
+#define __StGermain_Base_Automation_Stg_ComponentRegister_h__
/* Textual name of this class */
extern const Type Stg_ComponentRegister_Type;
@@ -192,5 +192,5 @@
/** Obtain the component metadata from the component list element */
Dictionary* Stg_ComponentRegisterElement_GetMetadata( Stg_ComponentRegisterElement* element );
-#endif /* __Base_Automation_Stg_ComponentRegister_h__ */
+#endif /* __StGermain_Base_Automation_Stg_ComponentRegister_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/offsets.h
--- a/Base/Automation/src/offsets.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/offsets.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_offsets_h__
-#define __Base_Automation_offsets_h__
+#ifndef __StGermain_Base_Automation_offsets_h__
+#define __StGermain_Base_Automation_offsets_h__
/** Given a struct object and the name of a member, return the member */
#define GetMember( structVar, member ) \
@@ -69,4 +69,4 @@
( GetOffsetOfIndex( (arrayVar), (structIndex) ) + \
GetOffsetOfMember( GetIndex( (arrayVar), (structIndex) ), (index) ) )
-#endif /* __Base_Automation_offsets_h__ */
+#endif /* __StGermain_Base_Automation_offsets_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/shortcuts.h
--- a/Base/Automation/src/shortcuts.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/shortcuts.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_shortcuts_h__
-#define __Base_Automation_shortcuts_h__
+#ifndef __StGermain_Base_Automation_shortcuts_h__
+#define __StGermain_Base_Automation_shortcuts_h__
-#endif /* __Base_Automation_shortcuts_h__ */
+#endif /* __StGermain_Base_Automation_shortcuts_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Automation/src/types.h
--- a/Base/Automation/src/types.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Automation/src/types.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_types_h__
-#define __Base_Automation_types_h__
+#ifndef __StGermain_Base_Automation_types_h__
+#define __StGermain_Base_Automation_types_h__
typedef struct stgComponent stgComponent;
typedef struct Comm Comm;
@@ -64,4 +64,4 @@ typedef struct Comm Comm;
typedef void (Stg_Component_LoadFromDict) ( void*, Dictionary*, Dictionary*, Stg_ObjectList* );
-#endif /* __Base_Automation_types_h__ */
+#endif /* __StGermain_Base_Automation_types_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/BTree.h
--- a/Base/Container/src/BTree.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/BTree.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __Base_Foundation__BTree_h__
-#define __Base_Foundation__BTree_h__
+#ifndef __StGermain_Base_Container_BTree_h__
+#define __StGermain_Base_Container_BTree_h__
#define MAX_DEPTH 100
@@ -159,4 +159,4 @@
/** Added ss alias to Stg_Class_Delete for forward declaraion wrappers */
void BTree_Delete( void* tree );
-#endif /* __Base_Foundation__BTree_h__ */
+#endif /* __StGermain_Base_Container_BTree_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/BTreeIterator.h
--- a/Base/Container/src/BTreeIterator.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/BTreeIterator.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __Base_Foundation__BTreeIterator_h__
-#define __Base_Foundation__BTreeIterator_h__
+#ifndef __StGermain_Base_Container_BTreeIterator_h__
+#define __StGermain_Base_Container_BTreeIterator_h__
#define MAX_DEPTH 100
@@ -87,4 +87,4 @@
/* Returns the data stored inside the Tree's next node ( will be used for iterating through the tree ) */
void *BTreeIterator_Next( BTreeIterator *self );
-#endif /* __Base_Foundation__BTreeIterator_h__ */
+#endif /* __StGermain_Base_Container_BTreeIterator_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/BTreeNode.h
--- a/Base/Container/src/BTreeNode.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/BTreeNode.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __Base_Foundation__BTreeNode_h__
-#define __Base_Foundation__BTreeNode_h__
+#ifndef __StGermain_Base_Container_BTreeNode_h__
+#define __StGermain_Base_Container_BTreeNode_h__
/** Textual name for BTreeNode class. */
extern const Type BTreeNode_Type;
@@ -76,5 +76,5 @@
/** Print interface. */
-#endif /* __Base_Foundation__BTreeNode_h__ */
+#endif /* __StGermain_Base_Container_BTreeNode_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/ChunkArray.h
--- a/Base/Container/src/ChunkArray.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/ChunkArray.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
**/
-#ifndef __Base_Foundation__ChunkArray_h__
-#define __Base_Foundation__ChunkArray_h__
+#ifndef __StGermain_Base_Container_ChunkArray_h__
+#define __StGermain_Base_Container_ChunkArray_h__
#define CHUNK_ARRAY_DELTA 10
#define INVALID -1
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/Container.h
--- a/Base/Container/src/Container.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/Container.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Container_h__
-#define __Base_Container_h__
+#ifndef __StGermain_Base_Container_h__
+#define __StGermain_Base_Container_h__
#include "units.h"
#include "types.h"
@@ -75,5 +75,5 @@
#include "Init.h"
#include "Finalise.h"
-#endif /* __Base_Container_h__ */
+#endif /* __StGermain_Base_Container_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/Finalise.h
--- a/Base/Container/src/Finalise.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/Finalise.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,9 +38,9 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Container_Finalise_h__
-#define __Base_Container_Finalise_h__
+#ifndef __StGermain_Base_Container_Finalise_h__
+#define __StGermain_Base_Container_Finalise_h__
Bool BaseContainer_Finalise( void );
-#endif /* __Base_Container_Finalise_h__ */
+#endif /* __StGermain_Base_Container_Finalise_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/HashTable.h
--- a/Base/Container/src/HashTable.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/HashTable.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __HashTable_h__
-#define __HashTable_h__
+#ifndef __StGermain_Base_Container_HashTable_h__
+#define __StGermain_Base_Container_HashTable_h__
/** Textual name for List class. */
extern const Type HashTable_Type;
@@ -171,6 +171,6 @@
struct HashTable_Index* HashTable_Next( struct HashTable_Index *hi );
struct HashTable_Index* HashTable_First( struct HashTable *ht );
-#endif /* __HashTable_h__ */
+#endif /* __StGermain_Base_Container_HashTable_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/Heap.h
--- a/Base/Container/src/Heap.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/Heap.h Fri Dec 04 17:06:33 2009 +1100
@@ -46,8 +46,8 @@
**
**/
-#ifndef __Heap_h__
-#define __Heap_h__
+#ifndef __StGermain_Base_Container_Heap_h__
+#define __StGermain_Base_Container_Heap_h__
/** Textual name for List class. */
extern const Type Heap_Type;
@@ -138,6 +138,6 @@
int _Heap_Right( _Heap *heap, int i );
-#endif /* __Heap_h__ */
+#endif /* __StGermain_Base_Container_Heap_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/IndexMap.h
--- a/Base/Container/src/IndexMap.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/IndexMap.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Container_IndexMap_h__
-#define __Base_Container_IndexMap_h__
+#ifndef __StGermain_Base_Container_IndexMap_h__
+#define __StGermain_Base_Container_IndexMap_h__
/** Textual name of this class */
@@ -150,5 +150,5 @@
*/
-#endif /* __Base_Container_IndexMap_h__ */
+#endif /* __StGermain_Base_Container_IndexMap_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/IndexSet.h
--- a/Base/Container/src/IndexSet.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/IndexSet.h Fri Dec 04 17:06:33 2009 +1100
@@ -45,8 +45,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Container_IndexSet_h__
-#define __Base_Container_IndexSet_h__
+#ifndef __StGermain_Base_Container_IndexSet_h__
+#define __StGermain_Base_Container_IndexSet_h__
/** Virtual function template */
@@ -195,5 +195,5 @@
/** Prints message and exits properly when bad access/write detected. */
void _IndexSet_Abort( IndexSet* indexSet, const char* const funcName, IndexSet_Index index );
-#endif /* __Base_Container_IndexSet_h__ */
+#endif /* __StGermain_Base_Container_IndexSet_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/Init.h
--- a/Base/Container/src/Init.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/Init.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,9 +39,9 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Container_Init_h__
-#define __Base_Container_Init_h__
+#ifndef __StGermain_Base_Container_Init_h__
+#define __StGermain_Base_Container_Init_h__
Bool BaseContainer_Init( int* argc, char** argv[] );
-#endif /* __Base_Container_Init_h__ */
+#endif /* __StGermain_Base_Container_Init_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/LinkedList.h
--- a/Base/Container/src/LinkedList.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/LinkedList.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __LinkedList_h__
-#define __LinkedList_h__
+#ifndef __StGermain_Base_Container_LinkedList_h__
+#define __StGermain_Base_Container_LinkedList_h__
/** Textual name for List class. */
extern const Type LinkedList_Type;
@@ -155,6 +155,6 @@
/** Private Functions */
-#endif /* __LinkedList_h__ */
+#endif /* __StGermain_Base_Container_LinkedList_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/LinkedListIterator.h
--- a/Base/Container/src/LinkedListIterator.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/LinkedListIterator.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __Base_Foundation__LinkedListIterator_h__
-#define __Base_Foundation__LinkedListIterator_h__
+#ifndef __StGermain_Base_Container_LinkedListIterator_h__
+#define __StGermain_Base_Container_LinkedListIterator_h__
/** Textual name for LinkedListIterator class. */
extern const Type LinkedListIterator_Type;
@@ -87,5 +87,5 @@
(it==NULL)?NULL:(it->curr == NULL)?NULL:((it->curr = it->curr->next)==NULL)?NULL:it->curr->data
-#endif /* __Base_Foundation__LinkedListIterator_h__ */
+#endif /* __StGermain_Base_Container_LinkedListIterator_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/LinkedListNode.h
--- a/Base/Container/src/LinkedListNode.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/LinkedListNode.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __LinkedListNode_h__
-#define __LinkedListNode_h__
+#ifndef __StGermain_Base_Container_LinkedListNode_h__
+#define __StGermain_Base_Container_LinkedListNode_h__
/** Textual name for ListNode class. */
extern const Type LinkedListNode_Type;
@@ -68,5 +68,5 @@
/** Print interface. */
-#endif /* __LinkedListNode_h__ */
+#endif /* __StGermain_Base_Container_LinkedListNode_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/List.h
--- a/Base/Container/src/List.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/List.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Container_List_h__
-#define __Base_Contianer_List_h__
+#ifndef __StGermain_Base_Container_List_h__
+#define __StGermain_Base_Contianer_List_h__
/** Textual name of this class */
extern const Type List_Type;
@@ -118,5 +118,5 @@
void List_Contract( List* self );
void List_Destruct( List* self );
-#endif /* __Base_Container_List_h__ */
+#endif /* __StGermain_Base_Container_List_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/MPIRoutines.h
--- a/Base/Container/src/MPIRoutines.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/MPIRoutines.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __Base_Foundation_MPIRoutines_h__
-#define __Base_Foundation_MPIRoutines_h__
+#ifndef __StGermain_Base_Container_MPIRoutines_h__
+#define __StGermain_Base_Container_MPIRoutines_h__
void MPIArray_Bcast( unsigned* arraySize, void** array, size_t itemSize,
unsigned root, MPI_Comm comm );
@@ -62,4 +62,4 @@ void Array_2DTo1D( unsigned nBlocks, uns
void Array_2DTo1D( unsigned nBlocks, unsigned* sizes, void** srcArrays,
void** dstArray, size_t itemSize, unsigned** disps );
-#endif /* __Base_Foundation_MPIRoutines_h__ */
+#endif /* __StGermain_Base_Container_MPIRoutines_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/MaxHeap.h
--- a/Base/Container/src/MaxHeap.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/MaxHeap.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __MaxHeap_h__
-#define __MaxHeap_h__
+#ifndef __StGermain_Base_Container_MaxHeap_h__
+#define __StGermain_Base_Container_MaxHeap_h__
/** Textual name for List class. */
extern const Type MaxHeap_Type;
@@ -92,6 +92,6 @@
/** Private Functions */
-#endif /* __MaxHeap_h__ */
+#endif /* __StGermain_Base_Container_MaxHeap_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/MemoryPool.h
--- a/Base/Container/src/MemoryPool.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/MemoryPool.h Fri Dec 04 17:06:33 2009 +1100
@@ -41,8 +41,8 @@
**
**/
-#ifndef __MemoryPool_h__
-#define __MemoryPool_h__
+#ifndef __StGermain_Base_Container_MemoryPool_h__
+#define __StGermain_Base_Container_MemoryPool_h__
/** Textual name for List class. */
extern const Type MemoryPool_Type;
@@ -133,6 +133,6 @@
/** Private Functions */
-#endif /* __MemoryPool_h__ */
+#endif /* __StGermain_Base_Container_MemoryPool_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/PtrMap.h
--- a/Base/Container/src/PtrMap.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/PtrMap.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Container_PtrMap_h__
-#define __Base_Container_PtrMap_h__
+#ifndef __StGermain_Base_Container_PtrMap_h__
+#define __StGermain_Base_Container_PtrMap_h__
/** Textual name of this class */
@@ -131,5 +131,5 @@
*/
-#endif /* __Base_Container_PtrMap_h__ */
+#endif /* __StGermain_Base_Container_PtrMap_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/PtrSet.h
--- a/Base/Container/src/PtrSet.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/PtrSet.h Fri Dec 04 17:06:33 2009 +1100
@@ -37,8 +37,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Container_PtrSet_h__
-#define __Base_Container_PtrSet_h__
+#ifndef __StGermain_Base_Container_PtrSet_h__
+#define __StGermain_Base_Container_PtrSet_h__
/* Textual name of this class */
@@ -126,5 +126,5 @@
void _PtrSet_DeleteData( void* data );
-#endif /* __Base_Container_PtrSet_h__ */
+#endif /* __StGermain_Base_Container_PtrSet_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/RangeSet.h
--- a/Base/Container/src/RangeSet.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/RangeSet.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Container_RangeSet_h__
-#define __Base_Container_RangeSet_h__
+#ifndef __StGermain_Base_Container_RangeSet_h__
+#define __StGermain_Base_Container_RangeSet_h__
/** Textual name of this class */
extern const Type RangeSet_Type;
@@ -139,5 +139,5 @@
void RangeSet_Destruct( RangeSet* self );
-#endif /* __Base_Container_RangeSet_h__ */
+#endif /* __StGermain_Base_Container_RangeSet_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/Set.h
--- a/Base/Container/src/Set.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/Set.h Fri Dec 04 17:06:33 2009 +1100
@@ -37,8 +37,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Container_Set_h__
-#define __Base_Container_Set_h__
+#ifndef __StGermain_Base_Container_Set_h__
+#define __StGermain_Base_Container_Set_h__
/* Textual name of this class */
@@ -185,5 +185,5 @@
void _Set_BTreeSubtraction( void* data, void* pack );
-#endif /* __Base_Container_Set_h__ */
+#endif /* __StGermain_Base_Container_Set_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/UIntMap.h
--- a/Base/Container/src/UIntMap.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/UIntMap.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Container_UIntMap_h__
-#define __Base_Container_UIntMap_h__
+#ifndef __StGermain_Base_Container_UIntMap_h__
+#define __StGermain_Base_Container_UIntMap_h__
/** Textual name of this class */
extern const Type UIntMap_Type;
@@ -113,5 +113,5 @@
void UIntMap_DataDelete( void* data );
void UIntMap_ParseNode( void* data, void* _parseStruct );
-#endif /* __Base_Container_UIntMap_h__ */
+#endif /* __StGermain_Base_Container_UIntMap_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/types.h
--- a/Base/Container/src/types.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/types.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Container_types_h__
-#define __Base_Container_types_h__
+#ifndef __StGermain_Base_Container_types_h__
+#define __StGermain_Base_Container_types_h__
typedef struct Iter Iter;
typedef struct AbsArray AbsArray;
@@ -154,5 +154,5 @@ struct IMapItem {
} RangeSet_ParseStruct;
-#endif /* __Base_Container_types_h__ */
+#endif /* __StGermain_Base_Container_types_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Container/src/units.h
--- a/Base/Container/src/units.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Container/src/units.h Fri Dec 04 17:06:33 2009 +1100
@@ -36,7 +36,7 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Container_units_h__
-#define __Base_Container_units_h__
+#ifndef __StGermain_Base_Container_units_h__
+#define __StGermain_Base_Container_units_h__
-#endif /* __Base_Container_units_h__ */
+#endif /* __StGermain_Base_Container_units_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/AbstractContext.h
--- a/Base/Context/src/AbstractContext.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/AbstractContext.h Fri Dec 04 17:06:33 2009 +1100
@@ -37,18 +37,18 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Context_AbstractContext_h__
-#define __Base_Context_AbstractContext_h__
+#ifndef __StGermain_Base_Context_AbstractContext_h__
+#define __StGermain_Base_Context_AbstractContext_h__
/* Templates of virtual functions */
typedef void (AbstractContext_SetDt) ( void* self, double dt );
/* Context_CallInfo info */
- #define __Base_Context_CallInfo \
+ #define __StGermain_Base_Context_CallInfo \
void* functionPointer; \
void* entryPoint;
- struct Context_CallInfo { __Base_Context_CallInfo };
+ struct Context_CallInfo { __StGermain_Base_Context_CallInfo };
typedef enum CheckpointFileFormat {
CHECKPOINT_FORMAT_ASCII, /** Default Stg Ascii text format */
@@ -303,5 +303,5 @@
void _AbstractContext_SaveTimeInfo( void* _context );
void _AbstractContext_CreateCheckpointDirectory( void* _context );
-#endif /* __Base_Context_AbstractContext_h__ */
+#endif /* __StGermain_Base_Context_AbstractContext_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/Codelet.h
--- a/Base/Context/src/Codelet.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/Codelet.h Fri Dec 04 17:06:33 2009 +1100
@@ -36,8 +36,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Context_Codelet_h__
-#define __Base_Context_Codelet_h__
+#ifndef __StGermain_Base_Context_Codelet_h__
+#define __StGermain_Base_Context_Codelet_h__
/* Textual name of this class */
extern const Type Codelet_Type;
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/Codelet.meta
--- a/Base/Context/src/Codelet.meta Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/Codelet.meta Fri Dec 04 17:06:33 2009 +1100
@@ -6,7 +6,7 @@
<param name="Author">Steve Quenette</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
-<param name="Location">./StGermain/Base/Extensibility/src/</param>
+<param name="Location">./StGermain/Base/Context/src/</param>
<param name="Project Web">http://www.stgermainproject.org/</param>
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License v2.1 - http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</param>
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/CompositeVC.h
--- a/Base/Context/src/CompositeVC.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/CompositeVC.h Fri Dec 04 17:06:33 2009 +1100
@@ -35,8 +35,8 @@
**
**/
-#ifndef __Base_Automation_CompositeVC_h__
-#define __Base_Automation_CompositeVC_h__
+#ifndef __StGermain_Base_Context_CompositeVC_h__
+#define __StGermain_Base_Context_CompositeVC_h__
extern const Type CompositeVC_Type;
@@ -171,5 +171,5 @@ void _CompositeVC_Apply( void* _self, vo
void _CompositeVC_Apply( void* _self, void* _ctx );
-#endif /* __Base_Automation_CompositeVC_h__ */
+#endif /* __StGermain_Base_Context_CompositeVC_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/CompositeVC.meta
--- a/Base/Context/src/CompositeVC.meta Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/CompositeVC.meta Fri Dec 04 17:06:33 2009 +1100
@@ -6,7 +6,7 @@
<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
-<param name="Location">./StGermain/Base/Automation/src/</param>
+<param name="Location">./StGermain/Base/Context/src/</param>
<param name="Project Web">http://www.stgermainproject.org/</param>
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License v2.1 - http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</param>
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/ConditionFunction.h
--- a/Base/Context/src/ConditionFunction.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/ConditionFunction.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_ConditionFunction_h__
-#define __Base_Automation_ConditionFunction_h__
+#ifndef __StGermain_Base_Context_ConditionFunction_h__
+#define __StGermain_Base_Context_ConditionFunction_h__
typedef void (ConditionFunction_ApplyFunc) (Index index, Variable_Index var_I, void* context, void* result);
@@ -125,5 +125,5 @@
void _ConditionFunction_Apply(void* conditionFunction, Index index, Variable_Index var_I, void* context, void* result);
-#endif /* __Base_Automation_ConditionFunction_h__ */
+#endif /* __StGermain_Base_Context_ConditionFunction_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/ConditionFunction_Register.h
--- a/Base/Context/src/ConditionFunction_Register.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/ConditionFunction_Register.h Fri Dec 04 17:06:33 2009 +1100
@@ -42,8 +42,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_ConditionFunction_Register_h__
-#define __Base_Automation_ConditionFunction_Register_h__
+#ifndef __StGermain_Base_Context_ConditionFunction_Register_h__
+#define __StGermain_Base_Context_ConditionFunction_Register_h__
extern const Type ConditionFunction_Register_Type;
@@ -125,5 +125,5 @@
void ConditionFunction_Register_PrintNameOfEachFunc( void* conditionFunction_Register, Stream* stream );
-#endif /* __Base_Automation_ConditionFunction_Register_h__ */
+#endif /* __StGermain_Base_Context_ConditionFunction_Register_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/Context.h
--- a/Base/Context/src/Context.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/Context.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Context_h__
-#define __Base_Context_h__
+#ifndef __StGermain_Base_Context_h__
+#define __StGermain_Base_Context_h__
#include "units.h"
#include "types.h"
@@ -63,4 +63,4 @@
#include "Finalise.h"
#include "DictionaryCheck.h"
-#endif /* __Base_Context_h__ */
+#endif /* __StGermain_Base_Context_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/ContextEntryPoint.h
--- a/Base/Context/src/ContextEntryPoint.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/ContextEntryPoint.h Fri Dec 04 17:06:33 2009 +1100
@@ -37,8 +37,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Context_ContextEntryPoint_h__
-#define __Base_Context_ContextEntryPoint_h__
+#ifndef __StGermain_Base_Context_ContextEntryPoint_h__
+#define __StGermain_Base_Context_ContextEntryPoint_h__
/* Templates for default entry point type */
typedef double (ContextEntryPoint_Dt_Cast) ( void* context );
@@ -95,5 +95,5 @@
/* Context entry point run... one void* arguement passed, one double arguement passed */
void _ContextEntryPoint_Run_Step( void* contextEntryPoint, void* data0, double data1 );
-#endif /* __Base_Context_ContextEntryPoint_h__ */
+#endif /* __StGermain_Base_Context_ContextEntryPoint_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/DictionaryCheck.h
--- a/Base/Context/src/DictionaryCheck.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/DictionaryCheck.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,11 +38,11 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_BaseContext_DictionaryCheck_h__
-#define __Base_BaseContext_DictionaryCheck_h__
+#ifndef __StGermain_Base_Context_DictionaryCheck_h__
+#define __StGermain_Base_Context_DictionaryCheck_h__
- void BaseContext_DictionaryCheck( Dictionary* dictionary );
+ void Context_DictionaryCheck( Dictionary* dictionary );
void CheckDictionaryKeys(Dictionary* dictionary, const char* errorMessage);
-#endif /* __Base_BaseContext_DictionaryCheck_h__ */
+#endif /* __StGermain_Base_Context_DictionaryCheck_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/DynamicVC.h
--- a/Base/Context/src/DynamicVC.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/DynamicVC.h Fri Dec 04 17:06:33 2009 +1100
@@ -34,8 +34,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_DynamicVC_h__
-#define __Base_Automation_DynamicVC_h__
+#ifndef __StGermain_Base_Context_DynamicVC_h__
+#define __StGermain_Base_Context_DynamicVC_h__
extern const Type DynamicVC_Type;
@@ -159,5 +159,5 @@ extern const Type DynamicVC_Type;
void DynamicVC_Remove( void* vc, int index );
Bool DynamicVC_Has( void* _self, int index );
-#endif /* __Base_Automation_DynamicVC_h__ */
+#endif /* __StGermain_Base_Context_DynamicVC_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/DynamicVC.meta
--- a/Base/Context/src/DynamicVC.meta Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/DynamicVC.meta Fri Dec 04 17:06:33 2009 +1100
@@ -6,7 +6,7 @@
<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
-<param name="Location">./StGermain/Base/Automation/src/</param>
+<param name="Location">./StGermain/Base/Context/src/</param>
<param name="Project Web">http://www.stgermainproject.org/</param>
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License v2.1 - http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</param>
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/Finalise.h
--- a/Base/Context/src/Finalise.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/Finalise.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,9 +38,9 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_BaseContext_Finalise_h__
-#define __Base_BaseContext_Finalise_h__
+#ifndef __StGermain_Base_Context_Finalise_h__
+#define __StGermain_Base_Context_Finalise_h__
- Bool BaseContext_Finalise( void );
+ Bool Context_Finalise( void );
-#endif /* __Base_BaseContext_Finalise_h__ */
+#endif /* __StGermain_Base_Context_Finalise_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/Init.h
--- a/Base/Context/src/Init.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/Init.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,9 +39,9 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_BaseContext_Init_h__
-#define __Base_BaseContext_Init_h__
+#ifndef __StGermain_Base_Context_Init_h__
+#define __StGermain_Base_Context_Init_h__
- Bool BaseContext_Init( int* argc, char** argv[] );
+ Bool Context_Init( int* argc, char** argv[] );
-#endif /* __Base_BaseContext_Init_h__ */
+#endif /* __StGermain_Base_Context_Init_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/SetVC.h
--- a/Base/Context/src/SetVC.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/SetVC.h Fri Dec 04 17:06:33 2009 +1100
@@ -34,8 +34,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_SetVC_h__
-#define __Base_Automation_SetVC_h__
+#ifndef __StGermain_Base_Context_SetVC_h__
+#define __StGermain_Base_Context_SetVC_h__
extern const Type SetVC_Type;
@@ -151,5 +151,5 @@
** Functions
*/
-#endif /* __Base_Automation_SetVC_h__ */
+#endif /* __StGermain_Base_Context_SetVC_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/SetVC.meta
--- a/Base/Context/src/SetVC.meta Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/SetVC.meta Fri Dec 04 17:06:33 2009 +1100
@@ -6,7 +6,7 @@
<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
- <param name="Location">./StGermain/Base/Automation/src/</param>
+ <param name="Location">./StGermain/Base/Context/src/</param>
<param name="Project Web">http://www.stgermainproject.org/</param>
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License v2.1 - http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</param>
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/Variable.h
--- a/Base/Context/src/Variable.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/Variable.h Fri Dec 04 17:06:33 2009 +1100
@@ -46,8 +46,8 @@
**
**/
-#ifndef __Base_Automation_Variable_h__
-#define __Base_Automation_Variable_h__
+#ifndef __StGermain_Base_Context_Variable_h__
+#define __StGermain_Base_Context_Variable_h__
/** Textual name for Variable class. */
extern const Type Variable_Type;
@@ -273,8 +273,8 @@
( ( (self)->offsetCount < 2 ) ? \
( (void*)( (ArithPointer)(self)->arrayPtr + (ArithPointer)(array_I) * (ArithPointer)( (self)->structSize) + (ArithPointer)( (self)->offsets[0] ) )) : \
( (void*)((ArithPointer)(self)->arrayPtr + (ArithPointer)(array_I) * (ArithPointer)((self)->structSize)) ) )
- #ifdef CAUTIOUS
- /** Implementation of "get" the structure in an array that the requested data member is in if CAUTIOUS is defined.
+ #ifdef CAUTContextUS
+ /** Implementation of "get" the structure in an array that the requested data member is in if CAUTContextUS is defined.
* It ensures that array_I is within its bounds. Private (Do not directly use!) */
#define _Variable_GetStructPtr( self, array_I ) \
( ((array_I) < (self)->arraySize) ? \
@@ -287,7 +287,7 @@
"out of range (array size is %d). Exiting.\n", (self)->name, array_I, \
(self)->arraySize ), NULL) )
#else
- /** Implementation of "get" the structure in an array, that the requested data member is in if CAUTIOUS is NOT
+ /** Implementation of "get" the structure in an array, that the requested data member is in if CAUTContextUS is NOT
* defined. It DOES NOT ensure that array_I is within its bounds. Private (Do not directly use!) */
#define _Variable_GetStructPtr __Variable_GetStructPtr
#endif
@@ -300,8 +300,8 @@
some architectures such as the SGI Altix is of a different size to the ArithPointer (unsigned long) */
#define __Variable_GetPtr( self, array_I, component_I, vector_I ) \
( (void*)((ArithPointer)(self)->arrayPtr + (ArithPointer)(array_I) * (self)->structSize + (self)->offsets[component_I]) )
- #ifdef CAUTIOUS
- /** Implementation of "get" the requested data member in a structure in an array if CAUTIOUS is defined.
+ #ifdef CAUTContextUS
+ /** Implementation of "get" the requested data member in a structure in an array if CAUTContextUS is defined.
* It ensures that component_I and array_I are within its bounds. Private (Do not directly use!) */
#define _Variable_GetPtr( self, array_I, component_I, vector_I ) \
( ((component_I) < (self)->offsetCount) ? \
@@ -311,7 +311,7 @@
Journal_Register( Error_Type, Variable_Type ), \
"Offset array_I out of range\n" ), NULL) )
#else
- /** Implementation of "get" the requested data member in a structure in an array if CAUTIOUS is NOT
+ /** Implementation of "get" the requested data member in a structure in an array if CAUTContextUS is NOT
* defined. It DOES NOT ensure that component_I and array_I are within its bounds. Private (Do not directly
* use!) */
#define _Variable_GetPtr __Variable_GetPtr
@@ -326,7 +326,7 @@
* (Do not directly use!). */
#define _Variable_GetPtrChar( self, array_I ) \
( (char*)_Variable_GetStructPtr( (self), (array_I) ) )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of a "char" inbuilt type, return a pointer to that char (type casted to char*).
* It ensures the Variable is of a "char" and is not complex. */
#define Variable_GetPtrChar( self, array_I ) \
@@ -346,7 +346,7 @@
/** Assuming this is a Variable of a vector "char" inbuilt type, return that char. Private (Do not directly use!). */
#define _Variable_GetValueAtChar( self, array_I, vector_I ) \
( Variable_GetPtrChar( (self), (array_I) )[(vector_I)] )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of a vector "char" inbuilt type, return that char. It ensures that vector_I is
* within range. */
#define Variable_GetValueAtChar( self, array_I, vector_I ) \
@@ -430,7 +430,7 @@
* (Do not directly use!). */
#define _Variable_GetPtrShort( self, array_I ) \
( (short*)_Variable_GetStructPtr( (self), (array_I) ) )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of a "short" inbuilt type, return a pointer to that short (type casted to short*).
* It ensures the Variable is of a "short" and is not complex. */
#define Variable_GetPtrShort( self, array_I ) \
@@ -450,7 +450,7 @@
/** Assuming this is a Variable of a vector "short" inbuilt type, return that short. Private (Do not directly use!). */
#define _Variable_GetValueAtShort( self, array_I, vector_I ) \
( Variable_GetPtrShort( (self), (array_I) )[(vector_I)] )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of a vector "short" inbuilt type, return that short. It ensures that vector_I is
* within range. */
#define Variable_GetValueAtShort( self, array_I, vector_I ) \
@@ -535,7 +535,7 @@
* (Do not directly use!). */
#define _Variable_GetPtrInt( self, array_I ) \
( (int*)_Variable_GetStructPtr( (self), (array_I) ) )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of a "int" inbuilt type, return a pointer to that int (type casted to int*).
* It ensures the Variable is of a "int" and is not complex. */
#define Variable_GetPtrInt( self, array_I ) \
@@ -555,7 +555,7 @@
/** Assuming this is a Variable of a vector "int" inbuilt type, return that int. Private (Do not directly use!). */
#define _Variable_GetValueAtInt( self, array_I, vector_I ) \
( Variable_GetPtrInt( (self), (array_I) )[(vector_I)] )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of a vector "int" inbuilt type, return that int. It ensures that vector_I is
* within range. */
#define Variable_GetValueAtInt( self, array_I, vector_I ) \
@@ -638,7 +638,7 @@
* (Do not directly use!). */
#define _Variable_GetPtrFloat( self, array_I ) \
( (float*)_Variable_GetStructPtr( (self), (array_I) ) )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of a "float" inbuilt type, return a pointer to that float (type casted to float*).
* It ensures the Variable is of a "float" and is not complex. */
#define Variable_GetPtrFloat( self, array_I ) \
@@ -658,7 +658,7 @@
/** Assuming this is a Variable of a vector "float" inbuilt type, return that float. Private (Do not directly use!). */
#define _Variable_GetValueAtFloat( self, array_I, vector_I ) \
( Variable_GetPtrFloat( (self), (array_I) )[(vector_I)] )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of a vector "float" inbuilt type, return that float. It ensures that vector_I is
* within range. */
#define Variable_GetValueAtFloat( self, array_I, vector_I ) \
@@ -743,7 +743,7 @@
* Private (Do not directly use!). */
#define _Variable_GetPtrDouble( self, array_I ) \
( (double*)_Variable_GetStructPtr( (self), (array_I) ) )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of a "double" inbuilt type, return a pointer to that double (type casted to
* double*). It ensures the Variable is of a "double" and is not complex. */
#define Variable_GetPtrDouble( self, array_I ) \
@@ -763,7 +763,7 @@
/** Assuming this is a Variable of a vector "double" inbuilt type, return that double. Private (Do not directly use!). */
#define _Variable_GetValueAtDouble( self, array_I, vector_I ) \
( (Variable_GetPtrDouble( (self), (array_I) ))[(vector_I)] )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of a vector "double" inbuilt type, return that double. It ensures that vector_I is
* within range. */
#define Variable_GetValueAtDouble( self, array_I, vector_I ) \
@@ -856,7 +856,7 @@
* Private. (Do not directly use!). */
#define _Variable_GetPtrPointer( self, array_I ) \
( (void**)_Variable_GetStructPtr( (self), (array_I) ) )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of a "pointer" inbuilt type, return a pointer to that pointer (type casted to
* void**). It ensures the Variable is of a "pointer" and is not complex. */
#define Variable_GetPtrPointer( self, array_I ) \
@@ -876,7 +876,7 @@
/** Assuming this is a Variable of a vector "pointer" inbuilt type, return that pointer. Private (Do not directly use!). */
#define _Variable_GetValueAtPointer( self, array_I, vector_I ) \
( Variable_GetPtrPointer( (self), (array_I) )[(vector_I)] )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of a vector "pointer" inbuilt type, return that pointer. It ensures that vector_I is
* within range. */
#define Variable_GetValueAtPointer( self, array_I, vector_I ) \
@@ -969,7 +969,7 @@
0, \
Journal_Register( Error_Type, Variable_Type ), \
"Variable is not of any inbuilt type, but this macro assumes so.\n" ) )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of any inbuilt type, return a char (type casted to char). It ensures the Variable
* is not complex. Resolution order: char, short, int, float, double, pointer. */
#define Variable_GetValueAsChar( self, array_I ) \
@@ -997,7 +997,7 @@
0, \
Journal_Register( Error_Type, Variable_Type ), \
"Variable is not of any inbuilt type, but this macro assumes so.\n" ) )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of any inbuilt type, return a short (type casted to short). It ensures the Variable
* is not complex. Resolution order: char, short, int, float, double, pointer. */
#define Variable_GetValueAsShort( self, array_I ) \
@@ -1025,7 +1025,7 @@
0, \
Journal_Register( Error_Type, Variable_Type ), \
"Variable is not of any inbuilt type, but this macro assumes so.\n" ) )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of any inbuilt type, return a int (type casted to int). It ensures the Variable
* is not complex. Resolution order: char, short, int, float, double, pointer. */
#define Variable_GetValueAsInt( self, array_I ) \
@@ -1053,7 +1053,7 @@
0, \
Journal_Register( Error_Type, Variable_Type ), \
"Variable is not of any inbuilt type, but this macro assumes so.\n" ) )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of any inbuilt type, return a float (type casted to float). It ensures the Variable
* is not complex. Resolution order: char, short, int, float, double, pointer. */
#define Variable_GetValueAsFloat( self, array_I ) \
@@ -1081,7 +1081,7 @@
0, \
Journal_Register( Error_Type, Variable_Type ), \
"Variable is not of any inbuilt type, but this macro assumes so.\n" ) )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of any inbuilt type, return a double (type casted to double). It ensures the
* Variable is not complex. Resolution order: char, short, int, float, double, pointer. */
#define Variable_GetValueAsDouble( self, array_I ) \
@@ -1110,7 +1110,7 @@
0, \
Journal_Register( Error_Type, Variable_Type ), \
"Variable is not of any inbuilt type, but this macro assumes so.\n" ), NULL) )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of any inbuilt type, return a pointer (type casted to void*). It ensures the Variable
* is not complex. Resolution order: pointer, short, int, float, double, pointer. */
#define Variable_GetValueAsPointer( self, array_I ) \
@@ -1140,7 +1140,7 @@
0, \
Journal_Register( Error_Type, Variable_Type ), \
"Variable is not of any inbuilt type, but this macro assumes so.\n" ), NULL) )
- #ifdef CAUTIOUS
+ #ifdef CAUTContextUS
/** Assuming this is a Variable of any inbuilt type, set the value. It ensures the Variable is not complex.
* Resolution order: pointer, short, int, float, double, pointer. */
#define Variable_SetValueFromInbuilt( self, array_I, value ) \
@@ -1197,5 +1197,5 @@
/** Checks whether || variable - comparison || / || variable || < tolerance */
Bool Variable_ValueCompareWithinTolerance( void* variable, void* comparison, double tolerance );
-#endif /* __Base_Automation_Variable__ */
+#endif /* __StGermain_Base_Context_Variable__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/Variable.meta
--- a/Base/Context/src/Variable.meta Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/Variable.meta Fri Dec 04 17:06:33 2009 +1100
@@ -6,14 +6,15 @@
<param name="Author">Steve Quenette</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
-<param name="Location">./StGermain/Base/Automation/src/</param>
+<param name="Location">./StGermain/Base/Context/src/</param>
<param name="Project Web">http://www.stgermainproject.org/</param>
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License v2.1 - http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</param>
<param name="Parent">Stg_Component</param>
<param name="Reference"></param>
<param name="Summary">Associates a textual label with a piece of data in memory, which can then be referred to via the Variable Register.</param>
-<param name="Description"><![CDATA[
+<param name="Description">
+
<p>Variable makes an association between a defined, textual name and a chunk of data in memory. This data could take the form of a basic type (such as an int or double), or an element of an array, or an entire array or struct. Variable may also index a regular series of non-contiguous locations in memory. This capability to define arbitrary data within a datastructure makes it very powerful.</p>
<p>For example, a Variable can refer to a series of ints in an array with an offset of 1 and a stride of 3. This terminology will be familiar to those who are accustomed with MPI. Once a Variable is defined, it is stored in the Variable Register. Like other Registers of StGermain, it can be accessed by any other Component.
@@ -24,7 +25,7 @@
<p>When specified throught the XML system, the Variable will actually allocate the memory of the underlying memory variable itself. When used in the C API, the Variable must be passed the underlying memory chunk (but the memory chunk itself need not yet be allocated until just before the Variable undergoes its build phase).</p>
<p>The XML implementation of Variable doesn't allow the specification of complex data types or arrays. For arrays, components such as MeshVariable should be used</p>
-]]>
+
</param>
@@ -89,7 +90,7 @@ Using Variable in C is different to the
Using Variable in C is different to the XML implementation because you need to
do own memory handling.
This example is based on the sourcecode in
-~/code/StGermain/Base/Automation/tests/testVariable.c </p>
+~/code/StGermain/Base/Context/tests/testVariable.c </p>
<p>
/* Construct phase */
double* velocity;
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/VariableAllVC.h
--- a/Base/Context/src/VariableAllVC.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/VariableAllVC.h Fri Dec 04 17:06:33 2009 +1100
@@ -36,8 +36,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_VariableAllVC_h__
-#define __Base_Automation_VariableAllVC_h__
+#ifndef __StGermain_Base_Context_VariableAllVC_h__
+#define __StGermain_Base_Context_VariableAllVC_h__
extern const Type VariableAllVC_Type;
@@ -159,5 +159,5 @@
*/
-#endif /* __Base_Automation_VariableAllVC_h__ */
+#endif /* __StGermain_Base_Context_VariableAllVC_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/VariableAllVC.meta
--- a/Base/Context/src/VariableAllVC.meta Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/VariableAllVC.meta Fri Dec 04 17:06:33 2009 +1100
@@ -6,7 +6,7 @@
<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
- <param name="Location">./StGermain/Base/Automation/src/</param>
+ <param name="Location">./StGermain/Base/Context/src/</param>
<param name="Project Web">http://www.stgermainproject.org/</param>
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License v2.1 - http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</param>
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/VariableCondition.h
--- a/Base/Context/src/VariableCondition.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/VariableCondition.h Fri Dec 04 17:06:33 2009 +1100
@@ -37,8 +37,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_VariableCondition_h__
-#define __Base_Automation_VariableCondition_h__
+#ifndef __StGermain_Base_Context_VariableCondition_h__
+#define __StGermain_Base_Context_VariableCondition_h__
/** Textual name of this class */
extern const Type VariableCondition_Type;
@@ -155,7 +155,7 @@
VariableCondition_ApplyFunc* _apply
#define VARIABLECONDITION_PASSARGS \
- STG_COMPONENT_PASSARGS, \
+ STG_COMPONENT_PASSARGS, \
_buildSelf, \
_printConcise, \
_readDictionary, \
@@ -250,5 +250,5 @@
void VariableCondition_PrintConcise( void* variableCondition, Stream* stream );
-#endif /* __Base_Automation_VariableCondition_h__ */
+#endif /* __StGermain_Base_Context_VariableCondition_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/VariableCondition.meta
--- a/Base/Context/src/VariableCondition.meta Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/VariableCondition.meta Fri Dec 04 17:06:33 2009 +1100
@@ -6,7 +6,7 @@
<param name="Author">...</param>
<param name="Organisation">VPAC</param>
<param name="Project">StGermain</param>
- <param name="Location">./StGermain/Base/Automation/src/</param>
+ <param name="Location">./StGermain/Base/Context/src/</param>
<param name="Project Web">http://www.stgermainproject.org/</param>
<param name="Copyright">StGermain Framework. Copyright (C) 2003-2005 VPAC.</param>
<param name="License">The Gnu Lesser General Public License v2.1 - http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</param>
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/VariableCondition_Register.h
--- a/Base/Context/src/VariableCondition_Register.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/VariableCondition_Register.h Fri Dec 04 17:06:33 2009 +1100
@@ -37,12 +37,13 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_VariableCondition_Register_h__
-#define __Base_Automation_VariableCondition_Register_h__
+#ifndef __StGermain_Base_Context_VariableCondition_Register_h__
+#define __StGermain_Base_Context_VariableCondition_Register_h__
/* Child classes must define these factories */
- typedef VariableCondition* (VariableCondition_Register_FactoryFunc) ( AbstractContext* context, Variable_Register* variable_Register, ConditionFunction_Register* conFunc_Register, Dictionary* dictionary, void* data );
+ typedef VariableCondition* (VariableCondition_Register_FactoryFunc)
+ ( AbstractContext* context, Variable_Register* variable_Register, ConditionFunction_Register* conFunc_Register, Dictionary* dictionary, void* data );
/** Textual name of this class */
@@ -133,5 +134,5 @@
void* dictionary,
void* data );
-#endif /* __Base_Automation_VariableCondition_Register_h__ */
+#endif /* __StGermain_Base_Context_VariableCondition_Register_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/VariableDumpStream.h
--- a/Base/Context/src/VariableDumpStream.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/VariableDumpStream.h Fri Dec 04 17:06:33 2009 +1100
@@ -43,8 +43,8 @@
**
**/
-#ifndef __Base_IO_VariableDumpStream_h__
-#define __Base_IO_VariableDumpStream_h__
+#ifndef __StGermain_Base_Context_VariableDumpStream_h__
+#define __StGermain_Base_Context_VariableDumpStream_h__
/** Textual name for VariableDumpStream class. */
extern const Type VariableDumpStream_Type;
@@ -104,7 +104,7 @@
void VariableDumpStream_SetVariable( void* stream, Variable* data, int numItems, unsigned int dumpEvery, const Name const fileName );
-#endif /* __IO_VariableDumpStreamFile_h__ */
+#endif /* __Context_VariableDumpStreamFile_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/Variable_Register.h
--- a/Base/Context/src/Variable_Register.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/Variable_Register.h Fri Dec 04 17:06:33 2009 +1100
@@ -42,8 +42,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_Variable_Register_h__
-#define __Base_Automation_Variable_Register_h__
+#ifndef __StGermain_Base_Context_Variable_Register_h__
+#define __StGermain_Base_Context_Variable_Register_h__
extern const Type Variable_Register_Type;
@@ -128,5 +128,5 @@
Variable* Variable_Register_GetByIndex( void* variable_Register, Variable_Index varIndex);
-#endif /* __Base_Automation_Variable_Register_h__ */
+#endif /* __StGermain_Base_Context_Variable_Register_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/shortcuts.h
--- a/Base/Context/src/shortcuts.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/shortcuts.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Context_shortcuts_h__
-#define __Base_Context_shortcuts_h__
+#ifndef __StGermain_Base_Context_shortcuts_h__
+#define __StGermain_Base_Context_shortcuts_h__
#define Context_PrintConcise AbstractContext_PrintConcise
#define Context_AddEntryPoint AbstractContext_AddEntryPoint
@@ -109,4 +109,4 @@
#define ContextEP_Purge( context, epName ) \
EP_Purge( Context_GetEntryPoint( context, epName ) )
-#endif /* __Base_Context_shortcuts_h__ */
+#endif /* __StGermain_Base_Context_shortcuts_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/types.h
--- a/Base/Context/src/types.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/types.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Context_types_h__
-#define __Base_Context_types_h__
+#ifndef __StGermain_Base_Context_types_h__
+#define __StGermain_Base_Context_types_h__
/* types/classes */
typedef struct Codelet Codelet;
@@ -103,4 +103,4 @@
typedef Stg_ObjectList Pointer_Register;
typedef Stg_ObjectList Register_Register;
-#endif /* __Base_Context_types_h__ */
+#endif /* __StGermain_Base_Context_types_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Context/src/units.h
--- a/Base/Context/src/units.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Context/src/units.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,7 +39,7 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Context_units_h__
-#define __Base_Context_units_h__
+#ifndef __StGermain_Base_Context_units_h__
+#define __StGermain_Base_Context_units_h__
-#endif /* __Base_Context_units_h__ */
+#endif /* __StGermain_Base_Context_units_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/ClassHook.h
--- a/Base/Extensibility/src/ClassHook.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/ClassHook.h Fri Dec 04 17:06:33 2009 +1100
@@ -36,8 +36,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_ClassHook_h__
-#define __Base_Extensibility_ClassHook_h__
+#ifndef __StGermain_Base_Extensibility_ClassHook_h__
+#define __StGermain_Base_Extensibility_ClassHook_h__
/** Textual name of this class */
@@ -95,5 +95,5 @@
void* _ClassHook_Copy( void* hook, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
-#endif /* __Base_Extensibility_ClassHook_h__ */
+#endif /* __StGermain_Base_Extensibility_ClassHook_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/ClassPtrExtensionInfo.h
--- a/Base/Extensibility/src/ClassPtrExtensionInfo.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/ClassPtrExtensionInfo.h Fri Dec 04 17:06:33 2009 +1100
@@ -47,8 +47,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_ClassPtrExtensionInfo_h__
-#define __Base_Extensibility_ClassPtrExtensionInfo_h__
+#ifndef __StGermain_Base_Extensibility_ClassPtrExtensionInfo_h__
+#define __StGermain_Base_Extensibility_ClassPtrExtensionInfo_h__
/** Textual name of this class */
extern const Type ClassPtrExtensionInfo_Type;
@@ -114,5 +114,5 @@
/* Public member functions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
/* Private member functions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#endif /* __Base_Extensibility_ClassPtrExtensionInfo_h__ */
+#endif /* __StGermain_Base_Extensibility_ClassPtrExtensionInfo_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/EntryPoint.h
--- a/Base/Extensibility/src/EntryPoint.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/EntryPoint.h Fri Dec 04 17:06:33 2009 +1100
@@ -58,8 +58,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_EntryPoint_h__
-#define __Base_Extensibility_EntryPoint_h__
+#ifndef __StGermain_Base_Extensibility_EntryPoint_h__
+#define __StGermain_Base_Extensibility_EntryPoint_h__
/* Templates of virtual functions */
@@ -309,5 +309,5 @@
void EntryPoint_ErrorIfNoHooks( void* entryPoint, const char* parentFunction );
-#endif /* __Base_Extensibility_EntryPoint_h__ */
+#endif /* __StGermain_Base_Extensibility_EntryPoint_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/EntryPoint_Register.h
--- a/Base/Extensibility/src/EntryPoint_Register.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/EntryPoint_Register.h Fri Dec 04 17:06:33 2009 +1100
@@ -37,8 +37,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_EntryPoint_Register_h__
-#define __Base_Extensibility_EntryPoint_Register_h__
+#ifndef __StGermain_Base_Extensibility_EntryPoint_Register_h__
+#define __StGermain_Base_Extensibility_EntryPoint_Register_h__
/* Textual name of this class */
@@ -103,5 +103,5 @@
/* If 'entryPoint' is in the register, return its index */
EntryPoint_Index EntryPoint_Register_Find( void* entryPoint_Register, void* entryPoint );
-#endif /* __Base_Extensibility_EntryPoint_Register_h__ */
+#endif /* __StGermain_Base_Extensibility_EntryPoint_Register_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/Extensibility.h
--- a/Base/Extensibility/src/Extensibility.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/Extensibility.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_h__
-#define __Base_Extensibility_h__
+#ifndef __StGermain_Base_Extensibility_h__
+#define __StGermain_Base_Extensibility_h__
#include "types.h"
#include "shortcuts.h"
@@ -59,5 +59,5 @@
#include "Init.h"
#include "Finalise.h"
-#endif /* __Base_Extensibility_h__ */
+#endif /* __StGermain_Base_Extensibility_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/ExtensionInfo.h
--- a/Base/Extensibility/src/ExtensionInfo.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/ExtensionInfo.h Fri Dec 04 17:06:33 2009 +1100
@@ -54,8 +54,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_ExtensionInfo_h__
-#define __Base_Extensibility_ExtensionInfo_h__
+#ifndef __StGermain_Base_Extensibility_ExtensionInfo_h__
+#define __StGermain_Base_Extensibility_ExtensionInfo_h__
/** Textual name of this class */
extern const Type ExtensionInfo_Type;
@@ -210,5 +210,5 @@
ExtensionInfo_Index handle,
void* data );
-#endif /* __Base_Extensibility_ExtensionInfo_h__ */
+#endif /* __StGermain_Base_Extensibility_ExtensionInfo_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/ExtensionManager.h
--- a/Base/Extensibility/src/ExtensionManager.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/ExtensionManager.h Fri Dec 04 17:06:33 2009 +1100
@@ -45,8 +45,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_ExtensionManager_h__
-#define __Base_Extensibility_ExtensionManager_h__
+#ifndef __StGermain_Base_Extensibility_ExtensionManager_h__
+#define __StGermain_Base_Extensibility_ExtensionManager_h__
/* Textual name of this class */
@@ -461,5 +461,5 @@
/* Property Set/Get for lockdown */
void ExtensionManager_SetLockDown( void* extension, Bool lockDown );
Bool ExtensionManager_GetLockDown( void* extension );
-#endif /* __Base_Extensibility_ExtensionManager_h__ */
+#endif /* __StGermain_Base_Extensibility_ExtensionManager_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/ExtensionManager_Register.h
--- a/Base/Extensibility/src/ExtensionManager_Register.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/ExtensionManager_Register.h Fri Dec 04 17:06:33 2009 +1100
@@ -40,8 +40,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_ExtensionManager_Register_h__
-#define __Base_Extensibility_ExtensionManager_Register_h__
+#ifndef __StGermain_Base_Extensibility_ExtensionManager_Register_h__
+#define __StGermain_Base_Extensibility_ExtensionManager_Register_h__
/** Textual name of this class */
@@ -108,5 +108,5 @@
ExtensionManager* _ExtensionManager_Register_At( void* extension_Register, ExtensionManager_Index handle );
-#endif /* __Base_Extensibility_ExtensionManager_Register_h__ */
+#endif /* __StGermain_Base_Extensibility_ExtensionManager_Register_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/Finalise.h
--- a/Base/Extensibility/src/Finalise.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/Finalise.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,9 +38,9 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_BaseExtensibility_Finalise_h__
-#define __Base_BaseExtensibility_Finalise_h__
+#ifndef __StGermain_Base_BaseExtensibility_Finalise_h__
+#define __StGermain_Base_BaseExtensibility_Finalise_h__
Bool BaseExtensibility_Finalise( void );
-#endif /* __Base_BaseExtensibility_Finalise_h__ */
+#endif /* __StGermain_Base_BaseExtensibility_Finalise_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/Hook.h
--- a/Base/Extensibility/src/Hook.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/Hook.h Fri Dec 04 17:06:33 2009 +1100
@@ -36,8 +36,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_Hook_h__
-#define __Base_Extensibility_Hook_h__
+#ifndef __StGermain_Base_Extensibility_Hook_h__
+#define __StGermain_Base_Extensibility_Hook_h__
/** Textual name of this class */
@@ -94,5 +94,5 @@
void* _Hook_Copy( void* hook, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
-#endif /* __Base_Extensibility_Hook_h__ */
+#endif /* __StGermain_Base_Extensibility_Hook_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/Init.h
--- a/Base/Extensibility/src/Init.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/Init.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,12 +39,12 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_BaseExtensibility_Init_h__
-#define __Base_BaseExtensibility_Init_h__
+#ifndef __StGermain_Base_BaseExtensibility_Init_h__
+#define __StGermain_Base_BaseExtensibility_Init_h__
/** The toolboxes singleton... this is the manager of loading and unloading toolboxes */
extern ToolboxesManager* stgToolboxesManager;
Bool BaseExtensibility_Init( int* argc, char** argv[] );
-#endif /* __Base_BaseExtensibility_Init_h__ */
+#endif /* __StGermain_Base_BaseExtensibility_Init_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/Module.h
--- a/Base/Extensibility/src/Module.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/Module.h Fri Dec 04 17:06:33 2009 +1100
@@ -36,8 +36,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_Module_h__
-#define __Base_Extensibility_Module_h__
+#ifndef __StGermain_Base_Extensibility_Module_h__
+#define __StGermain_Base_Extensibility_Module_h__
/* The prototype for the virtual functions in a module */
typedef char* (Module_MangleNameFunction) ( char* name );
@@ -115,5 +115,5 @@
/** Un load the module */
void Module_UnLoad( void* module );
-#endif /* __Base_Extensibility_Module_h__ */
+#endif /* __StGermain_Base_Extensibility_Module_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/ModulesManager.h
--- a/Base/Extensibility/src/ModulesManager.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/ModulesManager.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_ModulesManager_h__
-#define __Base_Extensibility_ModulesManager_h__
+#ifndef __StGermain_Base_Extensibility_ModulesManager_h__
+#define __StGermain_Base_Extensibility_ModulesManager_h__
/* Textual name of this class */
@@ -150,5 +150,5 @@
Bool ModulesManager_ConstructModule( void* modulesManager, Name moduleName, Stg_ComponentFactory* cf, void* data );
-#endif /* __Base_Extensibility_ModulesManager_h__ */
+#endif /* __StGermain_Base_Extensibility_ModulesManager_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/Plugin.h
--- a/Base/Extensibility/src/Plugin.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/Plugin.h Fri Dec 04 17:06:33 2009 +1100
@@ -36,8 +36,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_Plugin_h__
-#define __Base_Extensibility_Plugin_h__
+#ifndef __StGermain_Base_Extensibility_Plugin_h__
+#define __StGermain_Base_Extensibility_Plugin_h__
/** The prototype for the Register function in a plugin */
typedef Index (Plugin_RegisterFunction) ( void* pluginsManager );
@@ -91,5 +91,5 @@
/** Get the function pointer the to the plugin's register function */
Plugin_RegisterFunction* Plugin_GetRegisterFunc( void* plugin );
-#endif /* __Base_Extensibility_Plugin_h__ */
+#endif /* __StGermain_Base_Extensibility_Plugin_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/PluginsManager.h
--- a/Base/Extensibility/src/PluginsManager.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/PluginsManager.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_PluginsManager_h__
-#define __Base_Extensibility_PluginsManager_h__
+#ifndef __StGermain_Base_Extensibility_PluginsManager_h__
+#define __StGermain_Base_Extensibility_PluginsManager_h__
/* Textual name of this class */
@@ -104,5 +104,5 @@
#define PluginsManager_Submit ModulesManager_Submit
-#endif /* __Base_Extensibility_PluginsManager_h__ */
+#endif /* __StGermain_Base_Extensibility_PluginsManager_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/SimpleExtensionInfo.h
--- a/Base/Extensibility/src/SimpleExtensionInfo.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/SimpleExtensionInfo.h Fri Dec 04 17:06:33 2009 +1100
@@ -48,8 +48,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_SimpleExtensionInfo_h__
-#define __Base_Extensibility_SimpleExtensionInfo_h__
+#ifndef __StGermain_Base_Extensibility_SimpleExtensionInfo_h__
+#define __StGermain_Base_Extensibility_SimpleExtensionInfo_h__
/** Textual name of this class */
extern const Type SimpleExtensionInfo_Type;
@@ -107,5 +107,5 @@
/* Public member functions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
/* Private member functions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#endif /* __Base_Extensibility_SimpleExtensionInfo_h__ */
+#endif /* __StGermain_Base_Extensibility_SimpleExtensionInfo_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/Toolbox.h
--- a/Base/Extensibility/src/Toolbox.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/Toolbox.h Fri Dec 04 17:06:33 2009 +1100
@@ -36,8 +36,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_Toolbox_h__
-#define __Base_Extensibility_Toolbox_h__
+#ifndef __StGermain_Base_Extensibility_Toolbox_h__
+#define __StGermain_Base_Extensibility_Toolbox_h__
/** The prototype for the Register function in a toolbox */
typedef Index (Toolbox_RegisterFunction) ( void* toolboxesManager );
@@ -101,5 +101,5 @@
/** Get the function pointer the to the toolbox's register function */
Toolbox_FinaliseFunction* Toolbox_GetFinaliseFunc( void* toolbox );
-#endif /* __Base_Extensibility_Toolbox_h__ */
+#endif /* __StGermain_Base_Extensibility_Toolbox_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/ToolboxesManager.h
--- a/Base/Extensibility/src/ToolboxesManager.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/ToolboxesManager.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_ToolboxesManager_h__
-#define __Base_Extensibility_ToolboxesManager_h__
+#ifndef __StGermain_Base_Extensibility_ToolboxesManager_h__
+#define __StGermain_Base_Extensibility_ToolboxesManager_h__
/* Textual name of this class */
@@ -119,5 +119,5 @@
function. */
Bool ToolboxesManager_IsInitialised( void* toolboxesManager, char* label );
-#endif /* __Base_Extensibility_ToolboxesManager_h__ */
+#endif /* __StGermain_Base_Extensibility_ToolboxesManager_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/shortcuts.h
--- a/Base/Extensibility/src/shortcuts.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/shortcuts.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_shortcuts_h__
-#define __Base_Extensibility_shortcuts_h__
+#ifndef __StGermain_Base_Extensibility_shortcuts_h__
+#define __StGermain_Base_Extensibility_shortcuts_h__
/** Macro to grab an extension from a named Stg_ObjectList */
#define ExtensionManager_FromList( extList, index ) \
@@ -187,5 +187,5 @@
#define EP_Purge( entryPoint ) \
EntryPoint_Purge( entryPoint )
-#endif /* __Base_Extensibility_shortcuts_h__ */
+#endif /* __StGermain_Base_Extensibility_shortcuts_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Extensibility/src/types.h
--- a/Base/Extensibility/src/types.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Extensibility/src/types.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Extensibility_types_h__
-#define __Base_Extensibility_types_h__
+#ifndef __StGermain_Base_Extensibility_types_h__
+#define __StGermain_Base_Extensibility_types_h__
/* Generic types */
/* Base types/classes */
@@ -82,4 +82,4 @@
typedef void* DLL_Handle;
typedef DLL_Handle* DLL_Handle_List;
-#endif /* __Base_Extensibility_types_h__ */
+#endif /* __StGermain_Base_Extensibility_types_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/Class.h
--- a/Base/Foundation/src/Class.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/Class.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __Base_Foundation_Class_h__
-#define __Base_Foundation_Class_h__
+#ifndef __StGermain_Base_Foundation_Class_h__
+#define __StGermain_Base_Foundation_Class_h__
/* Textual name of this class */
extern const Type Stg_Class_Type;
@@ -146,4 +146,4 @@
/* Private member functions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#endif /* __Base_Foundation_Class_h__ */
+#endif /* __StGermain_Base_Foundation_Class_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/CommonRoutines.h
--- a/Base/Foundation/src/CommonRoutines.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/CommonRoutines.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __Base_Foundation_CommonRoutines_h__
-#define __Base_Foundation_CommonRoutines_h__
+#ifndef __StGermain_Base_Foundation_CommonRoutines_h__
+#define __StGermain_Base_Foundation_CommonRoutines_h__
#include <stdarg.h>
/** Global map from a Boolean's enum value to a string: for printing purposes */
@@ -73,4 +73,4 @@
* but possibly with gaps between occurrences of each character. */
unsigned int Stg_LongestMatchingSubsequenceLength( char* string1, char* string2, Bool caseSensitive ) ;
-#endif /* __Base_Foundation_CommonRoutines_h__ */
+#endif /* __StGermain_Base_Foundation_CommonRoutines_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/Finalise.h
--- a/Base/Foundation/src/Finalise.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/Finalise.h Fri Dec 04 17:06:33 2009 +1100
@@ -40,9 +40,9 @@
**
**/
-#ifndef __Base_BaseFoundation_Finalise_h__
-#define __Base_BaseFoundation_Finalise_h__
+#ifndef __StGermain_Base_Foundation_Finalise_h__
+#define __StGermain_Base_Foundation_Finalise_h__
- Bool BaseFoundation_Finalise( void );
+ Bool Foundation_Finalise( void );
-#endif /* __Base_BaseFoundation_Finalise_h__ */
+#endif /* __StGermain_Base_Foundation_Finalise_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/Foundation.h
--- a/Base/Foundation/src/Foundation.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/Foundation.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __Base_Foundation_h__
-#define __Base_Foundation_h__
+#ifndef __StGermain_Base_Foundation_h__
+#define __StGermain_Base_Foundation_h__
#include "types.h"
#include "shortcuts.h"
@@ -66,4 +66,4 @@
#include "Finalise.h"
#include "Log.h"
-#endif /* __Base_Foundation_h__ */
+#endif /* __StGermain_Base_Foundation_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/Init.h
--- a/Base/Foundation/src/Init.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/Init.h Fri Dec 04 17:06:33 2009 +1100
@@ -40,9 +40,9 @@
**
**/
-#ifndef __Base_BaseFoundation_Init_h__
-#define __Base_BaseFoundation_Init_h__
+#ifndef __StGermain_Base_Foundation_Init_h__
+#define __StGermain_Base_Foundation_Init_h__
- Bool BaseFoundation_Init( int* argc, char** argv[] );
+ Bool Foundation_Init( int* argc, char** argv[] );
-#endif /* __Base_BaseFoundation_Init_h__ */
+#endif /* __StGermain_Base_Foundation_Init_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/Log.h
--- a/Base/Foundation/src/Log.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/Log.h Fri Dec 04 17:06:33 2009 +1100
@@ -23,8 +23,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __STG_BASE_FOUNDATION_SRC_LOG__
-#define __STG_BASE_FOUNDATION_SRC_LOG__
+#ifndef __StGermain_Base_Foundation_Log_h__
+#define __StGermain_Base_Foundation_Log_h__
void stg_log_printf( const char *format, ... );
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/MemMonitor.h
--- a/Base/Foundation/src/MemMonitor.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/MemMonitor.h Fri Dec 04 17:06:33 2009 +1100
@@ -28,8 +28,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Foundation_MemMonitor_h__
-#define __Base_Foundation_MemMonitor_h__
+#ifndef __StGermain_Base_Foundation_MemMonitor_h__
+#define __StGermain_Base_Foundation_MemMonitor_h__
extern double Stg_MemoryWatchCriteria;
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/Memory.h
--- a/Base/Foundation/src/Memory.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/Memory.h Fri Dec 04 17:06:33 2009 +1100
@@ -67,8 +67,8 @@
**
**/
-#ifndef __Base_Foundation_Memory_h__
-#define __Base_Foundation_Memory_h__
+#ifndef __StGermain_Base_Foundation_Memory_h__
+#define __StGermain_Base_Foundation_Memory_h__
/** Textual name for Memory class. */
@@ -754,4 +754,4 @@
#define MemArray3D Memory_Alloc_3DArray
#define MemFree Memory_Free
-#endif /* __Base_Foundation_Memory_h__ */
+#endif /* __StGermain_Base_Foundation_Memory_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/MemoryField.h
--- a/Base/Foundation/src/MemoryField.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/MemoryField.h Fri Dec 04 17:06:33 2009 +1100
@@ -46,8 +46,8 @@
**
**/
-#ifndef __Base_Foundation_MemoryField_h__
-#define __Base_Foundation_MemoryField_h__
+#ifndef __StGermain_Base_Foundation_MemoryField_h__
+#define __StGermain_Base_Foundation_MemoryField_h__
/** Textual name for MemoryField class. */
extern const Type MemoryField_Type;
@@ -134,4 +134,4 @@
unsigned int _MemoryField_CalcLongestSubFieldNameLen( MemoryField* memoryField );
-#endif /* __Base_Foundation_MemoryField_h__ */
+#endif /* __StGermain_Base_Foundation_MemoryField_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/MemoryPointer.h
--- a/Base/Foundation/src/MemoryPointer.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/MemoryPointer.h Fri Dec 04 17:06:33 2009 +1100
@@ -42,8 +42,8 @@
**
**/
-#ifndef __Base_Foundation_MemoryPointer_h__
-#define __Base_Foundation_MemoryPointer_h__
+#ifndef __StGermain_Base_Foundation_MemoryPointer_h__
+#define __StGermain_Base_Foundation_MemoryPointer_h__
/** Textual name for MemoryPointer class. */
extern const Type MemoryPointer_Type;
@@ -179,7 +179,7 @@
/** Displays all fields of a MemoryPointer. */
#define MemoryPointer_PrintAll( memoryPointer ) MemoryPointer_Print( memoryPointer, MEMORYPOINTER_ALL );
-#endif /* __Base_Foundation_MemoryPointer_h__ */
+#endif /* __StGermain_Base_Foundation_MemoryPointer_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/MemoryReport.h
--- a/Base/Foundation/src/MemoryReport.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/MemoryReport.h Fri Dec 04 17:06:33 2009 +1100
@@ -44,8 +44,8 @@
**
**/
-#ifndef __Base_Foundation_MemoryReport_h__
-#define __Base_Foundation_MemoryReport_h__
+#ifndef __StGermain_Base_Foundation_MemoryReport_h__
+#define __StGermain_Base_Foundation_MemoryReport_h__
/** Textual name for MemoryReport class. */
extern const Type MemoryReport_Type;
@@ -95,7 +95,7 @@
const char* _MemoryReport_GetValue( MemoryReport* memoryReport, MemoryReportGroup reportGroup, MemoryPointer* memPtr );
-#endif /* __Base_Foundation_MemoryReport_h__ */
+#endif /* __StGermain_Base_Foundation_MemoryReport_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/MemoryTag.h
--- a/Base/Foundation/src/MemoryTag.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/MemoryTag.h Fri Dec 04 17:06:33 2009 +1100
@@ -37,8 +37,8 @@
**
**/
-#ifndef __Base_Foundation_MemoryTag_h__
-#define __Base_Foundation_MemoryTag_h__
+#ifndef __StGermain_Base_Foundation_MemoryTag_h__
+#define __StGermain_Base_Foundation_MemoryTag_h__
/* Memory Header that is inserted into every malloc
* As this grows, we can move into separate file.
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/NamedObject_Register.h
--- a/Base/Foundation/src/NamedObject_Register.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/NamedObject_Register.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Foundation_NamedObject_Register_h__
-#define __Base_Foundation_NamedObject_Register_h__
+#ifndef __StGermain_Base_Foundation_NamedObject_Register_h__
+#define __StGermain_Base_Foundation_NamedObject_Register_h__
extern const Type NamedObject_Register_Type;
@@ -105,5 +105,5 @@
( Stg_ObjectList_PrintAllEntryNames( (self)->objects, stream ) )
/* Private member functions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#endif /* __Base_Foundation_NamedObject_Register_h__ */
+#endif /* __StGermain_Base_Foundation_NamedObject_Register_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/Numerics.h
--- a/Base/Foundation/src/Numerics.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/Numerics.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,12 +38,12 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Foundation_Numerics_h__
-#define __Base_Foundation_Numerics_h__
+#ifndef __StGermain_Base_Foundation_Numerics_h__
+#define __StGermain_Base_Foundation_Numerics_h__
extern const double Num_Epsilon;
Bool Num_Approx( double var, double val );
Bool Num_InRange( double var, double low, double upp );
-#endif /* __Base_Foundation_Numerics_h__ */
+#endif /* __StGermain_Base_Foundation_Numerics_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/Object.h
--- a/Base/Foundation/src/Object.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/Object.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __Base_Foundation_Object_h__
-#define __Base_Foundation_Object_h__
+#ifndef __StGermain_Base_Foundation_Object_h__
+#define __StGermain_Base_Foundation_Object_h__
/** Textual name for Stg_Object class. */
extern const Type Stg_Object_Type;
@@ -114,5 +114,5 @@
Name Stg_Object_AppendSuffix( void* object, Name suffix ) ;
/* Private member functions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#endif /* __Base_Foundation_Object_h__ */
+#endif /* __StGermain_Base_Foundation_Object_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/ObjectAdaptor.h
--- a/Base/Foundation/src/ObjectAdaptor.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/ObjectAdaptor.h Fri Dec 04 17:06:33 2009 +1100
@@ -49,8 +49,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Automation_ObjectAdaptor_h__
-#define __Base_Automation_ObjectAdaptor_h__
+#ifndef __StGermain_Base_Automation_ObjectAdaptor_h__
+#define __StGermain_Base_Automation_ObjectAdaptor_h__
/** Delete/Print/Copy function prototypes for attached pointers (not StGermain classes) */
/** *Note*: this function should only delete extra memory allocated by the object, _not
@@ -223,5 +223,5 @@
#endif
/* Private member functions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#endif /* __Base_Automation_ObjectAdaptor_h__ */
+#endif /* __StGermain_Base_Automation_ObjectAdaptor_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/ObjectList.h
--- a/Base/Foundation/src/ObjectList.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/ObjectList.h Fri Dec 04 17:06:33 2009 +1100
@@ -62,8 +62,8 @@
**
**/
-#ifndef __Base_Foundation_Stg_ObjectList_h__
-#define __Base_Foundation_Stg_ObjectList_h__
+#ifndef __StGermain_Base_Foundation_Stg_ObjectList_h__
+#define __StGermain_Base_Foundation_Stg_ObjectList_h__
/* function prototype interface */
typedef Index (Stg_ObjectList_AppendFunction) ( void* objects, void* objectPtr );
@@ -421,5 +421,5 @@
/** Prints the first 'number' of names of objects in list which are most similar to 'name' */
void Stg_ObjectList_PrintSimilar( void* objectList, Name name, void* _stream, unsigned int number ) ;
-#endif /* __Base_Foundation_Stg_ObjectList_h__ */
+#endif /* __StGermain_Base_Foundation_Stg_ObjectList_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/PrimitiveObject.h
--- a/Base/Foundation/src/PrimitiveObject.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/PrimitiveObject.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Foundation_PrimitiveObject_h__
-#define __Base_Foundation_PrimitiveObject_h__
+#ifndef __StGermain_Base_Foundation_PrimitiveObject_h__
+#define __StGermain_Base_Foundation_PrimitiveObject_h__
extern const Type Stg_PrimitiveObject_Type;
@@ -126,6 +126,6 @@
void* _Stg_PrimitiveObject_Copy( void* objectAdaptor, void* dest, Bool deep, Name nameExt, struct PtrMap* ptrMap );
-#endif /* __Base_Foundation_PrimitiveObject_h__ */
+#endif /* __StGermain_Base_Foundation_PrimitiveObject_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/TimeMonitor.h
--- a/Base/Foundation/src/TimeMonitor.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/TimeMonitor.h Fri Dec 04 17:06:33 2009 +1100
@@ -28,8 +28,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_Foundation_TimeMonitor_h__
-#define __Base_Foundation_TimeMonitor_h__
+#ifndef __StGermain_Base_Foundation_TimeMonitor_h__
+#define __StGermain_Base_Foundation_TimeMonitor_h__
extern double Stg_TimeMonitor_t0;
extern double Stg_TimerWatchCriteria;
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/forwardDecl.h
--- a/Base/Foundation/src/forwardDecl.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/forwardDecl.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
* the StGermain framework.
*/
-#ifndef __Base_Foundation_forwardDecl_h__
-#define __Base_Foundation_forwardDecl_h__
+#ifndef __StGermain_Base_Foundation_forwardDecl_h__
+#define __StGermain_Base_Foundation_forwardDecl_h__
/* Forward Declaration of Stream ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/shortcuts.h
--- a/Base/Foundation/src/shortcuts.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/shortcuts.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __Base_Foundation_shortcuts_h__
-#define __Base_Foundation_shortcuts_h__
+#ifndef __StGermain_Base_Foundation_shortcuts_h__
+#define __StGermain_Base_Foundation_shortcuts_h__
/* If the system does not have these macros, define it here */
#ifndef MAX
@@ -172,4 +172,4 @@
#define insist( stmnt, expr ) stmnt
#endif
-#endif /* __Base_Foundation_shortcuts_h__ */
+#endif /* __StGermain_Base_Foundation_shortcuts_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/Foundation/src/types.h
--- a/Base/Foundation/src/types.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/Foundation/src/types.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __Base_Foundation_types_h__
-#define __Base_Foundation_types_h__
+#ifndef __StGermain_Base_Foundation_types_h__
+#define __StGermain_Base_Foundation_types_h__
/*
* #ifdef barrier for Bool type. Added 07-Sep-2004 -- Alan
@@ -125,4 +125,4 @@ typedef struct NewObject NewObject;
DELETE
} ReplacementOption;
-#endif /* __Base_Foundation_types_h__ */
+#endif /* __StGermain_Base_Foundation_types_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/BinaryStream.h
--- a/Base/IO/src/BinaryStream.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/BinaryStream.h Fri Dec 04 17:06:33 2009 +1100
@@ -43,8 +43,8 @@
**
**/
-#ifndef __Base_IO_BinaryStream_h__
-#define __Base_IO_BinaryStream_h__
+#ifndef __StGermain_Base_IO_BinaryStream_h__
+#define __StGermain_Base_IO_BinaryStream_h__
/** Textual name for BinaryStream class. */
extern const Type BinaryStream_Type;
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/CFile.h
--- a/Base/IO/src/CFile.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/CFile.h Fri Dec 04 17:06:33 2009 +1100
@@ -44,8 +44,8 @@
**
**/
-#ifndef __Base_IO_CFile_h__
-#define __Base_IO_CFile_h__
+#ifndef __StGermain_Base_IO_CFile_h__
+#define __StGermain_Base_IO_CFile_h__
/** Textual name for CFile class. */
extern const Type CFile_Type;
@@ -111,7 +111,7 @@
Bool _CFile_Flush( void* file );
-#endif /* __Base_IO_CFile_h__ */
+#endif /* __StGermain_Base_IO_CFile_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/CStream.h
--- a/Base/IO/src/CStream.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/CStream.h Fri Dec 04 17:06:33 2009 +1100
@@ -43,8 +43,8 @@
**
**/
-#ifndef __Base_IO_CStream_h__
-#define __Base_IO_CStream_h__
+#ifndef __StGermain_Base_IO_CStream_h__
+#define __StGermain_Base_IO_CStream_h__
/** Textual name for CStream class. */
extern const Type CStream_Type;
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/CmdLineArgs.h
--- a/Base/IO/src/CmdLineArgs.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/CmdLineArgs.h Fri Dec 04 17:06:33 2009 +1100
@@ -23,12 +23,12 @@
** Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_IO_CmdLineArgs_h__
-#define __Base_IO_CmdLineArgs_h__
+#ifndef __StGermain_Base_IO_CmdLineArgs_h__
+#define __StGermain_Base_IO_CmdLineArgs_h__
void stgRemoveCmdLineArg( int* argc, char** argv[], int index );
char* stgParseHelpCmdLineArg( int* argc, char** argv[] );
char* stgParseListCmdLineArg( int* argc, char** argv[] );
char* stgParseListAllCmdLineArg( int* argc, char** argv[] );
-#endif /* __Base_IO_CmdLineArgs_h__ */
+#endif /* __StGermain_Base_IO_CmdLineArgs_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/Dictionary.h
--- a/Base/IO/src/Dictionary.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/Dictionary.h Fri Dec 04 17:06:33 2009 +1100
@@ -48,8 +48,8 @@
**
**/
-#ifndef __Base_IO_Dictionary_h__
-#define __Base_IO_Dictionary_h__
+#ifndef __StGermain_Base_IO_Dictionary_h__
+#define __StGermain_Base_IO_Dictionary_h__
typedef Index Dictionary_Index; /**< Index type for Dictionary, */
@@ -229,5 +229,5 @@
/** Compares two dictionaries, returns True if all entries are identical */
Bool Dictionary_CompareAllEntriesFull( void* dictionary1, void* dictionary2, Bool strictTypeCheck );
-#endif /* __Base_IO_Dictionary_h__ */
+#endif /* __StGermain_Base_IO_Dictionary_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/Dictionary_Entry.h
--- a/Base/IO/src/Dictionary_Entry.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/Dictionary_Entry.h Fri Dec 04 17:06:33 2009 +1100
@@ -44,8 +44,8 @@
**
**/
-#ifndef __Base_IO_Dictionary_Entry_h__
-#define __Base_IO_Dictionary_Entry_h__
+#ifndef __StGermain_Base_IO_Dictionary_Entry_h__
+#define __StGermain_Base_IO_Dictionary_Entry_h__
/** \def __Dictionary_Entry See Dictionary_Entry */
#define __Dictionary_Entry \
@@ -96,6 +96,6 @@
/** Get an entry's originalSource */
Dictionary_Entry_Source Dictionary_Entry_GetSource( Dictionary_Entry* self );
-#endif /* __Base_IO_Dictionary_Entry_h__ */
+#endif /* __StGermain_Base_IO_Dictionary_Entry_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/Dictionary_Entry_Value.h
--- a/Base/IO/src/Dictionary_Entry_Value.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/Dictionary_Entry_Value.h Fri Dec 04 17:06:33 2009 +1100
@@ -42,8 +42,8 @@
**
**/
-#ifndef __Base_IO_Dictionary_Entry_Value_h__
-#define __Base_IO_Dictionary_Entry_Value_h__
+#ifndef __StGermain_Base_IO_Dictionary_Entry_Value_h__
+#define __StGermain_Base_IO_Dictionary_Entry_Value_h__
/** The available formats which a dictionary can be written to output. */
@@ -255,4 +255,4 @@
Dictionary_Entry_Value* self,
Bool deep );
-#endif /* __Base_IO_Dictionary_Entry_Value_h__ */
+#endif /* __StGermain_Base_IO_Dictionary_Entry_Value_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/Finalise.h
--- a/Base/IO/src/Finalise.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/Finalise.h Fri Dec 04 17:06:33 2009 +1100
@@ -41,12 +41,12 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_BaseIO_Finalise_h__
-#define __Base_BaseIO_Finalise_h__
+#ifndef __StGermain_Base_IO_Finalise_h__
+#define __StGermain_Base_IO_Finalise_h__
- Bool BaseIO_Finalise( void );
+ Bool IO_Finalise( void );
-#endif /* __Base_BaseIO_Finalise_h__ */
+#endif /* __StGermain_Base_IO_Finalise_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/IO.h
--- a/Base/IO/src/IO.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/IO.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_IO_h__
-#define __Base_IO_h__
+#ifndef __StGermain_Base_IO_h__
+#define __StGermain_Base_IO_h__
#include "types.h"
#include "shortcuts.h"
@@ -67,5 +67,5 @@
#include "StGermain/Base/IO/mpirecord/mpimessaging.h"
-#endif /* __Base_IO_h__ */
+#endif /* __StGermain_Base_IO_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/IO_Handler.h
--- a/Base/IO/src/IO_Handler.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/IO_Handler.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_IO_IO_Handler_h__
-#define __Base_IO_IO_Handler_h__
+#ifndef __StGermain_Base_IO_IO_Handler_h__
+#define __StGermain_Base_IO_IO_Handler_h__
/* Function pointer interface for inherited classes to use */
typedef void (IO_Handler_DeleteFunction) (void* io_handler);
@@ -161,5 +161,5 @@
Returns the number of files successfully read. */
Index IO_Handler_ReadAllFromCommandLineForceSource( void* ioHandler, int argc, char* argv[], Dictionary* dictionary ) ;
-#endif /* __Base_IO_IO_Handler_h__ */
+#endif /* __StGermain_Base_IO_IO_Handler_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/IndentFormatter.h
--- a/Base/IO/src/IndentFormatter.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/IndentFormatter.h Fri Dec 04 17:06:33 2009 +1100
@@ -40,8 +40,8 @@
**
**/
-#ifndef __Base_IO_IndentFormatter_h__
-#define __Base_IO_IndentFormatter_h__
+#ifndef __StGermain_Base_IO_IndentFormatter_h__
+#define __StGermain_Base_IO_IndentFormatter_h__
/** Textual name for IndentFormatter class. */
@@ -116,5 +116,5 @@
void IndentFormatter_SetCharacter( char _character );
-#endif /* __Base_IO_IndentFormatter_h__ */
+#endif /* __StGermain_Base_IO_IndentFormatter_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/Init.h
--- a/Base/IO/src/Init.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/Init.h Fri Dec 04 17:06:33 2009 +1100
@@ -40,8 +40,8 @@
**
**/
-#ifndef __Base_BaseIO_Init_h__
-#define __Base_BaseIO_Init_h__
+#ifndef __StGermain_Base_IO_Init_h__
+#define __StGermain_Base_IO_Init_h__
extern const Name LiveDebugName;
/** A global stream for interactive debugging through GDB. Note that the
@@ -50,9 +50,9 @@
extern Stream* stgErrorStream;
- Bool BaseIO_Init( int* argc, char** argv[] );
+ Bool IO_Init( int* argc, char** argv[] );
-#endif /* __Base_BaseIO_Init_h__ */
+#endif /* __StGermain_Base_IO_Init_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/Journal.h
--- a/Base/IO/src/Journal.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/Journal.h Fri Dec 04 17:06:33 2009 +1100
@@ -49,8 +49,8 @@
**
**/
-#ifndef __Base_IO_Journal_h__
-#define __Base_IO_Journal_h__
+#ifndef __StGermain_Base_IO_Journal_h__
+#define __StGermain_Base_IO_Journal_h__
#include <stdarg.h>
@@ -254,4 +254,4 @@
/** Set up the default type streams expected throughout StGermain */
void Journal_SetupDefaultTypedStreams();
-#endif /* __Base_IO_Journal_h__ */
+#endif /* __StGermain_Base_IO_Journal_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/JournalFile.h
--- a/Base/IO/src/JournalFile.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/JournalFile.h Fri Dec 04 17:06:33 2009 +1100
@@ -52,8 +52,8 @@
**
**/
-#ifndef __Base_IO_JournalFile_h__
-#define __Base_IO_JournalFile_h__
+#ifndef __StGermain_Base_IO_JournalFile_h__
+#define __StGermain_Base_IO_JournalFile_h__
/** Textual name for JournalFile class. */
extern const Type JournalFile_Type;
@@ -159,5 +159,5 @@
Bool JournalFile_Flush( void* journalFile );
-#endif /* __Base_IO_JournalFile_h__ */
+#endif /* __StGermain_Base_IO_JournalFile_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/LineFormatter.h
--- a/Base/IO/src/LineFormatter.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/LineFormatter.h Fri Dec 04 17:06:33 2009 +1100
@@ -43,8 +43,8 @@
**/
-#ifndef __Base_IO_LineFormatter_h__
-#define __Base_IO_LineFormatter_h__
+#ifndef __StGermain_Base_IO_LineFormatter_h__
+#define __StGermain_Base_IO_LineFormatter_h__
/** Textual name for LineFormatter class. */
extern const Type LineFormatter_Type;
@@ -99,7 +99,7 @@
char* _LineFormatter_Format( void* formatter, const char* const fmt );
-#endif /* __Base_IO_LineFormatter_h__ */
+#endif /* __StGermain_Base_IO_LineFormatter_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/MPIFile.h
--- a/Base/IO/src/MPIFile.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/MPIFile.h Fri Dec 04 17:06:33 2009 +1100
@@ -40,8 +40,8 @@
**
**/
-#ifndef __Base_IO_MPIFile_h__
-#define __Base_IO_MPIFile_h__
+#ifndef __StGermain_Base_IO_MPIFile_h__
+#define __StGermain_Base_IO_MPIFile_h__
#include <mpi.h>
@@ -103,5 +103,5 @@
Bool _MPIFile_Flush( void* file );
-#endif /* __Base_IO_MPIFile_h__ */
+#endif /* __StGermain_Base_IO_MPIFile_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/MPIStream.h
--- a/Base/IO/src/MPIStream.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/MPIStream.h Fri Dec 04 17:06:33 2009 +1100
@@ -43,8 +43,8 @@
**
**/
-#ifndef __Base_IO_MPIStream_h__
-#define __Base_IO_MPIStream_h__
+#ifndef __StGermain_Base_IO_MPIStream_h__
+#define __StGermain_Base_IO_MPIStream_h__
/** Textual name for MPIStream class. */
extern const Type MPIStream_Type;
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/PathUtils.h
--- a/Base/IO/src/PathUtils.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/PathUtils.h Fri Dec 04 17:06:33 2009 +1100
@@ -28,8 +28,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_IO_PathUtils_h__
-#define __Base_IO_PathUtils_h__
+#ifndef __StGermain_Base_IO_PathUtils_h__
+#define __StGermain_Base_IO_PathUtils_h__
/** Note that this function is designed as call-by-reference to modify fullPath to the found
@@ -54,4 +54,4 @@ Bool Stg_FileExists( const char* path );
Bool Stg_DirectoryExists( const char* path );
-#endif /* __Base_IO_PathUtils_h__ */
+#endif /* __StGermain_Base_IO_PathUtils_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/RankFormatter.h
--- a/Base/IO/src/RankFormatter.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/RankFormatter.h Fri Dec 04 17:06:33 2009 +1100
@@ -42,8 +42,8 @@
**
**/
-#ifndef __Base_IO_RankFormatter_h__
-#define __Base_IO_RankFormatter_h__
+#ifndef __StGermain_Base_IO_RankFormatter_h__
+#define __StGermain_Base_IO_RankFormatter_h__
/** Textual name for RankFormatter class. */
@@ -88,7 +88,7 @@
void _RankFormatter_Print( void* formatter, Stream* stream );
-#endif /* __Base_IO_RankFormatter_h__ */
+#endif /* __StGermain_Base_IO_RankFormatter_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/Stream.h
--- a/Base/IO/src/Stream.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/Stream.h Fri Dec 04 17:06:33 2009 +1100
@@ -43,8 +43,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_IO_Stream_h__
-#define __Base_IO_Stream_h__
+#ifndef __StGermain_Base_IO_Stream_h__
+#define __StGermain_Base_IO_Stream_h__
#include <stdarg.h>
@@ -273,5 +273,5 @@
/* Closes, deregisters and deletes the JournalFile associated with this stream */
void Stream_CloseAndFreeFile( void* stream ) ;
-#endif /* __Base_IO_Stream_h__ */
+#endif /* __StGermain_Base_IO_Stream_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/StreamFormatter.h
--- a/Base/IO/src/StreamFormatter.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/StreamFormatter.h Fri Dec 04 17:06:33 2009 +1100
@@ -42,8 +42,8 @@
**
**/
-#ifndef __Base_IO_StreamFormatter_h__
-#define __Base_IO_StreamFormatter_h__
+#ifndef __StGermain_Base_IO_StreamFormatter_h__
+#define __StGermain_Base_IO_StreamFormatter_h__
/** Textual name for StreamFormatter class. */
@@ -114,5 +114,5 @@
void StreamFormatter_Buffer_Delete( StreamFormatter_Buffer* buffer );
char* StreamFormatter_Buffer_AllocNext( Index size );
-#endif /* __Base_IO_StreamFormatter_h__ */
+#endif /* __StGermain_Base_IO_StreamFormatter_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/XML_IO_Handler.h
--- a/Base/IO/src/XML_IO_Handler.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/XML_IO_Handler.h Fri Dec 04 17:06:33 2009 +1100
@@ -40,8 +40,8 @@
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __Base_IO_XML_IO_Handler_h__
-#define __Base_IO_XML_IO_Handler_h__
+#ifndef __StGermain_Base_IO_XML_IO_Handler_h__
+#define __StGermain_Base_IO_XML_IO_Handler_h__
#include <libxml/tree.h>
@@ -185,5 +185,5 @@
* up using xmlSetGenericErrorFunc(), e.g. at the Init() stage. */
void XML_IO_Handler_LibXMLErrorHandler( void* ctx, const char* msg, ... );
-#endif /* __Base_IO_XML_IO_Handler_h__ */
+#endif /* __StGermain_Base_IO_XML_IO_Handler_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/forwardDecl.h
--- a/Base/IO/src/forwardDecl.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/forwardDecl.h Fri Dec 04 17:06:33 2009 +1100
@@ -39,8 +39,8 @@
* the StGermain framework.
*/
-#ifndef __Base_IO_forwardDecl_h__
-#define __Base_IO_forwardDecl_h__
+#ifndef __StGermain_Base_IO_forwardDecl_h__
+#define __StGermain_Base_IO_forwardDecl_h__
/* Forward Declaration of PtrMap ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/shortcuts.h
--- a/Base/IO/src/shortcuts.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/shortcuts.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __Base_IO_shortcuts_h__
-#define __Base_IO_shortcuts_h__
+#ifndef __StGermain_Base_IO_shortcuts_h__
+#define __StGermain_Base_IO_shortcuts_h__
#define Printf Journal_Printf
#define Write Journal_Write
@@ -144,4 +144,4 @@
Journal_Printf( stream, "%.5g }\n", (double)array[ journalPrintArray_array_I ] ); \
} while(0)
-#endif /* __Base_IO_shortcuts_h__ */
+#endif /* __StGermain_Base_IO_shortcuts_h__ */
diff -r f6579a57ece4 -r 23ed4f75f8fd Base/IO/src/types.h
--- a/Base/IO/src/types.h Thu Dec 03 10:39:40 2009 +1100
+++ b/Base/IO/src/types.h Fri Dec 04 17:06:33 2009 +1100
@@ -38,8 +38,8 @@
**
**/
-#ifndef __Base_IO_types_h__
-#define __Base_IO_types_h__
+#ifndef __StGermain_Base_IO_types_h__
+#define __StGermain_Base_IO_types_h__
/* Dicitonary internal types */
typedef char* Dictionary_Entry_Key;
@@ -86,4 +86,4 @@
typedef struct RankFormatter RankFormatter;
typedef struct IndentFormatter IndentFormatter;
-#endif /* __Base_IO_types_h__ */
+#endif /* __StGermain_Base_IO_types_h__ */
More information about the CIG-COMMITS
mailing list