From 9d53ab344ff4445d33294447f993a3626edcf150 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Mon, 25 Nov 2024 10:34:50 +0100 Subject: [PATCH] Move classreg.h to classreg.hpp --- src/ivoc/graph.cpp | 2 +- src/ivoc/grglyph.cpp | 2 +- src/ivoc/ivocrand.cpp | 2 +- src/ivoc/ivocvect.cpp | 2 +- src/ivoc/matrix.cpp | 2 +- src/ivoc/mlinedit.cpp | 2 +- src/ivoc/mymath.cpp | 2 +- src/ivoc/ocbox.cpp | 2 +- src/ivoc/ocdeck.cpp | 2 +- src/ivoc/ocfile.cpp | 2 +- src/ivoc/oclist.cpp | 2 +- src/ivoc/ocpointer.cpp | 2 +- src/ivoc/ocptrvector.cpp | 2 +- src/ivoc/octimer.cpp | 2 +- src/ivoc/pwman.cpp | 2 +- src/ivoc/strfun.cpp | 2 +- src/ivoc/symchoos.cpp | 2 +- src/ivoc/xmenu.cpp | 2 +- src/nrncvode/cvodeobj.cpp | 2 +- src/nrncvode/cvodestb.cpp | 2 +- src/nrncvode/netcvode.cpp | 2 +- src/nrniv/bbsavestate.cpp | 2 +- src/nrniv/finithnd.cpp | 2 +- src/nrniv/impedanc.cpp | 2 +- src/nrniv/kschan.cpp | 2 +- src/nrniv/linmod1.cpp | 2 +- src/nrniv/ndatclas.cpp | 2 +- src/nrniv/nmodlrandom.cpp | 2 +- src/nrniv/nrnmenu.cpp | 2 +- src/nrniv/nrnpy.cpp | 2 +- src/nrniv/nrnste.cpp | 2 +- src/nrniv/ppshape.cpp | 2 +- src/nrniv/savstate.cpp | 2 +- src/nrniv/secbrows.cpp | 2 +- src/nrniv/shape.cpp | 2 +- src/nrniv/shapeplt.cpp | 2 +- src/nrniv/spaceplt.cpp | 2 +- src/nrnoc/nrniv_mf.h | 2 +- src/nrnoc/seclist.cpp | 2 +- src/nrnoc/secref.cpp | 2 +- src/nrnpython/nrnpy_p2h.cpp | 2 +- src/oc/{classreg.h => classreg.hpp} | 0 src/oc/hoc_oop.cpp | 2 +- src/parallel/ocbbs.cpp | 2 +- test/unit_tests/oc/hoc_interpreter.cpp | 3 +-- 45 files changed, 44 insertions(+), 45 deletions(-) rename src/oc/{classreg.h => classreg.hpp} (100%) diff --git a/src/ivoc/graph.cpp b/src/ivoc/graph.cpp index 61582a24bb..a82e472cb2 100644 --- a/src/ivoc/graph.cpp +++ b/src/ivoc/graph.cpp @@ -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 diff --git a/src/ivoc/grglyph.cpp b/src/ivoc/grglyph.cpp index df245c7017..554b818671 100644 --- a/src/ivoc/grglyph.cpp +++ b/src/ivoc/grglyph.cpp @@ -1,7 +1,7 @@ #include <../../nrnconf.h> // hoc level Glyph implementation for graphing #include -#include "classreg.h" +#include "classreg.hpp" #include "oc2iv.h" #if HAVE_IV #include "ivoc.h" diff --git a/src/ivoc/ivocrand.cpp b/src/ivoc/ivocrand.cpp index e141d70db3..3bf58bc222 100644 --- a/src/ivoc/ivocrand.cpp +++ b/src/ivoc/ivocrand.cpp @@ -7,7 +7,7 @@ #include "Rand.hpp" #include -#include "classreg.h" +#include "classreg.hpp" #include "oc2iv.h" #include "utils/enumerate.h" diff --git a/src/ivoc/ivocvect.cpp b/src/ivoc/ivocvect.cpp index 48fff8e45b..9af7bf20b2 100644 --- a/src/ivoc/ivocvect.cpp +++ b/src/ivoc/ivocvect.cpp @@ -27,7 +27,7 @@ #include #endif -#include "classreg.h" +#include "classreg.hpp" #if HAVE_IV #include "apwindow.h" #include "ivoc.h" diff --git a/src/ivoc/matrix.cpp b/src/ivoc/matrix.cpp index 441fd57ddd..c8047bd583 100644 --- a/src/ivoc/matrix.cpp +++ b/src/ivoc/matrix.cpp @@ -1,5 +1,5 @@ #include <../../nrnconf.h> -#include "classreg.h" +#include "classreg.hpp" #include #include diff --git a/src/ivoc/mlinedit.cpp b/src/ivoc/mlinedit.cpp index d4f9db5529..b1db78b24d 100644 --- a/src/ivoc/mlinedit.cpp +++ b/src/ivoc/mlinedit.cpp @@ -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" diff --git a/src/ivoc/mymath.cpp b/src/ivoc/mymath.cpp index 07c62ef077..214bae6545 100644 --- a/src/ivoc/mymath.cpp +++ b/src/ivoc/mymath.cpp @@ -5,7 +5,7 @@ #include <../../nrnconf.h> #include #include "mymath.h" -#include "classreg.h" +#include "classreg.hpp" #include "oc2iv.h" #include #include diff --git a/src/ivoc/ocbox.cpp b/src/ivoc/ocbox.cpp index cf303a0fc7..c47f8ee679 100644 --- a/src/ivoc/ocbox.cpp +++ b/src/ivoc/ocbox.cpp @@ -19,7 +19,7 @@ #endif /* HAVE_IV */ #include "oc2iv.h" -#include "classreg.h" +#include "classreg.hpp" #include "gui-redirect.h" diff --git a/src/ivoc/ocdeck.cpp b/src/ivoc/ocdeck.cpp index 872b26d174..b59d4cd989 100644 --- a/src/ivoc/ocdeck.cpp +++ b/src/ivoc/ocdeck.cpp @@ -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 diff --git a/src/ivoc/ocfile.cpp b/src/ivoc/ocfile.cpp index d6f3e37c9e..5ed25affb5 100644 --- a/src/ivoc/ocfile.cpp +++ b/src/ivoc/ocfile.cpp @@ -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" diff --git a/src/ivoc/oclist.cpp b/src/ivoc/oclist.cpp index f01d8d76b3..77c88c2e7d 100644 --- a/src/ivoc/oclist.cpp +++ b/src/ivoc/oclist.cpp @@ -1,7 +1,7 @@ #include <../../nrnconf.h> #include -#include "classreg.h" +#include "classreg.hpp" #include "oclist.h" #include "oc2iv.h" #include "hoclist.h" diff --git a/src/ivoc/ocpointer.cpp b/src/ivoc/ocpointer.cpp index bc90f21506..ac4fa85e1b 100644 --- a/src/ivoc/ocpointer.cpp +++ b/src/ivoc/ocpointer.cpp @@ -11,7 +11,7 @@ */ #include #include -#include "classreg.h" +#include "classreg.hpp" #include "oc_ansi.h" #include "oc2iv.h" #include "ocpointer.h" diff --git a/src/ivoc/ocptrvector.cpp b/src/ivoc/ocptrvector.cpp index 71f321e356..353906de49 100644 --- a/src/ivoc/ocptrvector.cpp +++ b/src/ivoc/ocptrvector.cpp @@ -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" diff --git a/src/ivoc/octimer.cpp b/src/ivoc/octimer.cpp index d76cc6a8b2..dd062833d2 100644 --- a/src/ivoc/octimer.cpp +++ b/src/ivoc/octimer.cpp @@ -8,7 +8,7 @@ #include "oc2iv.h" #include "objcmd.h" #endif /* HAVE_IV */ -#include "classreg.h" +#include "classreg.hpp" #ifdef MINGW #include diff --git a/src/ivoc/pwman.cpp b/src/ivoc/pwman.cpp index e98c1c8d4a..fe8c466ac3 100644 --- a/src/ivoc/pwman.cpp +++ b/src/ivoc/pwman.cpp @@ -24,7 +24,7 @@ extern int hoc_return_type_code; #endif // HAVE_IV #include #include -#include "classreg.h" +#include "classreg.hpp" #include "oc2iv.h" #include diff --git a/src/ivoc/strfun.cpp b/src/ivoc/strfun.cpp index 478b9ae05f..3344f1a902 100644 --- a/src/ivoc/strfun.cpp +++ b/src/ivoc/strfun.cpp @@ -1,7 +1,7 @@ #include <../../nrnconf.h> #include #include -#include "classreg.h" +#include "classreg.hpp" #include "oc2iv.h" #include #include diff --git a/src/ivoc/symchoos.cpp b/src/ivoc/symchoos.cpp index 6fcb1fefd4..a54cce99f2 100644 --- a/src/ivoc/symchoos.cpp +++ b/src/ivoc/symchoos.cpp @@ -58,7 +58,7 @@ #include "ivoc.h" #endif /* HAVE_IV */ -#include "classreg.h" +#include "classreg.hpp" #include "gui-redirect.h" #if HAVE_IV diff --git a/src/ivoc/xmenu.cpp b/src/ivoc/xmenu.cpp index b728686020..9cf78cccde 100644 --- a/src/ivoc/xmenu.cpp +++ b/src/ivoc/xmenu.cpp @@ -1,7 +1,7 @@ #include <../../nrnconf.h> #include "oc2iv.h" -#include "classreg.h" +#include "classreg.hpp" #include "gui-redirect.h" #include "utils/enumerate.h" diff --git a/src/nrncvode/cvodeobj.cpp b/src/nrncvode/cvodeobj.cpp index cdb05b511e..d69a8de982 100644 --- a/src/nrncvode/cvodeobj.cpp +++ b/src/nrncvode/cvodeobj.cpp @@ -10,7 +10,7 @@ extern int hoc_return_type_code; #include #include -#include "classreg.h" +#include "classreg.hpp" #include "nrnoc2iv.h" #include "datapath.h" #include "cvodeobj.h" diff --git a/src/nrncvode/cvodestb.cpp b/src/nrncvode/cvodestb.cpp index 6d03820e33..f17274a171 100644 --- a/src/nrncvode/cvodestb.cpp +++ b/src/nrncvode/cvodestb.cpp @@ -2,7 +2,7 @@ // solver CVode stub to allow cvode as dll for mswindows version. #include -#include "classreg.h" +#include "classreg.hpp" #include "cvodeobj.h" #include "nrncvode.h" #include "nrniv_mf.h" diff --git a/src/nrncvode/netcvode.cpp b/src/nrncvode/netcvode.cpp index 1fe933ce9f..52a1ee034f 100644 --- a/src/nrncvode/netcvode.cpp +++ b/src/nrncvode/netcvode.cpp @@ -5,7 +5,7 @@ #include #include "cabcode.h" -#include "classreg.h" +#include "classreg.hpp" #include "parse.hpp" #include "cvodeobj.h" #include "hoclist.h" diff --git a/src/nrniv/bbsavestate.cpp b/src/nrniv/bbsavestate.cpp index da250dbd79..c718f2bc10 100644 --- a/src/nrniv/bbsavestate.cpp +++ b/src/nrniv/bbsavestate.cpp @@ -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" diff --git a/src/nrniv/finithnd.cpp b/src/nrniv/finithnd.cpp index 7b30c17b33..2e6c5cc112 100644 --- a/src/nrniv/finithnd.cpp +++ b/src/nrniv/finithnd.cpp @@ -16,7 +16,7 @@ Type 3 are at the very beginning of finitialize. ie structure changes #include #include #include -#include +#include #include #include "utils/enumerate.h" diff --git a/src/nrniv/impedanc.cpp b/src/nrniv/impedanc.cpp index e11543fe32..aa456c5331 100644 --- a/src/nrniv/impedanc.cpp +++ b/src/nrniv/impedanc.cpp @@ -7,7 +7,7 @@ #include #include #include "nrnoc2iv.h" -#include "classreg.h" +#include "classreg.hpp" #include "membfunc.h" typedef void (*Pfrv4)(int, Node**, double**, Datum**); diff --git a/src/nrniv/kschan.cpp b/src/nrniv/kschan.cpp index fd5c3e315c..7c5c7bbd89 100644 --- a/src/nrniv/kschan.cpp +++ b/src/nrniv/kschan.cpp @@ -3,7 +3,7 @@ #include #include #include "nrnoc2iv.h" -#include "classreg.h" +#include "classreg.hpp" #include "kschan.h" #include "kssingle.h" #include "ocnotify.h" diff --git a/src/nrniv/linmod1.cpp b/src/nrniv/linmod1.cpp index 053ff068c3..16a98cea91 100644 --- a/src/nrniv/linmod1.cpp +++ b/src/nrniv/linmod1.cpp @@ -5,7 +5,7 @@ #if HAVE_IV #include "ivoc.h" #endif -#include "classreg.h" +#include "classreg.hpp" #include "linmod.h" #include "nrnoc2iv.h" diff --git a/src/nrniv/ndatclas.cpp b/src/nrniv/ndatclas.cpp index 2d74ace692..5fda4cad37 100644 --- a/src/nrniv/ndatclas.cpp +++ b/src/nrniv/ndatclas.cpp @@ -2,7 +2,7 @@ #include #include #include "nrnoc2iv.h" -#include "classreg.h" +#include "classreg.hpp" #include "membfunc.h" #include "parse.hpp" diff --git a/src/nrniv/nmodlrandom.cpp b/src/nrniv/nmodlrandom.cpp index 88806ddde9..b700fe0795 100644 --- a/src/nrniv/nmodlrandom.cpp +++ b/src/nrniv/nmodlrandom.cpp @@ -13,7 +13,7 @@ syntax #include #include #include -#include +#include #include struct NMODLRandom { diff --git a/src/nrniv/nrnmenu.cpp b/src/nrniv/nrnmenu.cpp index 6dec4cfe84..d6c3e25ba2 100644 --- a/src/nrniv/nrnmenu.cpp +++ b/src/nrniv/nrnmenu.cpp @@ -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; diff --git a/src/nrniv/nrnpy.cpp b/src/nrniv/nrnpy.cpp index 6cfebd30c6..0706b6fd3a 100644 --- a/src/nrniv/nrnpy.cpp +++ b/src/nrniv/nrnpy.cpp @@ -8,7 +8,7 @@ #include #include #include "nrnoc2iv.h" -#include "classreg.h" +#include "classreg.hpp" #include "nonvintblock.h" #include "nrnmpi.h" diff --git a/src/nrniv/nrnste.cpp b/src/nrniv/nrnste.cpp index 36790b7b23..7f93db9fa9 100644 --- a/src/nrniv/nrnste.cpp +++ b/src/nrniv/nrnste.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/nrniv/ppshape.cpp b/src/nrniv/ppshape.cpp index ae75579e5a..3bc7e54b5e 100644 --- a/src/nrniv/ppshape.cpp +++ b/src/nrniv/ppshape.cpp @@ -2,7 +2,7 @@ #include #include "oclist.h" #include "nrnoc2iv.h" -#include "classreg.h" +#include "classreg.hpp" #if HAVE_IV #include "ppshape.h" diff --git a/src/nrniv/savstate.cpp b/src/nrniv/savstate.cpp index 31c2bbff9c..7e0b2169f5 100644 --- a/src/nrniv/savstate.cpp +++ b/src/nrniv/savstate.cpp @@ -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" diff --git a/src/nrniv/secbrows.cpp b/src/nrniv/secbrows.cpp index 84263229b6..263c2cb640 100644 --- a/src/nrniv/secbrows.cpp +++ b/src/nrniv/secbrows.cpp @@ -1,5 +1,5 @@ #include <../../nrnconf.h> -#include "classreg.h" +#include "classreg.hpp" #include "gui-redirect.h" #if HAVE_IV diff --git a/src/nrniv/shape.cpp b/src/nrniv/shape.cpp index 46279966ee..bd4cee2d8b 100644 --- a/src/nrniv/shape.cpp +++ b/src/nrniv/shape.cpp @@ -1,5 +1,5 @@ #include <../../nrnconf.h> -#include "classreg.h" +#include "classreg.hpp" #include "gui-redirect.h" #if HAVE_IV // to end of file diff --git a/src/nrniv/shapeplt.cpp b/src/nrniv/shapeplt.cpp index 719b9e85f8..65b76cbeec 100644 --- a/src/nrniv/shapeplt.cpp +++ b/src/nrniv/shapeplt.cpp @@ -1,5 +1,5 @@ #include <../../nrnconf.h> -#include "classreg.h" +#include "classreg.hpp" #include "gui-redirect.h" #include "ocnotify.h" diff --git a/src/nrniv/spaceplt.cpp b/src/nrniv/spaceplt.cpp index 49a220aee6..8bc3c0a26b 100644 --- a/src/nrniv/spaceplt.cpp +++ b/src/nrniv/spaceplt.cpp @@ -1,6 +1,6 @@ #include <../../nrnconf.h> #include -#include "classreg.h" +#include "classreg.hpp" #include diff --git a/src/nrnoc/nrniv_mf.h b/src/nrnoc/nrniv_mf.h index 3d28a0cbec..afe4ea91a5 100644 --- a/src/nrnoc/nrniv_mf.h +++ b/src/nrnoc/nrniv_mf.h @@ -1,5 +1,5 @@ #pragma once -#include "classreg.h" +#include "classreg.hpp" #include "hocdec.h" #include "membfunc.h" diff --git a/src/nrnoc/seclist.cpp b/src/nrnoc/seclist.cpp index d1509e2a00..01da6667de 100644 --- a/src/nrnoc/seclist.cpp +++ b/src/nrnoc/seclist.cpp @@ -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) \ diff --git a/src/nrnoc/secref.cpp b/src/nrnoc/secref.cpp index d835ed4532..33483bff96 100644 --- a/src/nrnoc/secref.cpp +++ b/src/nrnoc/secref.cpp @@ -18,7 +18,7 @@ access s1.sec // soma becomes the default section #include #include "section.h" #include "parse.hpp" -#include "classreg.h" +#include "classreg.hpp" #include "oc_ansi.h" extern int hoc_return_type_code; diff --git a/src/nrnpython/nrnpy_p2h.cpp b/src/nrnpython/nrnpy_p2h.cpp index 2ec3af6b42..7c76203096 100644 --- a/src/nrnpython/nrnpy_p2h.cpp +++ b/src/nrnpython/nrnpy_p2h.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "nrnpython.h" #include "hoccontext.h" #include "nrnpy.h" diff --git a/src/oc/classreg.h b/src/oc/classreg.hpp similarity index 100% rename from src/oc/classreg.h rename to src/oc/classreg.hpp diff --git a/src/oc/hoc_oop.cpp b/src/oc/hoc_oop.cpp index cca4bd8647..2a551d545d 100644 --- a/src/oc/hoc_oop.cpp +++ b/src/oc/hoc_oop.cpp @@ -5,7 +5,7 @@ #include "utils/formatting.hpp" -#include "classreg.h" +#include "classreg.hpp" #include "hocstr.h" #include "parse.hpp" diff --git a/src/parallel/ocbbs.cpp b/src/parallel/ocbbs.cpp index cafdb082cc..9dd0e18fa6 100644 --- a/src/parallel/ocbbs.cpp +++ b/src/parallel/ocbbs.cpp @@ -1,7 +1,7 @@ #include #include -#include "classreg.h" +#include "classreg.hpp" #include "ivocvect.h" #include "hoclist.h" #include "bbs.h" diff --git a/test/unit_tests/oc/hoc_interpreter.cpp b/test/unit_tests/oc/hoc_interpreter.cpp index 21338018d2..8119b094a5 100644 --- a/test/unit_tests/oc/hoc_interpreter.cpp +++ b/test/unit_tests/oc/hoc_interpreter.cpp @@ -2,10 +2,9 @@ #include #include -#include "classreg.h" +#include "classreg.hpp" #include "code.h" #include "hocdec.h" -#include "classreg.h" #include "ocfunc.h" #include