Changeset 247 for cpp/frams/neuro

Timestamp:

11/07/14 17:51:01 (9 years ago)

Author:

Maciej Komosinski

Message:

Sources support both 32-bit and 64-bit, and more compilers

Location:

cpp/frams/neuro

Files:

• geneticneuroparam.cpp (modified) (1 diff)
• geneticneuroparam.h (modified) (1 diff)
• neurocls-f0-GDK-factory.h (modified) (1 diff)
• neurocls-f0-GDK-library.h (modified) (1 diff)
• neuroimpl.h (modified) (1 diff)
• neurolibparam.cpp (modified) (1 diff)

cpp/frams/neuro/geneticneuroparam.cpp

@@ -11 +11 @@
 {}
 
-long GeneticNeuroParam::getInt(int i)
+paInt GeneticNeuroParam::getInt(int i)
 {return Neuro::getClass(i)->genactive;}
 
-int GeneticNeuroParam::setInt(int i,long v)
+int GeneticNeuroParam::setInt(int i,paInt v)
 {Neuro::getClass(i)->genactive=v;return PSET_CHANGED;}
 

cpp/frams/neuro/geneticneuroparam.h

@@ -15 +15 @@
 GeneticNeuroParam(const char* groupname,const char* myname, const char* prefix,const char* typ=0);
 
-long getInt(int i);
-int setInt(int i,long v);
+paInt getInt(int i);
+int setInt(int i,paInt v);
 const char *type(int i) {return types?types:NeuroLibParam::type(i);}
 };

cpp/frams/neuro/neurocls-f0-GDK-factory.h

@@ -1 @@
-// This file is a part of the Framsticks GDK.
-// Copyright (C) 1999-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
-// Refer to http://www.framsticks.com/ for further information.
-
 
 // do not edit - generated automatically from "f0.def"

cpp/frams/neuro/neurocls-f0-GDK-library.h

@@ -1 @@
-// This file is a part of the Framsticks GDK.
-// Copyright (C) 1999-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
-// Refer to http://www.framsticks.com/ for further information.
-
 
 // do not edit - generated automatically from "f0.def"

cpp/frams/neuro/neuroimpl.h

@@ -108 +108 @@
 
 public:
-  long intParameter;
+  paInt intParameter;
   double fpParameter;
   SString txtParameter;

cpp/frams/neuro/neurolibparam.cpp

@@ -22 +22 @@
 }
 
-void NeuroLibParam::neuroclassAdded(void* data,long i)
+void NeuroLibParam::neuroclassAdded(void* data,intptr_t i)
 {onadd.action(i);}
-void NeuroLibParam::neuroclassRemoved(void* data,long i)
+void NeuroLibParam::neuroclassRemoved(void* data,intptr_t i)
 {ondelete.action(i);}