working commit

Makefile

@@ -217,6 +217,7 @@ distcleancheck_listfiles = \
 ACLOCAL = ${SHELL} '/home/ziggi/Projects/tcpserv09/missing' aclocal-1.17
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
+ASTYLE = /bin/astyle
 AUTOCONF = ${SHELL} '/home/ziggi/Projects/tcpserv09/missing' autoconf
 AUTOHEADER = ${SHELL} '/home/ziggi/Projects/tcpserv09/missing' autoheader
 AUTOMAKE = ${SHELL} '/home/ziggi/Projects/tcpserv09/missing' automake-1.17
@@ -334,6 +335,7 @@ udpclient_test_SOURCES = \
 	udpclient.cpp udpclient.hpp \
 	udpclient_test.cpp
 
+ASTYLE_OPTS = --indent=spaces=8 --style=java
 all: defines.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -835,11 +837,14 @@ run: helmetd
 
 hello.pb.cc hello.pb.h: hello.proto
 	$(PROTOC) --cpp_out=. hello.proto
+format:
+	$(ASTYLE) $(ASTYLE_OPTS) *.hpp *.cpp
 
 clean-local:
 	rm -rf autom4te.cache
 	rm -f *~
 	rm -f *.o
+	rm -f *.orig
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

Makefile.am

@@ -45,8 +45,14 @@ run: helmetd
 hello.pb.cc hello.pb.h: hello.proto
 	$(PROTOC) --cpp_out=. hello.proto
 
+ASTYLE_OPTS = --indent=spaces=8 --style=java
+format:
+	$(ASTYLE) $(ASTYLE_OPTS) *.hpp *.cpp
+
 clean-local:
 	rm -rf autom4te.cache
 	rm -f *~
 	rm -f *.o
+	rm -f *.orig
+
 

Makefile.in

@@ -217,6 +217,7 @@ distcleancheck_listfiles = \
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ASTYLE = @ASTYLE@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -334,6 +335,7 @@ udpclient_test_SOURCES = \
 	udpclient.cpp udpclient.hpp \
 	udpclient_test.cpp
 
+ASTYLE_OPTS = --indent=spaces=8 --style=java
 all: defines.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -835,11 +837,14 @@ run: helmetd
 
 hello.pb.cc hello.pb.h: hello.proto
 	$(PROTOC) --cpp_out=. hello.proto
+format:
+	$(ASTYLE) $(ASTYLE_OPTS) *.hpp *.cpp
 
 clean-local:
 	rm -rf autom4te.cache
 	rm -f *~
 	rm -f *.o
+	rm -f *.orig
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

configure

@@ -610,6 +610,7 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+ASTYLE
 PROTOC
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
@@ -4879,7 +4880,7 @@ fi
 
 
 
-for ac_prog in protoc
+for ac_prog in protoc true
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4930,6 +4931,58 @@ fi
   test -n "$PROTOC" && break
 done
 
+for ac_prog in astyle true
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ASTYLE+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) case $ASTYLE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ASTYLE="$ASTYLE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ASTYLE="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac ;;
+esac
+fi
+ASTYLE=$ac_cv_path_ASTYLE
+if test -n "$ASTYLE"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ASTYLE" >&5
+printf "%s\n" "$ASTYLE" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  test -n "$ASTYLE" && break
+done
+
+
 
 ac_config_files="$ac_config_files Makefile"
 

configure.ac

@@ -7,7 +7,9 @@ AC_PROG_CC([gcc cc])
 AC_PROG_RANLIB
 AC_PROG_CXX([g++ c++])
 
-AC_PATH_PROGS([PROTOC],[protoc])
+AC_PATH_PROGS([PROTOC],[protoc true])
+AC_PATH_PROGS([ASTYLE],[astyle true])
+
 
 AC_CONFIG_FILES([
 Makefile

hello.pb.cc

@@ -49,7 +49,8 @@ Hello::Hello(::PROTOBUF_NAMESPACE_ID::Arena* arena,
 }
 Hello::Hello(const Hello& from)
         : ::PROTOBUF_NAMESPACE_ID::MessageLite() {
-  Hello* const _this = this; (void)_this;
+        Hello* const _this = this;
+        (void)_this;
         new (&_impl_) Impl_{
                 decltype(_impl_.name_) {}
                 , decltype(_impl_.id_) {}
@@ -74,7 +75,9 @@ inline void Hello::SharedCtor(
         (void)is_message_owned;
         new (&_impl_) Impl_{
                 decltype(_impl_.name_) {}
-    , decltype(_impl_.id_){0}
+                , decltype(_impl_.id_) {
+                        0
+                }
                 , /*decltype(_impl_._cached_size_)*/{}
         };
         _impl_.name_.InitDefault();