Skip to content

Commit 2a8dbc1

Browse files
committed
Remove Delegate class
1 parent 8ffc9ec commit 2a8dbc1

File tree

9 files changed

+63
-487
lines changed

9 files changed

+63
-487
lines changed

Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
noinst_LIBRARIES =
22
lib_LTLIBRARIES = libcolumnfile.la
33
check_PROGRAMS = src/columnfile_test
4-
include_HEADERS = src/columnfile.h
4+
include_HEADERS = src/columnfile.h src/columnfile-capnp.h
55

66
pkgconfigdir = $(libdir)/pkgconfig
77
pkgconfig_DATA = libcolumnfile.pc
@@ -20,7 +20,6 @@ include third_party/gtest/Makefile.am
2020

2121
libcolumnfile_la_SOURCES = \
2222
src/columnfile-capnp.cc \
23-
src/columnfile-capnp.h \
2423
src/columnfile-internal.h \
2524
src/columnfile-reader.cc \
2625
src/columnfile-select.cc \

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([libcolumnfile], [1.0.0])
1+
AC_INIT([libcolumnfile], [1.0.1])
22
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
33

44
AC_CONFIG_MACRO_DIR([m4])

debian/changelog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
libcolumnfile (1.0.1-1) unstable; urgency=medium
2+
3+
* Fixed some packaging issues.
4+
* Remove Delegate class with questionable license.
5+
6+
-- Morten Hustveit <[email protected]> Fri, 29 Apr 2016 12:50:38 -0400
7+
18
libcolumnfile (1.0.0-1) unstable; urgency=medium
29

310
* Initial release

src/columnfile-capnp.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef BASE_COLUMNFILE_CAPNP_H_
2-
#define BASE_COLUMNFILE_CAPNP_H_ 1
1+
#ifndef CANTERA_COLUMNFILE_CAPNP_H_
2+
#define CANTERA_COLUMNFILE_CAPNP_H_ 1
33

44
#include <capnp/dynamic.h>
55

@@ -15,4 +15,4 @@ void ReadMessageFromColumnFile(ColumnFileReader& input,
1515

1616
} // namespace cantera
1717

18-
#endif // !BASE_COLUMNFILE_CAPNP_H_
18+
#endif // !CANTERA_COLUMNFILE_CAPNP_H_

0 commit comments

Comments
 (0)