Skip to content

Commit f0ad13a

Browse files
committed
Merge branch 'v2.10'
2 parents 55a70da + 6f95d50 commit f0ad13a

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

src/maketools/plumedcheck

+4-1
Original file line numberDiff line numberDiff line change
@@ -595,8 +595,10 @@ ENDFILE{
595595
# DOC: macros are exempted from this rule.
596596
error("non_existing_cpp","file " file " is a header but there is no corresponding source");
597597
}
598-
while((getline < cppfile)>=0){
598+
noIncludes=1;
599+
while((getline < cppfile)>0){
599600
if(match($0,"^# *include")){
601+
noIncludes=0;
600602
sub("^# *include","");
601603
# DOC: :non_included_h:
602604
# DOC: The source file corresponding to a header file (that is: with the same name) should include it as the first included file.
@@ -605,6 +607,7 @@ ENDFILE{
605607
break;
606608
}
607609
}
610+
if(noIncludes==1) error("non_included_h","file " file " is a header but " cppfile " does not include it");
608611
close(cppfile)
609612
}
610613
}

src/sizeshape/.gitignore

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/*
2+
# in this directory, only accept source, Makefile and README
3+
!/.gitignore
4+
!/*.c
5+
!/*.cpp
6+
!/*.h
7+
!/Makefile
8+
!/README
9+
!/module.type

0 commit comments

Comments
 (0)