Skip to content

Commit

Permalink
Move classreg.h to classreg.hpp
Browse files Browse the repository at this point in the history
  • Loading branch information
alkino committed Nov 25, 2024
1 parent 86ed556 commit 9d53ab3
Show file tree
Hide file tree
Showing 45 changed files with 44 additions and 45 deletions.
2 changes: 1 addition & 1 deletion src/ivoc/graph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ extern Image* gif_image(const char*);
#include "ivocvect.h"
#endif /* HAVE_IV */

#include "classreg.h"
#include "classreg.hpp"
#include "gui-redirect.h"

#if HAVE_IV
Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/grglyph.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <../../nrnconf.h>
// hoc level Glyph implementation for graphing
#include <stdio.h>
#include "classreg.h"
#include "classreg.hpp"
#include "oc2iv.h"
#if HAVE_IV
#include "ivoc.h"
Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/ivocrand.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "Rand.hpp"

#include <InterViews/resource.h>
#include "classreg.h"
#include "classreg.hpp"
#include "oc2iv.h"
#include "utils/enumerate.h"

Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/ivocvect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <IV-look/kit.h>
#endif

#include "classreg.h"
#include "classreg.hpp"
#if HAVE_IV
#include "apwindow.h"
#include "ivoc.h"
Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/matrix.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <../../nrnconf.h>
#include "classreg.h"
#include "classreg.hpp"

#include <stdio.h>
#include <math.h>
Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/mlinedit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern int hoc_return_type_code;
#include "ocglyph.h"
#endif

#include "classreg.h"
#include "classreg.hpp"
#if HAVE_IV
#include "oc2iv.h"
#include "apwindow.h"
Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/mymath.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <../../nrnconf.h>
#include <InterViews/geometry.h>
#include "mymath.h"
#include "classreg.h"
#include "classreg.hpp"
#include "oc2iv.h"
#include <cmath>
#include <cstdio>
Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/ocbox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#endif /* HAVE_IV */

#include "oc2iv.h"
#include "classreg.h"
#include "classreg.hpp"

#include "gui-redirect.h"

Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/ocdeck.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "apwindow.h"
#include "oc2iv.h"
#endif /* HAVE_IV */
#include "classreg.h"
#include "classreg.hpp"
#include "gui-redirect.h"

#if HAVE_IV
Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/ocfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ extern int hoc_return_type_code;
#endif
#include "nrnmpi.h"
#include "oc2iv.h"
#include "classreg.h"
#include "classreg.hpp"
#include "ocfile.h"
#include "nrnfilewrap.h"

Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/oclist.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <../../nrnconf.h>

#include <stdio.h>
#include "classreg.h"
#include "classreg.hpp"
#include "oclist.h"
#include "oc2iv.h"
#include "hoclist.h"
Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/ocpointer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
#include <InterViews/observe.h>
#include <string.h>
#include "classreg.h"
#include "classreg.hpp"
#include "oc_ansi.h"
#include "oc2iv.h"
#include "ocpointer.h"
Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/ocptrvector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
p.scatter(Vector)
p.gather(Vector)
*/
#include "classreg.h"
#include "classreg.hpp"
#include "oc2iv.h"
#include "ocptrvector.h"
#include "objcmd.h"
Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/octimer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "oc2iv.h"
#include "objcmd.h"
#endif /* HAVE_IV */
#include "classreg.h"
#include "classreg.hpp"

#ifdef MINGW
#include <windows.h>
Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/pwman.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ extern int hoc_return_type_code;
#endif // HAVE_IV
#include <stdio.h>
#include <stdlib.h>
#include "classreg.h"
#include "classreg.hpp"
#include "oc2iv.h"
#include <cmath>

Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/strfun.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <../../nrnconf.h>
#include <stdio.h>
#include <stdlib.h>
#include "classreg.h"
#include "classreg.hpp"
#include "oc2iv.h"
#include <string.h>
#include <regex>
Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/symchoos.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
#include "ivoc.h"
#endif /* HAVE_IV */

#include "classreg.h"
#include "classreg.hpp"
#include "gui-redirect.h"

#if HAVE_IV
Expand Down
2 changes: 1 addition & 1 deletion src/ivoc/xmenu.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <../../nrnconf.h>

#include "oc2iv.h"
#include "classreg.h"
#include "classreg.hpp"
#include "gui-redirect.h"
#include "utils/enumerate.h"

Expand Down
2 changes: 1 addition & 1 deletion src/nrncvode/cvodeobj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extern int hoc_return_type_code;

#include <cmath>
#include <cstdlib>
#include "classreg.h"
#include "classreg.hpp"
#include "nrnoc2iv.h"
#include "datapath.h"
#include "cvodeobj.h"
Expand Down
2 changes: 1 addition & 1 deletion src/nrncvode/cvodestb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// solver CVode stub to allow cvode as dll for mswindows version.

#include <cmath>
#include "classreg.h"
#include "classreg.hpp"
#include "cvodeobj.h"
#include "nrncvode.h"
#include "nrniv_mf.h"
Expand Down
2 changes: 1 addition & 1 deletion src/nrncvode/netcvode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include <nrnmpi.h>
#include "cabcode.h"
#include "classreg.h"
#include "classreg.hpp"
#include "parse.hpp"
#include "cvodeobj.h"
#include "hoclist.h"
Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/bbsavestate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ callback to bbss_early when needed.

#include "bbsavestate.h"
#include "cabcode.h"
#include "classreg.h"
#include "classreg.hpp"
#include "nrncvode.h"
#include "nrnoc2iv.h"
#include "nrnran123.h"
Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/finithnd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Type 3 are at the very beginning of finitialize. ie structure changes
#include <vector>
#include <cstdio>
#include <nrnoc2iv.h>
#include <classreg.h>
#include <classreg.hpp>
#include <objcmd.h>
#include "utils/enumerate.h"

Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/impedanc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <InterViews/resource.h>
#include <complex>
#include "nrnoc2iv.h"
#include "classreg.h"
#include "classreg.hpp"
#include "membfunc.h"

typedef void (*Pfrv4)(int, Node**, double**, Datum**);
Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/kschan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <stdlib.h>
#include <math.h>
#include "nrnoc2iv.h"
#include "classreg.h"
#include "classreg.hpp"
#include "kschan.h"
#include "kssingle.h"
#include "ocnotify.h"
Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/linmod1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#if HAVE_IV
#include "ivoc.h"
#endif
#include "classreg.h"
#include "classreg.hpp"
#include "linmod.h"
#include "nrnoc2iv.h"

Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/ndatclas.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include <stdio.h>
#include <InterViews/resource.h>
#include "nrnoc2iv.h"
#include "classreg.h"
#include "classreg.hpp"

#include "membfunc.h"
#include "parse.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/nmodlrandom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ syntax
#include <section.h>
#include <parse.hpp>
#include <nrnran123.h>
#include <classreg.h>
#include <classreg.hpp>
#include <gui-redirect.h>

struct NMODLRandom {
Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/nrnmenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "nrnoc2iv.h"
#include "nrnpy.h"
#include "nrnmenu.h"
#include "classreg.h"
#include "classreg.hpp"
#include "gui-redirect.h"

extern int hoc_return_type_code;
Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/nrnpy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <stdlib.h>
#include <InterViews/resource.h>
#include "nrnoc2iv.h"
#include "classreg.h"
#include "classreg.hpp"
#include "nonvintblock.h"
#include "nrnmpi.h"

Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/nrnste.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <string.h>
#include <nrnoc2iv.h>
#include <nrniv_mf.h>
#include <classreg.h>
#include <classreg.hpp>
#include <objcmd.h>
#include <nrnste.h>
#include <netcon.h>
Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/ppshape.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include <stdio.h>
#include "oclist.h"
#include "nrnoc2iv.h"
#include "classreg.h"
#include "classreg.hpp"

#if HAVE_IV
#include "ppshape.h"
Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/savstate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "ocfile.h"
#include "nrncvode.h"
#include "nrnoc2iv.h"
#include "classreg.h"
#include "classreg.hpp"
#include "nrniv_mf.h"

#include "tqueue.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/secbrows.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <../../nrnconf.h>
#include "classreg.h"
#include "classreg.hpp"
#include "gui-redirect.h"

#if HAVE_IV
Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/shape.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <../../nrnconf.h>
#include "classreg.h"
#include "classreg.hpp"
#include "gui-redirect.h"

#if HAVE_IV // to end of file
Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/shapeplt.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <../../nrnconf.h>
#include "classreg.h"
#include "classreg.hpp"
#include "gui-redirect.h"
#include "ocnotify.h"

Expand Down
2 changes: 1 addition & 1 deletion src/nrniv/spaceplt.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <../../nrnconf.h>
#include <stdio.h>
#include "classreg.h"
#include "classreg.hpp"


#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion src/nrnoc/nrniv_mf.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "classreg.h"
#include "classreg.hpp"
#include "hocdec.h"
#include "membfunc.h"

Expand Down
2 changes: 1 addition & 1 deletion src/nrnoc/seclist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "parse.hpp"
#include "hocparse.h"
#include "code.h"
#include "classreg.h"
#include "classreg.hpp"

/* needs trailing '}' */
#define ITERATE_REMOVE(q1, q2, lst) \
Expand Down
2 changes: 1 addition & 1 deletion src/nrnoc/secref.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ access s1.sec // soma becomes the default section
#include <stdlib.h>
#include "section.h"
#include "parse.hpp"
#include "classreg.h"
#include "classreg.hpp"
#include "oc_ansi.h"

extern int hoc_return_type_code;
Expand Down
2 changes: 1 addition & 1 deletion src/nrnpython/nrnpy_p2h.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <InterViews/resource.h>
#include <nrnoc2iv.h>
#include <classreg.h>
#include <classreg.hpp>
#include "nrnpython.h"
#include "hoccontext.h"
#include "nrnpy.h"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/oc/hoc_oop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "utils/formatting.hpp"


#include "classreg.h"
#include "classreg.hpp"

#include "hocstr.h"
#include "parse.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/parallel/ocbbs.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <list>
#include <InterViews/resource.h>

#include "classreg.h"
#include "classreg.hpp"
#include "ivocvect.h"
#include "hoclist.h"
#include "bbs.h"
Expand Down
3 changes: 1 addition & 2 deletions test/unit_tests/oc/hoc_interpreter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
#include <catch2/matchers/catch_matchers_string.hpp>
#include <catch2/catch_test_macros.hpp>

#include "classreg.h"
#include "classreg.hpp"
#include "code.h"
#include "hocdec.h"
#include "classreg.h"
#include "ocfunc.h"

#include <sstream>
Expand Down

0 comments on commit 9d53ab3

Please sign in to comment.