Skip to content

Commit

Permalink
json fix
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanocasazza committed May 13, 2017
1 parent 3539f93 commit 7e6b3e1
Show file tree
Hide file tree
Showing 11 changed files with 505 additions and 759 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Expand Up @@ -3,7 +3,7 @@
AUTOMAKE_OPTIONS = no-dependencies ## dist-shar dist-zip
ACLOCAL_AMFLAGS = -I m4

EXTRA_DIST = cdb configure.help TODO LICENSE* README* *.spec* ulib.html \
EXTRA_DIST = cdb configure.help TODO LICENSE* README* *.spec* \
ULib.m4 rpm.sh rpmpkgreq.lst rpmpkgreq.lst.suse openwrt \
doc/Doxyfile doc/readme.txt shtool *.awk .travis.yml autogen.sh nativejson-benchmark \
fuzz/http1-corpus fuzz/http2-corpus fuzz/build_libFuzzer.sh fuzz/Makefile.in fuzz/Makefile.am fuzz/uclient_fuzzer.cpp fuzz/uclient.cfg
Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
Expand Up @@ -444,7 +444,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = no-dependencies ## dist-shar dist-zip
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = cdb configure.help TODO LICENSE* README* *.spec* ulib.html \
EXTRA_DIST = cdb configure.help TODO LICENSE* README* *.spec* \
ULib.m4 rpm.sh rpmpkgreq.lst rpmpkgreq.lst.suse openwrt \
doc/Doxyfile doc/readme.txt shtool *.awk .travis.yml autogen.sh nativejson-benchmark \
fuzz/http1-corpus fuzz/http2-corpus fuzz/build_libFuzzer.sh fuzz/Makefile.in fuzz/Makefile.am fuzz/uclient_fuzzer.cpp fuzz/uclient.cfg
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -42,7 +42,7 @@ The current version offers the following features :
* [C Servlet Support](http://bellard.org/tcc/) with libtcc (if available) as a backend for dynamic code generation (experimental).
* Support for running Ruby on Rails applications natively (experimental).
* Support for running natively PHP applications whith a php (embedded) library (experimental).
* Support for load balance support between physical server via udp brodcast (experimental).
* Support for load balance between physical server via udp brodcast (experimental).
* Preforking mode to improve concurrency with dedicated process for long-time request.
* Support for Windows (without preforking).
* Customizable builds (you can remove unneeded functionality).
Expand Down Expand Up @@ -81,7 +81,7 @@ userver application server is since 10th round in the [TechEmpower's web framewo

## Getting Started With ULib (donated generously by jonathan kelly)

* [ulib.html](https://github.com/stefanocasazza/ULib/blob/master/ulib.html)
* [wiki](https://github.com/stefanocasazza/ULib/wiki/Getting-Started-With-ULib)

## Contributing

Expand Down
2 changes: 2 additions & 0 deletions include/ulib/container/vector.h
Expand Up @@ -29,6 +29,7 @@
*/

class UHTTP;
class UValue;
class UThreadPool;
class UHttpPlugIn;
class UFileConfig;
Expand Down Expand Up @@ -430,6 +431,7 @@ template <> class U_EXPORT UVector<void*> {
private:
U_DISALLOW_ASSIGN(UVector<void*>)

friend class UValue;
friend class UThreadPool;

template <class T> friend class UOrmTypeHandler;
Expand Down

0 comments on commit 7e6b3e1

Please sign in to comment.