[Avida-SVN] r2843 - in development: Avida.xcodeproj source/script

brysonda at myxo.css.msu.edu brysonda at myxo.css.msu.edu
Mon Oct 13 18:48:24 PDT 2008


Author: brysonda
Date: 2008-10-13 21:48:24 -0400 (Mon, 13 Oct 2008)
New Revision: 2843

Added:
   development/source/script/cASCPPParameter_NativeObjectSupport.h
Removed:
   development/source/script/cASCPPParamNativeObjectSupport.h
Modified:
   development/Avida.xcodeproj/project.pbxproj
   development/source/script/ASAvidaLib.cc
Log:
AS: Rename to cASCPPParemNativeObjectSupport to cASCPPParameter_NativeObjectSupport to more clearly delineate as a supporting header file rather than class.

Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj	2008-10-14 01:46:27 UTC (rev 2842)
+++ development/Avida.xcodeproj/project.pbxproj	2008-10-14 01:48:24 UTC (rev 2843)
@@ -439,7 +439,7 @@
 		70436B260C36C64000A05ABA /* PlatformExpert.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformExpert.cc; sourceTree = "<group>"; };
 		70436B270C36C64000A05ABA /* PlatformExpert.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlatformExpert.h; sourceTree = "<group>"; };
 		7048A95E0EA417CD0087B7BD /* cASNativeObjectMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cASNativeObjectMethod.h; sourceTree = "<group>"; };
-		7048A9A40EA431140087B7BD /* cASCPPParamNativeObjectSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cASCPPParamNativeObjectSupport.h; sourceTree = "<group>"; };
+		7048A9A40EA431140087B7BD /* cASCPPParameter_NativeObjectSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cASCPPParameter_NativeObjectSupport.h; sourceTree = "<group>"; };
 		7049F2D70A66859300640512 /* cHardwareTransSMT.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cHardwareTransSMT.cc; sourceTree = "<group>"; };
 		7049F2D80A66859300640512 /* cHardwareTransSMT.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cHardwareTransSMT.h; sourceTree = "<group>"; };
 		7049F3520A66A8F500640512 /* instset-classic.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "instset-classic.cfg"; sourceTree = "<group>"; };
@@ -1255,7 +1255,7 @@
 				70BB2A290E9FA12F008269D2 /* ASAvidaLib.h */,
 				70BB2A2A0E9FA12F008269D2 /* ASAvidaLib.cc */,
 				7048A95E0EA417CD0087B7BD /* cASNativeObjectMethod.h */,
-				7048A9A40EA431140087B7BD /* cASCPPParamNativeObjectSupport.h */,
+				7048A9A40EA431140087B7BD /* cASCPPParameter_NativeObjectSupport.h */,
 			);
 			path = script;
 			sourceTree = "<group>";

Modified: development/source/script/ASAvidaLib.cc
===================================================================
--- development/source/script/ASAvidaLib.cc	2008-10-14 01:46:27 UTC (rev 2842)
+++ development/source/script/ASAvidaLib.cc	2008-10-14 01:48:24 UTC (rev 2843)
@@ -24,7 +24,7 @@
 
 #include "ASAvidaLib.h"
 
-#include "cASCPPParamNativeObjectSupport.h"
+#include "cASCPPParameter_NativeObjectSupport.h"
 #include "cASLibrary.h"
 
 #include "cAvidaConfig.h"

Deleted: development/source/script/cASCPPParamNativeObjectSupport.h
===================================================================
--- development/source/script/cASCPPParamNativeObjectSupport.h	2008-10-14 01:46:27 UTC (rev 2842)
+++ development/source/script/cASCPPParamNativeObjectSupport.h	2008-10-14 01:48:24 UTC (rev 2843)
@@ -1,39 +0,0 @@
-/*
- *  cASCPPParamNativeObjectSupport.h
- *  Avida
- *
- *  Created by David on 10/13/08.
- *  Copyright 2008 Michigan State University. All rights reserved.
- *
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; version 2
- *  of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- */
-
-#ifndef cASCPPParamNativeObjectSupport_h
-#define cASCPPParamNativeObjectSupport_h
-
-#include "cASCPPParameter.h"
-#include "cASNativeObject.h"
-
-
-template<typename T> inline T cASCPPParameter::Get() const
-{
-  if (strcmp(m_nobj->GetType(), typeid(T).name()) != 0)
-    Avida::Exit(AS_EXIT_INTERNAL_ERROR); // @TODO - report type mismatch error
-  return (T)m_nobj->GetObject();
-}
-
-#endif

Copied: development/source/script/cASCPPParameter_NativeObjectSupport.h (from rev 2842, development/source/script/cASCPPParamNativeObjectSupport.h)
===================================================================
--- development/source/script/cASCPPParameter_NativeObjectSupport.h	                        (rev 0)
+++ development/source/script/cASCPPParameter_NativeObjectSupport.h	2008-10-14 01:48:24 UTC (rev 2843)
@@ -0,0 +1,39 @@
+/*
+ *  cASCPPParameter_NativeObjectSupport.h
+ *  Avida
+ *
+ *  Created by David on 10/13/08.
+ *  Copyright 2008 Michigan State University. All rights reserved.
+ *
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; version 2
+ *  of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#ifndef cASCPPParameter_NativeObjectSupport_h
+#define cASCPPParameter_NativeObjectSupport_h
+
+#include "cASCPPParameter.h"
+#include "cASNativeObject.h"
+
+
+template<typename T> inline T cASCPPParameter::Get() const
+{
+  if (strcmp(m_nobj->GetType(), typeid(T).name()) != 0)
+    Avida::Exit(AS_EXIT_INTERNAL_ERROR); // @TODO - report type mismatch error
+  return (T)m_nobj->GetObject();
+}
+
+#endif




More information about the Avida-cvs mailing list